* fixed some error messages and comments

diff --git a/net/net.c b/net/net.c
index 9991c6b81e634963fcd5e9a8d54ec4c1a159feba..83c188e2ba35711d0896b1e97f523728aac202fe 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -58,7 +58,7 @@ static char *addr2str(const struct sockaddr *addr, socklen_t addrlen) {
 
 #ifdef NET_DBG
 #define NETLOG_DBG(...)     do {                                       \
-            NETLOG_MSG(__FILE__,__func__,__LINE__,__VA_ARGS__);        \
+            NETLOG_MSG(__FILE__,__func__,__LINE__,"DEBUG: "__VA_ARGS__);\
             fprintf(stderr,"\n");                                      \
         } while(0)
 #else
@@ -73,7 +73,7 @@ static char *addr2str(const struct sockaddr *addr, socklen_t addrlen) {
 #endif  /* NET_ERR */
 
 
-/* Helper function to bind a client port to local node address: */
+/* Helper function to bind a client socket to local node address: */
 static int net_bind_local(int sock, const char *addr, int st, int af ) {
     /* Only try to bind if actually requested! */
     if (addr == NULL || *addr == '\0' || *addr == '*')
@@ -101,7 +101,7 @@ static int net_bind_local(int sock, const char *addr, int st, int af ) {
         }
         else {
             GET_STRADDR(straddr_, ai->ai_addr, ai->ai_addrlen);
-            NETLOG_DBG("bind(%d, %s) : OK", sock, straddr_);
+            NETLOG_DBG("bind(%d, %s): Ok", sock, straddr_);
             FREE_STRADDR(straddr_);
         }
         break;
@@ -150,7 +150,7 @@ int net_open_server(const char *addr, const char *svc, int st, int af) {
         }
         else {
             GET_STRADDR(straddr_, ai->ai_addr, ai->ai_addrlen);
-            NETLOG_DBG("bind(%d, %s) : OK", sock, straddr_);
+            NETLOG_DBG("bind(%d, %s): Ok", sock, straddr_);
             FREE_STRADDR(straddr_);
         }
         break;
@@ -200,7 +200,7 @@ int net_open_client(const char *host, const char *svc, const char *addr, int st,
         }
         err = net_bind_local(sock, addr, ai->ai_socktype, ai->ai_family);
         if (err != 0) {
-            /* Errors already logged in net_bind()! */
+            /* Errors already logged in net_bind_local()! */
             close(sock);
             sock = -1;
             continue;
@@ -208,7 +208,7 @@ int net_open_client(const char *host, const char *svc, const char *addr, int st,
         err = connect(sock, ai->ai_addr, ai->ai_addrlen);
         if (err != 0) {
             GET_STRADDR(straddr_, ai->ai_addr, ai->ai_addrlen);
-            NETLOG_ERR(EAI_SYSTEM, "connect(%d, %s) ", sock, straddr_);
+            NETLOG_ERR(EAI_SYSTEM, "connect(%d, %s)", sock, straddr_);
             FREE_STRADDR(straddr_);
             close(sock);
             sock = -1;
@@ -216,7 +216,7 @@ int net_open_client(const char *host, const char *svc, const char *addr, int st,
         }
         else {
             GET_STRADDR(straddr_, ai->ai_addr, ai->ai_addrlen);
-            NETLOG_DBG("connect(%d, %s) : OK", sock, straddr_);
+            NETLOG_DBG("connect(%d, %s): Ok", sock, straddr_);
             FREE_STRADDR(straddr_);
         }
         break;
@@ -230,10 +230,10 @@ int net_open_client(const char *host, const char *svc, const char *addr, int st,
 /* Close socket: */
 int net_close(int sock) {
     int err;
-
     err = shutdown(sock, SHUT_RDWR);
     if (err < 0) {
-        NETLOG_DBG("shutdown(%d) : %s", sock, strerror(errno));
+        /* This "error" is never reported back to caller! */
+        NETLOG_DBG("shutdown(%d): %s", sock, strerror(errno));
     }
     err = close(sock);
     if (err < 0) {
@@ -259,7 +259,7 @@ int tcp_accept(int sock, int timeout) {
         if (conn < 0) {
             NETLOG_ERR(EAI_SYSTEM, "accept(%d, %s)", sock, straddr_);
         } else {
-            NETLOG_DBG("accept(%d) -> (%d, %s) : OK", sock, conn, straddr_);
+            NETLOG_DBG("accept(%d) -> (%d, %s): Ok", sock, conn, straddr_);
         }
         FREE_STRADDR(straddr_);
     }
@@ -268,7 +268,7 @@ int tcp_accept(int sock, int timeout) {
         return EAI_SYSTEM;
     }
     else if (pr == 0) {
-        NETLOG_DBG("poll(%d, %d) timed out", sock, timeout);
+        NETLOG_DBG("poll(%d, %d): Timeout", sock, timeout);
         errno = ETIMEDOUT;
         return EAI_SYSTEM;
     }
@@ -277,7 +277,9 @@ int tcp_accept(int sock, int timeout) {
 
 /* Copy textual description of last error to user supplied buffer: */
 char *net_strerror(int errnum, char *buf, size_t len) {
-    if ( errnum == EAI_SYSTEM )
+    if (errnum >= 0)
+        snprintf(buf, len, "Success");
+    else if (errnum == EAI_SYSTEM)
         strerror_r(errno, buf, len);
     else
         snprintf(buf, len, gai_strerror(errnum));