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

device: allow AF_UNSPEC for nm_device_get_connectivity_state()

Browse source 
Apparently it is not actually used, but the function implements
a return value for AF_UNSPEC, while also asserting that the addr_family
is AF_INET/AF_INET6. Drop the assertions.
This commit is contained in:
Thomas Haller 2020-10-30 12:51:13 +01:00
parent f20d0d6984
commit 6767ba1205
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/devices/nm-device.c
View file

@ -4546,17 +4546,15 @@ NMConnectivityState
nm_device_get_connectivity_state(NMDevice *self, int addr_family)
{
NMDevicePrivate *priv;
const gboolean IS_IPv4 = (addr_family == AF_INET);
g_return_val_if_fail(NM_IS_DEVICE(self), NM_CONNECTIVITY_UNKNOWN);
nm_assert_addr_family(addr_family);
priv = NM_DEVICE_GET_PRIVATE(self);
switch (addr_family) {
case AF_INET:
case AF_INET6:
return priv->concheck_x[IS_IPv4].state;
return priv->concheck_x[NM_IS_IPv4(addr_family)].state;
default:
nm_assert(addr_family == AF_UNSPEC);
return NM_MAX_WITH_CMP(nm_connectivity_state_cmp,