src - OpenBSD base system

diff options


context:
space:
mode:

author	Reyk Floeter <reyk@cvs.openbsd.org>	2004-11-02 02:15:50 +0000
committer	Reyk Floeter <reyk@cvs.openbsd.org>	2004-11-02 02:15:50 +0000
commit	fac4cd50f4d0c69a9899c2b9dbaf3d074a921d19 (patch)
tree	4c6765d7b6660e96e0ddf1dcd76d3e3ff3348898 /sys
parent	e0cf47c0de721634dc585c0294b135312565215c (diff)

some changes merged in from netbsd. ieee80211_regdomain.# will be used

by sdr (software defined radios). ok deraadt@ millert@ damien@

Diffstat (limited to 'sys')

-rw-r--r--

sys/net80211/ieee80211.c

-rw-r--r--

sys/net80211/ieee80211_input.c

105

-rw-r--r--

sys/net80211/ieee80211_node.h

-rw-r--r--

sys/net80211/ieee80211_proto.h

-rw-r--r--

sys/net80211/ieee80211_radiotap.h

-rw-r--r--

sys/net80211/ieee80211_regdomain.c

181

-rw-r--r--

sys/net80211/ieee80211_regdomain.h

816

-rw-r--r--

sys/net80211/ieee80211_var.h

8 files changed, 1153 insertions, 28 deletions

diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index df3887bcbb5..3d712951b3a 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: ieee80211.c,v 1.1 2004/06/22 22:53:51 millert Exp $ */

+/* $OpenBSD: ieee80211.c,v 1.2 2004/11/02 02:15:49 reyk Exp $ */

/* $NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $ */

/*-

@@ -112,8 +112,7 @@ int ieee80211_inact_max = IEEE80211_INACT_MAX;

static int ieee80211_inact_max_nodenum;

#endif

-static void ieee80211_set11gbasicrates(struct ieee80211_rateset *,

- enum ieee80211_phymode);

+static void ieee80211_setbasicrates(struct ieee80211com *);

#if 0

static const char *ieee80211_phymode_name[] = {

@@ -187,6 +186,7 @@ ieee80211_ifattach(struct ifnet *ifp)

ic->ic_curmode = IEEE80211_MODE_AUTO;

ic->ic_des_chan = IEEE80211_CHAN_ANYC; /* any channel is ok */

+ ieee80211_setbasicrates(ic);

(void) ieee80211_setmode(ic, ic->ic_curmode);

if (ic->ic_lintval == 0)

@@ -563,12 +563,6 @@ ieee80211_media_change(struct ifnet *ifp)

break;

case IEEE80211_M_IBSS:

ic->ic_flags |= IEEE80211_F_IBSSON;

-#ifdef notdef

- if (ic->ic_curmode == IEEE80211_MODE_11G)

- ieee80211_set11gbasicrates(

- &ic->ic_sup_rates[newphymode],

- IEEE80211_MODE_11B);

-#endif

break;

}

error = ENETRESET;

@@ -653,24 +647,30 @@ ieee80211_watchdog(struct ifnet *ifp)

* the basic OFDM rates.

static void

-ieee80211_set11gbasicrates(struct ieee80211_rateset *rs, enum ieee80211_phymode mode)

+ieee80211_setbasicrates(struct ieee80211com *ic)

{

static const struct ieee80211_rateset basic[] = {

+ { 0 }, /* IEEE80211_MODE_AUTO */

{ 3, { 12, 24, 48 } }, /* IEEE80211_MODE_11A */

- { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_11B */

- { 7, { 2, 4, 11, 22, 12, 24, 48 } },/* IEEE80211_MODE_11G */

- { 0 }, /* IEEE80211_MODE_FH */

+ { 2, { 2, 4 } }, /* IEEE80211_MODE_11B */

+ { 4, { 2, 4, 11, 22 } }, /* IEEE80211_MODE_11G */

+ { 2, { 2, 4 } }, /* IEEE80211_MODE_FH */

{ 0 }, /* IEEE80211_MODE_TURBO */

};

+ enum ieee80211_phymode mode;

+ struct ieee80211_rateset *rs;

int i, j;

- for (i = 0; i < rs->rs_nrates; i++) {

- rs->rs_rates[i] &= IEEE80211_RATE_VAL;

- for (j = 0; j < basic[mode].rs_nrates; j++)

- if (basic[mode].rs_rates[j] == rs->rs_rates[i]) {

- rs->rs_rates[i] |= IEEE80211_RATE_BASIC;

- break;

- }

+ for (mode = 0; mode < IEEE80211_MODE_MAX; mode++) {

+ rs = &ic->ic_sup_rates[mode];

+ for (i = 0; i < rs->rs_nrates; i++) {

+ rs->rs_rates[i] &= IEEE80211_RATE_VAL;

+ for (j = 0; j < basic[mode].rs_nrates; j++)

+ if (basic[mode].rs_rates[j] == rs->rs_rates[i]) {

+ rs->rs_rates[i] |= IEEE80211_RATE_BASIC;

+ break;

+ }

}

@@ -772,8 +772,6 @@ ieee80211_setmode(struct ieee80211com *ic, enum ieee80211_phymode mode)

if (mode == IEEE80211_MODE_11G) {

if (ic->ic_caps & IEEE80211_C_SHSLOT)

ic->ic_flags |= IEEE80211_F_SHSLOT;

- ieee80211_set11gbasicrates(&ic->ic_sup_rates[mode],

- IEEE80211_MODE_11G);

} else {

ic->ic_flags &= ~IEEE80211_F_SHSLOT;

}

@@ -805,7 +803,9 @@ ieee80211_chan2mode(struct ieee80211com *ic, struct ieee80211_channel *chan)

* characteristics. We assume that turbo-only channels

* are not considered when the channel set is constructed.

- if (IEEE80211_IS_CHAN_5GHZ(chan))

+ if (IEEE80211_IS_CHAN_T(chan))

+ return IEEE80211_MODE_TURBO;

+ else if (IEEE80211_IS_CHAN_5GHZ(chan))

return IEEE80211_MODE_11A;

else if (IEEE80211_IS_CHAN_FHSS(chan))

return IEEE80211_MODE_FH;

diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 5ddfa6ed618..0d2ff372cdb 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c

@@ -1,5 +1,5 @@

/* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */

-/* $OpenBSD: ieee80211_input.c,v 1.1 2004/06/22 22:53:52 millert Exp $ */

+/* $OpenBSD: ieee80211_input.c,v 1.2 2004/11/02 02:15:49 reyk Exp $ */

/*-

@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung

#endif

#include <sys/proc.h>

#include <sys/sysctl.h>

+#include <sys/endian.h>

#ifdef __FreeBSD__

#include <machine/atomic.h>

@@ -96,8 +97,14 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung

#include <dev/rndvar.h>

#endif

+const struct timeval ieee80211_merge_print_intvl = {

+ .tv_sec = 1,

+ .tv_usec = 0

+};

static void ieee80211_recv_pspoll(struct ieee80211com *,

struct mbuf *, int, u_int32_t);

+static int ieee80211_do_slow_print(struct ieee80211com *, int *);

* Process a received frame. The node associated with the sender

@@ -1603,5 +1610,101 @@ ieee80211_recv_pspoll(struct ieee80211com *ic, struct mbuf *m0, int rssi,

IF_ENQUEUE(&ic->ic_pwrsaveq, m);

(*ifp->if_start)(ifp);

}

+static int

+ieee80211_do_slow_print(struct ieee80211com *ic, int *did_print)

+ if ((ic->ic_if.if_flags & IFF_LINK0) == 0)

+ return 0;

+ if (!*did_print && (ic->ic_if.if_flags & IFF_DEBUG) == 0 &&

+ !ratecheck(&ic->ic_last_merge_print, &ieee80211_merge_print_intvl))

+ return 0;

+ *did_print = 1;

+ return 1;

+/* ieee80211_ibss_merge helps merge 802.11 ad hoc networks. The

+ * convention, set by the Wireless Ethernet Compatibility Alliance

+ * (WECA), is that an 802.11 station will change its BSSID to match

+ * the "oldest" 802.11 ad hoc network, on the same channel, that

+ * has the station's desired SSID. The "oldest" 802.11 network

+ * sends beacons with the greatest TSF timestamp.

+ *

+ * Return ENETRESET if the BSSID changed, 0 otherwise.

+ *

+ * XXX Perhaps we should compensate for the time that elapses

+ * between the MAC receiving the beacon and the host processing it

+ * in ieee80211_ibss_merge.

+ */

+int

+ieee80211_ibss_merge(struct ieee80211com *ic, struct ieee80211_node *ni,

+ uint64_t local_tsft)

+ uint64_t beacon_tsft;

+ int did_print = 0, sign;

+ union {

+ uint64_t word;

+ uint8_t tstamp[8];

+ } u;

+ /* ensure alignment */

+ (void)memcpy(&u, &ni->ni_tstamp[0], sizeof(u));

+ beacon_tsft = letoh64(u.word);

+ /* we are faster, let the other guy catch up */

+ if (beacon_tsft < local_tsft)

+ sign = -1;

+ else

+ sign = 1;

+ if (memcmp(ni->ni_bssid, ic->ic_bss->ni_bssid,

+ IEEE80211_ADDR_LEN) == 0) {

+ if (!ieee80211_do_slow_print(ic, &did_print))

+ return 0;

+ printf("%s: tsft offset %s%ull\n", ic->ic_if.if_xname,

+ (sign < 0) ? "-" : "",

+ (sign < 0)

+ ? (local_tsft - beacon_tsft)

+ : (beacon_tsft - local_tsft));

+ return 0;

+ }

+ if (sign < 0)

+ return 0;

+ if (ieee80211_match_bss(ic, ni) != 0)

+ return 0;

+ if (ieee80211_do_slow_print(ic, &did_print)) {

+ printf("%s: ieee80211_ibss_merge: bssid mismatch %s\n",

+ ic->ic_if.if_xname, ether_sprintf(ni->ni_bssid));

+ }

+ ic->ic_flags &= ~IEEE80211_F_SIBSS;

+ /* negotiate rates with new IBSS */

+ ieee80211_fix_rate(ic, ni, IEEE80211_F_DOFRATE |

+ IEEE80211_F_DONEGO | IEEE80211_F_DODEL);

+ if (ni->ni_rates.rs_nrates == 0) {

+ if (ieee80211_do_slow_print(ic, &did_print)) {

+ printf("%s: rates mismatch, BSSID %s\n",

+ ic->ic_if.if_xname, ether_sprintf(ni->ni_bssid));

+ }

+ return 0;

+ }

+ if (ieee80211_do_slow_print(ic, &did_print)) {

+ printf("%s: sync BSSID %s -> ",

+ ic->ic_if.if_xname, ether_sprintf(ic->ic_bss->ni_bssid));

+ printf("%s ", ether_sprintf(ni->ni_bssid));

+ printf("(from %s)\n", ether_sprintf(ni->ni_macaddr));

+ }

+ ieee80211_node_newstate(ni, IEEE80211_STA_BSS);

+ (*ic->ic_node_copy)(ic, ic->ic_bss, ni);

+ return ENETRESET;

#undef IEEE80211_VERIFY_LENGTH

#undef IEEE80211_VERIFY_ELEMENT

diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index e1592c8303e..208d171fe4d 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: ieee80211_node.h,v 1.1 2004/06/22 22:53:52 millert Exp $ */

+/* $OpenBSD: ieee80211_node.h,v 1.2 2004/11/02 02:15:49 reyk Exp $ */

/* $NetBSD: ieee80211_node.h,v 1.9 2004/04/30 22:57:32 dyoung Exp $ */

/*-

@@ -55,6 +55,23 @@ struct ieee80211_rateset {

u_int8_t rs_rates[IEEE80211_RATE_MAXSIZE];

};

+enum ieee80211_node_state {

+ IEEE80211_STA_CACHE, /* cached node */

+ IEEE80211_STA_BSS, /* ic->ic_bss, the network we joined */

+ IEEE80211_STA_AUTH, /* successfully authenticated */

+ IEEE80211_STA_ASSOC, /* successfully associated */

+ IEEE80211_STA_COLLECT /* This node remains in the cache while

+ * the driver sends a de-auth message;

+ * afterward it should be freed to make room

+ * for a new node.

+ */

+};

+#define ieee80211_node_newstate(__ni, __state) \

+ do { \

+ (__ni)->ni_state = (__state); \

+ } while (0)

* Node specific information. Note that drivers are expected

* to derive from this structure to add device-specific per-node

@@ -110,6 +127,7 @@ struct ieee80211_node {

int ni_fails; /* failure count to associate */

int ni_inact; /* inactivity mark count */

int ni_txrate; /* index to ni_rates[] */

+ int ni_state;

u_int32_t *ni_challenge; /* shared-key challenge */

};

diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 22f88d2994e..181e8f0b26d 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: ieee80211_proto.h,v 1.1 2004/06/22 22:53:52 millert Exp $ */

+/* $OpenBSD: ieee80211_proto.h,v 1.2 2004/11/02 02:15:49 reyk Exp $ */

/* $NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $ */

/*-

@@ -78,6 +78,8 @@ extern u_int8_t *ieee80211_add_xrates(u_int8_t *frm,

const struct ieee80211_rateset *);

extern void ieee80211_print_essid(u_int8_t *, int);

extern void ieee80211_dump_pkt(u_int8_t *, int, int, int);

+extern int ieee80211_ibss_merge(struct ieee80211com *,

+ struct ieee80211_node *, u_int64_t);

extern const char *ieee80211_state_name[IEEE80211_S_MAX];

#endif /* _NET80211_IEEE80211_PROTO_H_ */

diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h
index 6e12236cafa..9a1f9252217 100644
--- a/sys/net80211/ieee80211_radiotap.h
+++ b/sys/net80211/ieee80211_radiotap.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: ieee80211_radiotap.h,v 1.1 2004/06/22 22:53:52 millert Exp $ */

+/* $OpenBSD: ieee80211_radiotap.h,v 1.2 2004/11/02 02:15:49 reyk Exp $ */

/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.3 2004/04/05 22:13:21 sam Exp $ */

/* $NetBSD: ieee80211_radiotap.h,v 1.9 2004/06/06 04:13:28 dyoung Exp $ */

@@ -193,6 +193,7 @@ enum ieee80211_radiotap_type {

#define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */

#define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */

#define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */

+#define IEEE80211_CHAN_XR 0x1000 /* eXtended Range */

#endif /* !_KERNEL */

/* For IEEE80211_RADIOTAP_FLAGS */

diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
new file mode 100644
index 00000000000..a97473016de
--- /dev/null
+++ b/sys/net80211/ieee80211_regdomain.c

@@ -0,0 +1,181 @@

+/* $OpenBSD: ieee80211_regdomain.c,v 1.1 2004/11/02 02:15:49 reyk Exp $ */

+/*

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ * notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ * notice, this list of conditions and the following disclaimer in the

+ * documentation and/or other materials provided with the distribution.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY

+ * SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER

+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF

+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ */

+/*

+ * Basic regulation domain extensions for the IEEE 802.11 stack

+ */

+#include <sys/param.h>

+#include <sys/systm.h>

+#include <sys/mbuf.h>

+#include <sys/kernel.h>

+#include <sys/socket.h>

+#include <sys/sockio.h>

+#include <sys/endian.h>

+#include <sys/errno.h>

+#include <net/if.h>

+#include <net/if_dl.h>

+#include <net/if_media.h>

+#include <net/if_arp.h>

+#include <net/if_llc.h>

+#ifdef INET

+#include <netinet/in.h>

+#include <netinet/if_ether.h>

+#endif

+#include <net80211/ieee80211.h>

+#include <net80211/ieee80211_var.h>

+#include <net80211/ieee80211_regdomain.h>

+int ieee80211_regdomain_compare_cn(const void *, const void *);

+int ieee80211_regdomain_compare_rn(const void *, const void *);

+static const struct ieee80211_regdomainname

+ieee80211_r_names[] = IEEE80211_REGDOMAIN_NAMES;

+static const struct ieee80211_regdomainmap

+ieee80211_r_map[] = IEEE80211_REGDOMAIN_MAP;

+static const struct ieee80211_countryname

+ieee80211_r_ctry[] = IEEE80211_REGDOMAIN_COUNTRY_NAMES;

+#ifndef bsearch

+void *bsearch(const void *, const void *, size_t, size_t,

+ int (*)(const void *, const void *));

+void *

+bsearch(const void *key, const void *base0, size_t nmemb, size_t size,

+ int (*compar)(const void *, const void *))

+ const char *base = base0;

+ int lim, cmp;

+ const void *p;

+ for (lim = nmemb; lim != 0; lim >>= 1) {

+ p = base + (lim >> 1) * size;

+ cmp = (*compar)(key, p);

+ if (cmp == 0)

+ return ((void *)p);

+ if (cmp > 0) { /* key > p: move right */

+ base = (char *)p + size;

+ lim--;

+ } /* else move left */

+ }

+ return (NULL);

+#endif

+int

+ieee80211_regdomain_compare_cn(const void *a, const void *b)

+ return(strcmp(((struct ieee80211_countryname*)a)->cn_name,

+ ((struct ieee80211_countryname*)b)->cn_name));

+int

+ieee80211_regdomain_compare_rn(const void *a, const void *b)

+ return(strcmp(((struct ieee80211_regdomainname*)a)->rn_name,

+ ((struct ieee80211_regdomainname*)b)->rn_name));

+u_int16_t

+ieee80211_name2countrycode(const char *name)

+ struct ieee80211_countryname key = { CTRY_DEFAULT, name }, *value;

+ if((value = bsearch(&key, &ieee80211_r_ctry,

+ sizeof(ieee80211_r_ctry) / sizeof(ieee80211_r_ctry[0]),

+ sizeof(struct ieee80211_countryname),

+ ieee80211_regdomain_compare_cn)) != NULL)

+ return(value->cn_code);

+ return(CTRY_DEFAULT);

+u_int32_t

+ieee80211_name2regdomain(const char *name)

+ struct ieee80211_regdomainname key = { DMN_DEFAULT, name }, *value;

+ if((value = bsearch(&key, &ieee80211_r_names,

+ sizeof(ieee80211_r_names) / sizeof(ieee80211_r_names[0]),

+ sizeof(struct ieee80211_regdomainname),

+ ieee80211_regdomain_compare_rn)) != NULL)

+ return((u_int32_t)value->rn_domain);

+ return((u_int32_t)DMN_DEFAULT);

+const char *

+ieee80211_countrycode2name(u_int16_t code)

+ int i;

+ /* Linear search over the table */

+ for(i = 0; i < (sizeof(ieee80211_r_ctry) / sizeof(ieee80211_r_ctry[0])); i++)

+ if(ieee80211_r_ctry[i].cn_code == code)

+ return(ieee80211_r_ctry[i].cn_name);

+ return(NULL);

+const char *

+ieee80211_regdomain2name(u_int32_t regdomain)

+ int i;

+ /* Linear search over the table */

+ for(i = 0; i < (sizeof(ieee80211_r_names) /

+ sizeof(ieee80211_r_names[0])); i++)

+ if(ieee80211_r_names[i].rn_domain == regdomain)

+ return(ieee80211_r_names[i].rn_name);

+ return(ieee80211_r_names[0].rn_name);

+u_int32_t

+ieee80211_regdomain2flag(u_int16_t regdomain, u_int16_t mhz)

+ int i;

+ for(i = 0; i < (sizeof(ieee80211_r_map) /

+ sizeof(ieee80211_r_map[0])); i++) {

+ if(ieee80211_r_map[i].rm_domain == regdomain) {

+ if(mhz >= 2000 && mhz <= 3000)

+ return((u_int32_t)ieee80211_r_map[i].rm_domain_2ghz);

+ if(mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&

+ mhz <= IEEE80211_CHANNELS_5GHZ_MAX)

+ return((u_int32_t)ieee80211_r_map[i].rm_domain_5ghz);

+ }

+ return((u_int32_t)DMN_DEBUG);

diff --git a/sys/net80211/ieee80211_regdomain.h b/sys/net80211/ieee80211_regdomain.h
new file mode 100644
index 00000000000..2138d7d2b08
--- /dev/null
+++ b/sys/net80211/ieee80211_regdomain.h

@@ -0,0 +1,816 @@

+/* $OpenBSD: ieee80211_regdomain.h,v 1.1 2004/11/02 02:15:49 reyk Exp $ */