diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-12-01 01:28:20 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2005-12-01 01:28:20 +0000 |
| commit | 7a1e1bab720a2f7ab5b7684f0df13dacc6651cc2 (patch) | |
| tree | 4e72612e7cb3145195aa21c3457186e0ae0174d6 /usr.sbin/hostapd/hostapd.h | |
| parent | d3f81cc9daa83c281602dc9cb7188d1074bcfc89 (diff) | |
support netmasks in table entry ip address assignments
Diffstat (limited to 'usr.sbin/hostapd/hostapd.h')
| -rw-r--r-- | usr.sbin/hostapd/hostapd.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/usr.sbin/hostapd/hostapd.h b/usr.sbin/hostapd/hostapd.h index 376c3404f56..f386bcc47cd 100644 --- a/usr.sbin/hostapd/hostapd.h +++ b/usr.sbin/hostapd/hostapd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hostapd.h,v 1.12 2005/12/01 01:11:30 reyk Exp $ */ +/* $OpenBSD: hostapd.h,v 1.13 2005/12/01 01:28:19 reyk Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -92,17 +92,29 @@ struct hostapd_counter { ((_e)->e_lladdr[5] == ((_b)[5] & (_e)->e_addr.a_mask[5])) \ ) +struct hostapd_inaddr { + sa_family_t in_af; + union { + struct in_addr v4; + struct in6_addr v6; + } in_v; + int in_netmask; +}; + +#define in_v4 in_v.v4 +#define in_v6 in_v.v6 + struct hostapd_entry { u_int8_t e_lladdr[IEEE80211_ADDR_LEN]; u_int8_t e_flags; #define HOSTAPD_ENTRY_F_LLADDR 0x00 #define HOSTAPD_ENTRY_F_MASK 0x01 -#define HOSTAPD_ENTRY_F_IPV4 0x02 +#define HOSTAPD_ENTRY_F_INADDR 0x02 union { u_int8_t a_mask[IEEE80211_ADDR_LEN]; - struct in_addr a_ipv4; + struct hostapd_inaddr a_inaddr; } e_addr; RB_ENTRY(hostapd_entry) e_nodes; @@ -110,7 +122,7 @@ struct hostapd_entry { }; #define e_mask e_addr.a_mask -#define e_ipv4 e_addr.a_ipv4 +#define e_inaddr e_addr.a_inaddr #define HOSTAPD_TABLE_NAMELEN 32 @@ -236,6 +248,7 @@ struct hostapd_apme { char a_iface[IFNAMSIZ]; u_int8_t a_bssid[IEEE80211_ADDR_LEN]; void *a_cfg; + struct sockaddr_in a_addr; TAILQ_ENTRY(hostapd_apme) a_entries; }; |