From b5defda27f5d09f315fbecfcf3b08410c0ce7b2a Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Thu, 16 Sep 2021 15:58:16 +0200 Subject: [PATCH] network-watch: Don't fail initialization when unable to fetch local IP This would mean we're failing when Calls is started with all NICs not connected or disabled. To make matters worse this would only be fixable by restarting Calls. --- src/calls-network-watch.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/calls-network-watch.c b/src/calls-network-watch.c index d619da8..46216d4 100644 --- a/src/calls-network-watch.c +++ b/src/calls-network-watch.c @@ -396,7 +396,6 @@ calls_network_watch_initable_init (GInitable *initable, GError **error) { CallsNetworkWatch *self = CALLS_NETWORK_WATCH (initable); - gboolean ret = FALSE; self->fd = socket (AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if (self->fd == -1 && error) { @@ -406,16 +405,17 @@ calls_network_watch_initable_init (GInitable *initable, return FALSE; } - if (fetch_ipv4 (self)) { - ret = TRUE; + if (fetch_ipv4 (self)) self->ipv4 = g_strdup (self->tmp_addr); - } - if (fetch_ipv6 (self)) { - ret = TRUE; - self->ipv6 = g_strdup (self->tmp_addr); - } + else + self->ipv4 = g_strdup ("127.0.0.1"); - return ret; + if (fetch_ipv6 (self)) + self->ipv6 = g_strdup (self->tmp_addr); + else + self->ipv6 = g_strdup ("::1"); + + return TRUE; }