Commit Graph

215 Commits

Author SHA1 Message Date
dyoung 1e9e4aceb7 Rewrite ieee80211_get_rate using clue from sys/dev/ic/athrate-sample.c:
Change -1 to named constant IEEE80211_FIXED_RATE_NONE.  ic_fixed_rate
is an index into the ic_sup_rates table, so lookup a fixed rate
there and search the ni->ni_rates table for it.
2005-12-29 22:17:09 +00:00
dyoung ee2b2a752e IBSS merge nit: clear IEEE80211_F_SIBSS (STATUS: start IBSS) when
we merge with another IBSS.
2005-12-29 22:13:40 +00:00
dyoung 13283d6e4f In atw(4), use ieee80211_compute_duration() to compute IEEE 802.11
Duration and PLCP Length fields, and delete the abominable
atw_frame_setdurs() subroutine.

Make rtw(4) use the new ieee80211_compute_duration() calling
convention.

Add an ieee80211_key argument to ieee80211_compute_duration() and
lightly constify arguments.  Get the crypto header length from the
key argument instead of blithely assuming a WEP header.  Add some
inline documentation.  Account for data padding (IEEE80211_F_DATAPAD).
2005-12-29 21:08:26 +00:00
dyoung 7b6a25ed00 Cosmetic: extract a subroutine ieee80211_update_adhoc_node() from
ieee80211_recv_mgmt().  ieee80211_update_adhoc_node() updates IBSS
nodes based on received beacons and probe responses.  I extract a
subroutine to maintain a tolerable indentation level.
2005-12-29 10:06:52 +00:00
dyoung 5bbf511244 In IBSS mode, track all nodes' change of BSSID, not only the BSS
node's change.  Thanks to Konstantin Kabassanov for pointing out
the problem.
2005-12-16 11:27:33 +00:00
dyoung ac7bff6e7c Cosmetic: normalize whitespace. 2005-12-16 10:04:58 +00:00
dyoung 9c76f36a30 Fix ieee80211_media2rate to suit the funny order of NetBSD's DSSS
media flags: DS2, DS5, DS11, DS1.
2005-12-13 09:28:31 +00:00
christos 95e1ffb156 merge ktrace-lwp. 2005-12-11 12:16:03 +00:00
dyoung 22622a0962 Correct comment on ieee80211_compute_duration(). 2005-12-11 00:55:42 +00:00
elad 976bf6cfdd Multiple inclusion protection, as suggested by christos@ on tech-kern@
few days ago.
2005-12-10 23:21:38 +00:00
dyoung 277fb4409c Cosmetic: remove unnecessary stairstep. 2005-12-08 23:08:39 +00:00
dyoung 8e41de9845 Always record a change of the BSS node's BSSID, even if a desired
BSSID is set.

In IBSS mode, if the BSS node's BSSID changes, and a desired BSSID
is *not* set, make a RUN->RUN transition to give the driver an
opportunity to reprogram its BSSID filter.  This fixes a bug where
both wlanctl(8) and ifconfig(8) indicated that an interface had
joined a new BSS, but no packets would get through, except in
promiscuous mode, because the hardware still filtered packets based
on the old BSSID.
2005-12-08 20:19:49 +00:00
dyoung da04ad7825 Add flag IEEE80211_RADIOTAP_F_BADFCS for packets whose checksum
doesn't match their contents.  While I'm here, remove the mention
of field IEEE80211_RADIOTAP_FCS, which wasn't adopted.
2005-12-08 20:13:27 +00:00
christos 3b9c87155a Merge the 3 copies of m_getcl() so that fast ipsec compiles again together
with net80211. XXX: We don't really have an m_getcl(), we just emulate it.
2005-12-04 19:15:21 +00:00
thorpej 0a23751882 Move 802.11-specific files to files.net80211 2005-11-27 21:14:26 +00:00
thorpej 9c99eab147 Use a once control to call initialize the 802.11 layer when
ieee80211_ifattach() is called.  "wlan" no longer needs-flag,
and remove the ieee80211_init() call from main().
2005-11-25 17:33:56 +00:00
skrll 0b25d36d6a Update for recent changes and after tweaking the command to generate
this:

	- use UTC
	- only list the changes to HEAD.
2005-11-23 20:29:08 +00:00
dyoung 3d578b96da In adhoc mode, mark the "BSS" node's (ic->ic_bss) change of BSSID.
If the operator did not configure a "desired BSSID," then we simply
adopt the BSS node's new BSSID.  If the operator configured a
"desired BSSID," the new BSSID is (probably) not the desired one,
so start scanning for it.

Note that a change of BSSID will occur as two ad hoc networks merge.
2005-11-23 04:32:12 +00:00
dyoung 5e8176f5d5 In ieee80211_init_neighbor, delete unsupported rates from an adhoc
node.  It's the right thing to do, but it is of pressing importance
because SampleRate's ath_rate_ctl_reset() will convert an unsupported
rate to an invalid rate-index of 0xff, and pass the index to
ath_hal_computetxtime().  ath_hal_computetxtime() does not tolerate
an invalid index; the CPU traps a divide-by-zero fault in
ath_hal_computetxtime().
2005-11-23 04:24:00 +00:00
dyoung cd662cea95 Set the "special" struct ieee80211_channel pointer, IEEE80211_CHAN_ANYC,
to 0x1 instead of 0xffff, so the kernel will trap accidental
dereferences.  I don't set IEEE80211_CHAN_ANYC to NULL because it
may have a distinct meaning in net80211.  Thanks to Steve Woodford
for pointing out that 0xffff may be a valid kernel memory address
on x86.
2005-11-20 10:16:51 +00:00
dyoung 461cd4dbb5 Repair adhoc mode.
1 Complete initialization of "faked up" ieee80211_nodes,
          whose capabilities and other fields are wrong, when we
          first receive a beacon or probe response from the
          corresponding neighbor.  This entails factoring
          ieee80211_init_neighbor out of ieee80211_add_neighbor.

        2 In adhoc mode, ic->ic_bss is present in the neighbors
          table, ic->ic_sta, and it is not necessarily the wrong
          node on which to mark statistics for a rx'd packet.  Do
          not reject ic->ic_bss and fake-up a new node without
          comparing its MAC address with the address of the sender
          in the rx'd packet.  This fixes a memory leak.
2005-11-20 10:04:21 +00:00
dyoung 2bfe9acea8 Mark ieee80211_nodes with their node-table membership: scan table
or client/neighbor table.

While I'm here, assert that ieee80211_getmgtframe returns a frame
that starts on a 32-bit boundary.
2005-11-20 09:39:04 +00:00
he 6e11a90e46 Add an overlooked #if NBPFILTER > 0 / #endif. 2005-11-19 21:09:17 +00:00
riz ba27c061d3 Move the (ALTQ-conditional) declaration of struct altq_pktattr pktattr
into ieee80211_deliver_data(), since the code which uses it has been
moved there.  Fixes build with options ALTQ.

reviewed by christos@
2005-11-19 01:06:21 +00:00
skrll bd636a6d23 Register these crypto modules. 2005-11-18 16:57:22 +00:00
skrll 87515e34ff Resolve conflicts and adapt to NetBSD.
Thanks to dyoung@, scw@, and perry@ for help testing.

2005-08-30 15:27  avatar

Properly set ic_curchan before calling back to device driver to do channel
switching(ifconfig devX channel Y).  This fix should make channel changing
works again in monitor mode.

Submitted by:	sam
X-MFC-With:	other ic_curchan changes

2005-08-13 18:50  sam

revert 1.64: we cannot use the channel characteristics to decide when to
do 11g erp sta accounting because b/g channels show up as false positives
when operating in 11b.

Noticed by:	Michal Mertl

2005-08-13 18:31  sam

Extend acl support to pass ioctl requests through and use this to
add support for getting the current policy setting and collecting
the list of mac addresses in the acl table.

Submitted by:	Michal Mertl (original version)
MFC after:	2 weeks

2005-08-10 18:42  sam

Don't use ic_curmode to decide when to do 11g station accounting,
use the station channel properties.  Fixes assert failure/bogus
operation when an ap is operating in 11a and has associated stations
then switches to 11g.

Noticed by:	Michal Mertl
Reviewed by:	avatar
MFC after:	2 weeks

2005-08-10 17:22  sam

Clarify/fix handling of the current channel:
o add ic_curchan and use it uniformly for specifying the current
  channel instead of overloading ic->ic_bss->ni_chan (or in some
  drivers ic_ibss_chan)
o add ieee80211_scanparams structure to encapsulate scanning-related
  state captured for rx frames
o move rx beacon+probe response frame handling into separate routines
o change beacon+probe response handling to treat the scan table
  more like a scan cache--look for an existing entry before adding
  a new one; this combined with ic_curchan use corrects handling of
  stations that were previously found at a different channel
o move adhoc neighbor discovery by beacon+probe response frames to
  a new ieee80211_add_neighbor routine

Reviewed by:	avatar
Tested by:	avatar, Michal Mertl
MFC after:	2 weeks

2005-08-09 11:19  rwatson

Propagate rename of IFF_OACTIVE and IFF_RUNNING to IFF_DRV_OACTIVE and
IFF_DRV_RUNNING, as well as the move from ifnet.if_flags to
ifnet.if_drv_flags.  Device drivers are now responsible for
synchronizing access to these flags, as they are in if_drv_flags.  This
helps prevent races between the network stack and device driver in
maintaining the interface flags field.

Many __FreeBSD__ and __FreeBSD_version checks maintained and continued;
some less so.

Reviewed by:	pjd, bz
MFC after:	7 days

2005-08-08 19:46  sam

Split crypto tx+rx key indices and add a key index -> node mapping table:

Crypto changes:
o change driver/net80211 key_alloc api to return tx+rx key indices; a
  driver can leave the rx key index set to IEEE80211_KEYIX_NONE or set
  it to be the same as the tx key index (the former disables use of
  the key index in building the keyix->node mapping table and is the
  default setup for naive drivers by null_key_alloc)
o add cs_max_keyid to crypto state to specify the max h/w key index a
  driver will return; this is used to allocate the key index mapping
  table and to bounds check table loookups
o while here introduce ieee80211_keyix (finally) for the type of a h/w
  key index
o change crypto notifiers for rx failures to pass the rx key index up
  as appropriate (michael failure, replay, etc.)

Node table changes:
o optionally allocate a h/w key index to node mapping table for the
  station table using the max key index setting supplied by drivers
  (note the scan table does not get a map)
o defer node table allocation to lateattach so the driver has a chance
  to set the max key id to size the key index map
o while here also defer the aid bitmap allocation
o add new ieee80211_find_rxnode_withkey api to find a sta/node entry
  on frame receive with an optional h/w key index to use in checking
  mapping table; also updates the map if it does a hash lookup and the
  found node has a rx key index set in the unicast key; note this work
  is separated from the old ieee80211_find_rxnode call so drivers do
  not need to be aware of the new mechanism
o move some node table manipulation under the node table lock to close
  a race on node delete
o add ieee80211_node_delucastkey to do the dirty work of deleting
  unicast key state for a node (deletes any key and handles key map
  references)

Ath driver:
o nuke private sc_keyixmap mechansim in favor of net80211 support
o update key alloc api

These changes close several race conditions for the ath driver operating
in ap mode.  Other drivers should see no change.  Station mode operation
for ath no longer uses the key index map but performance tests show no
noticeable change and this will be fixed when the scan table is eliminated
with the new scanning support.

Tested by:	Michal Mertl, avatar, others
Reviewed by:	avatar, others
MFC after:	2 weeks

2005-08-08 06:49  sam

use ieee80211_iterate_nodes to retrieve station data; the previous
code walked the list w/o locking

MFC after:	1 week

2005-08-08 04:30  sam

Cleanup beacon/listen interval handling:
o separate configured beacon interval from listen interval; this
  avoids potential use of one value for the other (e.g. setting
  powersavesleep to 0 clobbers the beacon interval used in hostap
  or ibss mode)
o bounds check the beacon interval received in probe response and
  beacon frames and drop frames with bogus settings; not clear
  if we should instead clamp the value as any alteration would
  result in mismatched sta+ap configuration and probably be more
  confusing (don't want to log to the console but perhaps ok with
  rate limiting)
o while here up max beacon interval to reflect WiFi standard

Noticed by:	Martin <nakal@nurfuerspam.de>
MFC after:	1 week

2005-08-06 05:57  sam

fix debug msg typo

MFC after:	3 days

2005-08-06 05:56  sam

Fix handling of frames sent prior to a station being authorized
when operating in ap mode.  Previously we allocated a node from the
station table, sent the frame (using the node), then released the
reference that "held the frame in the table".  But while the frame
was in flight the node might be reclaimed which could lead to
problems.  The solution is to add an ieee80211_tmp_node routine
that crafts a node that does exist in a table and so isn't ever
reclaimed; it exists only so long as the associated frame is in flight.

MFC after:	5 days

2005-07-31 07:12  sam

close a race between reclaiming a node when a station is inactive
and sending the null data frame used to probe inactive stations

MFC after:	5 days

2005-07-27 05:41  sam

when bridging internally bypass the bss node as traffic to it
must follow the normal input path

Submitted by:	Michal Mertl
MFC after:	5 days

2005-07-27 03:53  sam

bandaid ni_fails handling so ap's with association failures are
reconsidered after a bit; a proper fix involves more changes to
the scanning infrastructure

Reviewed by:	avatar, David Young
MFC after:	5 days

2005-07-23 01:16  sam

the AREF flag is only meaningful in ap mode; adhoc neighbors now
are timed out of the sta/neighbor table

2005-07-23 00:25  sam

o move inactivity-related debug msgs under IEEE80211_MSG_INACT
o probe inactive neighbors in adhoc mode (they don't have an
  association id so previously were being timed out)

MFC after:	3 days

2005-07-22 22:11  sam

split xmit of probe request frame out into a separate routine that
takes explicit parameters; this will be needed when scanning is
decoupled from the state machine to do bg scanning

MFC after:	3 days

2005-07-22 21:48  sam

split 802.11 frame xmit setup code into ieee80211_send_setup

MFC after:	3 days

2005-07-22 18:57  sam

simplify ic_newassoc callback

MFC after:	3 days

2005-07-22 18:54  sam

simplify ieee80211_ibss_merge api

MFC after:	3 days

2005-07-22 18:50  sam

add stats we know we'll need soon and some spare fields for future expansion

MFC after:	3 days

2005-07-22 18:45  sam

simplify tim callback api

MFC after:	3 days

2005-07-22 18:42  sam

don't include 802.3 header in min frame length calculation as it may
not be present for a frag; fixes problem with small (fragmented) frames
being dropped

Obtained from:	Atheros
MFC after:	3 days

2005-07-22 18:36  sam

simplify ieee80211_node_authorize and ieee80211_node_unauthorize api's

MFC after:	3 days

2005-07-22 18:31  sam

simplifiy ieee80211_send_nulldata api

MFC after:	3 days

2005-07-22 18:29  sam

simplify rate set api's by removing ic parameter (implicit in node reference)

MFC after:	3 days

2005-07-22 18:21  sam

reject association requests with a wpa/rsn ie when wpa/rsn is not
configured on the ap; previously we either ignored the ie or (possibly)
failed an assertion

Obtained from:	Atheros
MFC after:	3 days

2005-07-22 18:16  sam

missed one in last commit; add device name to discard msgs

2005-07-22 18:13  sam

include device name in discard msgs

2005-07-22 18:12  sam

add diag msgs for frames discarded because the direction field is wrong

2005-07-22 18:08  sam

split data frame delivery out to a new function ieee80211_deliver_data

2005-07-22 18:00  sam

o add IEEE80211_IOC_FRAGTHRESHOLD for getting+setting the
  tx fragmentation threshold
o fix bounds checking on IEEE80211_IOC_RTSTHRESHOLD

MFC after:	3 days

2005-07-22 17:55  sam

o add IEEE80211_FRAG_DEFAULT
o move default settings for RTS and frag thresholds to ieee80211_var.h

2005-07-22 17:50  sam

diff reduction against p4: define IEEE80211_FIXED_RATE_NONE and use
it instead of -1

2005-07-22 17:37  sam

add flags missed in last merge

2005-07-22 17:36  sam

Diff reduction against p4:
o add ic_flags_ext for eventual extention of ic_flags
o define/reserve flag+capabilities bits for superg,
  bg scan, and roaming support
o refactor debug msg macros

MFC after:	3 days

2005-07-22 06:17  sam

send a response when an auth request is denied due to an acl;
might be better to silently ignore the frame but this way we
give stations a chance of figuring out what's wrong

2005-07-22 06:15  sam

remove excess whitespace

2005-07-22 05:55  sam

use IF_HANDOFF when bridging frames internally so if_start gets
called; fixes communication between associated sta's

MFC after:	3 days

2005-07-11 04:06  sam

Handle encrypt of arbitarily fragmented mbuf chains: previously
we bailed if we couldn't collect the 16-bytes of data required
for an aes block cipher in 2 mbufs; now we deal with it.  While
here make space accounting signed so a sanity check does the
right thing for malformed mbuf chains.

Approved by:	re (scottl)

2005-07-11 04:00  sam

nuke assert that duplicates real check

Reviewed by:	avatar
Approved by:	re (scottl)
2005-11-18 16:40:08 +00:00
skrll 931fb40431 Import FreeBSD's net80211(9) of 1-nov-2005 2005-11-18 16:20:29 +00:00
dyoung a66272d2ef Cosmetic: fix indentation. 2005-09-25 00:04:01 +00:00
dyoung 55977f0bc7 Reduce diffs from FreeBSD: remove a gratuitous temporary variable.
Also, remove redundant code that honors the "desired BSSID"
(ic_des_bssid), since FreeBSD already does that.
2005-09-25 00:03:06 +00:00
dyoung 92b58820b1 Reduce gratuitous differences from FreeBSD. 2005-09-24 23:57:12 +00:00
dyoung 5f9f2606fc Reduce diffs against FreeBSD by removing some redundant checks on
the BSSID and destination address.
2005-09-24 23:04:51 +00:00
dyoung 4cbe1276a3 Add a CHANGES file with a summary of source changes between FreeBSD
imports on 2005-05-18 and on 2005-07-11.
2005-09-04 21:20:18 +00:00
dyoung 51f2ebb45a In ieee80211_mbuf_adjust, cope with read-only mbufs: make the
802.11 header + opt(crypto header) + LLC writable, regardless of
crypto state.  If s/w crypto is enabled, still make the entire
chain writable, as before.

Reviewed by: Nick Hudson
2005-08-21 00:07:57 +00:00
skrll e25c26acb6 Don't need to declare m_append twice. 2005-08-18 06:07:30 +00:00
yamt 2e85eff671 - introduce M_MOVE_PKTHDR and use it where appropriate.
intended to be mostly API compatible with openbsd/freebsd.
- remove a glue #define in netipsec/ipsec_osdep.h.
2005-08-18 00:30:58 +00:00
dyoung c617298659 Fix previous patch for non-crypto operation: test for a NULL key
before testing the key flags.

XXX Problems remain.  Nick Hudson points out my questionable
XXX M_COPY_PKTHDR usage.  Also, it seems to me that we may not be
XXX protected against writing a read-only mbuf during the crypto
XXX encapsulation stage, even if hardware does the actual crypto.
2005-08-16 02:12:58 +00:00
dyoung 4b5bbb7a00 Don't build sta_disassoc or sta_deauth if IEEE80211_NO_HOSTAP is
defined.  Avoids "declared static but not used" warnings.
2005-08-15 23:37:10 +00:00
skrll 3900777496 If we're going to s/w encrypt the mbuf chain make sure it is writable.
Fixes wep on iwi(4).
2005-08-15 21:33:26 +00:00
dyoung 214312dad2 We don't really have FreeBSD 802.11 compatibility, and it will take
more work to get it right, so change the misleading COMPAT_FREEBSD
#ifdefs to #ifdef __FreeBSD__.
2005-07-27 20:31:24 +00:00
dyoung 9cb2b69eeb IEEE80211_IOC_BEACON_INTERVAL is not duplicated by SIOC[SG]80211POWER,
as I thought.  The latter actually sets the station listen interval.

We cannot get/set "drop-unencrypted" and "privacy" properties
independently with SIOCS80211NWKEY, so put back IEEE80211_IOC_PRIVACY
and IEEE80211_IOC_DROPUNENCRYPTED.

Thanks Sam Leffler for pointing out my mistakes.
2005-07-27 20:18:59 +00:00
dyoung 9ec95e5520 NetBSD already has ioctls that get/set these parameters. Only
compile support for the duplicate ioctls from FreeBSD if it is a
COMPAT_FREEBSD kernel:

        IEEE80211_IOC_SSID
        IEEE80211_IOC_WEPTXKEY
        IEEE80211_IOC_CHANNEL
        IEEE80211_IOC_PRIVACY
        IEEE80211_IOC_DROPUNENCRYPTED
        IEEE80211_IOC_BSSID
        IEEE80211_IOC_BEACON_INTERVAL
        IEEE80211_IOC_WEPKEY
2005-07-27 07:01:25 +00:00
dyoung d6d1366732 Restore ABI compatibility with SIOCG80211STATS, SIOCG80211ZSTATS
in NetBSD 2.0:

        * If 2.x compatibility is enabled (#ifdef COMPAT_20),
          compile support for OSIOCG80211STATS and OSIOCG80211ZSTATS,
          with the same ioctl numbers as SIOCG80211STATS and
          SIOCG80211ZSTATS in 2.x.  OSIOCG80211STATS and
          OSIOCG80211ZSTATS return an ieee80211_ostats struct,
          which has the same layout as ieee80211_stats in 2.x.

        * Add new ioctl numbers for SIOCG80211STATS and SIOCG80211ZSTATS.
          Both these ioctls will copy at most ifr_buflen bytes of
          the new ieee80211_stats to ifr_buf.
2005-07-27 06:52:27 +00:00
dyoung 930c942c22 In ieee80211_refine_node_for_beacon, deal gracefully with a node
that belongs to no table: don't dereference the null ni_table
pointer and panic.
2005-07-26 23:07:53 +00:00
dyoung 9bfd14b600 Remove duplicate FreeBSD RCS ID. 2005-07-26 22:57:26 +00:00
dyoung 61fb42b78a Resolve conflicts. 2005-07-26 22:52:48 +00:00
dyoung 80b91eea2d Import changes in FreeBSD's net80211 between 2005-05-18 and 2005-07-11.
A summary of changes is forthcoming.
2005-07-26 22:52:47 +00:00
dyoung d2ba878019 Resolve conflicts. 2005-07-26 22:52:47 +00:00
dyoung 5d0039996f Synchronize ieee80211_find_vap, ieee80211_find_instance. 2005-07-11 17:15:30 +00:00
dyoung 9e9d2907ec Cosmetic: reunite a comment with the code it describes. 2005-07-10 08:12:50 +00:00
dyoung 0e4587ae92 Bug fix: reset saw_bss when we start iterating over a new interface's
nodes, so that we list every interface's ic_bss node, instead of
listing only the first interface's.
2005-07-10 08:11:40 +00:00