blob: d27bca07b3e4bc3f0148916181ff98846fee0773 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
diff -urN kismet-2005-04-R1.old/configfile.cc kismet-2005-04-R1.dev/configfile.cc
--- kismet-2005-04-R1.old/configfile.cc 2005-04-03 07:33:42.000000000 +0200
+++ kismet-2005-04-R1.dev/configfile.cc 2005-04-26 01:37:32.000000000 +0200
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
+#include <time.h>
#include "configfile.h"
#include "util.h"
diff -urN kismet-2005-04-R1.old/macaddr.h kismet-2005-04-R1.dev/macaddr.h
--- kismet-2005-04-R1.old/macaddr.h 2005-04-03 07:33:42.000000000 +0200
+++ kismet-2005-04-R1.dev/macaddr.h 2005-04-26 01:42:38.000000000 +0200
@@ -321,12 +321,12 @@
}
// equal
- inline bool operator==(const iterator& op) const {
+ inline bool operator==(const iterator& op) {
return (singleton_itr == op.singleton_itr) && (vector_itr == op.vector_itr);
}
// not
- inline bool operator!=(const iterator& op) const {
+ inline bool operator!=(const iterator& op) {
return (singleton_itr != op.singleton_itr) || (vector_itr != op.vector_itr);
}
diff -urN kismet-2005-04-R1.old/tcpserver.cc kismet-2005-04-R1.dev/tcpserver.cc
--- kismet-2005-04-R1.old/tcpserver.cc 2005-04-03 07:33:42.000000000 +0200
+++ kismet-2005-04-R1.dev/tcpserver.cc 2005-06-08 23:17:34.000000000 +0200
@@ -373,7 +373,7 @@
return 0;
}
} else {
- copt->wrbuf.erase(0, res);
+ copt->wrbuf = "";
}
}
diff -urN kismet-2005-04-R1.old/tcpclient.cc kismet-2005-04-R1.dev/tcpclient.cc
--- kismet-2005-04-R1.old/tcpclient.cc 2005-04-03 07:33:42.000000000 +0200
+++ kismet-2005-04-R1.dev/tcpclient.cc 2005-07-01 16:42:33.000000000 +0200
@@ -214,7 +214,7 @@
return(-1);
}
} else {
- writebuf.erase(0, res);
+ writebuf = "";
}
}
|
