diff options
| -rw-r--r-- | package/kismet/Makefile | 4 | ||||
| -rw-r--r-- | package/kismet/patches/100-wrt54g_source.patch (renamed from package/kismet/patches/120-wrt54g_source.patch) | 112 | ||||
| -rw-r--r-- | package/kismet/patches/120-cleanup.patch (renamed from package/kismet/patches/100-cleanup.patch) | 1667 |
3 files changed, 473 insertions, 1310 deletions
diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 0cd3299d7..dab9e0278 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kismet -PKG_VERSION:=2005-07-R1a +PKG_VERSION:=2005-08-R1 PKG_RELEASE:=1 -PKG_MD5SUM:=9f59bce7d6cc8504ff602f150e578ab5 +PKG_MD5SUM:=17edb7688e04dd28028d5268a77d0ce7 PKG_SOURCE_URL:=http://www.kismetwireless.net/code PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/kismet/patches/120-wrt54g_source.patch b/package/kismet/patches/100-wrt54g_source.patch index 2a0eac24a..3336a8f42 100644 --- a/package/kismet/patches/120-wrt54g_source.patch +++ b/package/kismet/patches/100-wrt54g_source.patch @@ -1,19 +1,19 @@ diff -urN kismet.old/kis_packsources.cc kismet.dev/kis_packsources.cc ---- kismet.old/kis_packsources.cc 2005-08-15 00:15:11.107594000 +0200 -+++ kismet.dev/kis_packsources.cc 2005-08-15 01:56:36.467769104 +0200 -@@ -215,7 +215,7 @@ - #endif +--- kismet.old/kis_packsources.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev/kis_packsources.cc 2005-08-23 00:59:04.465379568 +0200 +@@ -192,7 +192,7 @@ + chancontrol_wlanng_avs, 1); sourcetracker->RegisterPacketsource("wrt54g", 1, "na", 0, pcapsource_wrt54g_registrant, - monitor_wrt54g, NULL, NULL, 0); -+ monitor_wrt54g, unmonitor_wrt54g, chancontrol_wext, 0); ++ monitor_wrt54g, unmonitor_wrt54g, chancontrol_wext, 0); #else REG_EMPTY_CARD(sourcetracker, "wlanng"); REG_EMPTY_CARD(sourcetracker, "wlanng_avs"); diff -urN kismet.old/packetsourcetracker.cc kismet.dev/packetsourcetracker.cc ---- kismet.old/packetsourcetracker.cc 2005-08-15 00:33:14.628874000 +0200 -+++ kismet.dev/packetsourcetracker.cc 2005-08-15 01:20:41.284203096 +0200 -@@ -984,6 +984,7 @@ +--- kismet.old/packetsourcetracker.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev/packetsourcetracker.cc 2005-08-23 00:59:39.969982048 +0200 +@@ -986,6 +986,7 @@ (meta_packsources[chanpak.meta_num]->device.c_str(), chanpak.channel, errstr, (void *) (meta_packsources[chanpak.meta_num]->capsource)) < 0) { @@ -21,7 +21,7 @@ diff -urN kismet.old/packetsourcetracker.cc kismet.dev/packetsourcetracker.cc meta_packsources[chanpak.meta_num]->consec_errors++; -@@ -1005,6 +1006,7 @@ +@@ -1007,6 +1008,7 @@ CHANFLAG_FATAL)); continue; } @@ -30,8 +30,8 @@ diff -urN kismet.old/packetsourcetracker.cc kismet.dev/packetsourcetracker.cc // Otherwise reset the error count meta_packsources[chanpak.meta_num]->consec_errors = 0; diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc ---- kismet.old/pcapsource.cc 2005-08-15 00:40:28.291416000 +0200 -+++ kismet.dev/pcapsource.cc 2005-08-15 01:55:53.972229408 +0200 +--- kismet.old/pcapsource.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev/pcapsource.cc 2005-08-23 01:03:45.652632608 +0200 @@ -115,6 +115,53 @@ u_char callback_data[MAX_PACKET_LEN]; @@ -86,27 +86,28 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc int PcapSource::OpenSource() { channel = 0; -@@ -1561,45 +1608,39 @@ - +@@ -1928,63 +1975,32 @@ int monitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { -- char cmdline[2048]; -+ char cmdline[2048]; - int mode; - int wlmode = 0; - + char cmdline[2048]; +- int mode; +- int wlmode = 0; +- +-#ifdef HAVE_LINUX_WIRELESS - vector<string> devbits = StrTokenize(in_dev, ":"); -+ vector<string> devbits = StrTokenize(in_dev, ":"); - if (devbits.size() < 2) { - snprintf(cmdline, 2048, "/usr/sbin/wl monitor 1"); -- if (RunSysCmd(cmdline) < 0) { ++ snprintf(cmdline, 2048, "/usr/sbin/iwpriv %s set_monitor 1", in_dev); + if (RunSysCmd(cmdline) < 0) { - snprintf(in_err, 1024, "Unable to set mode using 'wl monitor 1'. Some " - "custom firmware images require you to specify the origial " -- "device and a new dynamic device and use the iwconfig controls. " -- "see the README for how to configure your capture source."); -- return -1; -- } ++ snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 1'. " ++ "Some custom firmware images require you to specify the origial " + "device and a new dynamic device and use the iwconfig controls. " + "see the README for how to configure your capture source."); + return -1; + } - } else { - // Get the mode ... If this doesn't work, try the old wl method. - if (Iwconfig_Get_Mode(devbits[0].c_str(), in_err, &mode) < 0) { @@ -114,14 +115,6 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc - "defaulting to trying the 'wl' command.\n"); - wlmode = 1; - } -+ snprintf(cmdline, 2048, "/usr/sbin/iwpriv %s set_monitor 1", in_dev); -+ if (RunSysCmd(cmdline) < 0) { -+ snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 1'. Some " -+ "custom firmware images require you to specify the origial " -+ "device and a new dynamic device and use the iwconfig controls. " -+ "see the README for how to configure your capture source.", in_dev); -+ return -1; -+ } - if (wlmode == 1) { - snprintf(cmdline, 2048, "/usr/sbin/wl monitor 1"); @@ -138,41 +131,56 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc - "only the ethernet device, not ethX:prismX"); - return -1; - } -- } + return 1; +} + ++ +int unmonitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, + void *in_ext) { -+ char cmdline[2048]; -+ int mode; -+ int wlmode = 0; -+ -+ vector<string> devbits = StrTokenize(in_dev, ":"); -+ -+ snprintf(cmdline, 2048, "/usr/sbin/iwpriv %s set_monitor 0", in_dev); -+ if (RunSysCmd(cmdline) < 0) { -+ snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 0'. Some " -+ "custom firmware images require you to specify the origial " -+ "device and a new dynamic device and use the iwconfig controls. " -+ "see the README for how to configure your capture source.", in_dev); -+ return -1; - } ++ char cmdline[2048]; ++ ++ snprintf(cmdline, 2048, "/usr/sbin/iwpriv %s set_monitor 0", in_dev); ++ if (RunSysCmd(cmdline) < 0) { ++ snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 0'. " ++ "Some custom firmware images require you to specify the origial " ++ "device and a new dynamic device and use the iwconfig controls. " ++ "see the README for how to configure your capture source."); ++ return -1; + } +- } +-#else +- snprintf(cmdline, 2048, "/usr/sbin/wl monitor 1"); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to set mode using 'wl monitor 1'. Some " +- "custom firmware images require you to specify the origial " +- "device and a new dynamic device and use the iwconfig controls. " +- "see the README for how to configure your capture source. " +- "Support for wireless extensions was not compiled in, so more " +- "advanced modes of setting monitor mode are not available."); +- return -1; +- } +- fprintf(stderr, "WARNING: Support for wireless extensions was not compiled " +- "into this binary. Using the iw* tools to set monitor mode will not " +- "be available. This may cause opening the source to fail on some " +- "firmware versions. To fix this, make sure wireless extensions are " +- "available and found by the configure script when building Kismet."); +-#endif return 1; + } diff -urN kismet.old/pcapsource.h kismet.dev/pcapsource.h ---- kismet.old/pcapsource.h 2005-08-15 00:42:50.849744000 +0200 -+++ kismet.dev/pcapsource.h 2005-08-15 01:56:07.649150200 +0200 +--- kismet.old/pcapsource.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev/pcapsource.h 2005-08-23 01:04:26.057490136 +0200 @@ -265,6 +265,7 @@ PcapSourceWrt54g(string in_name, string in_dev) : PcapSource(in_name, in_dev) { fcsbytes = 4; } -+ int OpenSource(); ++ int OpenSource(); int FetchPacket(kis_packet *packet, uint8_t *data, uint8_t *moddata); protected: carrier_type IEEE80211Carrier(); -@@ -388,6 +389,7 @@ - #ifdef SYS_LINUX +@@ -412,6 +413,7 @@ + int monitor_wlanng_avs(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); // linksys wrt54g monitoring int monitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); +int unmonitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); diff --git a/package/kismet/patches/100-cleanup.patch b/package/kismet/patches/120-cleanup.patch index d018fdfd5..17430807c 100644 --- a/package/kismet/patches/100-cleanup.patch +++ b/package/kismet/patches/120-cleanup.patch @@ -1,7 +1,7 @@ -diff -urN kismet.old/Makefile.in kismet.dev/Makefile.in ---- kismet.old/Makefile.in 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/Makefile.in 2005-08-15 00:16:38.100369736 +0200 -@@ -39,26 +39,26 @@ +diff -urN kismet.dev/Makefile.in kismet.dev2/Makefile.in +--- kismet.dev/Makefile.in 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/Makefile.in 2005-08-23 01:59:25.643220248 +0200 +@@ -39,26 +39,25 @@ DEPEND = .depend # Objects @@ -11,10 +11,9 @@ diff -urN kismet.old/Makefile.in kismet.dev/Makefile.in - wtapdump.o wtaplocaldump.o gpsdump.o airsnortdump.o fifodump.o \ - gpsd.o manuf.o \ +PSO = util.o ringbuf.o configfile.o ifcontrol.o iwcontrol.o packet.o \ -+ pcapsource.o \ ++ pcapsource.o manuf.o \ + dronesource.o packetsourcetracker.o kis_packsources.o \ -+ wtaplocaldump.o fifodump.o \ -+ manuf.o \ ++ wtapdump.o wtaplocaldump.o airsnortdump.o fifodump.o \ packetracker.o timetracker.o alertracker.o finitestate.o \ getopt.o \ tcpserver.o server_protocols.o server_globals.o kismet_server.o @@ -24,12 +23,13 @@ diff -urN kismet.old/Makefile.in kismet.dev/Makefile.in - tcpstreamer.o prism2source.o pcapsource.o wtapfilesource.o wsp100source.o \ - dronesource.o vihasource.o packetsourcetracker.o kis_packsources.o \ - timetracker.o gpsd.o server_globals.o kismet_drone.o -+ tcpstreamer.o pcapsource.o wtapfilesource.o \ ++ tcpstreamer.o pcapsource.o \ + dronesource.o packetsourcetracker.o kis_packsources.o \ + timetracker.o server_globals.o kismet_drone.o DRONE = kismet_drone - NCO = util.o configfile.o speech.o manuf.o tcpclient.o \ +-NCO = util.o configfile.o speech.o manuf.o tcpclient.o \ ++NCO = util.o configfile.o manuf.o tcpclient.o \ frontend.o cursesfront.o \ panelfront.o panelfront_display.o panelfront_input.o \ - gpsd.o getopt.o kismet_client.o @@ -37,9 +37,9 @@ diff -urN kismet.old/Makefile.in kismet.dev/Makefile.in NC = kismet_client GPSLO = getopt.o util.o configfile.o expat.o manuf.o \ -diff -urN kismet.old/cursesfront.cc kismet.dev/cursesfront.cc ---- kismet.old/cursesfront.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/cursesfront.cc 2005-08-15 01:08:49.461799648 +0200 +diff -urN kismet.dev/cursesfront.cc kismet.dev2/cursesfront.cc +--- kismet.dev/cursesfront.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/cursesfront.cc 2005-08-23 01:59:25.643220248 +0200 @@ -30,7 +30,6 @@ // Enable the protocols we can use void NCurseFront::AddClient(TcpClient *in_client) { @@ -81,9 +81,9 @@ diff -urN kismet.old/cursesfront.cc kismet.dev/cursesfront.cc box(infoborder, '|', '-'); mvwaddstr(infoborder, 0, 2, "Info"); -diff -urN kismet.old/dronesource.cc kismet.dev/dronesource.cc ---- kismet.old/dronesource.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/dronesource.cc 2005-08-15 00:06:41.235746912 +0200 +diff -urN kismet.dev/dronesource.cc kismet.dev2/dronesource.cc +--- kismet.dev/dronesource.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/dronesource.cc 2005-08-23 01:59:25.644220096 +0200 @@ -201,9 +201,6 @@ return -1; } @@ -120,21 +120,22 @@ diff -urN kismet.old/dronesource.cc kismet.dev/dronesource.cc packet->data = data; packet->moddata = moddata; packet->modified = 0; -diff -urN kismet.old/dronesource.h kismet.dev/dronesource.h ---- kismet.old/dronesource.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/dronesource.h 2005-08-15 00:06:56.589412800 +0200 -@@ -80,8 +80,6 @@ +diff -urN kismet.dev/dronesource.h kismet.dev2/dronesource.h +--- kismet.dev/dronesource.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/dronesource.h 2005-08-23 01:59:25.644220096 +0200 +@@ -79,9 +79,6 @@ + uint8_t databuf[MAX_PACKET_LEN]; unsigned int resyncing; - +- - // Is the drone pushing GPS data to us? - int gps_enabled; }; // Nothing but a registrant for us -diff -urN kismet.old/frontend.cc kismet.dev/frontend.cc ---- kismet.old/frontend.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/frontend.cc 2005-08-15 01:07:50.236803216 +0200 +diff -urN kismet.dev/frontend.cc kismet.dev2/frontend.cc +--- kismet.dev/frontend.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/frontend.cc 2005-08-23 01:59:25.645219944 +0200 @@ -248,33 +248,6 @@ } @@ -169,10 +170,10 @@ diff -urN kismet.old/frontend.cc kismet.dev/frontend.cc // Aggregate the carriers and encodings dnet->virtnet->carrier_set |= wnet->carrier_set; dnet->virtnet->encoding_set |= wnet->encoding_set; -diff -urN kismet.old/kis_packsources.cc kismet.dev/kis_packsources.cc ---- kismet.old/kis_packsources.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kis_packsources.cc 2005-08-15 00:15:11.107594648 +0200 -@@ -60,13 +60,6 @@ +diff -urN kismet.dev/kis_packsources.cc kismet.dev2/kis_packsources.cc +--- kismet.dev/kis_packsources.cc 2005-08-23 00:59:04.465379568 +0200 ++++ kismet.dev2/kis_packsources.cc 2005-08-23 02:01:08.585570632 +0200 +@@ -60,13 +60,8 @@ #if defined(HAVE_LIBPCAP) && defined(HAVE_LINUX_WIRELESS) // Linux wext-driven cards @@ -183,133 +184,149 @@ diff -urN kismet.old/kis_packsources.cc kismet.dev/kis_packsources.cc - sourcetracker->RegisterPacketsource("cisco_wifix", 1, "IEEE80211b", 6, - pcapsource_ciscowifix_registrant, - monitor_cisco_wifix, NULL, NULL, 1); ++ REG_EMPTY_CARD(sourcetracker, "cisco"); ++ REG_EMPTY_CARD(sourcetracker, "cisco_wifix"); sourcetracker->RegisterPacketsource("hostap", 1, "IEEE80211b", 6, pcapsource_wext_registrant, monitor_hostap, unmonitor_hostap, -@@ -79,6 +72,14 @@ +@@ -79,21 +74,9 @@ pcapsource_wext_registrant, monitor_orinoco, unmonitor_orinoco, chancontrol_orinoco, 1); -+#if 0 -+ sourcetracker->RegisterPacketsource("cisco", 1, "IEEE80211b", 6, -+ pcapsource_wext_registrant, -+ monitor_cisco, unmonitor_cisco, -+ chancontrol_wext, 1); -+ sourcetracker->RegisterPacketsource("cisco_wifix", 1, "IEEE80211b", 6, -+ pcapsource_ciscowifix_registrant, -+ monitor_cisco_wifix, NULL, NULL, 1); - sourcetracker->RegisterPacketsource("acx100", 1, "IEEE80211b", 6, - pcapsource_wextfcs_registrant, - monitor_acx100, unmonitor_acx100, -@@ -94,7 +95,13 @@ - pcapsource_wext_registrant, - monitor_wext, unmonitor_wext, - chancontrol_wext, 1); -- -+#else -+ REG_EMPTY_CARD(sourcetracker, "cisco"); -+ REG_EMPTY_CARD(sourcetracker, "cisco_wifix"); -+ REG_EMPTY_CARD(sourcetracker, "acx100"); -+ REG_EMPTY_CARD(sourcetracker, "vtar5k"); -+#endif -+ +- sourcetracker->RegisterPacketsource("acx100", 1, "IEEE80211b", 6, +- pcapsource_wextfcs_registrant, +- monitor_acx100, unmonitor_acx100, +- chancontrol_wext, 1); +- sourcetracker->RegisterPacketsource("admtek", 1, "IEEE80211b", 6, +- pcapsource_wext_registrant, +- monitor_admtek, unmonitor_admtek, +- chancontrol_wext, 1); +- sourcetracker->RegisterPacketsource("vtar5k", 1, "IEEE80211a", 36, +- pcapsource_wext_registrant, +- monitor_vtar5k, NULL, chancontrol_wext, 1); +- sourcetracker->RegisterPacketsource("atmel_usb", 1, "IEEE80211b", 6, +- pcapsource_wext_registrant, +- monitor_wext, unmonitor_wext, +- chancontrol_wext, 1); ++ REG_EMPTY_CARD(sourcetracker, "acx100"); ++ REG_EMPTY_CARD(sourcetracker, "admtek"); ++ REG_EMPTY_CARD(sourcetracker, "vtar5k"); + sourcetracker->RegisterPacketsource("madwifi_a", 1, "IEEE80211a", 36, pcapsource_wextfcs_registrant, - monitor_madwifi_a, unmonitor_madwifi, -@@ -121,11 +128,12 @@ +@@ -121,38 +104,14 @@ monitor_prism54g, unmonitor_prism54g, chancontrol_prism54g, 1); -+#if 0 - sourcetracker->RegisterPacketsource("wlanng_wext", 1, "IEEE80211b", 6, - pcapsource_wlanng_registrant, - monitor_wlanng_avs, NULL, - chancontrol_wext, 1); -- -+ - sourcetracker->RegisterPacketsource("ipw2100", 1, "IEEE80211b", 6, - pcapsource_wext_registrant, - monitor_ipw2100, unmonitor_ipw2100, -@@ -153,6 +161,16 @@ - pcapsource_wext_registrant, - monitor_wext, unmonitor_wext, - chancontrol_wext, 1); -+#else -+ REG_EMPTY_CARD(sourcetracker, "wlanng_wext"); -+ REG_EMPTY_CARD(sourcetracker, "ipw2100"); -+ REG_EMPTY_CARD(sourcetracker, "ipw2200"); -+ REG_EMPTY_CARD(sourcetracker, "ipw2915"); -+ +- sourcetracker->RegisterPacketsource("wlanng_wext", 1, "IEEE80211b", 6, +- pcapsource_wlanng_registrant, +- monitor_wlanng_avs, NULL, +- chancontrol_wext, 1); +- +- sourcetracker->RegisterPacketsource("ipw2100", 1, "IEEE80211b", 6, +- pcapsource_wext_registrant, +- monitor_ipw2100, unmonitor_ipw2100, +- chancontrol_ipw2100, 1); +- +- sourcetracker->RegisterPacketsource("ipw2200", 1, "IEEE80211g", 6, +- pcapsource_wext_registrant, +- monitor_ipw2200, unmonitor_ipw2200, +- chancontrol_ipw2200, 1); +- +- sourcetracker->RegisterPacketsource("ipw2915", 1, "IEEE80211ab", 6, +- pcapsource_wext_registrant, +- monitor_ipw2200, unmonitor_ipw2200, +- chancontrol_ipw2200, 1); ++ REG_EMPTY_CARD(sourcetracker, "wlanng_wext"); ++ REG_EMPTY_CARD(sourcetracker, "ipw2100"); ++ REG_EMPTY_CARD(sourcetracker, "ipw2200"); ++ REG_EMPTY_CARD(sourcetracker, "ipw2915"); + REG_EMPTY_CARD(sourcetracker, "rt2400"); + REG_EMPTY_CARD(sourcetracker, "rt2500"); + REG_EMPTY_CARD(sourcetracker, "rt8180"); -+#endif + +- sourcetracker->RegisterPacketsource("rt2400", 1, "IEEE80211b", 6, +- pcapsource_wext_registrant, +- monitor_wext, unmonitor_wext, +- chancontrol_wext, 1); +- sourcetracker->RegisterPacketsource("rt2500", 1, "IEEE80211g", 6, +- pcapsource_11g_registrant, +- monitor_wext, unmonitor_wext, +- chancontrol_wext, 1); +- sourcetracker->RegisterPacketsource("rt8180", 1, "IEEE80211b", 6, +- pcapsource_wext_registrant, +- monitor_wext, unmonitor_wext, +- chancontrol_wext, 1); #else // Register the linuxwireless pcap stuff as null -@@ -183,6 +201,7 @@ +@@ -182,31 +141,13 @@ + REG_EMPTY_CARD(sourcetracker, "wlanng_wext"); #endif - #if defined(HAVE_LIBPCAP) && defined(SYS_LINUX) -+#if 0 - sourcetracker->RegisterPacketsource("wlanng", 1, "IEEE80211b", 6, - pcapsource_wlanng_registrant, - monitor_wlanng, NULL, chancontrol_wlanng, 1); -@@ -190,6 +209,10 @@ - pcapsource_wlanng_registrant, - monitor_wlanng_avs, NULL, - chancontrol_wlanng_avs, 1); -+#else -+ REG_EMPTY_CARD(sourcetracker, "wlanng"); -+ REG_EMPTY_CARD(sourcetracker, "wlanng_avs"); -+#endif +-#if defined(HAVE_LIBPCAP) && defined(SYS_LINUX) +- sourcetracker->RegisterPacketsource("wlanng", 1, "IEEE80211b", 6, +- pcapsource_wlanng_registrant, +- monitor_wlanng, NULL, chancontrol_wlanng, 1); +- sourcetracker->RegisterPacketsource("wlanng_avs", 1, "IEEE80211b", 6, +- pcapsource_wlanng_registrant, +- monitor_wlanng_avs, NULL, +- chancontrol_wlanng_avs, 1); sourcetracker->RegisterPacketsource("wrt54g", 1, "na", 0, pcapsource_wrt54g_registrant, - monitor_wrt54g, NULL, NULL, 0); -@@ -199,7 +222,8 @@ - REG_EMPTY_CARD(sourcetracker, "wrt54g"); - #endif - +- monitor_wrt54g, unmonitor_wrt54g, chancontrol_wext, 0); +-#else ++ monitor_wrt54g, unmonitor_wrt54g, chancontrol_wext, 0); ++ + REG_EMPTY_CARD(sourcetracker, "wlanng"); + REG_EMPTY_CARD(sourcetracker, "wlanng_avs"); +- REG_EMPTY_CARD(sourcetracker, "wrt54g"); +-#endif +- -#if defined(SYS_LINUX) && defined(HAVE_LINUX_NETLINK) -+//#if defined(SYS_LINUX) && defined(HAVE_LINUX_NETLINK) -+#if 0 - sourcetracker->RegisterPacketsource("wlanng_legacy", 1, "IEEE80211b", 6, - prism2source_registrant, - monitor_wlanng_legacy, NULL, -@@ -240,7 +264,8 @@ +- sourcetracker->RegisterPacketsource("wlanng_legacy", 1, "IEEE80211b", 6, +- prism2source_registrant, +- monitor_wlanng_legacy, NULL, +- chancontrol_wlanng_legacy, 1); +-#else + REG_EMPTY_CARD(sourcetracker, "wlanng_legacy"); +-#endif + + #if defined(HAVE_LIBPCAP) && defined(SYS_OPENBSD) + sourcetracker->RegisterPacketsource("cisco_openbsd", 1, "IEEE80211b", 6, +@@ -240,29 +181,11 @@ REG_EMPTY_CARD(sourcetracker, "radiotap_bsd_b"); #endif -#if defined(HAVE_LIBWIRETAP) -+// #if defined(HAVE_LIBWIRETAP) -+#if 0 - sourcetracker->RegisterPacketsource("wtapfile", 0, "na", 0, - wtapfilesource_registrant, - NULL, NULL, NULL, 0); -@@ -248,7 +273,8 @@ +- sourcetracker->RegisterPacketsource("wtapfile", 0, "na", 0, +- wtapfilesource_registrant, +- NULL, NULL, NULL, 0); +-#else REG_EMPTY_CARD(sourcetracker, "wtapfile"); - #endif +-#endif -#if defined(HAVE_WSP100) -+#if 0 -+//#if defined(HAVE_WSP100) - sourcetracker->RegisterPacketsource("wsp100", 0, "IEEE80211b", 6, - wsp100source_registrant, - monitor_wsp100, NULL, chancontrol_wsp100, 0); -@@ -256,7 +282,9 @@ +- sourcetracker->RegisterPacketsource("wsp100", 0, "IEEE80211b", 6, +- wsp100source_registrant, +- monitor_wsp100, NULL, chancontrol_wsp100, 0); +-#else REG_EMPTY_CARD(sourcetracker, "wsp100"); - #endif +-#endif -#if defined(HAVE_VIHAHEADERS) -+ -+#if 0 -+//#if defined(HAVE_VIHAHEADERS) - sourcetracker->RegisterPacketsource("viha", 1, "IEEE80211b", 6, - vihasource_registrant, - NULL, NULL, chancontrol_viha, 0); -diff -urN kismet.old/kis_packsources.h kismet.dev/kis_packsources.h ---- kismet.old/kis_packsources.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kis_packsources.h 2005-08-15 00:15:54.831947536 +0200 +- sourcetracker->RegisterPacketsource("viha", 1, "IEEE80211b", 6, +- vihasource_registrant, +- NULL, NULL, chancontrol_viha, 0); +-#else + REG_EMPTY_CARD(sourcetracker, "viha"); +-#endif + + return 1; + } +diff -urN kismet.dev/kis_packsources.h kismet.dev2/kis_packsources.h +--- kismet.dev/kis_packsources.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/kis_packsources.h 2005-08-23 01:59:25.646219792 +0200 @@ -22,11 +22,7 @@ #include "config.h" @@ -322,9 +339,9 @@ diff -urN kismet.old/kis_packsources.h kismet.dev/kis_packsources.h #include "dronesource.h" #include "packetsourcetracker.h" -diff -urN kismet.old/kismet_client.cc kismet.dev/kismet_client.cc ---- kismet.old/kismet_client.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kismet_client.cc 2005-08-15 00:20:21.533402752 +0200 +diff -urN kismet.dev/kismet_client.cc kismet.dev2/kismet_client.cc +--- kismet.dev/kismet_client.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/kismet_client.cc 2005-08-23 01:59:25.648219488 +0200 @@ -28,7 +28,6 @@ #include "cursesfront.h" #include "panelfront.h" @@ -716,14 +733,14 @@ diff -urN kismet.old/kismet_client.cc kismet.dev/kismet_client.cc if (kismet_serv.Connect(guiport, guihost) < 0) { fprintf(stderr, "FATAL: Could not connect to %s:%d.\n", guihost, guiport); CatchShutdown(-1); -@@ -884,53 +553,14 @@ +@@ -884,53 +553,13 @@ } if (pollret != 0) { - if (pollret == CLIENT_ALERT) - if (sound == 1) - sound = PlaySound("alert"); - +- if (strlen(tcpcli->FetchStatus()) != 0) { gui->WriteStatus(tcpcli->FetchStatus()); // gui->DrawDisplay(); @@ -770,7 +787,7 @@ diff -urN kismet.old/kismet_client.cc kismet.dev/kismet_client.cc } num_networks += tcpcli->FetchNumNetworks(); -@@ -938,17 +568,7 @@ +@@ -938,17 +567,7 @@ num_noise += tcpcli->FetchNumNoise(); num_dropped += tcpcli->FetchNumDropped(); @@ -785,13 +802,13 @@ diff -urN kismet.old/kismet_client.cc kismet.dev/kismet_client.cc - last_click = time(0); - } - } -+ tcpcli->FetchDeltaNumPackets(); ++ tcpcli->FetchDeltaNumPackets(); } } } else { -diff -urN kismet.old/kismet_drone.cc kismet.dev/kismet_drone.cc ---- kismet.old/kismet_drone.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kismet_drone.cc 2005-08-15 01:04:06.114874928 +0200 +diff -urN kismet.dev/kismet_drone.cc kismet.dev2/kismet_drone.cc +--- kismet.dev/kismet_drone.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/kismet_drone.cc 2005-08-23 01:59:25.649219336 +0200 @@ -32,16 +32,11 @@ #include "packet.h" @@ -857,7 +874,7 @@ diff -urN kismet.old/kismet_drone.cc kismet.dev/kismet_drone.cc int channel_hop = -1; int channel_velocity = 1; int channel_dwell = 0; -@@ -351,46 +319,7 @@ +@@ -351,46 +319,6 @@ exit(1); } @@ -899,15 +916,15 @@ diff -urN kismet.old/kismet_drone.cc kismet.dev/kismet_drone.cc - // Add the GPS to the tcpstreamer - streamer.AddGpstracker(gps); - - // Register the gps and timetracker with the sourcetracker +- // Register the gps and timetracker with the sourcetracker - sourcetracker.AddGpstracker(gps); sourcetracker.AddTimetracker(&timetracker); // Register the sources -diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc ---- kismet.old/kismet_server.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kismet_server.cc 2005-08-15 01:03:15.103629816 +0200 -@@ -37,29 +37,19 @@ +diff -urN kismet.dev/kismet_server.cc kismet.dev2/kismet_server.cc +--- kismet.dev/kismet_server.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/kismet_server.cc 2005-08-23 01:59:25.653218728 +0200 +@@ -37,11 +37,7 @@ #include "packet.h" #include "packetsource.h" @@ -919,11 +936,9 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc #include "dronesource.h" #include "packetsourcetracker.h" #include "kis_packsources.h" - - #include "dumpfile.h" --#include "wtapdump.h" +@@ -51,15 +47,11 @@ #include "wtaplocaldump.h" --#include "airsnortdump.h" + #include "airsnortdump.h" #include "fifodump.h" -#include "gpsdump.h" - @@ -937,27 +952,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc #include "tcpserver.h" #include "server_globals.h" #include "kismet_server.h" -@@ -73,13 +62,13 @@ - - // Some globals for command line options - char *configfile = NULL; --int no_log = 0, noise_log = 0, data_log = 0, net_log = 0, crypt_log = 0, cisco_log = 0, -- gps_log = -1, gps_enable = 1, csv_log = 0, xml_log = 0, ssid_cloak_track = 0, -- ip_track = 0, waypoint = 0, fifo = 0, corrupt_log = 0; -+int no_log = 0, noise_log = 0, data_log = 0, net_log = 0, cisco_log = 0, -+ csv_log = 0, xml_log = 0, ssid_cloak_track = 0, -+ ip_track = 0, fifo = 0, corrupt_log = 0; - string logname, dumplogfile, netlogfile, cryptlogfile, ciscologfile, -- gpslogfile, csvlogfile, xmllogfile, ssidtrackfile, configdir, iptrackfile, -- waypointfile, fifofile; --FILE *ssid_file = NULL, *ip_file = NULL, *waypoint_file = NULL, *pid_file = NULL; -+ csvlogfile, xmllogfile, ssidtrackfile, configdir, iptrackfile, -+ fifofile; -+FILE *ssid_file = NULL, *ip_file = NULL, *pid_file = NULL; - - DumpFile *dumpfile, *cryptfile; - int packnum = 0, localdropnum = 0; -@@ -89,17 +78,8 @@ +@@ -89,17 +81,8 @@ Alertracker alertracker; Timetracker timetracker; @@ -975,33 +970,20 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc packet_info last_info; int decay; channel_power channel_graph[CHANNEL_MAX]; -@@ -113,16 +93,13 @@ +@@ -112,11 +95,8 @@ + // Wep keys macmap<wep_key_info *> bssid_wep_map; - // Pipe file descriptor pairs and fd's +-// Pipe file descriptor pairs and fd's -int soundpair[2]; -int speechpair[2]; int chanpair[2]; -pid_t soundpid = -1, speechpid = -1, chanpid = -1; ++pid_t chanpid = -1; // Past alerts unsigned int max_alerts = 50; - - // Reference numbers for all of our builtin protocols --int kismet_ref = -1, network_ref = -1, client_ref = -1, gps_ref = -1, -+int kismet_ref = -1, network_ref = -1, client_ref = -1, - time_ref = -1, error_ref = -1, info_ref = -1, cisco_ref = -1, terminate_ref = -1, - remove_ref = -1, capability_ref = -1, protocols_ref = -1, status_ref = -1, - alert_ref = -1, packet_ref = -1, string_ref = -1, ack_ref = -1, wepkey_ref = -1, -@@ -169,24 +146,12 @@ - const char *logtypes = NULL, *dumptype = NULL; - int limit_logs = 0; - --char gpshost[1024]; --int gpsport = -1; -- - string allowed_hosts; - string bind_addr; +@@ -177,17 +157,6 @@ int tcpport = -1; int tcpmax; @@ -1010,29 +992,19 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc - -const char *festival = NULL; -int speech = -1; - int flite = 0; +-int flite = 0; -int speech_encoding = 0; -string speech_sentence_encrypted, speech_sentence_unencrypted; - -map<string, string> wav_map; - +- int beacon_log = 1; int phy_log = 1; -@@ -336,28 +301,6 @@ - // delete dumpfile; + int mangle_log = 0; +@@ -347,17 +316,6 @@ + // delete cryptfile; } -- if (crypt_log) { -- cryptfile->CloseDump(); -- -- if (cryptfile->FetchDumped() == 0) { -- fprintf(stderr, "Didn't see any weak encryption packets, unlinking weak file\n"); -- unlink(cryptlogfile.c_str()); -- } -- -- // delete cryptfile; -- } -- - if (gps_log == 1) { - if (gpsdump.CloseDump(1) < 0) - fprintf(stderr, "Didn't log any GPS coordinates, unlinking gps file\n"); @@ -1047,7 +1019,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Shut down the packet sources sourcetracker.CloseSources(); -@@ -368,228 +311,11 @@ +@@ -368,228 +326,10 @@ exit(0); } @@ -1269,14 +1241,14 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc time_t now = time(0); if (!silent) fprintf(stderr, "ALERT %.24s %s\n", ctime(&now), in_text); - +- - if (sound == 1) - sound = PlaySound("alert"); - } void KisLocalStatus(const char *in_status) { -@@ -638,37 +364,6 @@ +@@ -638,37 +378,6 @@ char tmpstr[32]; @@ -1314,7 +1286,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc INFO_data idata; snprintf(tmpstr, 32, "%d", tracker.FetchNumNetworks()); idata.networks = tmpstr; -@@ -789,82 +484,6 @@ +@@ -789,81 +498,6 @@ } } @@ -1393,11 +1365,10 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc - // We want to be rescheduled - return 1; -} -- + // Simple redirect to the network info drawer. We don't want to change netwriteinfo to a // timer event since we call it un-timed too - int NetWriteEvent(Timetracker::timer_event *evt, void *parm) { -@@ -884,13 +503,6 @@ +@@ -884,13 +518,6 @@ return 1; } @@ -1411,23 +1382,24 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Handle tracker maintenance int TrackerTickEvent(Timetracker::timer_event *evt, void *parm) { tracker.Tick(); -@@ -1159,11 +771,10 @@ +@@ -1159,11 +786,9 @@ " -c, --capture-source <src> Packet capture source line (type,interface,name)\n" " -C, --enable-capture-sources Comma separated list of named packet sources to use.\n" " -l, --log-types <types> Comma separated list of types to log,\n" - " (ie, dump,cisco,weak,network,gps)\n" -+ " (ie, dump,cisco,network)\n" ++ " (ie, dump,cisco,weak,network)\n" " -d, --dump-type <type> Dumpfile type (wiretap)\n" " -m, --max-packets <num> Maximum number of packets before starting new dump\n" - " -q, --quiet Don't play sounds\n" +- " -q, --quiet Don't play sounds\n" - " -g, --gps <host:port> GPS server (host:port or off)\n" " -p, --port <port> TCPIP server port for GUI connections\n" " -a, --allowed-hosts <hosts> Comma separated list of hosts allowed to connect\n" " -b, --bind-address <address> Bind to this address. Default INADDR_ANY\n." -@@ -1288,18 +899,6 @@ +@@ -1287,23 +912,6 @@ + ip_track = 1; } - +- - if (conf->FetchOpt("waypoints") == "true") { - if(conf->FetchOpt("waypointdata") == "") { - fprintf(stderr, "WARNING: Waypoint logging requested but no waypoint data file given.\n" @@ -1437,33 +1409,21 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc - waypointfile = conf->ExpandLogPath(conf->FetchOpt("waypointdata"), "", "", 0, 1); - waypoint = 1; - } -- +- if(conf->FetchOpt("waypoint_essid") == "true") { +- waypointformat = 1; +- } else { +- waypointformat = 0; +- } - } - if (conf->FetchOpt("metric") == "true") { fprintf(stderr, "Using metric measurements.\n"); metric = 1; -@@ -1379,16 +971,6 @@ +@@ -1421,26 +1029,6 @@ + } } - -- if (strstr(logtypes, "weak")) { -- crypt_log = 1; -- -- if (conf->FetchOpt("logtemplate") == "") { -- fprintf(stderr, "FATAL: Logging (weak packets) enabled but no logtemplate given in config.\n"); -- ErrorShutdown(); -- } -- -- } - - if (strstr(logtypes, "csv")) { - csv_log = 1; - -@@ -1418,25 +1000,6 @@ - - } - - if (strstr(logtypes, "gps")) { - if (gps_log == 0) { - fprintf(stderr, "WARNING: Disabling GPS logging.\n"); @@ -1486,7 +1446,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc } if (conf->FetchOpt("decay") != "") { -@@ -1557,72 +1120,6 @@ +@@ -1561,72 +1149,6 @@ legal_ipblock_vec.push_back(ipb); } @@ -1559,7 +1519,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc if (conf->FetchOpt("writeinterval") != "") { if (sscanf(conf->FetchOpt("writeinterval").c_str(), "%d", &datainterval) != 1) { fprintf(stderr, "FATAL: Illegal config file value for data interval.\n"); -@@ -1642,45 +1139,6 @@ +@@ -1646,45 +1168,6 @@ fprintf(stderr, "WARNING: No client_manuf file specified. Client manufacturers will not be detected.\n"); } @@ -1605,7 +1565,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Grab the filtering string filter_bit; -@@ -1706,7 +1164,7 @@ +@@ -1710,7 +1193,7 @@ } if ((filter_bit = conf->FetchOpt("filter_export")) != "") { @@ -1614,7 +1574,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc filter_export = 1; if (ConfigFile::ParseFilterLine(filter_bit, &filter_export_bssid, &filter_export_source, &filter_export_dest, &filter_export_bssid_invert, -@@ -1812,14 +1270,6 @@ +@@ -1816,14 +1299,6 @@ } @@ -1629,21 +1589,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Create all the logs and title/number them appropriately // We need to save this for after we toast the conf record int logfile_matched = 0; -@@ -1839,13 +1289,6 @@ - continue; - } - -- if (crypt_log) { -- cryptlogfile = conf->ExpandLogPath(conf->FetchOpt("logtemplate"), logname, "weak", run_num); -- -- if (cryptlogfile == "") -- continue; -- } -- - if (csv_log) { - csvlogfile = conf->ExpandLogPath(conf->FetchOpt("logtemplate"), logname, "csv", run_num); - -@@ -1867,13 +1310,6 @@ +@@ -1871,13 +1346,6 @@ continue; } @@ -1657,13 +1603,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // if we made it this far we're cool -- all the logfiles we're writing to matched // this number logfile_matched = 1; -@@ -1896,15 +1332,9 @@ - if (xml_log) - fprintf(stderr, "Logging networks in XML format to %s\n", xmllogfile.c_str()); - -- if (crypt_log) -- fprintf(stderr, "Logging cryptographically weak packets to %s\n", cryptlogfile.c_str()); -- +@@ -1906,9 +1374,6 @@ if (cisco_log) fprintf(stderr, "Logging cisco product information to %s\n", ciscologfile.c_str()); @@ -1673,7 +1613,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc if (data_log) fprintf(stderr, "Logging data to %s\n", dumplogfile.c_str()); -@@ -2051,7 +1481,6 @@ +@@ -2055,7 +1520,6 @@ { "dump-type", required_argument, 0, 'd' }, { "max-packets", required_argument, 0, 'm' }, { "quiet", no_argument, 0, 'q' }, @@ -1681,7 +1621,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc { "port", required_argument, 0, 'p' }, { "allowed-hosts", required_argument, 0, 'a' }, { "bind-address", required_argument, 0, 'b'}, -@@ -2132,18 +1561,6 @@ +@@ -2136,18 +1600,6 @@ Usage(argv[0]); } break; @@ -1700,7 +1640,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc case 'p': // Port if (sscanf(optarg, "%d", &tcpport) != 1) { -@@ -2165,7 +1582,6 @@ +@@ -2169,7 +1621,6 @@ break; case 'q': // Quiet @@ -1708,7 +1648,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc break; case 'v': // version -@@ -2319,39 +1735,7 @@ +@@ -2323,39 +1774,6 @@ // And we're done fclose(pid_file); @@ -1743,12 +1683,12 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc - gps_log = 0; - } - - // Register the gps and timetracker with the sourcetracker +- // Register the gps and timetracker with the sourcetracker - sourcetracker.AddGpstracker(gps); sourcetracker.AddTimetracker(&timetracker); // Handle errors here maybe in the future -@@ -2518,13 +1902,6 @@ +@@ -2522,13 +1940,6 @@ fprintf(stderr, "Dump file format: %s\n", dumpfile->FetchType()); } @@ -1762,45 +1702,24 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Open our files first to make sure we can, we'll unlink the empties later. FILE *testfile = NULL; if (net_log) { -@@ -2567,18 +1944,6 @@ - fclose(testfile); - } - -- // Crypt log stays open like the dump log for continual writing -- if (crypt_log) { -- cryptfile = new AirsnortDumpFile; -- -- if (cryptfile->OpenDump(cryptlogfile.c_str()) < 0) { -- fprintf(stderr, "FATAL: %s\n", cryptfile->FetchError()); -- ErrorShutdown(); -- } -- -- fprintf(stderr, "Crypt file format: %s\n", cryptfile->FetchType()); -- -- } - - snprintf(status, STATUS_MAX, "Kismet %s.%s.%s (%s)", - VERSION_MAJOR, VERSION_MINOR, VERSION_TINY, servername); -@@ -2595,15 +1960,13 @@ - } +@@ -2600,14 +2011,13 @@ */ -- if (data_log || net_log || crypt_log) { + if (data_log || net_log || crypt_log) { - snprintf(status, STATUS_MAX, "Logging%s%s%s%s%s%s%s", -+ if (data_log || net_log) { -+ snprintf(status, STATUS_MAX, "Logging%s%s%s%s%s", ++ snprintf(status, STATUS_MAX, "Logging%s%s%s%s%s%s", data_log ? " data" : "" , net_log ? " networks" : "" , csv_log ? " CSV" : "" , xml_log ? " XML" : "" , -- crypt_log ? " weak" : "", + crypt_log ? " weak" : "", - cisco_log ? " cisco" : "", - gps_log == 1 ? " gps" : ""); + cisco_log ? " cisco" : ""); fprintf(stderr, "%s\n", status); } else if (no_log) { snprintf(status, STATUS_MAX, "Not logging any data."); -@@ -2621,23 +1984,6 @@ +@@ -2625,23 +2035,6 @@ } } @@ -1824,7 +1743,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc fprintf(stderr, "Listening on port %d.\n", tcpport); for (unsigned int ipvi = 0; ipvi < legal_ipblock_vec.size(); ipvi++) { char *netaddr = strdup(inet_ntoa(legal_ipblock_vec[ipvi]->network)); -@@ -2678,8 +2024,6 @@ +@@ -2682,8 +2075,6 @@ &Protocol_NETWORK, &ProtocolNetworkEnable); client_ref = ui_server.RegisterProtocol("CLIENT", 0, CLIENT_fields_text, &Protocol_CLIENT, &ProtocolClientEnable); @@ -1833,7 +1752,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc info_ref = ui_server.RegisterProtocol("INFO", 0, INFO_fields_text, &Protocol_INFO, NULL); remove_ref = ui_server.RegisterProtocol("REMOVE", 0, REMOVE_fields_text, -@@ -2734,14 +2078,9 @@ +@@ -2738,14 +2129,9 @@ // Write network info and tick the tracker once per second timetracker.RegisterTimer(SERVER_TIMESLICES_SEC, NULL, 1, &NetWriteEvent, NULL); timetracker.RegisterTimer(SERVER_TIMESLICES_SEC, NULL, 1, &TrackerTickEvent, NULL); @@ -1848,7 +1767,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // Channel hop if requested if (channel_hop) { if (channel_dwell) -@@ -2765,7 +2104,6 @@ +@@ -2769,7 +2155,6 @@ snprintf(status, 1024, "%s", TIMESTAMP); kdata.timestamp = status; @@ -1856,7 +1775,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc int num_networks = 0, num_packets = 0, num_noise = 0, num_dropped = 0; -@@ -2914,54 +2252,12 @@ +@@ -2918,54 +2303,13 @@ } @@ -1873,7 +1792,7 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc // tracker.ProcessPacket(info); tracker.ProcessPacket(&packet, &info, &bssid_wep_map, wep_identity); -- + - if (tracker.FetchNumNetworks() > num_networks) { - if (sound == 1) - if (info.crypt_set && @@ -1911,20 +1830,9 @@ diff -urN kismet.old/kismet_server.cc kismet.dev/kismet_server.cc num_packets = tracker.FetchNumPackets(); num_noise = tracker.FetchNumNoise(); num_dropped = tracker.FetchNumDropped() + localdropnum; -@@ -3070,10 +2366,6 @@ - } - } - -- if (crypt_log) { -- cryptfile->DumpPacket(&info, &packet); -- } -- - } else if (ret < 0) { - // Fail on error - snprintf(status, STATUS_MAX, "FATAL: %s", -diff -urN kismet.old/kismet_server.h kismet.dev/kismet_server.h ---- kismet.old/kismet_server.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/kismet_server.h 2005-08-15 00:29:19.088681928 +0200 +diff -urN kismet.dev/kismet_server.h kismet.dev2/kismet_server.h +--- kismet.dev/kismet_server.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/kismet_server.h 2005-08-23 01:59:25.653218728 +0200 @@ -33,10 +33,6 @@ void handle_command(TcpServer *tcps, client_command *cc); int NetWriteStatus(const char *in_status); @@ -1936,269 +1844,10 @@ diff -urN kismet.old/kismet_server.h kismet.dev/kismet_server.h void ProtocolAlertEnable(int in_fd); void ProtocolNetworkEnable(int in_fd); void ProtocolClientEnable(int in_fd); -diff -urN kismet.old/packet.cc kismet.dev/packet.cc ---- kismet.old/packet.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packet.cc 2005-08-15 00:30:26.190480904 +0200 -@@ -257,14 +257,6 @@ - ret_packinfo->encoding = packet->encoding; - ret_packinfo->datarate = packet->datarate; - -- // Assign the location info -- ret_packinfo->gps_lat = packet->gps_lat; -- ret_packinfo->gps_lon = packet->gps_lon; -- ret_packinfo->gps_alt = packet->gps_alt; -- ret_packinfo->gps_spd = packet->gps_spd; -- ret_packinfo->gps_heading = packet->gps_heading; -- ret_packinfo->gps_fix = packet->gps_fix; -- - // Assign a hardware channel if we're on an 802.11a carrier since the beacon doesn't - // carry that tag - if (packet->carrier == carrier_80211a) -diff -urN kismet.old/packetracker.cc kismet.dev/packetracker.cc ---- kismet.old/packetracker.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packetracker.cc 2005-08-15 00:58:01.441313736 +0200 -@@ -255,19 +255,6 @@ - - client->metric = net->metric; - -- if (info->gps_fix >= 2) { -- client->gps_fixed = info->gps_fix; -- client->min_lat = client->max_lat = info->gps_lat; -- client->min_lon = client->max_lon = info->gps_lon; -- client->min_alt = client->max_alt = info->gps_alt; -- client->min_spd = client->max_spd = info->gps_spd; -- -- client->aggregate_lat = info->gps_lat; -- client->aggregate_lon = info->gps_lon; -- client->aggregate_alt = info->gps_alt; -- client->aggregate_points = 1; -- } -- - // Classify the client. We'll call no-distrib packets (lucent) - // inter-distrib clients since it's not an end-user bridge into the - // network, it's a lucent AP talking to another one. -@@ -410,19 +397,6 @@ - KisLocalStatus(status); - } - -- if (info->gps_fix >= 2) { -- net->gps_fixed = info->gps_fix; -- net->min_lat = net->max_lat = info->gps_lat; -- net->min_lon = net->max_lon = info->gps_lon; -- net->min_alt = net->max_alt = info->gps_alt; -- net->min_spd = net->max_spd = info->gps_spd; -- -- net->aggregate_lat = info->gps_lat; -- net->aggregate_lon = info->gps_lon; -- net->aggregate_alt = info->gps_alt; -- net->aggregate_points = 1; -- } -- - // Find out what we can from what we know now... - if (net->type != network_adhoc && net->type != network_probe) { - net->manuf_ref = MatchBestManuf(ap_manuf_map, net->bssid, net->ssid, -@@ -463,11 +437,6 @@ - - if (info->signal > net->best_signal || net->best_signal == 0) { - net->best_signal = info->signal; -- if (info->gps_fix >= 2) { -- net->best_lat = info->gps_lat; -- net->best_lon = info->gps_lon; -- net->best_alt = info->gps_alt; -- } - } - - net->noise = info->noise; -@@ -477,41 +446,6 @@ - net->best_noise = info->noise; - } - -- if (info->gps_fix >= 2) { -- // Don't aggregate slow-moving packets to prevent average "pulling".. -- if (info->gps_spd <= 0.3) { -- net->aggregate_lat += info->gps_lat; -- net->aggregate_lon += info->gps_lon; -- net->aggregate_alt += info->gps_alt; -- net->aggregate_points += 1; -- } -- -- net->gps_fixed = info->gps_fix; -- -- if (info->gps_lat < net->min_lat || net->min_lat == -90) -- net->min_lat = info->gps_lat; -- if (info->gps_lat > net->max_lat || net->max_lat == 90) -- net->max_lat = info->gps_lat; -- -- if (info->gps_lon < net->min_lon || net->min_lon == -180) -- net->min_lon = info->gps_lon; -- if (info->gps_lon > net->max_lon || net->max_lon == 180) -- net->max_lon = info->gps_lon; -- -- if (info->gps_alt < net->min_alt || net->min_alt == 0) -- net->min_alt = info->gps_alt; -- if (info->gps_alt > net->max_alt || net->max_alt == 0) -- net->max_alt = info->gps_alt; -- -- if (info->gps_spd < net->min_spd || net->min_spd == 0) -- net->min_spd = info->gps_spd; -- if (info->gps_spd > net->max_spd || net->max_spd == 0) -- net->max_spd = info->gps_spd; -- -- } else { -- net->gps_fixed = 0; -- } -- - // Handle the IV sets. 4-byte compare IV is fine - if (info->encrypted) { - map<uint32_t, int>::iterator ivitr = net->iv_map.find(info->ivset); -@@ -834,50 +768,11 @@ - } - } - -- if (info->gps_fix >= 2) { -- if (info->gps_spd <= 0.3) { -- client->aggregate_lat += info->gps_lat; -- client->aggregate_lon += info->gps_lon; -- client->aggregate_alt += info->gps_alt; -- client->aggregate_points += 1; -- } -- -- client->gps_fixed = info->gps_fix; -- -- if (info->gps_lat < client->min_lat || client->min_lat == -90) -- client->min_lat = info->gps_lat; -- if (info->gps_lat > client->max_lat || client->max_lat == 90) -- client->max_lat = info->gps_lat; -- -- if (info->gps_lon < client->min_lon || client->min_lon == -180) -- client->min_lon = info->gps_lon; -- if (info->gps_lon > client->max_lon == 180) -- client->max_lon = info->gps_lon; -- -- if (info->gps_alt < client->min_alt || client->min_alt == 0) -- client->min_alt = info->gps_alt; -- if (info->gps_alt > client->max_alt || client->min_alt == 0) -- client->max_alt = info->gps_alt; -- -- if (info->gps_spd < client->min_spd || client->min_spd == 0) -- client->min_spd = info->gps_spd; -- if (info->gps_spd > client->max_spd || client->max_spd == 0) -- client->max_spd = info->gps_spd; -- -- } else { -- client->gps_fixed = 0; -- } -- - if (info->signal >= 0) { - client->signal = info->signal; - - if (info->signal > client->best_signal || client->best_signal == 0) { - client->best_signal = info->signal; -- if (info->gps_fix >= 2) { -- client->best_lat = info->gps_lat; -- client->best_lon = info->gps_lon; -- client->best_alt = info->gps_alt; -- } - } - - net->noise = info->noise; -@@ -1416,17 +1311,6 @@ - (net->llc_packets + net->data_packets), - ft, lt); - -- if (net->gps_fixed != -1) -- fprintf(netfile, -- " Min Loc: Lat %f Lon %f Alt %f Spd %f\n" -- " Max Loc: Lat %f Lon %f Alt %f Spd %f\n", -- net->min_lat, net->min_lon, -- metric ? net->min_alt / 3.3 : net->min_alt, -- metric ? net->min_spd * 1.6093 : net->min_spd, -- net->max_lat, net->max_lon, -- metric ? net->max_alt / 3.3 : net->max_alt, -- metric ? net->max_spd * 1.6093 : net->max_spd); -- - if (net->ipdata.atype == address_dhcp) - fprintf(netfile, " Address found via DHCP %d.%d.%d.%d \n", - net->ipdata.range_ip[0], net->ipdata.range_ip[1], -@@ -1634,8 +1518,7 @@ - - fprintf(netfile, "Network;NetType;ESSID;BSSID;Info;Channel;Cloaked;Encryption;Decrypted;MaxRate;MaxSeenRate;Beacon;" - "LLC;Data;Crypt;Weak;Total;Carrier;Encoding;FirstTime;LastTime;BestQuality;BestSignal;BestNoise;" -- "GPSMinLat;GPSMinLon;GPSMinAlt;GPSMinSpd;GPSMaxLat;GPSMaxLon;GPSMaxAlt;GPSMaxSpd;" -- "GPSBestLat;GPSBestLon;GPSBestAlt;DataSize;IPType;IP;\n\r"); -+ "DataSize;IPType;IP;\n\r"); - - stable_sort(network_list.begin(), network_list.end(), SortFirstTimeLT()); - -@@ -1819,9 +1702,6 @@ - "%d;%d;%d;%d;%d;" - "%s;%s;%s;%s;" - "%d;%d;%d;" -- "%f;%f;%f;%f;" -- "%f;%f;%f;%f;" -- "%f;%f;%f;" - "%ld;%s;" - "%hu.%hu.%hu.%hu;\n\r", - netnum, type, SanitizeCSV(net->ssid).c_str(), -@@ -1835,9 +1715,6 @@ - (net->llc_packets + net->data_packets), - carrier.c_str(), encoding.c_str(), ft, lt, - net->best_quality, net->best_signal, net->best_noise, -- net->min_lat, net->min_lon, net->min_alt, net->min_spd, -- net->max_lat, net->max_lon, net->max_alt, net->max_spd, -- net->best_lat, net->best_lon, net->best_alt, - net->datasize, iptype.c_str(), - net->ipdata.range_ip[0], net->ipdata.range_ip[1], - net->ipdata.range_ip[2], net->ipdata.range_ip[3]); -@@ -2056,23 +1933,6 @@ - - fprintf(netfile, " <datasize>%ld</datasize>\n", net->datasize); - -- if (net->gps_fixed != -1) { -- fprintf(netfile, " <gps-info unit=\"%s\">\n", metric ? "metric" : "english"); -- fprintf(netfile, " <min-lat>%f</min-lat>\n", net->min_lat); -- fprintf(netfile, " <min-lon>%f</min-lon>\n", net->min_lon); -- fprintf(netfile, " <min-alt>%f</min-alt>\n", -- metric ? net->min_alt / 3.3 : net->min_alt); -- fprintf(netfile, " <min-spd>%f</min-spd>\n", -- metric ? net->min_spd * 1.6093 : net->min_spd); -- fprintf(netfile, " <max-lat>%f</max-lat>\n", net->max_lat); -- fprintf(netfile, " <max-lon>%f</max-lon>\n", net->max_lon); -- fprintf(netfile, " <max-alt>%f</max-alt>\n", -- metric ? net->max_alt / 3.3 : net->max_alt); -- fprintf(netfile, " <max-spd>%f</max-spd>\n", -- metric ? net->max_spd * 1.6093 : net->max_spd); -- fprintf(netfile, " </gps-info>\n"); -- } -- - if (net->ipdata.atype > address_factory) { - char *addrtype; - switch (net->ipdata.atype) { -@@ -2171,23 +2031,6 @@ - if (cli->crypt_set & crypt_pptp) - fprintf(netfile, " <client-encryption>PPTP</client-encryption>\n"); - -- if (cli->gps_fixed != -1) { -- fprintf(netfile, " <client-gps-info unit=\"%s\">\n", metric ? "metric" : "english"); -- fprintf(netfile, " <client-min-lat>%f</client-min-lat>\n", cli->min_lat); -- fprintf(netfile, " <client-min-lon>%f</client-min-lon>\n", cli->min_lon); -- fprintf(netfile, " <client-min-alt>%f</client-min-alt>\n", -- metric ? cli->min_alt / 3.3 : cli->min_alt); -- fprintf(netfile, " <client-min-spd>%f</client-min-spd>\n", -- metric ? cli->min_spd * 1.6093 : cli->min_spd); -- fprintf(netfile, " <client-max-lat>%f</client-max-lat>\n", cli->max_lat); -- fprintf(netfile, " <client-max-lon>%f</client-max-lon>\n", cli->max_lon); -- fprintf(netfile, " <client-max-alt>%f</client-max-alt>\n", -- metric ? cli->max_alt / 3.3 : cli->max_alt); -- fprintf(netfile, " <client-max-spd>%f</client-max-spd>\n", -- metric ? cli->max_spd * 1.6093 : cli->max_spd); -- fprintf(netfile, " </client-gps-info>\n"); -- } -- - fprintf(netfile, " <client-datasize>%ld</client-datasize>\n", cli->datasize); - fprintf(netfile, " <client-maxrate>%2.1f</client-maxrate>\n", cli->maxrate); - fprintf(netfile, " <client-maxseenrate>%ld</client-maxseenrate>\n", (long) cli->maxseenrate * 100); -@@ -2437,23 +2280,3 @@ +diff -urN kismet.dev/packetracker.cc kismet.dev2/packetracker.cc +--- kismet.dev/packetracker.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/packetracker.cc 2005-08-23 01:59:25.656218272 +0200 +@@ -2439,23 +2439,3 @@ } @@ -2215,16 +1864,16 @@ diff -urN kismet.old/packetracker.cc kismet.dev/packetracker.cc - float lat, lon; - lat = (net->min_lat + net->max_lat) / 2; - lon = (net->min_lon + net->max_lon) / 2; -- fprintf(in_file, "%s\t%f %f\n", net->bssid.Mac2String().c_str(), lat, lon); +- fprintf(in_file, "%s\t%f %f\n", waypointformat == 1 ? net->ssid.c_str() : net->bssid.Mac2String().c_str(), lat, lon); - } - - fflush(in_file); - - return 1; -} -diff -urN kismet.old/packetracker.h kismet.dev/packetracker.h ---- kismet.old/packetracker.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packetracker.h 2005-08-15 00:32:27.876981744 +0200 +diff -urN kismet.dev/packetracker.h kismet.dev2/packetracker.h +--- kismet.dev/packetracker.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/packetracker.h 2005-08-23 01:59:25.656218272 +0200 @@ -30,7 +30,6 @@ #include <string> @@ -2242,9 +1891,9 @@ diff -urN kismet.old/packetracker.h kismet.dev/packetracker.h void WriteSSIDMap(FILE *in_file); void ReadSSIDMap(FILE *in_file); -diff -urN kismet.old/packetsourcetracker.cc kismet.dev/packetsourcetracker.cc ---- kismet.old/packetsourcetracker.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packetsourcetracker.cc 2005-08-15 00:33:14.628874376 +0200 +diff -urN kismet.dev/packetsourcetracker.cc kismet.dev2/packetsourcetracker.cc +--- kismet.dev/packetsourcetracker.cc 2005-08-23 00:59:39.969982048 +0200 ++++ kismet.dev2/packetsourcetracker.cc 2005-08-23 01:59:25.657218120 +0200 @@ -24,7 +24,6 @@ Packetsourcetracker::Packetsourcetracker() { next_packsource_id = 0; @@ -2261,9 +1910,9 @@ diff -urN kismet.old/packetsourcetracker.cc kismet.dev/packetsourcetracker.cc // Open it fprintf(stderr, "Source %d (%s): Opening %s source interface %s...\n", -diff -urN kismet.old/packetsourcetracker.h kismet.dev/packetsourcetracker.h ---- kismet.old/packetsourcetracker.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packetsourcetracker.h 2005-08-15 00:33:28.304795320 +0200 +diff -urN kismet.dev/packetsourcetracker.h kismet.dev2/packetsourcetracker.h +--- kismet.dev/packetsourcetracker.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/packetsourcetracker.h 2005-08-23 01:59:25.658217968 +0200 @@ -30,7 +30,6 @@ #include <string> @@ -2290,39 +1939,9 @@ diff -urN kismet.old/packetsourcetracker.h kismet.dev/packetsourcetracker.h Timetracker *timetracker; char errstr[1024]; -diff -urN kismet.old/packetstream.h kismet.dev/packetstream.h ---- kismet.old/packetstream.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/packetstream.h 2005-08-15 00:33:45.954112216 +0200 -@@ -45,7 +45,6 @@ - - typedef struct stream_version_packet { - uint16_t drone_version; -- uint8_t gps_enabled; - }; - - typedef struct stream_packet_header { -@@ -64,18 +63,6 @@ - uint8_t encoding __attribute__ ((packed)); - uint32_t datarate __attribute__ ((packed)); - -- int16_t gps_lat __attribute__ ((packed)); -- int64_t gps_lat_mant __attribute__ ((packed)); -- int16_t gps_lon __attribute__ ((packed)); -- int64_t gps_lon_mant __attribute__ ((packed)); -- int16_t gps_alt __attribute__ ((packed)); -- int64_t gps_alt_mant __attribute__ ((packed)); -- int16_t gps_spd __attribute__ ((packed)); -- int64_t gps_spd_mant __attribute__ ((packed)); -- int16_t gps_heading __attribute__ ((packed)); -- int64_t gps_heading_mant __attribute__ ((packed)); -- int8_t gps_fix __attribute__ ((packed)); -- - uint8_t sourcename[32] __attribute__ ((packed)); - }; - -diff -urN kismet.old/panelfront.cc kismet.dev/panelfront.cc ---- kismet.old/panelfront.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/panelfront.cc 2005-08-15 01:09:42.017809920 +0200 +diff -urN kismet.dev/panelfront.cc kismet.dev2/panelfront.cc +--- kismet.dev/panelfront.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/panelfront.cc 2005-08-23 01:59:25.659217816 +0200 @@ -37,7 +37,6 @@ " Key Action", " e List Kismet servers", @@ -2331,7 +1950,15 @@ diff -urN kismet.old/panelfront.cc kismet.dev/panelfront.cc " t Tag (or untag) selected network", " g Group tagged networks", " u Ungroup current group", -@@ -237,19 +236,6 @@ +@@ -121,7 +120,6 @@ + "Key Action", + " e List Kismet servers", + " z Toggle fullscreen net list", +- " m Toggle muting", + " t Tag (or untag) selected", + " g Group tagged networks", + " u Ungroup current group", +@@ -237,19 +235,6 @@ }; @@ -2351,7 +1978,7 @@ diff -urN kismet.old/panelfront.cc kismet.dev/panelfront.cc char *KismetHelpStats[] = { "KISMET NETWORK STATISTICS", "This panel displays overall statistics about the wireless", -@@ -678,7 +664,6 @@ +@@ -678,7 +663,6 @@ } // Enable all the protocols we handle @@ -2359,7 +1986,7 @@ diff -urN kismet.old/panelfront.cc kismet.dev/panelfront.cc in_client->EnableProtocol("INFO"); in_client->EnableProtocol("REMOVE"); in_client->EnableProtocol("NETWORK"); -@@ -1282,27 +1267,6 @@ +@@ -1282,27 +1266,6 @@ if (con->client == NULL) continue; @@ -2387,9 +2014,9 @@ diff -urN kismet.old/panelfront.cc kismet.dev/panelfront.cc // Update quality con->quality = con->client->FetchQuality(); con->power = con->client->FetchPower(); -diff -urN kismet.old/panelfront.h kismet.dev/panelfront.h ---- kismet.old/panelfront.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/panelfront.h 2005-08-15 00:34:52.481998440 +0200 +diff -urN kismet.dev/panelfront.h kismet.dev2/panelfront.h +--- kismet.dev/panelfront.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/panelfront.h 2005-08-23 01:59:25.660217664 +0200 @@ -65,7 +65,6 @@ #define SORT_SIZE 10 extern char *KismetHelpPower[]; @@ -2414,67 +2041,19 @@ diff -urN kismet.old/panelfront.h kismet.dev/panelfront.h int AlertInput(void *in_window, int in_chr); int MainClientInput(void *in_window, int in_chr); -diff -urN kismet.old/panelfront_display.cc kismet.dev/panelfront_display.cc ---- kismet.old/panelfront_display.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/panelfront_display.cc 2005-08-15 00:35:58.199007936 +0200 -@@ -727,56 +727,6 @@ +diff -urN kismet.dev/panelfront_display.cc kismet.dev2/panelfront_display.cc +--- kismet.dev/panelfront_display.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/panelfront_display.cc 2005-08-23 01:59:25.663217208 +0200 +@@ -727,7 +727,7 @@ mvwaddstr(netwin, netwin->_maxy, netwin->_maxx - 14, ptxt); } -#ifdef HAVE_GPS -- -- -- if (!(lat == 0 && lon == 0 && alt == 0 && spd == 0 && fix == 0)) { -- -- char gpsdata[80]; -- char fixstr[16]; -- float show_alt = alt; -- float show_spd = spd; -- -- if (metric) { -- show_alt = alt / 3.3; -- show_spd = spd * 1.6093; -- } -- -- if (fix == -1) -- snprintf(fixstr, 16, "No signal"); -- else if (fix == 2) -- snprintf(fixstr, 5, "2D"); -- else if (fix == 3) -- snprintf(fixstr, 5, "3D"); -- else -- snprintf(fixstr, 5, "NONE"); -- -- // Convert if we're less than a mile/hr or kilom/hr -- int spdslow = 0; -- if (spd < 0.5) { -- spdslow = 1; -- if (metric) -- show_spd = spd * 0.2778; -- else -- show_spd = spd * 1.4667; -- } -- -- snprintf(gpsdata, 80, "Lat %.3f Lon %.3f Alt %.1f%c Spd %.3f%s Hed %.3f Fix %s", -- lat, lon, show_alt, -- metric ? 'm' : 'f', -- show_spd, -- spdslow ? (metric ? "m/s" : "f/s") : (metric ? "km/h" : "m/h"), -- heading, -- fixstr); -- -- if (color) -- wattrset(kwin->win, color_map["monitor"].pair); -- mvwaddstr(netwin, netwin->_maxy, 2, gpsdata); -- if (color) -- wattrset(kwin->win, color_map["text"].pair); -- -- } --#endif ++#if 0 - return 1; -@@ -1496,51 +1446,6 @@ + if (!(lat == 0 && lon == 0 && alt == 0 && spd == 0 && fix == 0)) { +@@ -1496,51 +1496,6 @@ snprintf(output, print_width, "Networks: %d", (int) details_network->networks.size()); kwin->text.push_back(output); @@ -2526,7 +2105,7 @@ diff -urN kismet.old/panelfront_display.cc kismet.dev/panelfront_display.cc if (details_network->virtnet->carrier_set & (1 << (int) carrier_80211b)) { snprintf(output, print_width, "Carrier : IEEE 802.11b"); kwin->text.push_back(output); -@@ -1848,49 +1753,6 @@ +@@ -1853,49 +1808,6 @@ dnet->ipdata.range_ip[2], dnet->ipdata.range_ip[3]); kwin->text.push_back(output); } @@ -2576,7 +2155,7 @@ diff -urN kismet.old/panelfront_display.cc kismet.dev/panelfront_display.cc } // Now we just use the text printer to handle the rest for us -@@ -1898,184 +1760,6 @@ +@@ -1903,184 +1815,6 @@ return TextPrinter(in_window); } @@ -2761,7 +2340,7 @@ diff -urN kismet.old/panelfront_display.cc kismet.dev/panelfront_display.cc int PanelFront::PackPrinter(void *in_window) { kis_window *kwin = (kis_window *) in_window; -@@ -3044,54 +2728,6 @@ +@@ -3049,53 +2783,6 @@ details_client->ipdata.ip[2], details_client->ipdata.ip[3]); kwin->text.push_back(output); @@ -2812,13 +2391,12 @@ diff -urN kismet.old/panelfront_display.cc kismet.dev/panelfront_display.cc - } - kwin->text.push_back(""); - } -- + snprintf(output, print_width, "Packets :"); kwin->text.push_back(output); - snprintf(output, print_width, " Data : %d", details_client->data_packets); -diff -urN kismet.old/panelfront_input.cc kismet.dev/panelfront_input.cc ---- kismet.old/panelfront_input.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/panelfront_input.cc 2005-08-15 01:10:39.680043928 +0200 +diff -urN kismet.dev/panelfront_input.cc kismet.dev2/panelfront_input.cc +--- kismet.dev/panelfront_input.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/panelfront_input.cc 2005-08-23 01:59:25.665216904 +0200 @@ -300,16 +300,9 @@ break; case 'f': @@ -2844,7 +2422,7 @@ diff -urN kismet.old/panelfront_input.cc kismet.dev/panelfront_input.cc break; case 'p': case 'P': -@@ -546,32 +538,6 @@ +@@ -546,33 +538,6 @@ return 1; } @@ -2874,10 +2452,11 @@ diff -urN kismet.old/panelfront_input.cc kismet.dev/panelfront_input.cc - - return 1; -} - +- int PanelFront::RateInput(void *in_window, int in_chr) { switch (in_chr) { -@@ -645,24 +611,6 @@ + case 'h': +@@ -645,24 +610,6 @@ return 1; } @@ -2902,10 +2481,10 @@ diff -urN kismet.old/panelfront_input.cc kismet.dev/panelfront_input.cc int PanelFront::AlertInput(void *in_window, int in_chr) { kis_window *kwin = (kis_window *) in_window; -diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc ---- kismet.old/pcapsource.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/pcapsource.cc 2005-08-15 00:40:28.291416856 +0200 -@@ -296,11 +296,6 @@ +diff -urN kismet.dev/pcapsource.cc kismet.dev2/pcapsource.cc +--- kismet.dev/pcapsource.cc 2005-08-23 01:03:45.652632608 +0200 ++++ kismet.dev2/pcapsource.cc 2005-08-23 01:59:25.667216600 +0200 +@@ -343,11 +343,6 @@ packet->moddata = moddata; packet->modified = 0; @@ -2917,7 +2496,7 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc if (datalink_type == DLT_PRISM_HEADER) { ret = Prism2KisPack(packet, data, moddata); } else if (datalink_type == KDLT_BSD802_11) { -@@ -1075,133 +1070,6 @@ +@@ -1146,133 +1141,6 @@ // Monitor commands #ifdef HAVE_LINUX_WIRELESS @@ -3051,7 +2630,7 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc // Hostap uses iwpriv and iwcontrol settings to control monitor mode int monitor_hostap(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { int ret; -@@ -1350,134 +1218,6 @@ +@@ -1421,134 +1289,6 @@ return 1; } @@ -3186,10 +2765,11 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc // Madwifi stuff uses iwpriv mode int monitor_madwifi_a(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { // Allocate a tracking record for the interface settings and remember our -@@ -1656,88 +1396,6 @@ +@@ -1726,89 +1466,6 @@ + return unmonitor_wext(in_dev, initch, in_err, in_if, in_ext); } - +- -int monitor_ipw2100(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { - // Allocate a tracking record for the interface settings and remember our - // setup @@ -3275,7 +2855,134 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc // "standard" wireless extension monitor mode int monitor_wext(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { int mode; -@@ -2186,75 +1844,6 @@ +@@ -1870,108 +1527,6 @@ + #endif + + #ifdef SYS_LINUX +-// wlan-ng modern standard +-int monitor_wlanng(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { +- // I really didn't want to do this... +- char cmdline[2048]; +- +- // Sanitize the device just to be safe. The ifconfig should fail if +- // the device is invalid, but why take risks +- for (unsigned int x = 0; x < strlen(in_dev); x++) { +- if (!isalnum(in_dev[x])) { +- snprintf(in_err, STATUS_MAX, "Invalid device '%s'", in_dev); +- return -1; +- } +- } +- +- if (Ifconfig_Delta_Flags(in_dev, in_err, IFF_UP | IFF_RUNNING | IFF_PROMISC) < 0) +- return -1; +- +- // Enable the interface +- snprintf(cmdline, 2048, "wlanctl-ng %s lnxreq_ifstate ifstate=enable >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Turn off WEP +- snprintf(cmdline, 2048, "wlanctl-ng %s dot11req_mibset " +- "mibattribute=dot11PrivacyInvoked=false >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Don't exclude packets +- snprintf(cmdline, 2048, "wlanctl-ng %s dot11req_mibset " +- "mibattribute=dot11ExcludeUnencrypted=false >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Turn on rfmon on the initial channel +- snprintf(cmdline, 2048, "wlanctl-ng %s lnxreq_wlansniff channel=%d " +- "enable=true prismheader=true >/dev/null 2>/dev/null", in_dev, initch); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- return 0; +-} +- +-// wlan-ng avs +-int monitor_wlanng_avs(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext) { +- // I really didn't want to do this... +- char cmdline[2048]; +- +- // Sanitize the device just to be safe. The ifconfig should fail if +- // the device is invalid, but why take risks +- for (unsigned int x = 0; x < strlen(in_dev); x++) { +- if (!isalnum(in_dev[x])) { +- snprintf(in_err, STATUS_MAX, "Invalid device '%s'", in_dev); +- return -1; +- } +- } +- +- if (Ifconfig_Delta_Flags(in_dev, in_err, IFF_UP | IFF_RUNNING | IFF_PROMISC) < 0) +- return -1; +- +- // Enable the interface +- snprintf(cmdline, 2048, "wlanctl-ng %s lnxreq_ifstate ifstate=enable >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Turn off WEP +- snprintf(cmdline, 2048, "wlanctl-ng %s dot11req_mibset " +- "mibattribute=dot11PrivacyInvoked=false >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Don't exclude packets +- snprintf(cmdline, 2048, "wlanctl-ng %s dot11req_mibset " +- "mibattribute=dot11ExcludeUnencrypted=false >/dev/null 2>/dev/null", in_dev); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- // Turn on rfmon on the initial channel +- snprintf(cmdline, 2048, "wlanctl-ng %s lnxreq_wlansniff channel=%d prismheader=false " +- "wlanheader=true stripfcs=false keepwepflags=false enable=true >/dev/null 2>/dev/null", in_dev, initch); +- if (RunSysCmd(cmdline) < 0) { +- snprintf(in_err, 1024, "Unable to execute '%s'", cmdline); +- return -1; +- } +- +- return 0; +-} +- + int monitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, + void *in_ext) { + char cmdline[2048]; +@@ -1981,7 +1536,7 @@ + snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 1'. " + "Some custom firmware images require you to specify the origial " + "device and a new dynamic device and use the iwconfig controls. " +- "see the README for how to configure your capture source."); ++ "see the README for how to configure your capture source.", in_dev); + return -1; + } + +@@ -1998,7 +1553,7 @@ + snprintf(in_err, 1024, "Unable to set mode using 'iwpriv %s set_monitor 0'. " + "Some custom firmware images require you to specify the origial " + "device and a new dynamic device and use the iwconfig controls. " +- "see the README for how to configure your capture source."); ++ "see the README for how to configure your capture source.", in_dev); + return -1; + } + +@@ -2244,75 +1799,6 @@ return 0; } @@ -3351,471 +3058,19 @@ diff -urN kismet.old/pcapsource.cc kismet.dev/pcapsource.cc #endif #ifdef SYS_OPENBSD -diff -urN kismet.old/pcapsource.h kismet.dev/pcapsource.h ---- kismet.old/pcapsource.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/pcapsource.h 2005-08-15 00:42:50.849744696 +0200 -@@ -336,8 +336,6 @@ - char *in_err); - KisPacketSource *pcapsource_wextfcs_registrant(string in_name, string in_device, - char *in_err); --KisPacketSource *pcapsource_ciscowifix_registrant(string in_name, string in_device, -- char *in_err); - KisPacketSource *pcapsource_11g_registrant(string in_name, string in_device, - char *in_err); - KisPacketSource *pcapsource_11gfcs_registrant(string in_name, string in_device, -@@ -365,25 +363,12 @@ - int unmonitor_pcapfile(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - - #ifdef HAVE_LINUX_WIRELESS --// Cisco (old) --int monitor_cisco(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int unmonitor_cisco(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// Cisco (new) --int monitor_cisco_wifix(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - // hostap prism2 - int monitor_hostap(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - int unmonitor_hostap(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - // orinoco - int monitor_orinoco(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - int unmonitor_orinoco(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// acx100 --int monitor_acx100(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int unmonitor_acx100(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// admtek --int monitor_admtek(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int unmonitor_admtek(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// ar5k --int monitor_vtar5k(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - // Madwifi group of cards - int monitor_madwifi_a(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - int monitor_madwifi_b(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); -@@ -393,11 +378,6 @@ - // prism54 needs to override the error messages it gets setting channels - int monitor_prism54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - int unmonitor_prism54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// Centrino --int monitor_ipw2100(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int unmonitor_ipw2100(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int monitor_ipw2200(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --int unmonitor_ipw2200(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - // "Standard" wext monitor sequence - mostly a helper for other functions - // since most cards that use wext still have custom initialization that - // needs to be done. -@@ -406,10 +386,6 @@ - #endif - - #ifdef SYS_LINUX --// wlan-ng modern standard --int monitor_wlanng(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); --// wlan-ng avs --int monitor_wlanng_avs(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - // linksys wrt54g monitoring - int monitor_wrt54g(const char *in_dev, int initch, char *in_err, void **in_if, void *in_ext); - #endif -@@ -434,16 +410,8 @@ - // Prism54 apparently returns a fail code on an iwconfig channel change but - // then works so we need to override the wext failure code - int chancontrol_prism54g(const char *in_dev, int in_ch, char *in_err, void *in_ext); --// We need a delay in it like orinoco, apparently --int chancontrol_ipw2100(const char *in_dev, int in_ch, char *in_err, void *in_ext); --int chancontrol_ipw2200(const char *in_dev, int in_ch, char *in_err, void *in_ext); - #endif - --#ifdef SYS_LINUX --// Modern wlan-ng and wlan-ng avs --int chancontrol_wlanng(const char *in_dev, int in_ch, char *in_err, void *in_ext); --int chancontrol_wlanng_avs(const char *in_dev, int in_ch, char *in_err, void *in_ext); --#endif - - #ifdef SYS_OPENBSD - // openbsd prism2 controls -diff -urN kismet.old/server_protocols.cc kismet.dev/server_protocols.cc ---- kismet.old/server_protocols.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/server_protocols.cc 2005-08-15 00:44:07.921028080 +0200 -@@ -96,7 +96,7 @@ - "bssid", "type", "ssid", "beaconinfo", - "llcpackets", "datapackets", "cryptpackets", - "weakpackets", "channel", "wep", "firsttime", -- "lasttime", "atype", "rangeip", "gpsfixed", -+ "lasttime", "atype", "rangeip", - "minlat", "minlon", "minalt", "minspd", - "maxlat", "maxlon", "maxalt", "maxspd", - "octets", "cloaked", "beaconrate", "maxrate", -@@ -104,7 +104,6 @@ - "quality", "signal", "noise", - "bestquality", "bestsignal", "bestnoise", - "bestlat", "bestlon", "bestalt", -- "agglat", "agglon", "aggalt", "aggpoints", - "datasize", - "turbocellnid", "turbocellmode", "turbocellsat", - "carrierset", "maxseenrate", "encodingset", -@@ -116,10 +115,6 @@ - "bssid", "mac", "type", "firsttime", "lasttime", - "manufkey", "manufscore", - "datapackets", "cryptpackets", "weakpackets", -- "gpsfixed", -- "minlat", "minlon", "minalt", "minspd", -- "maxlat", "maxlon", "maxalt", "maxspd", -- "agglat", "agglon", "aggalt", "aggpoints", - "maxrate", - "quality", "signal", "noise", - "bestquality", "bestsignal", "bestnoise", -@@ -399,33 +394,6 @@ - net->ipdata.range_ip[2], net->ipdata.range_ip[3]); - data->ndvec.push_back(tmpstr); - -- snprintf(tmpstr, 128, "%d", net->gps_fixed); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->min_lat); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->min_lon); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->min_alt); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->min_spd); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->max_lat); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->max_lon); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->max_alt); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->max_spd); -- data->ndvec.push_back(tmpstr); -- - snprintf(tmpstr, 128, "%d", net->ipdata.octets); - data->ndvec.push_back(tmpstr); - -@@ -476,18 +444,6 @@ - snprintf(tmpstr, 128, "%f", net->best_alt); - data->ndvec.push_back(tmpstr); - -- snprintf(tmpstr, 128, "%f", net->aggregate_lat); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->aggregate_lon); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", net->aggregate_alt); -- data->ndvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%ld", net->aggregate_points); -- data->ndvec.push_back(tmpstr); -- - snprintf(tmpstr, 128, "%ld", net->datasize); - data->ndvec.push_back(tmpstr); - -@@ -573,45 +529,6 @@ - snprintf(tmpstr, 128, "%d", cli->interesting_packets); - data->cdvec.push_back(tmpstr); - -- snprintf(tmpstr, 128, "%d", cli->gps_fixed); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->min_lat); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->min_lon); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->min_alt); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->min_spd); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->max_lat); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->max_lon); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->max_alt); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->max_spd); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->aggregate_lat); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->aggregate_lon); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%f", cli->aggregate_alt); -- data->cdvec.push_back(tmpstr); -- -- snprintf(tmpstr, 128, "%ld", cli->aggregate_points); -- data->cdvec.push_back(tmpstr); -- - snprintf(tmpstr, 128, "%2.1f", cli->maxrate); - data->cdvec.push_back(tmpstr); - -diff -urN kismet.old/tcpclient.cc kismet.dev/tcpclient.cc ---- kismet.old/tcpclient.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/tcpclient.cc 2005-08-15 01:06:01.938267096 +0200 -@@ -29,18 +29,16 @@ - protocol_default_map["STRING"] = "bssid,sourcemac,text"; - protocol_default_map["KISMET"] = "version,starttime,servername,timestamp," - "channelhop,newversion"; -- protocol_default_map["GPS"] = "lat,lon,alt,spd,heading,fix"; - protocol_default_map["NETWORK"] = "bssid,type,ssid,beaconinfo,llcpackets,datapackets,cryptpackets," -- "weakpackets,channel,wep,firsttime,lasttime,atype,rangeip,gpsfixed,minlat,minlon,minalt,minspd," -- "maxlat,maxlon,maxalt,maxspd,octets,cloaked,beaconrate,maxrate," -- "quality,signal,noise,bestquality,bestsignal,bestnoise,bestlat,bestlon,bestalt," -- "agglat,agglon,aggalt,aggpoints,datasize,turbocellnid,turbocellmode,turbocellsat," -+ "weakpackets,channel,wep,firsttime,lasttime,atype,rangeip," -+ "octets,cloaked,beaconrate,maxrate," -+ "quality,signal,noise,bestquality,bestsignal,bestnoise," -+ "datasize,turbocellnid,turbocellmode,turbocellsat," - "carrierset,maxseenrate,encodingset,decrypted,dupeivpackets"; - protocol_default_map["CLIENT"] = "bssid,mac,type,firsttime,lasttime," - "datapackets,cryptpackets,weakpackets," -- "gpsfixed,minlat,minlon,minalt,minspd,maxlat,maxlon,maxalt,maxspd," -- "agglat,agglon,aggalt,aggpoints,maxrate,quality,signal,noise," -- "bestquality,bestsignal,bestnoise,bestlat,bestlon,bestalt," -+ "maxrate,quality,signal,noise," -+ "bestquality,bestsignal,bestnoise," - "atype,ip,datasize,maxseenrate,encodingset,decrypted,wep"; - protocol_default_map["WEPKEY"] = "origin,bssid,key,encrypted,failed"; - protocol_default_map["CARD"] = "interface,type,username,channel,id,packets,hopping"; -@@ -48,7 +46,6 @@ - sv_valid = 0; - client_fd = 0; - -- lat = lon = alt = spd = 0; - mode = 0; - - num_networks = num_packets = num_crypt = num_interesting = -@@ -343,14 +340,6 @@ - // Bitmask set of encoding types seen in this network - int encoding_set; - -- int gps_fixed; -- float min_lat, min_lon, min_alt, min_spd; -- float max_lat, max_lon, max_alt, max_spd; -- -- // Averaged center position -- double aggregate_lat, aggregate_lon, aggregate_alt; -- long aggregate_points; -- - // How fast we can go - float maxrate; - -@@ -359,7 +348,6 @@ - // Connection information - int quality, signal, noise; - int best_quality, best_signal, best_noise; -- float best_lat, best_lon, best_alt; - - // Amount of data, in bytes - unsigned long datasize; -@@ -393,23 +381,20 @@ - scanned = sscanf(in_data+hdrlen+18, "%d \001%255[^\001]\001 " - "\001%255[^\001]\001 " - "%d %d %d %d %d %d %d %d %d %hd.%hd.%hd.%hd " -- "%d %f %f %f %f %f %f %f %f %d %d %d %f %d %d %d %d %d %d " -- "%f %f %f %lf %lf %lf %ld %ld" -+ "%d %d %d %f %d %d %d %d %d %d " -+ "%ld" - "%d %d %d %d %d %d %d %d", - (int *) &type, ssid, beaconstr, - &llc_packets, &data_packets, &crypt_packets, - &interesting_packets, &channel, &crypt_set, - (int *) &first_time, (int *) &last_time, - (int *) &atype, &range[0], &range[1], &range[2], -- &range[3], &gps_fixed, &min_lat, &min_lon, -- &min_alt, &min_spd, &max_lat, &max_lon, -- &max_alt, &max_spd, &octets, -+ &range[3], -+ &octets, - &cloaked, &beacon, &maxrate, &quality, - &signal, &noise, &best_quality, - &best_signal, &best_noise, -- &best_lat, &best_lon, &best_alt, -- &aggregate_lat, &aggregate_lon, &aggregate_alt, -- &aggregate_points, &datasize, -+ &datasize, - &turbocell_nid, (int *) &turbocell_mode, - &turbocell_sat, &carrier_set, &maxseenrate, - &encoding_set, &decrypted, &dupeiv_packets); -@@ -456,15 +441,6 @@ - net->beacon = beacon; - net->carrier_set = carrier_set; - net->encoding_set = encoding_set; -- net->gps_fixed = gps_fixed; -- net->min_lat = min_lat; -- net->min_lon = min_lon; -- net->min_alt = min_alt; -- net->min_spd = min_spd; -- net->max_lat = max_lat; -- net->max_lon = max_lon; -- net->max_alt = max_alt; -- net->max_spd = max_spd; - net->maxrate = maxrate; - net->maxseenrate = maxseenrate; - net->quality = quality; -@@ -473,13 +449,6 @@ - net->best_quality = best_quality; - net->best_signal = best_signal; - net->best_noise = best_noise; -- net->best_lat = best_lat; -- net->best_lon = best_lon; -- net->best_alt = best_alt; -- net->aggregate_points = aggregate_points; -- net->aggregate_lat = aggregate_lat; -- net->aggregate_lon = aggregate_lon; -- net->aggregate_alt = aggregate_alt; - net->datasize = datasize; - net->dupeiv_packets = dupeiv_packets; - net->decrypted = decrypted; -@@ -505,13 +474,6 @@ - int crypt_packets; - int interesting_packets; - -- // gps data -- int gps_fixed; -- float min_lat, min_lon, min_alt, min_spd; -- float max_lat, max_lon, max_alt, max_spd; -- double aggregate_lat, aggregate_lon, aggregate_alt; -- long aggregate_points; -- - // How fast we can go - float maxrate; - // How fast we've been seen to go, in 100kbs units -@@ -523,7 +485,6 @@ - // Last seen quality for a packet from this client - int quality, signal, noise; - int best_quality, best_signal, best_noise; -- float best_lat, best_lon, best_alt; - - // ip data - address_type atype; -@@ -558,24 +519,16 @@ - return 0; - } - -- scanned = sscanf(in_data+hdrlen+36, "%d %d %d %d %d %d %d " -- "%f %f %f %f %f %f %f %f %lf %lf " -- "%lf %ld %f %d %d %d %d %d %d " -- "%f %f %f %d %hd.%hd.%hd.%hd %ld %d %d %d %d", -+ scanned = sscanf(in_data+hdrlen+36, "%d %d %d %d %d %d " -+ "%d %d %d %d %d %d " -+ "%d %hd.%hd.%hd.%hd %ld %d %d %d %d", - (int *) &type, - (int *) &first_time, (int *) &last_time, - &data_packets, &crypt_packets, - &interesting_packets, -- &gps_fixed, &min_lat, &min_lon, -- &min_alt, &min_spd, -- &max_lat, &max_lon, &max_alt, -- &max_spd, &aggregate_lat, -- &aggregate_lon, -- &aggregate_alt, &aggregate_points, - &maxrate, &quality, &signal, &noise, - &best_quality, &best_signal, - &best_noise, -- &best_lat, &best_lon, &best_alt, - (int *) &atype, &ip[0], &ip[1], &ip[2], &ip[3], - &datasize, &maxseenrate, &encoding_set, - &decrypted, &crypt_set); -@@ -607,15 +560,6 @@ - client->last_time = last_time; - client->first_time = first_time; - client->encoding_set = encoding_set; -- client->gps_fixed = gps_fixed; -- client->min_lat = min_lat; -- client->min_lon = min_lon; -- client->min_alt = min_alt; -- client->min_spd = min_spd; -- client->max_lat = max_lat; -- client->max_lon = max_lon; -- client->max_alt = max_alt; -- client->max_spd = max_spd; - client->maxrate = maxrate; - client->maxseenrate = maxseenrate; - client->quality = quality; -@@ -624,13 +568,6 @@ - client->best_quality = best_quality; - client->best_signal = best_signal; - client->best_noise = best_noise; -- client->best_lat = best_lat; -- client->best_lon = best_lon; -- client->best_alt = best_alt; -- client->aggregate_lat = aggregate_lat; -- client->aggregate_lon = aggregate_lon; -- client->aggregate_alt = aggregate_alt; -- client->aggregate_points = aggregate_points; - client->datasize = datasize; - client->decrypted = decrypted; - -@@ -653,10 +590,6 @@ - net_map[bssid]->type = network_remove; - } - -- } else if (!strncmp(header, "*GPS", 64)) { -- if (sscanf(in_data+hdrlen, "%f %f %f %f %f %d", &lat, &lon, &alt, &spd, &heading, &mode) < 5) -- return 0; -- - } else if (!strncmp(header, "*INFO", 64)) { - char chan_details[1024]; - char chan_details_sec[1024]; -@@ -843,14 +776,6 @@ - return serv_time; - } - --int TcpClient::FetchLoc(float *in_lat, float *in_lon, float *in_alt, float *in_spd, float *in_hed, int *in_mode) { -- *in_lat = lat; *in_lon = lon; -- *in_alt = alt; *in_spd = spd; -- *in_hed = heading; -- *in_mode = mode; -- return mode; --} -- - vector<TcpClient::card_info *> TcpClient::FetchCardList() { - return card_map_vec; - } -diff -urN kismet.old/tcpclient.h kismet.dev/tcpclient.h ---- kismet.old/tcpclient.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/tcpclient.h 2005-08-15 01:06:11.096874776 +0200 -@@ -125,8 +125,6 @@ - // Disable a protocol - void RemoveProtocol(string in_protocol); - -- // Fetch the location -- int FetchLoc(float *in_lat, float *in_lon, float *in_alt, float *in_spd, float *in_hed, int *in_mode); - // Fetch the mode - int FetchMode() { return mode; } - -@@ -236,8 +234,6 @@ - struct hostent *client_host; - - // Data sent to us -- // GPS -- float lat, lon, alt, spd, heading; - int mode; - // Timestampt - time_t serv_time; -diff -urN kismet.old/tcpstreamer.cc kismet.dev/tcpstreamer.cc ---- kismet.old/tcpstreamer.cc 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/tcpstreamer.cc 2005-08-15 00:54:02.870582000 +0200 -@@ -31,7 +31,6 @@ +diff -urN kismet.dev/tcpstreamer.cc kismet.dev2/tcpstreamer.cc +--- kismet.dev/tcpstreamer.cc 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/tcpstreamer.cc 2005-08-23 01:59:25.668216448 +0200 +@@ -30,8 +30,6 @@ + serv_fd = 0; max_fd = 0; - +- - gpsd = NULL; } TcpStreamer::~TcpStreamer() -@@ -287,10 +286,6 @@ +@@ -287,10 +285,6 @@ hdr.frame_len = (uint32_t) htonl(sizeof(struct stream_version_packet)); vpkt.drone_version = (uint16_t) htons(STREAM_DRONE_VERSION); @@ -3826,32 +3081,9 @@ diff -urN kismet.old/tcpstreamer.cc kismet.dev/tcpstreamer.cc if (!FD_ISSET(in_fd, &client_fds)) return -1; -@@ -361,22 +356,6 @@ - packhdr.carrier = in_packet->carrier; - packhdr.encoding = in_packet->encoding; - packhdr.datarate = (uint32_t) htonl(in_packet->datarate); -- // GPS first-iteration -- Float2Pair(in_packet->gps_lat, &packhdr.gps_lat, &packhdr.gps_lat_mant); -- Float2Pair(in_packet->gps_lon, &packhdr.gps_lon, &packhdr.gps_lon_mant); -- Float2Pair(in_packet->gps_alt, &packhdr.gps_alt, &packhdr.gps_alt_mant); -- Float2Pair(in_packet->gps_spd, &packhdr.gps_spd, &packhdr.gps_spd_mant); -- packhdr.gps_fix = in_packet->gps_fix; -- // endianswap -- packhdr.gps_lat = (int16_t) htons(packhdr.gps_lat); -- packhdr.gps_lat_mant = (int64_t) kis_hton64(packhdr.gps_lat_mant); -- packhdr.gps_lon = (int16_t) htons(packhdr.gps_lon); -- packhdr.gps_lon_mant = (int64_t) kis_hton64(packhdr.gps_lon_mant); -- packhdr.gps_alt = (int16_t) htons(packhdr.gps_alt); -- packhdr.gps_alt_mant = (int64_t) kis_hton64(packhdr.gps_alt_mant); -- packhdr.gps_spd = (int16_t) htons(packhdr.gps_spd); -- packhdr.gps_spd_mant = (int64_t) kis_hton64(packhdr.gps_spd_mant); -- - // Sourcename - memcpy(packhdr.sourcename, in_packet->sourcename, 32); - -diff -urN kismet.old/tcpstreamer.h kismet.dev/tcpstreamer.h ---- kismet.old/tcpstreamer.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/tcpstreamer.h 2005-08-15 00:54:22.181646272 +0200 +diff -urN kismet.dev/tcpstreamer.h kismet.dev2/tcpstreamer.h +--- kismet.dev/tcpstreamer.h 2005-08-16 03:22:51.000000000 +0200 ++++ kismet.dev2/tcpstreamer.h 2005-08-23 01:59:25.669216296 +0200 @@ -42,7 +42,6 @@ #include "ringbuf.h" #include "packet.h" @@ -3870,89 +3102,12 @@ diff -urN kismet.old/tcpstreamer.h kismet.dev/tcpstreamer.h void Kill(int in_fd); int Poll(fd_set& in_rset, fd_set& in_wset); -@@ -125,7 +121,6 @@ +@@ -124,8 +120,6 @@ + fd_set client_fds; unsigned int max_fd; - +- - GPSD *gpsd; }; #endif -diff -urN kismet.old/tracktypes.h kismet.dev/tracktypes.h ---- kismet.old/tracktypes.h 2005-07-25 16:19:44.000000000 +0200 -+++ kismet.dev/tracktypes.h 2005-08-15 00:55:29.308441448 +0200 -@@ -104,22 +104,6 @@ - - data_packets = crypt_packets = interesting_packets = 0; - -- gps_fixed = -1; -- -- /* by setting the min to the highest possible values in the range and -- max to the lowest we ensure that the data is correct */ -- min_lat = 90; -- max_lat = -90; -- min_lon = 180; -- max_lon = -180; -- -- /* since these are not limited, we just set to 0 */ -- min_alt = min_spd = 0; -- max_alt = max_spd = 0; -- -- aggregate_lat = aggregate_lon = aggregate_alt = 0; -- aggregate_points = 0; -- - maxrate = 0; - maxseenrate = 0; - -@@ -219,13 +203,6 @@ - int crypt_packets; - int interesting_packets; - -- // gps data -- int gps_fixed; -- float min_lat, min_lon, min_alt, min_spd; -- float max_lat, max_lon, max_alt, max_spd; -- double aggregate_lat, aggregate_lon, aggregate_alt; -- long aggregate_points; -- - // How fast we can go - double maxrate; - // How fast we've been seen to go, in 100kbs units -@@ -288,22 +265,6 @@ - beacon = 0; - listed = 0; - -- gps_fixed = -1; -- -- /* by setting the min to the highest possible values in the range and -- max to the lowest we ensure that the data is correct */ -- min_lat = 90; -- max_lat = -90; -- min_lon = 180; -- max_lon = -180; -- -- /* since these are not limited, we just set to 0 */ -- min_alt = min_spd = 0; -- max_alt = max_spd = 0; -- -- aggregate_lat = aggregate_lon = aggregate_alt = 0; -- aggregate_points = 0; -- - maxrate = 0; - maxseenrate = 0; - -@@ -469,14 +430,6 @@ - - map<string, cdp_packet> cisco_equip; - -- int gps_fixed; -- float min_lat, min_lon, min_alt, min_spd; -- float max_lat, max_lon, max_alt, max_spd; -- -- // Averaged center position -- double aggregate_lat, aggregate_lon, aggregate_alt; -- long aggregate_points; -- - // How fast we can go - double maxrate; - |