colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm-iface-helper: fix pidfile name and obtain the ifindex earlier

Browse Source 
The @ifindex is needed for the @pidfile. Obtain the @ifindex earlier
without resorting to platform.
This commit is contained in:
Thomas Haller
2015-03-15 17:18:59 +01:00
parent 95786a4e4e
commit e36bfaadf7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nm-iface-helper.c
View File

@@ -34,6 +34,10 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <signal.h> #include <signal.h>
/* Cannot include <net/if.h> due to conflict with <linux/if.h>.
* Forward declare if_nametoindex. */
extern unsigned int if_nametoindex (const char *__ifname);
#include "gsystem-local-alloc.h" #include "gsystem-local-alloc.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-linux-platform.h" #include "nm-linux-platform.h"
@@ -391,6 +395,11 @@ main (int argc, char *argv[])
nm_main_utils_ensure_rundir (); nm_main_utils_ensure_rundir ();
ifindex = if_nametoindex (global_opt.ifname);
if (ifindex <= 0) {
fprintf (stderr, _("Failed to find interface index for %s (%s)\n"), global_opt.ifname, strerror (errno));
exit (1);
}
pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex); pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex);
nm_main_utils_ensure_not_running_pidfile (pidfile); nm_main_utils_ensure_not_running_pidfile (pidfile);
@@ -419,12 +428,6 @@ main (int argc, char *argv[])
/* Set up platform interaction layer */ /* Set up platform interaction layer */
nm_linux_platform_setup (); nm_linux_platform_setup ();
ifindex = nm_platform_link_get_ifindex (global_opt.ifname);
if (ifindex <= 0) {
fprintf (stderr, _("Failed to find interface index for %s\n"), global_opt.ifname);
exit (1);
}
tmp = nm_platform_link_get_address (ifindex, &hwaddr_len); tmp = nm_platform_link_get_address (ifindex, &hwaddr_len);
if (tmp) { if (tmp) {
hwaddr = g_byte_array_sized_new (hwaddr_len); hwaddr = g_byte_array_sized_new (hwaddr_len);