4 files changed, 19 insertions, 19 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc index c29f4d0..7362f14 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc @@ -21,5 +21,5 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) } - /* Setting the prmiscous and up flag to the interface */ + /* Setting the promiscous and up flag to the interface */ if (!card_set_promisc_up(device)) { @@ -65,5 +65,5 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype) int card_set_promisc_up (const char *device) { - char ifconfigcmd[32]; + char ifconfigcmd[48]; int retval=0; @@ -71,7 +71,4 @@ int card_set_promisc_up (const char *device) retval = system(ifconfigcmd); - if(retval != 0) - return 0; - -return 1; + return (retval ? 0 : 1); } diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc index e2169ca..9b4e360 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc @@ -125,5 +125,9 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);; - send_network_found((char *)guihost, guiport, &wl_net); + if(!send_network_found((char *)guihost, guiport, &wl_net)) + { + wl_logerr("Error sending data to UI: %s", strerror(errno)); + break; + } wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport); } diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc index f15523f..5317f52 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc @@ -36,8 +36,9 @@ int get_field(const char *buffer, char *out) memcpy(out, buffer + 3, atoi(len)); - return atoi(len) + 3; + /* Return length of whole field (including 3 byte length) */ + return (atoi(len) + 3); } -/* Send found network to GUI */ +/* Send found network to UI */ int send_network_found (const char *guihost, int guiport, void *structure) { @@ -76,18 +77,16 @@ int send_network_found (const char *guihost, int guiport, void *structure) /* Set Mac */ - retval = add_field(buffer + len, (char *)ptr->mac, 17); + retval = add_field(buffer + len, ptr->mac, 17); len += retval; /* Set ssid */ - retval = add_field(buffer + len, (char *)ptr->bssid, ptr->ssid_len); + retval = add_field(buffer + len, ptr->bssid, ptr->ssid_len); - /* Send prepared buffer to GUI */ + /* Send prepared buffer to UI */ #ifdef DEBUG - wl_loginfo("Sending network to GUI: '%s'", buffer); + wl_loginfo("Sending network to UI: '%s'", buffer); #endif - wl_send(guihost, guiport, buffer); - - return 1; + return ((!wl_send(guihost, guiport, buffer)) ? 0 : 1); } diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc index 5714afb..4942fba 100644 --- a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc +++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc @@ -57,5 +57,5 @@ int wl_send(const char *host, int port, const char *string, ...) { wl_logerr("Cannot set up socket: %s", strerror(errno)); - return -1; + return 0; } @@ -64,5 +64,5 @@ int wl_send(const char *host, int port, const char *string, ...) wl_logerr("Cannot write to socket: %s", strerror(errno)); close(sock); - return -1; + return 0; } @@ -70,5 +70,5 @@ int wl_send(const char *host, int port, const char *string, ...) wl_logerr("Cannot close socket: %s", strerror(errno)); - return 0; + return 1; } |