Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-25 16:42:37 +01:00
Code Releases Activity

netdev: React to interface address change

Browse Source 
Handle the changes of interface address in RTNL New Link messages
similarly to the name changes, emit a NETDEV_WATCH_EVENT_ADDRESS_CHANGE
event and a propety change on dbus.

Note this can only happen when the interface is down so it doesn't
break anything but we need to handle it anyway.
This commit is contained in:
Andrew Zaborowski 2017-03-08 15:07:14 +01:00 committed by Denis Kenzior
parent 43a882e934
commit d67425c936
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/device.c
View File

@ -1699,6 +1699,10 @@ static void device_netdev_notify(struct netdev *netdev,
l_dbus_property_changed(dbus, device_get_path(device), l_dbus_property_changed(dbus, device_get_path(device),
IWD_DEVICE_INTERFACE, "Name"); IWD_DEVICE_INTERFACE, "Name");
break; break;
case NETDEV_WATCH_EVENT_ADDRESS_CHANGE:
l_dbus_property_changed(dbus, device_get_path(device),
IWD_DEVICE_INTERFACE, "Address");
break;
} }
} }

24
src/netdev.c
View File

@ -2585,6 +2585,7 @@ static void netdev_newlink_notify(const struct ifinfomsg *ifi, int bytes)
struct netdev *netdev; struct netdev *netdev;
bool old_up, new_up; bool old_up, new_up;
char old_name[IFNAMSIZ]; char old_name[IFNAMSIZ];
uint8_t old_addr[ETH_ALEN];
struct rtattr *attr; struct rtattr *attr;
struct netdev_watch_event_data event; struct netdev_watch_event_data event;
@ -2594,17 +2595,23 @@ static void netdev_newlink_notify(const struct ifinfomsg *ifi, int bytes)
old_up = netdev_get_is_up(netdev); old_up = netdev_get_is_up(netdev);
strcpy(old_name, netdev->name); strcpy(old_name, netdev->name);
memcpy(old_addr, netdev->addr, ETH_ALEN);
netdev->ifi_flags = ifi->ifi_flags; netdev->ifi_flags = ifi->ifi_flags;
for (attr = IFLA_RTA(ifi); RTA_OK(attr, bytes); for (attr = IFLA_RTA(ifi); RTA_OK(attr, bytes);
attr = RTA_NEXT(attr, bytes)) { attr = RTA_NEXT(attr, bytes)) {
if (attr->rta_type != IFLA_IFNAME) switch (attr->rta_type) {
continue; case IFLA_IFNAME:
strcpy(netdev->name, RTA_DATA(attr));
break;
case IFLA_ADDRESS:
if (RTA_PAYLOAD(attr) < ETH_ALEN)
break;
strcpy(netdev->name, RTA_DATA(attr)); memcpy(netdev->addr, RTA_DATA(attr), ETH_ALEN);
break;
break; }
} }
new_up = netdev_get_is_up(netdev); new_up = netdev_get_is_up(netdev);
@ -2623,6 +2630,13 @@ static void netdev_newlink_notify(const struct ifinfomsg *ifi, int bytes)
l_queue_foreach(netdev->watches, netdev_watch_notify, &event); l_queue_foreach(netdev->watches, netdev_watch_notify, &event);
} }
if (memcmp(old_addr, netdev->addr, ETH_ALEN)) {
event.netdev = netdev;
event.type = NETDEV_WATCH_EVENT_ADDRESS_CHANGE;
l_queue_foreach(netdev->watches, netdev_watch_notify, &event);
}
} }
static void netdev_dellink_notify(const struct ifinfomsg *ifi, int bytes) static void netdev_dellink_notify(const struct ifinfomsg *ifi, int bytes)

1
src/netdev.h
View File

@ -52,6 +52,7 @@ enum netdev_watch_event {
NETDEV_WATCH_EVENT_UP, NETDEV_WATCH_EVENT_UP,
NETDEV_WATCH_EVENT_DOWN, NETDEV_WATCH_EVENT_DOWN,
NETDEV_WATCH_EVENT_NAME_CHANGE, NETDEV_WATCH_EVENT_NAME_CHANGE,
NETDEV_WATCH_EVENT_ADDRESS_CHANGE,
}; };
typedef void (*netdev_command_func_t) (bool result, void *user_data); typedef void (*netdev_command_func_t) (bool result, void *user_data);