[Madwifi-cvs] madwifi/net80211 ieee80211_node.h,1.1.4.3,1.1.4.4
Status: Beta
Brought to you by:
otaku
From: Sam L. <sam...@us...> - 2004-05-14 06:16:09
|
Update of /cvsroot/madwifi/madwifi/net80211 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12631 Modified Files: Tag: WPA ieee80211_node.h Log Message: o add WPA/802.11i parameters o add wpa information element o remove country information element for now o strip dtim stuff we won't use for a while o remove unused per-station proc fs reference Index: ieee80211_node.h =================================================================== RCS file: /cvsroot/madwifi/madwifi/net80211/Attic/ieee80211_node.h,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** ieee80211_node.h 27 Feb 2004 17:41:14 -0000 1.1.4.3 --- ieee80211_node.h 14 May 2004 06:16:00 -0000 1.1.4.4 *************** *** 73,76 **** --- 73,87 ---- }; + struct ieee80211_rsnparms { + u_int8_t rsn_mcastcipher; /* mcast/group cipher */ + u_int8_t rsn_mcastkeylen; /* mcast key length */ + u_int8_t rsn_ucastcipherset; /* unicast cipher set */ + u_int8_t rsn_ucastcipher; /* selected unicast cipher */ + u_int8_t rsn_ucastkeylen; /* unicast key length */ + u_int8_t rsn_keymgmtset; /* key mangement algorithms */ + u_int8_t rsn_keymgmt; /* selected key mgmt algo */ + u_int16_t rsn_caps; /* capabilities */ + }; + /* * Node specific information. Note that drivers are expected *************** *** 84,94 **** atomic_t ni_refcnt; u_int ni_scangen; /* gen# for timeout scan */ - u_int8_t ni_fragno; /* frag # of previous frame */ u_int8_t ni_authmode; /* authentication algorithm */ u_int16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ ! #define IEEE80211_NODE_WPA 0x0002 /* WPA enabled */ ! #define IEEE80211_NODE_QOS 0x0004 /* QoS enabled */ ! #define IEEE80211_NODE_ERP 0x0008 /* ERP enabled */ /* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */ #define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ --- 95,103 ---- atomic_t ni_refcnt; u_int ni_scangen; /* gen# for timeout scan */ u_int8_t ni_authmode; /* authentication algorithm */ u_int16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ ! #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ ! #define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ /* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */ #define IEEE80211_NODE_PWR_MGT 0x0010 /* power save mode enabled */ *************** *** 97,100 **** --- 106,110 ---- u_int16_t ni_vlan; /* vlan tag */ u_int32_t *ni_challenge; /* shared-key challenge */ + u_int8_t *ni_wpa_ie; /* captured WPA/RSN ie */ u_int16_t ni_txseq; /* seq to be transmitted */ u_int16_t ni_rxseq; /* seq previous received */ *************** *** 102,105 **** --- 112,116 ---- u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ struct sk_buff *ni_rxfrag[3]; /* rx frag reassembly */ + struct ieee80211_rsnparms ni_rsn; /* RSN/WPA parameters */ u_int16_t ni_ucastkeyix; /* unicast key index */ struct ieee80211_wepkey ni_ucastkey; /* unicast key */ *************** *** 120,138 **** u_int8_t ni_essid[IEEE80211_NWID_LEN]; struct ieee80211_rateset ni_rates; /* negotiated rate set */ - u_int8_t *ni_country; /* country information XXX */ struct ieee80211_channel *ni_chan; u_int16_t ni_fhdwell; /* FH only */ u_int8_t ni_fhindex; /* FH only */ - #ifdef notyet - /* DTIM and contention free period (CFP) */ - u_int8_t ni_dtimperiod; - u_int8_t ni_cfpperiod; /* # of DTIMs between CFPs */ - u_int16_t ni_cfpduremain; /* remaining cfp duration */ - u_int16_t ni_cfpmaxduration;/* max CFP duration in TU */ - u_int16_t ni_nextdtim; /* time to next DTIM */ - u_int16_t ni_timoffset; - #endif - /* others */ struct sk_buff_head ni_savedq; /* packets queued for pspoll */ --- 131,138 ---- *************** *** 142,146 **** int ni_txrate; /* index to ni_rates[] */ struct ieee80211_nodestats ni_stats; /* per-node statistics */ - struct proc_dir_entry *ni_proc; /* status of associated sta's */ }; MALLOC_DECLARE(M_80211_NODE); --- 142,145 ---- *************** *** 173,179 **** struct ieee80211_node *); extern void ieee80211_begin_scan(struct ieee80211com *); ! extern void ieee80211_next_scan(struct ieee80211com *); extern void ieee80211_end_scan(struct ieee80211com *); extern struct ieee80211_node *ieee80211_alloc_node(struct ieee80211com *, u_int8_t *); --- 172,191 ---- struct ieee80211_node *); + /* XXX to be replaced */ + extern int ieee80211_node_newkey(struct ieee80211com *, + struct ieee80211_node *); + extern int ieee80211_node_delkey(struct ieee80211com *, + struct ieee80211_node *); + extern int ieee80211_node_setkey(struct ieee80211com *, + struct ieee80211_node *); + extern void ieee80211_begin_scan(struct ieee80211com *); ! extern int ieee80211_next_scan(struct ieee80211com *); ! extern void ieee80211_create_ibss(struct ieee80211com*, ! struct ieee80211_channel *); extern void ieee80211_end_scan(struct ieee80211com *); + extern int ieee80211_sta_join(struct ieee80211com *, + struct ieee80211_node *); + extern struct ieee80211_node *ieee80211_alloc_node(struct ieee80211com *, u_int8_t *); *************** *** 182,209 **** extern struct ieee80211_node *ieee80211_find_node(struct ieee80211com *, u_int8_t *); ! extern struct ieee80211_node * ieee80211_find_txnode(struct ieee80211com *, u_int8_t *); ! extern struct ieee80211_node * ieee80211_lookup_node(struct ieee80211com *, ! u_int8_t *macaddr, struct ieee80211_channel *); extern void ieee80211_free_node(struct ieee80211com *, struct ieee80211_node *); extern void ieee80211_free_allnodes(struct ieee80211com *); typedef void ieee80211_iter_func(void *, struct ieee80211_node *); extern void ieee80211_iterate_nodes(struct ieee80211com *, ieee80211_iter_func *, void *); extern void ieee80211_dump_node(struct ieee80211_node *); extern void ieee80211_dump_nodes(struct ieee80211com *); extern void ieee80211_timeout_nodes(struct ieee80211com *); - extern void ieee80211_node_leave(struct ieee80211com *, - struct ieee80211_node *); ! extern int ieee80211_node_newkey(struct ieee80211com *, ! struct ieee80211_node *); ! extern int ieee80211_node_delkey(struct ieee80211com *, ! struct ieee80211_node *); ! extern int ieee80211_node_setkey(struct ieee80211com *, struct ieee80211_node *); - - extern void ieee80211_create_ibss(struct ieee80211com* , - struct ieee80211_channel *); #endif /* _NET80211_IEEE80211_NODE_H_ */ --- 194,220 ---- extern struct ieee80211_node *ieee80211_find_node(struct ieee80211com *, u_int8_t *); ! extern struct ieee80211_node *ieee80211_find_txnode(struct ieee80211com *, u_int8_t *); ! extern struct ieee80211_node *ieee80211_find_node_with_channel( ! struct ieee80211com *, u_int8_t *macaddr, ! struct ieee80211_channel *); ! extern struct ieee80211_node *ieee80211_find_node_with_ssid( ! struct ieee80211com *, u_int8_t *macaddr, u_int ssidlen, ! const u_int8_t *ssid); extern void ieee80211_free_node(struct ieee80211com *, struct ieee80211_node *); extern void ieee80211_free_allnodes(struct ieee80211com *); + typedef void ieee80211_iter_func(void *, struct ieee80211_node *); extern void ieee80211_iterate_nodes(struct ieee80211com *, ieee80211_iter_func *, void *); + extern void ieee80211_dump_node(struct ieee80211_node *); extern void ieee80211_dump_nodes(struct ieee80211com *); extern void ieee80211_timeout_nodes(struct ieee80211com *); ! extern void ieee80211_node_join(struct ieee80211com *, ! struct ieee80211_node *, int); ! extern void ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *); #endif /* _NET80211_IEEE80211_NODE_H_ */ |