simplify code

diff --git a/server.c b/server.c
index b8c5eed8e4dea030c2bbffec03853f658e9f8ed9..b2a564d9767a23cb73921fa3c51c204125c24ecb 100644 (file)
--- a/server.c
+++ b/server.c
@@ -110,8 +110,8 @@ int open_listening_socket (int port)
     VERBOSE (DEBUG, PRINT ("Opening socket\n"));
     //socket_t sock = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
     _closesocket (sock);
-    sock = socket (AF_INET, SOCK_STREAM, 0);
-    if (sock == INVALID_SOCKET) {
+    socket_t _sock = socket (AF_INET, SOCK_STREAM, 0);
+    if (_sock == INVALID_SOCKET) {
         return 0;
     }
 
@@ -123,35 +123,34 @@ int open_listening_socket (int port)
     addr.sin_addr.s_addr = htonl (INADDR_ANY);
 
     VERBOSE (DEBUG, PRINT ("Binding socket\n"));
-    //setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof (val));
-    int rc = bind (sock, (struct sockaddr *)&addr, sizeof (addr));
+    //setsockopt (_sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof (val));
+    int rc = bind (_sock, (struct sockaddr *)&addr, sizeof (addr));
     if (rc == SOCKET_ERROR) {
         VERBOSE (ERROR, PERROR ("error: bind %d\n", ERRNO));
-        _closesocket (sock);
-        sock = INVALID_SOCKET;
+        _closesocket (_sock);
         return 0;
     }
 
     VERBOSE (DEBUG, PRINT ("Configuring socket\n"));
 #ifndef _WIN32 /* Posix */
-    fcntl (sock, F_SETFL, O_NONBLOCK);
+    fcntl (_sock, F_SETFL, O_NONBLOCK);
 #endif
-    rc = setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
+    rc = setsockopt (_sock, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
     if (rc < 0) {
         VERBOSE (ERROR, PERROR ("error: %s\n", "setsockopt/TCP_NODELAY"));
-        _closesocket (sock);
-        sock = INVALID_SOCKET;
+        _closesocket (_sock);
         return 0;
     }
 
-    rc = listen (sock, BACKLOG);
+    rc = listen (_sock, BACKLOG);
     if (rc < 0) {
         VERBOSE (ERROR, PERROR ("error: %s\n", "listen"));
-        _closesocket (sock);
-        sock = INVALID_SOCKET;
+        _closesocket (_sock);
         return 0;
     }
 
+    sock = _sock;
+
     return 1;
 }
 
@@ -168,23 +167,24 @@ int accept_incoming_connection (void)
         _closesocket (conn);
         conn = INVALID_SOCKET;
     }
-    conn = accept (sock, NULL, 0);
-    if (conn == INVALID_SOCKET) {
+    socket_t _conn = accept (sock, NULL, 0);
+    if (_conn == INVALID_SOCKET) {
         return 0;
     }
 
 #ifndef _WIN32 /* POSIX */
-    fcntl (conn, F_SETFL, O_NONBLOCK);
+    fcntl (_conn, F_SETFL, O_NONBLOCK);
 #endif
     int val = 1;
-    int rc = setsockopt (conn, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
+    int rc = setsockopt (_conn, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof (val));
     if (rc < 0) {
         VERBOSE (ERROR, PERROR ("error: %s\n", "setsockopt/TCP_NODELAY"));
-        _closesocket (conn);
-        conn = INVALID_SOCKET;
+        _closesocket (_conn);
         return 0;
     }
 
+    conn = _conn;
+
     return 1;
 }