瀏覽代碼

* Added a message indicating how many concurrent connections the server was compiled to support.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14978 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 13 年之前
父節點
當前提交
b13243b678
共有 2 個文件被更改,包括 5 次插入0 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 4 0
      src/common/socket.c

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2011/10/16
+	* Added a message indicating how many concurrent connections the server was compiled to support. [Ai4rei]
 	* Added field for the change slot feature to character select list packet for 2011-09-28aRagexeRE and newer. [Ai4rei]
 	* Changed function-like macros into inline functions where it seemed appropriate (topic:264007). [Ai4rei]
 	* Fixed public/guild chat message packets sending strings without zero-termination causing recent clients to display trailing junk on such messages (bugreport:5068). [Ai4rei]

+ 4 - 0
src/common/socket.c

@@ -1222,6 +1222,7 @@ int socket_getips(uint32* ips, int max)
 void socket_init(void)
 {
 	char *SOCKET_CONF_FILENAME = "conf/packet_athena.conf";
+	unsigned int rlim_cur = FD_SETSIZE;
 
 #ifdef WIN32
 	{// Start up windows networking
@@ -1265,6 +1266,7 @@ void socket_init(void)
 					if( err == EPERM )
 						errmsg = "permission denied";
 					ShowWarning("socket_init: failed to set socket limit to %d, setting to maximum allowed (original limit=%d, current limit=%d, maximum allowed=%d, error=%s).\n", FD_SETSIZE, rlim_ori, (int)rlp.rlim_cur, (int)rlp.rlim_max, errmsg);
+					rlim_cur = rlp.rlim_cur;
 				}
 			}
 		}
@@ -1294,6 +1296,8 @@ void socket_init(void)
 	add_timer_func_list(connect_check_clear, "connect_check_clear");
 	add_timer_interval(gettick()+1000, connect_check_clear, 0, 0, 5*60*1000);
 #endif
+
+	ShowInfo("Server supports up to '"CL_WHITE"%u"CL_RESET"' concurrent connections.\n", rlim_cur);
 }