summaryrefslogtreecommitdiff
authormjm <mjm>2002-12-14 19:13:32 (UTC)
committer mjm <mjm>2002-12-14 19:13:32 (UTC)
commitd9d4e587e62eac418b892c90145e958d6495d081 (patch) (side-by-side diff)
tree6a554548d6dfaaa082f4b088f8912f4c5fc7e528
parent57918323f3b2e1377d9cf97ed6466e31b260d24a (diff)
downloadopie-d9d4e587e62eac418b892c90145e958d6495d081.zip
opie-d9d4e587e62eac418b892c90145e958d6495d081.tar.gz
opie-d9d4e587e62eac418b892c90145e958d6495d081.tar.bz2
code cleanup, possible bug in sniff.cc fixed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc1
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh2
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/proto.cc9
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/sniff.cc17
4 files changed, 11 insertions, 18 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index a1c3945..3aaa4a7 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -5,6 +5,7 @@
*/
#include "cardmode.hh"
+#include "log.hh"
/* main card into monitor function */
int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index fad74cf..7c6a21d 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -16,8 +16,6 @@ extern "C"
#include <pcap.h>
}
-#include "../../libwellenreiter/source/log.hh"
-
/* Defines, used for the card setup */
#define DEFAULT_PATH "/proc/driver/aironet/%s/Config"
#define CARD_TYPE_CISCO 1
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
index 305f401..2ec23f4 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/proto.cc
@@ -56,15 +56,14 @@ int send_network_found (const char *guihost, int guiport, void *structure)
memcpy(buffer + 23, temp, 3);
- fprintf( stderr, "Temp is %s\n", temp );
- fprintf( stderr, "ssid_len is %d\n", ptr->ssid_len );
-
/* Set ssid */
memcpy(buffer + 26, ptr->bssid, ptr->ssid_len);
- fprintf( stderr, "Buffer is %s\n", buffer );
-
/* Send prepared buffer to GUI */
+#ifdef DEBUG
+ wl_loginfo("Sending network to GUI: '%s'", buffer);
+#endif
+
sendcomm(guihost, guiport, buffer);
return 1;
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
index 84caf12..c703052 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
@@ -94,8 +94,6 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
return;
}
- printf( "cap_ESS is %d, cap_IBSS is %d\n", pinfoptr->cap_ESS, pinfoptr->cap_IBSS );
-
/* Here should be the infos to the gui issued */
if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0)
{
@@ -107,15 +105,14 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
wl_loginfo("Found an ad-hoc network");
wl_net.net_type=2;
}
+
if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0)
- {
wl_loginfo("Net is a non-broadcasting network");
- }
else
- {
wl_loginfo("SSID is: %s", pinfoptr->ssid);
- // wl_net.bssid=pinfoptr->ssid;
- }
+
+ wl_loginfo("SSID is: %s", pinfoptr->ssid);
+ memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1);
wl_loginfo("SSID length is: %d", pinfoptr->ssid_len);
wl_net.ssid_len=pinfoptr->ssid_len;
@@ -126,14 +123,12 @@ 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);;
- wl_loginfo("SSID is: %s", pinfoptr->ssid);
- memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1);
-
- // 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;