aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2016-03-25 16:00:44 (GMT)
committerJouni Malinen <j@w1.fi>2016-03-25 16:00:44 (GMT)
commite86859929fd5e0fcc733192b1db7af2f6315af36 (patch)
treef7da450ef1bd82f6a7f75637ef417c9ac4e7ff84
parent7c03c08229ee0aa5f98ddf15d2dccb805e7f94b4 (diff)
downloadhostap-e86859929fd5e0fcc733192b1db7af2f6315af36.zip
hostap-e86859929fd5e0fcc733192b1db7af2f6315af36.tar.gz
hostap-e86859929fd5e0fcc733192b1db7af2f6315af36.tar.bz2
vlan: Move if_nametoindex() use out of vlan_init.c
With this, vlan_init.c does not need any special header files anymore and vlan_ifconfig.c does not need hostapd-specific header files that might conflict with net/if.h on NetBSD. Signed-off-by: Jouni Malinen <j@w1.fi>
-rw-r--r--src/ap/vlan_ifconfig.c6
-rw-r--r--src/ap/vlan_init.c5
-rw-r--r--src/ap/vlan_util.h1
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ap/vlan_ifconfig.c b/src/ap/vlan_ifconfig.c
index 6a4d10c..ef953a5 100644
--- a/src/ap/vlan_ifconfig.c
+++ b/src/ap/vlan_ifconfig.c
@@ -61,3 +61,9 @@ int ifconfig_up(const char *if_name)
wpa_printf(MSG_DEBUG, "VLAN: Set interface %s up", if_name);
return ifconfig_helper(if_name, 1);
}
+
+
+int iface_exists(const char *ifname)
+{
+ return if_nametoindex(ifname);
+}
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index b8ca4f7..31e4fc6 100644
--- a/src/ap/vlan_init.c
+++ b/src/ap/vlan_init.c
@@ -9,9 +9,6 @@
*/
#include "utils/includes.h"
-#include <net/if.h>
-/* Avoid conflicts due to NetBSD net/if.h if_type define with driver.h */
-#undef if_type
#include "utils/common.h"
#include "hostapd.h"
@@ -36,7 +33,7 @@ static int vlan_if_add(struct hostapd_data *hapd, struct hostapd_vlan *vlan,
return -1;
}
- if (!if_nametoindex(vlan->ifname))
+ if (!iface_exists(vlan->ifname))
ret = hostapd_vlan_if_add(hapd, vlan->ifname);
else if (!existsok)
return -1;
diff --git a/src/ap/vlan_util.h b/src/ap/vlan_util.h
index 5e9e690..2446859 100644
--- a/src/ap/vlan_util.h
+++ b/src/ap/vlan_util.h
@@ -19,6 +19,7 @@ int vlan_set_name_type(unsigned int name_type);
int ifconfig_helper(const char *if_name, int up);
int ifconfig_up(const char *if_name);
+int iface_exists(const char *ifname);
int vlan_if_remove(struct hostapd_data *hapd, struct hostapd_vlan *vlan);
struct full_dynamic_vlan *