summaryrefslogtreecommitdiff
authormjm <mjm>2002-11-28 00:00:52 (UTC)
committer mjm <mjm>2002-11-28 00:00:52 (UTC)
commit27fe94d8aec5ffff56b39eb89b0e36f2b1c229ed (patch) (side-by-side diff)
tree0e56faeb0dce9717b86b1d08b88ff17c6df902df
parent3d3add0a024d650d6247108ed6a19c11efd63724 (diff)
downloadopie-27fe94d8aec5ffff56b39eb89b0e36f2b1c229ed.zip
opie-27fe94d8aec5ffff56b39eb89b0e36f2b1c229ed.tar.gz
opie-27fe94d8aec5ffff56b39eb89b0e36f2b1c229ed.tar.bz2
moved handlesettings for pcap temporary to daemon.cc
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc32
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh3
2 files changed, 4 insertions, 31 deletions
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index a9b3276..a1c3945 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -7,15 +7,11 @@
#include "cardmode.hh"
/* main card into monitor function */
-int card_into_monitormode (void *orighandle, char *device, int cardtype)
+int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
{
- int datalink; /* used for getting the pcap datalink type */
char CiscoRFMON[35] = "/proc/driver/aironet/";
FILE *CISCO_CONFIG_FILE;
- char errbuf[PCAP_ERRBUF_SIZE];
- pcap_t *handle;
-
- handle = (pcap_t *)orighandle;
+ pcap_t *handle = (pcap_t*)orighandle;
/* Checks if we have a device to sniff on */
if(device == NULL)
@@ -62,28 +58,6 @@ int card_into_monitormode (void *orighandle, char *device, int cardtype)
wl_logerr("Got a host-ap card, nothing is implemented now");
}
- /* Check the interface if it is in the correct raw mode */
- if((handle = pcap_open_live(device, BUFSIZ, 1, 0, errbuf)) == NULL)
- {
- wl_logerr("pcap_open_live() failed: %s", strerror(errno));
- return 0;
- }
-
-#ifdef HAVE_PCAP_NONBLOCK
- pcap_setnonblock(handle, 1, errstr);
-#endif
-
- /* getting the datalink type */
- datalink = pcap_datalink(handle);
-
- if (datalink != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
- {
- wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", device);
- pcap_close(handle);
- return 0;
- }
- wl_loginfo("Your successfully listen on %s in 802.11 raw mode", device);
-
return 1;
}
@@ -96,7 +70,7 @@ int card_set_promisc_up (const char *device)
snprintf(ifconfigcmd, sizeof(ifconfigcmd), SBIN_PATH, device);
retval = system(ifconfigcmd);
- if(retval < 0 || retval == 1)
+ if(retval != 0)
return 0;
return 1;
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index d80b24b..976ceeb 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -27,8 +27,7 @@
#define WLANCTL_PATH "/sbin/wlanctl-ng"
/* Prototypes */
-
-int card_into_monitormode (void *, char *, int);
+int card_into_monitormode (pcap_t **, char *, int);
int card_set_promisc_up (const char *);
#endif /* CARDMODE_HH */