Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-16 23:40:43 +01:00
Code Releases Activity

monitor: Always try to find an existing interface

Browse Source 
Duplicate detection will happen when we try to create a new link.  The
newlink flags were updated to fail if the device already exists.
This commit is contained in:
Denis Kenzior 2014-10-04 21:09:11 -05:00
parent 046e49588e
commit d9768348d5
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
monitor/main.c
View File

@ -242,7 +242,7 @@ static struct l_netlink *rtm_interface_send_message(struct l_netlink *rtnl,
case RTM_NEWLINK: case RTM_NEWLINK:
rtmmsg->ifi_flags = IFF_UP | IFF_ALLMULTI | IFF_NOARP; rtmmsg->ifi_flags = IFF_UP | IFF_ALLMULTI | IFF_NOARP;
l_netlink_send(rtnl, RTM_NEWLINK, NLM_F_CREATE, l_netlink_send(rtnl, RTM_NEWLINK, NLM_F_CREATE|NLM_F_EXCL,
rtmmsg, rta_buf - (void *) rtmmsg, callback, rtmmsg, rta_buf - (void *) rtmmsg, callback,
user_data, destroy); user_data, destroy);
break; break;
@ -290,15 +290,14 @@ static void iwmon_interface_enable_callback(int error, uint16_t type,
struct iwmon_interface *monitor_interface = user_data; struct iwmon_interface *monitor_interface = user_data;
if (error) { if (error) {
fprintf(stderr, "Failed to create monitor interface %s %d\n", fprintf(stderr, "Failed to create monitor interface %s: %s\n",
monitor_interface->ifname, error); monitor_interface->ifname, strerror(error));
l_main_quit(); l_main_quit();
return; return;
} }
fprintf(stderr, "Created interface %s\n", monitor_interface->ifname); printf("Created interface %s\n", monitor_interface->ifname);
monitor_interface->genl = genl_lookup(monitor_interface->ifname); monitor_interface->genl = genl_lookup(monitor_interface->ifname);
} }
@ -318,6 +317,9 @@ static void iwmon_interface_lookup_done(void *user_data)
struct iwmon_interface *monitor_interface = user_data; struct iwmon_interface *monitor_interface = user_data;
if (monitor_interface->exists && monitor_interface->ifname) { if (monitor_interface->exists && monitor_interface->ifname) {
printf("Using %s as Monitor interface\n",
monitor_interface->ifname);
monitor_interface->genl = monitor_interface->genl =
genl_lookup(monitor_interface->ifname); genl_lookup(monitor_interface->ifname);
@ -368,22 +370,9 @@ static void iwmon_interface_lookup_callback(int error, uint16_t type,
if (!ifname) if (!ifname)
return; return;
if (monitor_interface->ifname && if (!nlmon)
strncmp(ifname, monitor_interface->ifname, ifname_len))
return; return;
if (!nlmon) {
if (monitor_interface->ifname) {
fprintf(stderr, "Interface %s already in use\n",
ifname);
l_main_quit();
}
return;
}
if ((rtmmsg->ifi_flags & (IFF_UP | IFF_ALLMULTI | IFF_NOARP)) != if ((rtmmsg->ifi_flags & (IFF_UP | IFF_ALLMULTI | IFF_NOARP)) !=
(IFF_UP | IFF_ALLMULTI | IFF_NOARP)) (IFF_UP | IFF_ALLMULTI | IFF_NOARP))
return; return;