Jelajahi Sumber

* Changed failed socket bindings to DEBUG msgs

svn: 2040
Bryan Drewery 21 tahun lalu
induk
melakukan
7391ee0927
2 mengubah file dengan 10 tambahan dan 10 penghapusan
  1. 1 1
      doc/UPDATES
  2. 9 9
      src/net.c

+ 1 - 1
doc/UPDATES

@@ -51,7 +51,7 @@ Lines prefixxed with '-' were disabled before release and are not finishsed, or
 * Fixed channel bans not displaying on hubs (#1)
 * Fixed users showing up in .whom after doing .botcmd and relinking the bot which the cmd was ran on. (#9)
 * Default UID is now: -1 (Fixes running as root by accident. #12)
-* Added some error logging for failed bind() listen() and getsockname()
+* Added some debug logging for failed bind() listen() and getsockname()
 * Fixed DNS returning a blank reply for reverse lookups with missing records.
 * Setting -take now automatically sets +fastop as well (#13).
 * Added cmd_version (does same as .botversion)

+ 9 - 9
src/net.c

@@ -637,7 +637,7 @@ int open_telnet_raw(int sock, const char *server, port_t sport, bool proxy_on)
     initialize_sockaddr(is_resolved, NULL, 0, &so);
 
     if (bind(sock, &so.sa, SIZEOF_SOCKADDR(so)) < 0) {
-      putlog(LOG_ERROR, "*", "Failed to bind to socket %d: %s", sock, strerror(errno));
+      putlog(LOG_DEBUG, "*", "Failed to bind to socket %d: %s", sock, strerror(errno));
       killsock(sock);
       return -1;
     }
@@ -655,14 +655,14 @@ int open_telnet_raw(int sock, const char *server, port_t sport, bool proxy_on)
 #ifdef USE_IPV6
         if (so.sa.sa_family == AF_INET6) {
           if (bind(sock, &cached_myip6_so.sa, SIZEOF_SOCKADDR(cached_myip6_so)) < 0) {
-            putlog(LOG_ERROR, "*", "Failed to bind to v6 socket %d: %s", sock, strerror(errno));
+            putlog(LOG_DEBUG, "*", "Failed to bind to v6 socket %d: %s", sock, strerror(errno));
             killsock(sock);
             return -1;
           }
         } else {
 #endif /* USE_IPV6 */
           if (bind(sock, &cached_myip4_so.sa, SIZEOF_SOCKADDR(cached_myip4_so)) < 0) {
-            putlog(LOG_ERROR, "*", "Failed to bind to socket %d: %s", sock, strerror(errno));
+            putlog(LOG_DEBUG, "*", "Failed to bind to socket %d: %s", sock, strerror(errno));
             killsock(sock);
             return -3;
           }
@@ -769,21 +769,21 @@ intt open_address_listen(in_addr_t addr, port_t *port)
     memcpy(&name6.sin6_addr, &cached_myip6_so.sin6.sin6_addr, 16);
     if (bind(sock, (struct sockaddr *) &name6, sizeof(name6)) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to bind to socket %d for listen on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to bind to socket %d for listen on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
     addrlen = sizeof(name6);
     if (getsockname(sock, (struct sockaddr *) &name6, &addrlen) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to getsockname on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to getsockname on socket %d for listen on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
     *port = ntohs(name6.sin6_port);
     if (listen(sock, 1) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to listen on socket %d for listen on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
@@ -803,7 +803,7 @@ intt open_address_listen(in_addr_t addr, port_t *port)
     name.sin_addr.s_addr = addr;
     if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to bind to socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to bind to socket %d for listen on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
@@ -811,14 +811,14 @@ intt open_address_listen(in_addr_t addr, port_t *port)
     addrlen = sizeof(name);
     if (getsockname(sock, (struct sockaddr *) &name, &addrlen) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to getsockname on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to getsockname on socket %d for listen on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
     *port = ntohs(name.sin_port);
     if (listen(sock, 1) < 0) {
       if (!(identd_hack && *port == 113))
-        putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for on port '%d': %s", sock, *port, strerror(errno));
+        putlog(LOG_DEBUG, "*", "Failed to listen on socket %d for on port %d: %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }