From f8430aaa9fb93d13cf3265d72058be145d03d9df Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 15 Mar 2015 17:18:59 +0100 Subject: [PATCH] nm-iface-helper: fix pidfile name and obtain the ifindex earlier The @ifindex is needed for the @pidfile. Obtain the @ifindex earlier without resorting to platform. (cherry picked from commit e36bfaadf74ee2f4080d6416f979897b000ba94e) --- src/nm-iface-helper.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index fdcb8c9676..1d842358c4 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -34,6 +34,10 @@ #include #include +/* Cannot include due to conflict with . + * Forward declare if_nametoindex. */ +extern unsigned int if_nametoindex (const char *__ifname); + #include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" @@ -394,6 +398,11 @@ main (int argc, char *argv[]) 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); nm_main_utils_ensure_not_running_pidfile (pidfile); @@ -422,12 +431,6 @@ main (int argc, char *argv[]) /* Set up platform interaction layer */ 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); if (tmp) { hwaddr = g_byte_array_sized_new (hwaddr_len);