diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-06 14:19:26 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-06 14:19:26 +0000 |
| commit | 3adaf8788b65a84ec4266c6621d30679a95f546d (patch) | |
| tree | da233eb45db1f482a4f2a86be9529c90edd76c8b /src/common/socket.c | |
| parent | ad95c2ba955e42d74afffbb6b9b333f69a3f1b1e (diff) | |
| download | hercules-3adaf8788b65a84ec4266c6621d30679a95f546d.tar.gz hercules-3adaf8788b65a84ec4266c6621d30679a95f546d.tar.bz2 hercules-3adaf8788b65a84ec4266c6621d30679a95f546d.tar.xz hercules-3adaf8788b65a84ec4266c6621d30679a95f546d.zip | |
Modified showmsg code to not attach a timestamp to MSG_NONE-type messages, generated by ShowMessage(). It now works exactly like printf().
Removed/replaced all printf calls in the code.
Added a new flag to setting 'console_silent', for filtering debug messages.
Silenced the "Broken pipe found" and "Server running in debug mode" messages.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12020 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/socket.c')
| -rw-r--r-- | src/common/socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/socket.c b/src/common/socket.c index 0173ee846..9bc49a3e0 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -817,7 +817,7 @@ static int connect_check(uint32 ip) { int result = connect_check_(ip); if( access_debug ) { - ShowMessage("connect_check: Connection from %d.%d.%d.%d %s\n", CONVIP(ip),result ? "allowed." : "denied!"); + ShowInfo("connect_check: Connection from %d.%d.%d.%d %s\n", CONVIP(ip),result ? "allowed." : "denied!"); } return result; } @@ -837,7 +837,7 @@ static int connect_check_(uint32 ip) for( i=0; i < access_allownum; ++i ){ if( (ip & access_allow[i].mask) == (access_allow[i].ip & access_allow[i].mask) ){ if( access_debug ){ - ShowMessage("connect_check: Found match from allow list:%d.%d.%d.%d IP:%d.%d.%d.%d Mask:%d.%d.%d.%d\n", + ShowInfo("connect_check: Found match from allow list:%d.%d.%d.%d IP:%d.%d.%d.%d Mask:%d.%d.%d.%d\n", CONVIP(ip), CONVIP(access_allow[i].ip), CONVIP(access_allow[i].mask)); @@ -850,7 +850,7 @@ static int connect_check_(uint32 ip) for( i=0; i < access_denynum; ++i ){ if( (ip & access_deny[i].mask) == (access_deny[i].ip & access_deny[i].mask) ){ if( access_debug ){ - ShowMessage("connect_check: Found match from deny list:%d.%d.%d.%d IP:%d.%d.%d.%d Mask:%d.%d.%d.%d\n", + ShowInfo("connect_check: Found match from deny list:%d.%d.%d.%d IP:%d.%d.%d.%d Mask:%d.%d.%d.%d\n", CONVIP(ip), CONVIP(access_deny[i].ip), CONVIP(access_deny[i].mask)); @@ -956,7 +956,7 @@ static int connect_check_clear(int tid, unsigned int tick, int id, int data) connect_history[i] = root.next; } if( access_debug ){ - ShowMessage("connect_check_clear: Cleared %d of %d from IP list.\n", clear, list); + ShowInfo("connect_check_clear: Cleared %d of %d from IP list.\n", clear, list); } return list; } @@ -1001,7 +1001,7 @@ int access_ipmask(const char* str, AccessControl* acc) } } if( access_debug ){ - ShowMessage("access_ipmask: Loaded IP:%d.%d.%d.%d mask:%d.%d.%d.%d\n", CONVIP(ip), CONVIP(mask)); + ShowInfo("access_ipmask: Loaded IP:%d.%d.%d.%d mask:%d.%d.%d.%d\n", CONVIP(ip), CONVIP(mask)); } acc->ip = ip; acc->mask = mask; @@ -1215,7 +1215,7 @@ void socket_init(void) } if( LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 0 ) { - printf("socket_init: WinSock version mismatch (2.0 or compatible required)!\n"); + ShowError("socket_init: WinSock version mismatch (2.0 or compatible required)!\n"); return; } } |