X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/8d4c29d2d46656f85b1ef29ce0020c83fdc8ecf2..917c5c17c0321c7ebd31737261a62de768da4a75:/server/peer.c?ds=sidebyside

diff --git a/server/peer.c b/server/peer.c
index 377dcc59..5855f2e1 100644
--- a/server/peer.c
+++ b/server/peer.c
@@ -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;
@@ -850,39 +850,61 @@ 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].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);
   }
 
+}
+
+/* --- @p_init@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	---
+ *
+ * Use:		Initializes the peer system.
+ */
+
+void p_init(void)
+{
   sym_create(&byname);
   am_create(&byaddr);
 }
@@ -970,6 +992,7 @@ peer *p_create(peerspec *spec)
   T( trace(T_TUNNEL, "peer: attached interface %s to peer `%s'",
 	   p->ifname, p_name(p)); )
   p_setkatimer(p);
+  iv_addreason();
   if (kx_setup(&p->kx, p, &p->ks, p->spec.f & PSF_KXMASK))
     goto tidy_4;
   a_notify("ADD",
@@ -988,6 +1011,7 @@ tidy_4:
   if (spec->t_ka) sel_rmtimer(&p->tka);
   xfree(p->ifname);
   p->t->ops->destroy(p->t);
+  iv_rmreason();
 tidy_3:
   if (fd >= 0) close(fd);
 tidy_2:
@@ -1119,9 +1143,21 @@ void p_destroy(peer *p, int bye)
   }
   sym_remove(&byname, p->byname);
   am_remove(&byaddr, p->byaddr);
+  iv_rmreason();
   DESTROY(p);
 }
 
+/* --- @p_destroyall@ --- *
+ *
+ * Arguments:	---
+ *
+ * Returns:	---
+ *
+ * Use:		Destroys all of the peers, saying goodbye.
+ */
+
+void p_destroyall(void) { FOREACH_PEER(p, { p_destroy(p, 1); }); }
+
 /* --- @p_mkiter@ --- *
  *
  * Arguments:	@peer_iter *i@ = pointer to an iterator