| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.cc | 41 | ||||
| -rw-r--r-- | noncore/net/wellenreiter/libwellenreiter/source/sniff.hh | 10 |
2 files changed, 31 insertions, 20 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc index fedd8fc..66299d1 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc @@ -1,34 +1,39 @@ /* * rfmon mode sniffer * * $Id$ */ #include "sniff.hh" #include "ieee802_11.hh" #include "extract.hh" #include "log.hh" +#include "proto.hh" /* Main function, checks packets */ -void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *packet) +void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *packet, char *guihost, int guiport) { unsigned int caplen = pkthdr->caplen; unsigned int length = pkthdr->len; u_int16_t fc; unsigned int HEADER_LENGTH; /* pinfo holds all interresting information for us */ struct packetinfo pinfo; struct packetinfo *pinfoptr; + + /* wl_network_t will finally be set and send to the ui */ + wl_network_t wl_net; + pinfoptr=&pinfo; pinfoptr->isvalid = 0; pinfoptr->pktlen = pkthdr->len; if (caplen < IEEE802_11_FC_LEN) { /* This is a garbage packet, because is does not long enough to hold a 802.11b header */ pinfoptr->isvalid = 0; return; } @@ -83,46 +88,52 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack } if (pinfoptr->channel < 1 || pinfoptr->channel > 14) { /* Only channels between 1 and 14 are possible others must be noise packets */ pinfoptr->isvalid = 0; return; } /* Here should be the infos to the gui issued */ if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0) - { - printf ("\nHave found an accesspoint:"); + { + wl_loginfo("Found an access point"); + wl_net.net_type=1; } else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 1) { - printf ("\nHave found an AD-HOC station:"); - + wl_loginfo("Found an ad-hoc network"); + wl_net.net_type=2; } if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0) { - printf ("\n\tOn a non-broadcasting network"); + wl_loginfo("Net is a non-broadcasting network"); } else { - printf ("\n\tOn network : %s",pinfoptr->ssid); + wl_loginfo("SSID is: %s", pinfoptr->ssid); + // wl_net.bssid=pinfoptr->ssid; } - printf ("\n\tLen SSID : %d",pinfoptr->ssid_len); - printf ("\n\tOn Channel : %d",pinfoptr->channel); - printf ("\n\tEncryption : %s", pinfoptr->cap_WEP ? "ON" : "OFF"); - printf ("\n\tMacaddress : %s",pinfoptr->sndhwaddr); - printf ("\n\tBssid : %s",pinfoptr->bssid); - printf ("\n\tDest : %s\n",pinfoptr->desthwaddr); + + wl_net.ssid_len=pinfoptr->ssid_len; + wl_net.channel=pinfoptr->channel; + wl_net.wep=pinfoptr->cap_WEP; + memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac));; + memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)); + + // printf ("\n\tDest : %s\n",pinfoptr->desthwaddr); + send_network_found((char *)guihost, guiport, &wl_net); + wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport); } break; default: wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc)); break; } /* End of switch over different mgt frame types */ break; case T_CTRL: wl_loginfo("Received control frame, not implemented yet"); break; @@ -196,27 +207,27 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) /* Gets the tagged elements out of the packets */ while (offset + 1 < ppinfo->pktlen) { switch (*(p + offset)) { case E_SSID: memcpy(&(pbody.ssid),p+offset,2); offset += 2; if (pbody.ssid.length > 0) { memcpy(&(pbody.ssid.ssid),p+offset,pbody.ssid.length); offset += pbody.ssid.length; pbody.ssid.ssid[pbody.ssid.length]='\0'; if (strcmp((char *)pbody.ssid.ssid,"")==0) - ppinfo->ssid = NONBROADCASTING; + memcpy(ppinfo->ssid, NONBROADCASTING, sizeof(ppinfo->ssid)); else - ppinfo->ssid = (char *)pbody.ssid.ssid; + memcpy(ppinfo->ssid, pbody.ssid.ssid, sizeof(ppinfo->ssid)); ppinfo->ssid_len = pbody.ssid.length; } break; case E_CHALLENGE: memcpy(&(pbody.challenge),p+offset,2); offset += 2; if (pbody.challenge.length > 0) { memcpy(&(pbody.challenge.text),p+offset,pbody.challenge.length); offset += pbody.challenge.length; pbody.challenge.text[pbody.challenge.length]='\0'; } break; diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh index fa8519b..60cdc43 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.hh @@ -18,32 +18,32 @@ /* holds all the interresting data */ struct packetinfo { int isvalid; int pktlen; int fctype; int fcsubtype; int fc_wep; int cap_WEP; int cap_IBSS; int cap_ESS; int channel; - char bssid[sizeof("00:00:00:00:00:00")]; - char desthwaddr[sizeof("00:00:00:00:00:00")]; - char sndhwaddr[sizeof("00:00:00:00:00:00")]; - char *ssid; + char bssid[sizeof("00:00:00:00:00:00") + 1]; + char desthwaddr[sizeof("00:00:00:00:00:00") + 1]; + char sndhwaddr[sizeof("00:00:00:00:00:00") + 1]; + char ssid[128]; int ssid_len; }; -void process_packets(const struct pcap_pkthdr* pkthdr,const u_char* packet); +void process_packets(const struct pcap_pkthdr* pkthdr,const u_char* packet, char *, int); int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo); void etheraddr_string(register const u_char *ep,char * text); int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo); int GetHeaderLength(u_int16_t fc); /* * True if "l" bytes of "var" were captured. * * The "snapend - (l) <= snapend" checks to make sure "l" isn't so large * that "snapend - (l)" underflows. * |