From 766433b8501e9218d7a6b0f4c66ffce788032118 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 22 Feb 2016 17:10:13 +0100 Subject: socket: improve and simplify error handling Rather exit on errors we're unlikely to recover from than retrying indefinitely. --- src/fastd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/fastd.c') diff --git a/src/fastd.c b/src/fastd.c index f75bc87..bd1482f 100644 --- a/src/fastd.c +++ b/src/fastd.c @@ -187,7 +187,7 @@ static void init_sockets(void) { fastd_bind_address_t *addr = conf.bind_addrs; for (i = 0; i < conf.n_bind_addrs; i++) { if (get_bind_port(addr)) { - ctx.socks[i] = (fastd_socket_t){ .fd = FASTD_POLL_FD(POLL_TYPE_SOCKET, -2), .addr = addr }; + ctx.socks[i] = (fastd_socket_t){ .fd = FASTD_POLL_FD(POLL_TYPE_SOCKET, -1), .addr = addr }; if (addr == conf.bind_addr_default_v4) ctx.sock_default_v4 = &ctx.socks[i]; @@ -545,8 +545,7 @@ static inline void init(int argc, char *argv[]) { fastd_status_init(); fastd_async_init(); - if (!fastd_socket_handle_binds()) - exit_error("unable to bind default socket"); + fastd_socket_bind_all(); on_pre_up(); -- cgit v1.2.3