fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 05:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

connectivity: fix build with --disable-concheck

Browse source 
Fixes: 2cec94bacc ('connectivity: use systemd-resolved for resolving the check endpoint')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/155
This commit is contained in:
Thomas Haller 2019-04-10 21:22:22 +02:00
parent ad77eed0d5
commit 8aefac804c
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nm-connectivity.c
View file

@ -167,6 +167,7 @@ NM_DEFINE_SINGLETON_GETTER (NMConnectivity, nm_connectivity_get, NM_TYPE_CONNECT
/*****************************************************************************/
#if WITH_CONCHECK
static ConConfig *
_con_config_ref (ConConfig *con_config)
{
@ -176,6 +177,7 @@ _con_config_ref (ConConfig *con_config)
}
return con_config;
}
#endif
static void
_con_config_unref (ConConfig *con_config)
@ -195,11 +197,13 @@ _con_config_unref (ConConfig *con_config)
g_slice_free (ConConfig, con_config);
}
#if WITH_CONCHECK
static const char *
_con_config_get_response (const ConConfig *con_config)
{
return con_config->response ?: NM_CONFIG_DEFAULT_CONNECTIVITY_RESPONSE;
}
#endif
/*****************************************************************************/
@ -673,6 +677,7 @@ _idle_cb (gpointer user_data)
return G_SOURCE_REMOVE;
}
#if WITH_CONCHECK
static void
do_curl_request (NMConnectivityCheckHandle *cb_data)
{
@ -791,6 +796,7 @@ resolve_cb (GObject *object, GAsyncResult *res, gpointer user_data)
do_curl_request (cb_data);
}
#endif
#define SD_RESOLVED_DNS ((guint64) (1LL << 0))
@ -819,13 +825,13 @@ nm_connectivity_check_start (NMConnectivity *self,
cb_data->user_data = user_data;
cb_data->completed_state = NM_CONNECTIVITY_UNKNOWN;
cb_data->addr_family = addr_family;
cb_data->concheck.con_config = _con_config_ref (priv->con_config);
if (iface)
cb_data->ifspec = g_strdup_printf ("if!%s", iface);
#if WITH_CONCHECK
cb_data->concheck.con_config = _con_config_ref (priv->con_config);
if ( iface
&& ifindex > 0
&& priv->enabled