2008-06-21 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Sources contained lot of bogus 'typedef' resulting into
| warning: 'typedef' was ignored in this declaration
warnings.
diff -up kismet-2008-05-R1/macaddr.h.~1~ kismet-2008-05-R1/macaddr.h
--- kismet-2008-05-R1/macaddr.h.~1~ 2007-07-24 04:02:37.000000000 +0200
+++ kismet-2008-05-R1/macaddr.h 2008-06-21 17:56:36.000000000 +0200
@@ -46,7 +46,7 @@
#define MAC_STR_LEN ((MAC_LEN * 2) + 6)
// A packet MAC address
-typedef struct mac_addr {
+struct mac_addr {
uint64_t longmac;
uint64_t longmask;
int error;
@@ -277,12 +277,12 @@ typedef struct mac_addr {
template<class T>
class macmap {
protected:
- typedef struct mask_vec_content {
+ struct mask_vec_content {
mac_addr mac;
T value;
};
- typedef struct mask_vec_offsets {
+ struct mask_vec_offsets {
unsigned int first;
unsigned int last;
};
diff -up kismet-2008-05-R1/packet.h.~1~ kismet-2008-05-R1/packet.h
--- kismet-2008-05-R1/packet.h.~1~ 2007-09-24 07:30:19.000000000 +0200
+++ kismet-2008-05-R1/packet.h 2008-06-21 17:57:01.000000000 +0200
@@ -54,7 +54,7 @@
#define MAC_STR_LEN ((MAC_LEN * 2) + 6)
// Parmeters to the packet info
-typedef struct packet_parm {
+struct packet_parm {
int fuzzy_crypt;
int fuzzy_decode;
};
@@ -295,7 +295,7 @@ typedef struct {
} cdp_proto_element;
// Info about a protocol
-typedef struct proto_info {
+struct proto_info {
protocol_info_type type;
uint8_t source_ip[4];
diff -up kismet-2008-05-R1/tracktypes.h.~1~ kismet-2008-05-R1/tracktypes.h
--- kismet-2008-05-R1/tracktypes.h.~1~ 2007-10-06 23:09:03.000000000 +0200
+++ kismet-2008-05-R1/tracktypes.h 2008-06-21 17:57:29.000000000 +0200
@@ -27,7 +27,7 @@
#include "packet.h"
#ifndef display_network
-typedef struct display_network;
+struct display_network;
#endif
// Forward definition
@@ -90,7 +90,7 @@ enum client_type {
};
// Client info
-typedef struct wireless_client {
+struct wireless_client {
wireless_client() {
type = client_unknown;
@@ -266,7 +266,7 @@ typedef struct wireless_client {
};
// A network
-typedef struct wireless_network {
+struct wireless_network {
wireless_network() {
type = network_data;
diff -up kismet-2008-05-R1/util.h.~1~ kismet-2008-05-R1/util.h
--- kismet-2008-05-R1/util.h.~1~ 2006-08-28 22:37:29.000000000 +0200
+++ kismet-2008-05-R1/util.h 2008-06-21 17:58:01.000000000 +0200
@@ -54,7 +54,7 @@ int Hex2UChar(unsigned char *in_hex, uns
vector<string> StrTokenize(string in_str, string in_split, int return_partial = 1);
// 'smart' tokenizeing with start/end positions
-typedef struct smart_word_token {
+struct smart_word_token {
string word;
size_t begin;
size_t end;
diff -up kismet-2008-05-R1/alertracker.h.~1~ kismet-2008-05-R1/alertracker.h
--- kismet-2008-05-R1/alertracker.h.~1~ 2005-05-26 20:33:30.000000000 +0200
+++ kismet-2008-05-R1/alertracker.h 2008-06-21 18:02:33.000000000 +0200
@@ -43,7 +43,7 @@ enum alert_time_unit {
class Alertracker {
public:
// A registered alert type
- typedef struct alert_rec {
+ struct alert_rec {
int ref_index;
string header;
diff -up kismet-2008-05-R1/packetstream.h.~1~ kismet-2008-05-R1/packetstream.h
--- kismet-2008-05-R1/packetstream.h.~1~ 2006-04-26 05:52:04.000000000 +0200
+++ kismet-2008-05-R1/packetstream.h 2008-06-21 18:01:33.000000000 +0200
@@ -37,18 +37,18 @@
#define STREAM_COMMAND_FLUSH -1
-typedef struct stream_frame_header {
+struct stream_frame_header {
uint32_t frame_sentinel;
uint8_t frame_type;
uint32_t frame_len;
} __attribute__((__packed__));
-typedef struct stream_version_packet {
+struct stream_version_packet {
uint16_t drone_version;
uint8_t gps_enabled;
};
-typedef struct stream_packet_header {
+struct stream_packet_header {
uint32_t header_len;
uint16_t drone_version;
uint32_t len;
diff -up kismet-2008-05-R1/pcapsource.h.~1~ kismet-2008-05-R1/pcapsource.h
--- kismet-2008-05-R1/pcapsource.h.~1~ 2008-05-19 11:51:54.000000000 +0200
+++ kismet-2008-05-R1/pcapsource.h 2008-06-21 18:01:47.000000000 +0200
@@ -298,7 +298,7 @@ public:
#ifdef SYS_LINUX
// What we need to track on a linux interface to restore the settings
-typedef struct linux_ifparm {
+struct linux_ifparm {
int flags;
char essid[MAX_SSID_LEN + 1];
int channel;
diff -up kismet-2008-05-R1/server_protocols.h.~1~ kismet-2008-05-R1/server_protocols.h
--- kismet-2008-05-R1/server_protocols.h.~1~ 2007-02-08 20:17:31.000000000 +0100
+++ kismet-2008-05-R1/server_protocols.h 2008-06-21 18:02:18.000000000 +0200
@@ -165,7 +165,7 @@ extern char *CARD_fields_text[];
// same order as the field names. For shorter ones, the code is a lot more maintainable
// to have named vars, for longer ones it just makes sense to use a big ordered vector
-typedef struct KISMET_data {
+struct KISMET_data {
string version;
string starttime;
string servername;
@@ -173,31 +173,31 @@ typedef struct KISMET_data {
string newversion;
};
-typedef struct GPS_data {
+struct GPS_data {
string lat, lon, alt, spd, heading, mode;
};
-typedef struct INFO_data {
+struct INFO_data {
string networks, packets, crypt, weak, noise, dropped, rate, signal;
};
-typedef struct NETWORK_data {
+struct NETWORK_data {
vector<string> ndvec;
};
-typedef struct CLIENT_data {
+struct CLIENT_data {
vector<string> cdvec;
};
-typedef struct ALERT_data {
+struct ALERT_data {
string header, sec, usec, bssid, source, dest, other, channel, text;
};
-typedef struct PACKET_data {
+struct PACKET_data {
vector<string> pdvec;
};
-typedef struct STRING_data {
+struct STRING_data {
string bssid, sourcemac, text;
};
diff -up kismet-2008-05-R1/tcpserver.h.~1~ kismet-2008-05-R1/tcpserver.h
--- kismet-2008-05-R1/tcpserver.h.~1~ 2007-01-26 17:26:57.000000000 +0100
+++ kismet-2008-05-R1/tcpserver.h 2008-06-21 18:02:42.000000000 +0200
@@ -56,7 +56,7 @@ struct client_command {
string cmd;
};
-typedef struct server_protocol {
+struct server_protocol {
int ref_index;
string header;
int required;
diff -up kismet-2008-05-R1/timetracker.h.~1~ kismet-2008-05-R1/timetracker.h
--- kismet-2008-05-R1/timetracker.h.~1~ 2003-04-03 17:33:38.000000000 +0200
+++ kismet-2008-05-R1/timetracker.h 2008-06-21 18:01:10.000000000 +0200
@@ -31,7 +31,7 @@
class Timetracker {
public:
- typedef struct timer_event {
+ struct timer_event {
int timer_id;
// Time it was scheduled
diff -up kismet-2008-05-R1/frontend.h.~1~ kismet-2008-05-R1/frontend.h
--- kismet-2008-05-R1/frontend.h.~1~ 2008-03-02 17:29:21.000000000 +0100
+++ kismet-2008-05-R1/frontend.h 2008-06-21 18:05:47.000000000 +0200
@@ -56,7 +56,7 @@ enum group_type {
};
// What do we actually display
-typedef struct display_network {
+struct display_network {
// Are we a group or just a single network?
group_type type;
// If we're a group, this will hold multiple networks
diff -up kismet-2008-05-R1/gpsmap.cc.~1~ kismet-2008-05-R1/gpsmap.cc
--- kismet-2008-05-R1/gpsmap.cc.~1~ 2008-06-21 18:04:00.000000000 +0200
+++ kismet-2008-05-R1/gpsmap.cc 2008-06-21 18:07:09.000000000 +0200
@@ -297,7 +297,7 @@ bool hullPoint::operator() (const hullPo
return a.angle < b.angle;
}
-typedef struct gps_network {
+struct gps_network {
gps_network() {
filtered = 0;
@@ -2154,7 +2154,7 @@ void DrawNetBoundRects(vector<gps_networ
// Thread function to compute a line of interpolated data
-typedef struct powerline_arg {
+struct powerline_arg {
// unsigned int y;
// unsigned int y_max;
unsigned int in_res;
diff -up kismet-2008-05-R1/kismet_server.cc.~1~ kismet-2008-05-R1/kismet_server.cc
--- kismet-2008-05-R1/kismet_server.cc.~1~ 2008-06-21 18:04:00.000000000 +0200
+++ kismet-2008-05-R1/kismet_server.cc 2008-06-21 18:06:42.000000000 +0200
@@ -173,7 +173,7 @@ int filter_export_bssid_invert = -1, fil
filter_export_dest_invert = -1;
// For alert enabling...
-typedef struct _alert_enable {
+struct _alert_enable {
string alert_name;
alert_time_unit limit_unit;
alert_time_unit burst_unit;
diff -up kismet-2008-05-R1/panelfront.h.~1~ kismet-2008-05-R1/panelfront.h
--- kismet-2008-05-R1/panelfront.h.~1~ 2008-03-02 17:29:21.000000000 +0100
+++ kismet-2008-05-R1/panelfront.h 2008-06-21 18:06:16.000000000 +0200
@@ -118,7 +118,7 @@ public:
virtual int FetchDescriptor() { return fileno(stdin); };
protected:
// Curses color pair
- typedef struct color_pair {
+ struct color_pair {
color_pair() { index = -1; pair = 0; bold = 0; }
int index;
@@ -178,7 +178,7 @@ protected:
list<kis_window *> window_list;
// Server context records for multiple servers
- typedef struct server_context {
+ struct server_context {
server_context() {
client = NULL;
quality = power = noise = 0;
@@ -241,7 +241,7 @@ protected:
};
// Context-aware cardinfo
- typedef struct cardinfo_context {
+ struct cardinfo_context {
server_context *context;
TcpClient::card_info *cardinfo;
};
diff -up kismet-2008-05-R1/tcpclient.h.~1~ kismet-2008-05-R1/tcpclient.h
--- kismet-2008-05-R1/tcpclient.h.~1~ 2004-06-13 22:36:33.000000000 +0200
+++ kismet-2008-05-R1/tcpclient.h 2008-06-21 18:05:30.000000000 +0200
@@ -62,7 +62,7 @@ class TcpClient;
class TcpClient {
public:
- typedef struct alert_info {
+ struct alert_info {
timeval alert_ts;
string alert_text;
};
@@ -78,7 +78,7 @@ public:
}
};
- typedef struct string_info {
+ struct string_info {
mac_addr bssid;
mac_addr source;
timeval string_ts;
@@ -96,7 +96,7 @@ public:
}
};
- typedef struct card_info {
+ struct card_info {
string interface;
string type;
string username;