author | mjm <mjm> | 2002-12-31 12:36:06 (UTC) |
---|---|---|
committer | mjm <mjm> | 2002-12-31 12:36:06 (UTC) |
commit | d331ca1cf11e8f525665a1e5cb10f491d47c19e8 (patch) (side-by-side diff) | |
tree | 42e46b280ac5b9ce5762f0df3a09189c4912d560 /noncore/net | |
parent | e34eef8e2f2a36797ef980d505a99948f88a5df2 (diff) | |
download | opie-d331ca1cf11e8f525665a1e5cb10f491d47c19e8.zip opie-d331ca1cf11e8f525665a1e5cb10f491d47c19e8.tar.gz opie-d331ca1cf11e8f525665a1e5cb10f491d47c19e8.tar.bz2 |
wl_recv was more or less broken because of missing socket structure, fixed.
general cleanup.
GUI has to be updated in functions wl_setupsock and wl_recv
5 files changed, 45 insertions, 41 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 @@ -9,8 +9,12 @@ #include "extract.hh" #include "wl_log.hh" +#include "wl_types.hh" #include "wl_proto.hh" /* 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) { unsigned int caplen = pkthdr->caplen; @@ -96,16 +100,14 @@ 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; + } if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0) @@ -115,4 +117,5 @@ 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); @@ -238,5 +241,6 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) if (pbody.ssid.length > 0) { - 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'; if (strcmp((char *)pbody.ssid.ssid,"")==0) @@ -252,5 +256,6 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) if (pbody.challenge.length > 0) { - 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'; } @@ -260,17 +265,22 @@ int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo) if (pbody.rates.length > 0) { - 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; } break; case E_DS: - memcpy(&(pbody.ds),p+offset,3); offset +=3; + memcpy(&(pbody.ds),p+offset,3); + offset +=3; ppinfo->channel = pbody.ds.channel; break; 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) { diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc index 0630d04..664ba92 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc @@ -5,4 +5,5 @@ */ +#include "wl_types.hh" #include "wl_proto.hh" #include "wl_log.hh" @@ -35,5 +36,5 @@ int get_field(const char *buffer, char *out, int maxlen) memset(out, 0, maxlen); - if(atoi(len)-3 > maxlen -1) + if(atoi(len) > maxlen -1) memcpy(out, buffer + 3, maxlen - 1); else @@ -55,5 +56,5 @@ int send_network_found (const char *guihost, int guiport, void *structure) /* Type = Found new net (without length field) */ memset(temp, 0, sizeof(temp)); - snprintf(temp, sizeof(temp), "%.2d", NETFOUND); + snprintf(temp, sizeof(temp), "%.2d", WL_NETFOUND); memcpy(buffer, temp, 2); len += 2; @@ -99,5 +100,5 @@ int get_network_found (void *structure, const char *buffer) ptr = (wl_network_t *)structure; - + /* packet type already determined, skip check */ len += 2; diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh index f645f58..46ef8e5 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh @@ -19,12 +19,3 @@ int send_network_found (const char *, int, void *); int get_network_found (void *, const char *); -typedef struct { - int net_type; /* 1 = Accesspoint ; 2 = Ad-Hoc */ - int ssid_len; /* Length of SSID */ - int channel; /* Channel */ - int wep; /* 1 = WEP enabled ; 0 = disabled */ - char mac[64]; /* MAC address of Accesspoint */ - char bssid[128]; /* BSSID of Net */ -} wl_network_t; - #endif /* WLPROTO_HH */ diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc index db6b7b8..6e26cb8 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc @@ -9,7 +9,6 @@ /* Setup UDP Socket for incoming commands */ -int wl_setupsock(const char *host, int port) +int wl_setupsock(const char *host, int port, struct sockaddr_in saddr) { - struct sockaddr_in saddr; int sock; @@ -24,5 +23,5 @@ int wl_setupsock(const char *host, int port) saddr.sin_port = htons(port); saddr.sin_addr.s_addr = inet_addr(host); - + if(bind(sock,(struct sockaddr *)&saddr, sizeof(saddr)) < 0) { @@ -74,13 +73,15 @@ int wl_send(const char *host, int port, const char *string, ...) /* Check for new messages on commsock */ -int wl_recv(int *sock, char *out, int maxlen) +int wl_recv(int *sock, struct sockaddr_in cliaddr, char *out, int maxlen) { - struct sockaddr_in *cliaddr; socklen_t len = sizeof(struct sockaddr); char retval[3]; - + memset(out, 0, maxlen); - if(recvfrom(*sock, out, maxlen - 1, 0, (struct sockaddr *)cliaddr, &len) < 0) + if(recvfrom(*sock, out, maxlen - 1, 0, (struct sockaddr *)&cliaddr, &len) < 0) + { + wl_logerr("Cannot receive from socket: %s", strerror(errno)); return -1; + } /* Get packet type and return it */ diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.hh b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.hh index 6ddbaef..e7d9747 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.hh +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.hh @@ -1,7 +1,8 @@ -/* $id */ +/* $Id */ #ifndef WLSOCK_HH #define WLSOCK_HH +#include <stdarg.h> #include <sys/types.h> #include <sys/socket.h> @@ -14,7 +15,7 @@ #include <errno.h> -int wl_setupsock(const char *, int); +int wl_setupsock(const char *, int, struct sockaddr_in); int wl_send(const char *, int, const char *, ...); -int wl_recv(int *, char *, int); +int wl_recv(int *, struct sockaddr_in, char *, int); #endif /* WLSOCK_HH */ |