Kaynağa Gözat

* Don't warn about falures to listen on port 113

svn: 1816
Bryan Drewery 21 yıl önce
ebeveyn
işleme
eb620e7634
1 değiştirilmiş dosya ile 12 ekleme ve 6 silme
  1. 12 6
      src/net.c

+ 12 - 6
src/net.c

@@ -754,19 +754,22 @@ intt open_address_listen(in_addr_t addr, port_t *port)
     /* memcpy(&name6.sin6_addr, &in6addr_any, 16); */ /* this is the only way to get ipv6+ipv4 in 1 socket */
     memcpy(&name6.sin6_addr, &cached_myip6_so.sin6.sin6_addr, 16);
     if (bind(sock, (struct sockaddr *) &name6, sizeof(name6)) < 0) {
-      putlog(LOG_ERROR, "*", "Failed to bind to socket %d for listen on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "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) {
-      putlog(LOG_ERROR, "*", "Failed to getsockname on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "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) {
-      putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
@@ -785,20 +788,23 @@ intt open_address_listen(in_addr_t addr, port_t *port)
     name.sin_port = htons(*port); /* 0 = just assign us a port */
     name.sin_addr.s_addr = addr;
     if (bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0) {
-      putlog(LOG_ERROR, "*", "Failed to bind to socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "Failed to bind to socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }
     /* what port are we on? */
     addrlen = sizeof(name);
     if (getsockname(sock, (struct sockaddr *) &name, &addrlen) < 0) {
-      putlog(LOG_ERROR, "*", "Failed to getsockname on socket '%d' for listen on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "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) {
-      putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for on port '%d': %s", sock, *port, strerror(errno));
+      if (!(identd_hack && *port == 113))
+        putlog(LOG_ERROR, "*", "Failed to listen on socket '%d' for on port '%d': %s", sock, *port, strerror(errno));
       killsock(sock);
       return -1;
     }