diff options
| -rw-r--r-- | net/kismet/distinfo | 5 | ||||
| -rw-r--r-- | net/kismet/patches/patch-gpsdump.cc | 13 | ||||
| -rw-r--r-- | net/kismet/patches/patch-kismet__server.cc | 49 | ||||
| -rw-r--r-- | net/kismet/patches/patch-macaddr.h | 12 |
4 files changed, 78 insertions, 1 deletions
diff --git a/net/kismet/distinfo b/net/kismet/distinfo index 24855cc3df1..93e5d65c0c0 100644 --- a/net/kismet/distinfo +++ b/net/kismet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2013/03/02 17:59:10 joerg Exp $ +$NetBSD: distinfo,v 1.9 2013/05/06 14:56:35 joerg Exp $ SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2 RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc @@ -9,4 +9,7 @@ SHA1 (patch-ae) = 5c6e69e7c7490d27433e67c0fc15a4352ff2b99d SHA1 (patch-af) = e4e176998e78a657178b3e14e614adf27b517eb6 SHA1 (patch-ag) = cb1e1eaf07ae40128fbe9760c95cfdecc200d22c SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26 +SHA1 (patch-gpsdump.cc) = 2ef05923053bd887249427db286cbb5c485018f5 +SHA1 (patch-kismet__server.cc) = 611f22eb7746d7d210f01cc9ceb9bc28e998a866 +SHA1 (patch-macaddr.h) = c5841ecd5c9ddb2b008c88e78665740a0e23195b SHA1 (patch-panelfront.cc) = 5a09a92598c8ffb7851b74fe87577a997f69e4f6 diff --git a/net/kismet/patches/patch-gpsdump.cc b/net/kismet/patches/patch-gpsdump.cc new file mode 100644 index 00000000000..a1cf34574b5 --- /dev/null +++ b/net/kismet/patches/patch-gpsdump.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-gpsdump.cc,v 1.1 2013/05/06 14:56:35 joerg Exp $ + +--- gpsdump.cc.orig 2013-05-06 07:12:44.000000000 +0000 ++++ gpsdump.cc +@@ -108,7 +108,7 @@ int GPSDump::DumpTrack(GPSD *in_gps) { + + int sig = 0, qual = 0, noise = 0; + +- if (time(0) - last_info.ts.tv_sec < decay && last_info.quality != -1) { ++ if (time(0) - last_info.ts.tv_sec < ::decay && last_info.quality != -1) { + sig = last_info.signal; + qual = last_info.quality; + noise = last_info.noise; diff --git a/net/kismet/patches/patch-kismet__server.cc b/net/kismet/patches/patch-kismet__server.cc new file mode 100644 index 00000000000..f19c06bb9d1 --- /dev/null +++ b/net/kismet/patches/patch-kismet__server.cc @@ -0,0 +1,49 @@ +$NetBSD: patch-kismet__server.cc,v 1.1 2013/05/06 14:56:35 joerg Exp $ + +--- kismet_server.cc.orig 2013-05-06 07:13:15.000000000 +0000 ++++ kismet_server.cc +@@ -759,7 +759,7 @@ void NetWriteInfo() { + snprintf(tmpstr, 32, "%d", tracker.FetchNumPackets() - last_packnum); + idata.rate = tmpstr; + +- if (time(0) - last_info.ts.tv_sec < decay && last_info.signal != -1) ++ if (time(0) - last_info.ts.tv_sec < ::decay && last_info.signal != -1) + snprintf(tmpstr, 16, "%d %d" , last_info.signal, last_info.noise); + else if (last_info.quality == -1) + snprintf(tmpstr, 16, "-1 -1"); +@@ -1543,7 +1543,7 @@ int ProcessBulkConf(ConfigFile *conf) { + } + + if (conf->FetchOpt("decay") != "") { +- if (sscanf(conf->FetchOpt("decay").c_str(), "%d", &decay) != 1) { ++ if (sscanf(conf->FetchOpt("decay").c_str(), "%d", &::decay) != 1) { + fprintf(stderr, "FATAL: Illegal config file value for decay.\n"); + ErrorShutdown(); + } +@@ -2237,7 +2237,7 @@ int main(int argc,char *argv[]) { + { 0, 0, 0, 0 } + }; + int option_index; +- decay = 5; ++ ::decay = 5; + + // Catch the interrupt handler to shut down + signal(SIGINT, CatchShutdown); +@@ -2950,7 +2950,7 @@ int main(int argc,char *argv[]) { + timetracker.RegisterTimer(datainterval * SERVER_TIMESLICES_SEC, NULL, 1, &ExportSyncEvent, NULL); + // Write waypoints if requested + if (waypoint) +- timetracker.RegisterTimer(decay * SERVER_TIMESLICES_SEC, NULL, 1, &WaypointSyncEvent, NULL); ++ timetracker.RegisterTimer(::decay * SERVER_TIMESLICES_SEC, NULL, 1, &WaypointSyncEvent, NULL); + // Channel hop if requested + if (channel_hop) { + if (channel_dwell) +@@ -3175,7 +3175,7 @@ daemon_parent_cleanup: + num_networks = tracker.FetchNumNetworks(); + + if (tracker.FetchNumPackets() != num_packets) { +- if (cur_time - last_click >= decay && sound == 1) { ++ if (cur_time - last_click >= ::decay && sound == 1) { + if (tracker.FetchNumPackets() - num_packets > + tracker.FetchNumDropped() + localdropnum - num_dropped) { + sound = PlaySound("traffic"); diff --git a/net/kismet/patches/patch-macaddr.h b/net/kismet/patches/patch-macaddr.h new file mode 100644 index 00000000000..7154d409c30 --- /dev/null +++ b/net/kismet/patches/patch-macaddr.h @@ -0,0 +1,12 @@ +$NetBSD: patch-macaddr.h,v 1.1 2013/05/06 14:56:35 joerg Exp $ + +--- macaddr.h.orig 2013-05-06 07:11:44.000000000 +0000 ++++ macaddr.h +@@ -22,6 +22,7 @@ + #include "config.h" + + #include <stdio.h> ++#include <stdlib.h> + #include <ctype.h> + #include <sys/time.h> + #include <sys/resource.h> |