X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/7737eb87d283d46b7a90caba20ac75c3214451d3..c9aded9f1c5c6eea294bf85e5e34efb9f52138c6:/server/peer.c

diff --git a/server/peer.c b/server/peer.c
index 27ac4a78..fb016169 100644
--- a/server/peer.c
+++ b/server/peer.c
@@ -850,37 +850,46 @@ void p_bind(struct addrinfo *ailist)
      * than second-guessing me.
      */
 
-    if ((fd = socket(ai->ai_family, SOCK_DGRAM, 0)) < 0)
-      die(EXIT_FAILURE, "socket creation failed: %s", strerror(errno));
+    if ((fd = socket(ai->ai_family, SOCK_DGRAM, 0)) < 0) {
+      a_warn("PEER", "-", "udp-socket", "%s", aftab[i].name,
+	     "create-failed", "?ERRNO", A_END);
+      exit(EXIT_FAILURE);
+    }
     if (i == AFIX_INET6 &&
 	setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes))) {
-      die(EXIT_FAILURE, "failed to set IPv6-only state: %s",
-	  strerror(errno));
+      a_warn("PEER", "-", "udp-socket", "%s", aftab[i].name,
+	     "set-v6only-failed", "?ERRNO", A_END);
+      exit(EXIT_FAILURE);
     }
     assert(ai->ai_addrlen <= sizeof(a));
     memcpy(&a, ai->ai_addr, ai->ai_addrlen);
     if ((port = getport(&a)) == 0 && lastport) setport(&a, lastport);
-    if (bind(fd, &a.sa, addrsz(&a)))
-      die(EXIT_FAILURE, "bind failed: %s", strerror(errno));
+    if (bind(fd, &a.sa, addrsz(&a))) {
+      a_warn("PEER", "-", "udp-socket", "%s", aftab[i].name,
+	     "bind-failed", "?ERRNO", A_END);
+      exit(EXIT_FAILURE);
+    }
     if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &len, sizeof(len)) ||
 	setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &len, sizeof(len))) {
-      die(EXIT_FAILURE, "failed to set socket buffer sizes: %s",
-	  strerror(errno));
+      a_warn("PEER", "-", "udp-socket", "%s", aftab[i].name,
+	     "set-buffers-failed", "?ERRNO", A_END);
+      exit(EXIT_FAILURE);
     }
     fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
-    sel_initfile(&sel, &udpsock[i].sf, fd, SEL_READ, p_read, 0);
-    sel_addfile(&udpsock[i].sf);
-    T( trace(T_PEER, "peer: created %s socket", aftab[i].name); )
     if (port)
       udpsock[i].port = port;
     else {
       sz = sizeof(a);
       if (getsockname(fd, &a.sa, &sz)) {
-	die(EXIT_FAILURE, "failed to read local socket address: %s",
-	    strerror(errno));
+	a_warn("PEER", "-", "udp-socket", "%s", aftab[i].name,
+	       "read-local-address-failed", "?ERRNO", A_END);
+	exit(EXIT_FAILURE);
       }
       udpsock[i].port = lastport = getport(&a);
     }
+    T( trace(T_PEER, "peer: created %s socket", aftab[i].name); )
+    sel_initfile(&sel, &udpsock[i].sf, fd, SEL_READ, p_read, 0);
+    sel_addfile(&udpsock[i].sf);
   }
 
 }