summaryrefslogtreecommitdiffstats
path: root/src/fastd.c
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-02-22 17:10:13 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-02-22 17:10:13 +0100
commit766433b8501e9218d7a6b0f4c66ffce788032118 (patch)
treedf52bca988f78a2cdf5a5750e0d1ce3f6f245242 /src/fastd.c
parent29894cc8d155188e057451cf58cc686a9ad0d1c6 (diff)
downloadfastd-766433b8501e9218d7a6b0f4c66ffce788032118.tar
fastd-766433b8501e9218d7a6b0f4c66ffce788032118.zip
socket: improve and simplify error handling
Rather exit on errors we're unlikely to recover from than retrying indefinitely.
Diffstat (limited to 'src/fastd.c')
-rw-r--r--src/fastd.c5
1 files changed, 2 insertions, 3 deletions
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();