summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-11 14:57:54 (UTC)
committer mickeyl <mickeyl>2002-12-11 14:57:54 (UTC)
commitf9ab0941b88762b0c6c2f0a623f3067d6e1e9c49 (patch) (side-by-side diff)
treed9d45a52b43b74029a9d5fd36b34016c55a1d036
parent7a17954c26add31f28b69989f54e0f28a17c8949 (diff)
downloadopie-f9ab0941b88762b0c6c2f0a623f3067d6e1e9c49.zip
opie-f9ab0941b88762b0c6c2f0a623f3067d6e1e9c49.tar.gz
opie-f9ab0941b88762b0c6c2f0a623f3067d6e1e9c49.tar.bz2
- include wellenreiter.desktop in .pro-file
- daemon now uses CARD_TYPE defined in header file (was: hardcoded CARD_TYPE_NG) (BTW. - we really need argument parsing and the config stuff ASAP) - default CARD_TYPE now is CARD_TYPE_HOSTAP
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/daemon/source/daemon.cc2
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh2
-rw-r--r--noncore/net/wellenreiter/opie-wellenreiter.control2
3 files changed, 3 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/daemon/source/daemon.cc b/noncore/net/wellenreiter/daemon/source/daemon.cc
index 95f2f83..cc72377 100644
--- a/noncore/net/wellenreiter/daemon/source/daemon.cc
+++ b/noncore/net/wellenreiter/daemon/source/daemon.cc
@@ -1,47 +1,47 @@
/*
* Startup functions of wellenreiter
*
* $Id$
*/
#include "config.hh"
#include "daemon.hh"
/* Main function of wellenreiterd */
int main(int argc, char **argv)
{
int sock, maxfd, retval;
char buffer[128];
struct pcap_pkthdr header;
pcap_t *handletopcap;
const unsigned char *packet;
fd_set rset;
fprintf(stderr, "wellenreiterd %s\n\n", VERSION);
- if(!card_into_monitormode(&handletopcap, SNIFFER_DEVICE, CARD_TYPE_NG))
+ if(!card_into_monitormode(&handletopcap, SNIFFER_DEVICE, CARD_TYPE))
{
wl_logerr("Cannot set card into mon mode, aborting");
exit(-1);
}
wl_loginfo("Set card into monitor mode");
/////// following line will be moved to lib as soon as possible ////////////
if((handletopcap = pcap_open_live(SNIFFER_DEVICE, BUFSIZ, 1, 0, NULL)) == NULL)
{
wl_logerr("pcap_open_live() failed: %s", strerror(errno));
exit(-1);
}
#ifdef HAVE_PCAP_NONBLOCK
pcap_setnonblock(handletopcap, 1, NULL);
#endif
/* getting the datalink type */
retval = pcap_datalink(handletopcap);
if (retval != DLT_IEEE802_11) /* Rawmode is IEEE802_11 */
{
wl_loginfo("Interface %s does not work in the correct 802.11 raw mode", SNIFFER_DEVICE);
pcap_close(handletopcap);
return 0;
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index a3f8280..fad74cf 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -5,33 +5,33 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
extern "C"
{
#include <net/bpf.h>
#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
#define CARD_TYPE_NG 2
#define CARD_TYPE_HOSTAP 3
/* only for now, until we have the daemon running */
/*the config file should provide these information */
-#define CARD_TYPE CARD_TYPE_CISCO
+#define CARD_TYPE CARD_TYPE_HOSTAP
#define SBIN_PATH "/sbin/ifconfig %s promisc up"
#define WLANCTL_PATH "/sbin/wlanctl-ng"
/* Prototypes */
int card_into_monitormode (pcap_t **, char *, int);
int card_set_promisc_up (const char *);
#endif /* CARDMODE_HH */
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index f34cc08..0ea27bf 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -1,9 +1,9 @@
-Files: bin/wellenreiter bin/wellenreiterd bin/orinoco_hopper pics/wellenreiter $QTDIR/lib/libwellenreiter.*
+Files: bin/wellenreiter bin/wellenreiterd bin/orinoco_hopper pics/wellenreiter apps/Applications/wellenreiter.desktop $QTDIR/lib/libwellenreiter.*
Priority: optional
Section: opie/applications
Maintainer: Michael Lauer <mickeyl@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-base ($QPE_VERSION), libpcap
Description: A WaveLAN Network Monitor
A WaveLAN Network Monitor/Sniffer for the Opie Environment.