From 298aa593725dffcd32f8e29f0a2d2b136cabaa6b Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Wed, 9 Mar 2016 08:36:29 +0000 Subject: [PATCH] Detect method now checks WBID. FossilOrigin-Name: 0897b9a86e6e40ea04acc14fcfb41d020be1cc4c06683d73123be821cdee47cc --- src/cw/capwap.h | 8 ++++---- src/mod/capwap80211/mod_capwap80211_ac.c | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/cw/capwap.h b/src/cw/capwap.h index ad57af9d..1ac1d345 100644 --- a/src/cw/capwap.h +++ b/src/cw/capwap.h @@ -97,10 +97,10 @@ /* wireless binding ids */ -#define CWTH_WBID_RESERVED1 0 -#define CWTH_WBID_IEEE80211 1 -#define CWTH_WBID_RESERVED2 2 -#define CWTH_WBID_EPCGLOBAL 3 +#define CW_WBID_RESERVED1 0 +#define CW_WBID_IEEE80211 1 +#define CW_WBID_RESERVED2 2 +#define CW_WBID_EPCGLOBAL 3 #define CAPWAP_PACKET_PREAMBLE (CAPWAP_VERSION<<4) diff --git a/src/mod/capwap80211/mod_capwap80211_ac.c b/src/mod/capwap80211/mod_capwap80211_ac.c index ab20abd5..e58b6bde 100644 --- a/src/mod/capwap80211/mod_capwap80211_ac.c +++ b/src/mod/capwap80211/mod_capwap80211_ac.c @@ -4,6 +4,7 @@ #include "cw/dbg.h" #include "cw/action.h" +#include "cw/capwap.h" #include "mod_capwap80211.h" @@ -29,7 +30,10 @@ static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int ele if (mode != MOD_DETECT_BINDINGS) return 0; - cw_log(LOG_INFO, "Detecting 80211"); + int wbid = cw_get_hdr_wbid(rawmsg); + if (wbid != CW_WBID_IEEE80211 ) + return 0; + return 1; }