IPBAN関連を一つにまとめた

diff --git a/chatServer.js b/chatServer.js
index 40012bf..461c0e5 100644 (file)
--- a/chatServer.js
+++ b/chatServer.js
@@ -187,39 +187,6 @@ function removeLog(files,callback)
        });\r
 }\r
 \r
-function getTextFromIpBanlist(list)\r
-{\r
-       var text = "";\r
-       for(var key in ipbanlist)\r
-       {\r
-               if(ipbanlist[key] == "")\r
-                       text += key + "\r\n";\r
-               else\r
-                       text += key + ":" + ipbanlist[key] + "\r\n";\r
-       }\r
-       return text;\r
-}\r
-\r
-function updateIpBanList(text,callfunc)\r
-{\r
-       async.waterfall([\r
-               function(callback){\r
-                       fs.open($ip_ban_list_file_name,"w",callback);\r
-               },\r
-               function(fd,callback){\r
-                       var buf = new Buffer(text);\r
-                       fs.write(fd,buf,0,Buffer.byteLength(text),null,function(){\r
-                               callback(null,fd);\r
-                       });\r
-               },\r
-               function(fd,callback){\r
-                       fs.close(fd,function(){\r
-                               getIpBanList(callfunc);\r
-                       });\r
-               }\r
-       ]);\r
-}\r
-\r
 app.listen($port);\r
 console.log("Express server listening on port %d in %s mode", app.address().port, app.settings.env);\r
 \r
@@ -281,34 +248,6 @@ function createLogDirectory()
        });\r
 }\r
 \r
-function getIpBanList(callback)\r
-{\r
-       ipbanlist = {};\r
-       path.exists($ip_ban_list_file_name,function(exists){\r
-               if(exists == false)\r
-               {\r
-                       if(typeof(callback) == "function")\r
-                               callback();\r
-                       return;\r
-               }\r
-               var stream = fs.createReadStream($ip_ban_list_file_name);\r
-               new lazy(stream)\r
-                       .lines\r
-                       .forEach(function(line){\r
-                               var token = line.toString().split(":");\r
-                               var ip = token[0].replace(/(\r|\n|\r\n)/gm, "");\r
-                               if(token.length == 1)\r
-                                       ipbanlist[ip] = "";\r
-                               else\r
-                                       ipbanlist[ip] = token[1];\r
-                       })\r
-                       .join(function(){\r
-                               if(typeof(callback) == "function")\r
-                                       callback();\r
-                       });\r
-       });\r
-}\r
-\r
 function ParseAuthorization(handshakeData, callback)\r
 {\r
        if(handshakeData.headers.cookie) {\r
@@ -727,3 +666,65 @@ function CreateRoomsFromString(str)
                }\r
        }\r
 }\r
+\r
+//IPBAN\r
+function getTextFromIpBanlist(list)\r
+{\r
+       var text = "";\r
+       for(var key in ipbanlist)\r
+       {\r
+               if(ipbanlist[key] == "")\r
+                       text += key + "\r\n";\r
+               else\r
+                       text += key + ":" + ipbanlist[key] + "\r\n";\r
+       }\r
+       return text;\r
+}\r
+\r
+function updateIpBanList(text,callfunc)\r
+{\r
+       async.waterfall([\r
+               function(callback){\r
+                       fs.open($ip_ban_list_file_name,"w",callback);\r
+               },\r
+               function(fd,callback){\r
+                       var buf = new Buffer(text);\r
+                       fs.write(fd,buf,0,Buffer.byteLength(text),null,function(){\r
+                               callback(null,fd);\r
+                       });\r
+               },\r
+               function(fd,callback){\r
+                       fs.close(fd,function(){\r
+                               getIpBanList(callfunc);\r
+                       });\r
+               }\r
+       ]);\r
+}\r
+\r
+function getIpBanList(callback)\r
+{\r
+       ipbanlist = {};\r
+       path.exists($ip_ban_list_file_name,function(exists){\r
+               if(exists == false)\r
+               {\r
+                       if(typeof(callback) == "function")\r
+                               callback();\r
+                       return;\r
+               }\r
+               var stream = fs.createReadStream($ip_ban_list_file_name);\r
+               new lazy(stream)\r
+                       .lines\r
+                       .forEach(function(line){\r
+                               var token = line.toString().split(":");\r
+                               var ip = token[0].replace(/(\r|\n|\r\n)/gm, "");\r
+                               if(token.length == 1)\r
+                                       ipbanlist[ip] = "";\r
+                               else\r
+                                       ipbanlist[ip] = token[1];\r
+                       })\r
+                       .join(function(){\r
+                               if(typeof(callback) == "function")\r
+                                       callback();\r
+                       });\r
+       });\r
+}\r