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

device: fix method check in IPvLL code

Browse source 
The check condition was inverted. Anyway, we should receive IPv4LL
events only when the method is LINK_LOCAL so turn this into an
assertion.

Fixes: b16e09a707
This commit is contained in:
Beniamino Galvani 2018-12-20 09:49:56 +01:00
parent abe22689bd
commit 3db4d3aceb
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6805,7 +6805,6 @@ nm_device_handle_ipv4ll_event (sd_ipv4ll *ll, int event, void *data)
{
NMDevice *self = data;
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const char *method;
struct in_addr address;
NMIP4Config *config;
int r;
@ -6813,10 +6812,8 @@ nm_device_handle_ipv4ll_event (sd_ipv4ll *ll, int event, void *data)
if (priv->act_request.obj == NULL)
return;
/* Ignore if the connection isn't an AutoIP connection */
method = nm_device_get_effective_ip_config_method (self, AF_INET);
if (nm_streq (method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL))
return;
nm_assert (nm_streq (nm_device_get_effective_ip_config_method (self, AF_INET),
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL));
switch (event) {
case SD_IPV4LL_EVENT_BIND: