summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-28 12:59:38 (UTC)
committer mjm <mjm>2002-12-28 12:59:38 (UTC)
commit1adf0d153cd8c4714719183af45ed703abef0a43 (patch) (side-by-side diff)
tree8845f1bbee4d050a18a6e5fa970bb5adaa277bc0
parent7a6a55d19048de7920eb885e80a26e1bef0f66e4 (diff)
downloadopie-1adf0d153cd8c4714719183af45ed703abef0a43.zip
opie-1adf0d153cd8c4714719183af45ed703abef0a43.tar.gz
opie-1adf0d153cd8c4714719183af45ed703abef0a43.tar.bz2
cleanup
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc9
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/sniff.cc6
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc17
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc6
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
@@ -20,7 +20,7 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
return 0;
}
- /* Setting the prmiscous and up flag to the interface */
+ /* Setting the promiscous and up flag to the interface */
if (!card_set_promisc_up(device))
{
wl_logerr("Cannot set interface to promisc mode: %s", strerror(errno));
@@ -64,14 +64,11 @@ int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
/* Set card into promisc mode */
int card_set_promisc_up (const char *device)
{
- char ifconfigcmd[32];
+ char ifconfigcmd[48];
int retval=0;
snprintf(ifconfigcmd, sizeof(ifconfigcmd) - 1, SBIN_PATH, 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
@@ -124,7 +124,11 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr);
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);
}
break;
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
@@ -35,10 +35,11 @@ int get_field(const char *buffer, char *out)
memset(out, 0, atoi(len) + 1);
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)
{
wl_network_t *ptr;
@@ -75,20 +76,18 @@ int send_network_found (const char *guihost, int guiport, void *structure)
len += retval;
/* 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);
}
/* Fill buffer into structur */
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
@@ -56,20 +56,20 @@ int wl_send(const char *host, int port, const char *string, ...)
if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{
wl_logerr("Cannot set up socket: %s", strerror(errno));
- return -1;
+ return 0;
}
if(sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&saddr, sizeof(saddr)) < 0)
{
wl_logerr("Cannot write to socket: %s", strerror(errno));
close(sock);
- return -1;
+ return 0;
}
if(close(sock) < 0)
wl_logerr("Cannot close socket: %s", strerror(errno));
- return 0;
+ return 1;
}
/* Check for new messages on commsock */