jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vlan: Move if_nametoindex() use out of vlan_init.c

Browse source 
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>
This commit is contained in:
Jouni Malinen 2016-03-25 18:00:44 +02:00
parent 7c03c08229
commit e86859929f
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ap/vlan_ifconfig.c
View file

@ -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);
}

5
src/ap/vlan_init.c
View file

@ -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;

1
src/ap/vlan_util.h
View file

@ -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 *