Update copyright year.

[umurmur.git] / src / server.c

diff --git a/src/server.c b/src/server.c
index d41aab10e231bb64133ec15b6399c7f34ebac924..439b6c3e775adf90b8b4d388fb29058a6c575d15 100644 (file)
--- 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-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, 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) {