X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/56c76774f4077c83e975d51c3488f43e54390b5c..ac3a27f5170d199ad452e29ce7f78a6f5d0be913:/server/peer.c

diff --git a/server/peer.c b/server/peer.c
index 341ea38b..fb016169 100644
--- a/server/peer.c
+++ b/server/peer.c
@@ -29,7 +29,7 @@
 
 /*----- Global state ------------------------------------------------------*/
 
-sel_file udpsock[NADDRFAM];
+udpsocket udpsock[NADDRFAM];
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -534,7 +534,7 @@ int p_txaddr(const addr *a, const void *p, size_t sz)
     return (-1);
   }
   IF_TRACING(T_PEER, trace_block(T_PACKET, "peer: sending packet", p, sz); )
-  if (sendto(udpsock[i].fd, p, sz, 0, &a->sa, sasz) < 0) {
+  if (sendto(udpsock[i].sf.fd, p, sz, 0, &a->sa, sasz) < 0) {
     a_warn("PEER", "?ADDR", a, "socket-write-error", "?ERRNO", A_END);
     return (-1);
   }
@@ -562,7 +562,7 @@ static int p_dotxend(peer *p)
   }
   IF_TRACING(T_PEER, trace_block(T_PACKET, "peer: sending packet",
 				 BBASE(&p->b), BLEN(&p->b)); )
-  if (sendto(udpsock[p->afix].fd, BBASE(&p->b), BLEN(&p->b),
+  if (sendto(udpsock[p->afix].sf.fd, BBASE(&p->b), BLEN(&p->b),
 	     0, &p->spec.sa.sa, sasz) < 0) {
     a_warn("PEER", "?PEER", p, "socket-write-error", "?ERRNO", A_END);
     return (0);
@@ -816,7 +816,7 @@ void p_setifname(peer *p, const char *name)
 
 const addr *p_addr(peer *p) { return (&p->spec.sa); }
 
-/* --- @p_init@ --- *
+/* --- @p_bind@ --- *
  *
  * Arguments:	@struct addrinfo *ailist@ = addresses to bind to
  *
@@ -825,7 +825,7 @@ const addr *p_addr(peer *p) { return (&p->spec.sa); }
  * Use:		Initializes the peer system; creates the socket.
  */
 
-void p_init(struct addrinfo *ailist)
+void p_bind(struct addrinfo *ailist)
 {
   int fd;
   int len = PKBUFSZ;
@@ -836,11 +836,11 @@ void p_init(struct addrinfo *ailist)
   addr a;
   socklen_t sz;
 
-  for (i = 0; i < NADDRFAM; i++) udpsock[i].fd = -1;
+  for (i = 0; i < NADDRFAM; i++) udpsock[i].sf.fd = -1;
 
   for (ai = ailist; ai; ai = ai->ai_next) {
     if ((i = afix(ai->ai_family)) < 0) continue;
-    if (udpsock[i].fd != -1) continue;
+    if (udpsock[i].sf.fd != -1) continue;
 
     /* --- Note on socket buffer sizes --- *
      *
@@ -850,56 +850,63 @@ void p_init(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], fd, SEL_READ, p_read, 0);
-    sel_addfile(&udpsock[i]);
-    T( trace(T_PEER, "peer: created %s socket", aftab[i].name); )
-    if (!port) {
+    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);
       }
-      lastport = getport(&a);
+      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);
   }
 
-  sym_create(&byname);
-  am_create(&byaddr);
 }
 
-/* --- @p_port@ --- *
+/* --- @p_init@ --- *
+ *
+ * Arguments:	---
  *
- * Arguments:	@int i@ = address family index to retrieve
+ * Returns:	---
  *
- * Returns:	Port number used for socket.
+ * Use:		Initializes the peer system.
  */
 
-unsigned p_port(int i)
+void p_init(void)
 {
-  addr a;
-  socklen_t sz = sizeof(addr);
-
-  if (getsockname(udpsock[i].fd, &a.sa, &sz))
-    die(EXIT_FAILURE, "couldn't read port number: %s", strerror(errno));
-  return (getport(&a));
+  sym_create(&byname);
+  am_create(&byaddr);
 }
 
 /* --- @p_keepalive@ --- *