Diffstat (limited to 'noncore/net/wellenreiter/libwellenreiter/source/sniff.cc') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.cc | 48 |
1 files changed, 29 insertions, 19 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc index e516177..6e512c4 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc @@ -10,2 +10,3 @@ #include "wl_log.hh" +#include "wl_types.hh" #include "wl_proto.hh" @@ -13,3 +14,6 @@ /* Main function, checks packets */ -void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *packet, char *guihost, int guiport) +void process_packets(const struct pcap_pkthdr *pkthdr, + const unsigned char *packet, + char *guihost, + int guiport) { @@ -97,14 +101,12 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack /* Here should be the infos to the gui issued */ - if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0) - { - wl_loginfo("Found an access point"); - wl_net.net_type=1; - } + if (pinfoptr->cap_ESS == 1 && pinfoptr->cap_IBSS ==0) + { + wl_loginfo("Found an access point"); + wl_net.net_type=1; + } else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2) - { - wl_loginfo("Found an ad-hoc network"); - wl_net.net_type=2; - } - - memset(wl_net.bssid, 0, sizeof(wl_net.bssid)); + { + wl_loginfo("Found an ad-hoc network"); + wl_net.net_type=2; + } @@ -116,2 +118,3 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack wl_loginfo("SSID is: %s", pinfoptr->ssid); + memset(wl_net.bssid, 0, sizeof(wl_net.bssid)); memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1); @@ -239,3 +242,4 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) { - memcpy(&(pbody.ssid.ssid),p+offset,pbody.ssid.length); offset += pbody.ssid.length; + memcpy(&(pbody.ssid.ssid),p+offset,pbody.ssid.length); + offset += pbody.ssid.length; pbody.ssid.ssid[pbody.ssid.length]='\0'; @@ -253,3 +257,4 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) { - memcpy(&(pbody.challenge.text),p+offset,pbody.challenge.length); offset += pbody.challenge.length; + memcpy(&(pbody.challenge.text),p+offset,pbody.challenge.length); + offset += pbody.challenge.length; pbody.challenge.text[pbody.challenge.length]='\0'; @@ -261,3 +266,4 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) { - memcpy(&(pbody.rates.rate),p+offset,pbody.rates.length); offset += pbody.rates.length; + memcpy(&(pbody.rates.rate),p+offset,pbody.rates.length); + offset += pbody.rates.length; } @@ -265,3 +271,4 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) case E_DS: - memcpy(&(pbody.ds),p+offset,3); offset +=3; + memcpy(&(pbody.ds),p+offset,3); + offset +=3; ppinfo->channel = pbody.ds.channel; @@ -269,7 +276,10 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) case E_CF: - memcpy(&(pbody.cf),p+offset,8); offset +=8; + memcpy(&(pbody.cf),p+offset,8); + offset +=8; break; case E_TIM: - memcpy(&(pbody.tim),p+offset,2); offset +=2; - memcpy(&(pbody.tim.count),p+offset,3); offset +=3; + memcpy(&(pbody.tim),p+offset,2); + offset +=2; + memcpy(&(pbody.tim.count),p+offset,3); + offset +=3; if ((pbody.tim.length -3) > 0) |