const addr *p_addr(peer *p) { return (&p->spec.sa); }
-/* --- @p_init@ --- *
+/* --- @p_bind@ --- *
*
* Arguments: @struct addrinfo *ailist@ = addresses to bind to
*
* 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;
* 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) {
+ 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].sf.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@ --- *