X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fserver.c;h=51f2cee9a94f0cb4f68731bb71ac072ad041f442;hb=772cee17b53bb6795a5e98f1ae2acb7e7d6c25c1;hp=d41aab10e231bb64133ec15b6399c7f34ebac924;hpb=a76733ea91c6a1d42dfbb50631fa214cc284c3bf;p=umurmur.git

diff --git a/src/server.c b/src/server.c
index d41aab1..51f2cee 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -132,8 +132,8 @@ void Server_run()
 	
 	Timer_init(&janitorTimer);
 	
-	Log_info("uMurmur version %s protocol version %d.%d.%d",
-			 UMURMUR_VERSION, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
+	Log_info("uMurmur version %s ('%s') protocol version %d.%d.%d",
+	         UMURMUR_VERSION, UMURMUR_CODENAME, PROTVER_MAJOR, PROTVER_MINOR, PROTVER_PATCH);
 	Log_info("Visit http://code.google.com/p/umurmur/");
 	
 	/* Main server loop */
@@ -173,7 +173,8 @@ void Server_run()
 			setsockopt(tcpfd, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, sizeof(int));
 			Log_debug("Connection from %s port %d\n", inet_ntoa(remote.sin_addr),
 					  ntohs(remote.sin_port));
-			Client_add(tcpfd, &remote);
+			if (Client_add(tcpfd, &remote) < 0)
+				close(tcpfd);
 		}
 
 		if (pollfds[UDP_SOCK].revents) {