Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 693f20d..11cdaef 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -47,4 +47,4 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | |||
47 | qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." ); | 47 | qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." ); |
48 | //else | 48 | else |
49 | //startTimer( 700 ); | 49 | startTimer( 700 ); |
50 | 50 | ||
@@ -62,3 +62,3 @@ void Wellenreiter::handleMessage() | |||
62 | qDebug( "received message from daemon." ); | 62 | qDebug( "received message from daemon." ); |
63 | 63 | ||
64 | char buffer[128]; | 64 | char buffer[128]; |
@@ -79,2 +79,4 @@ typedef struct { | |||
79 | 79 | ||
80 | qDebug( "Sniffer sent: '%s'", buffer ); | ||
81 | |||
80 | if ( result == NETFOUND ) /* new network found */ | 82 | if ( result == NETFOUND ) /* new network found */ |
@@ -84,3 +86,7 @@ typedef struct { | |||
84 | get_network_found( &n, (char*) &buffer ); | 86 | get_network_found( &n, (char*) &buffer ); |
85 | n.bssid[n.ssid_len] = "\0"; | 87 | |
88 | qDebug( "Sniffer said: net_type is %d.", n.net_type ); | ||
89 | qDebug( "Sniffer said: MAC is %s", (const char*) &n.mac ); | ||
90 | |||
91 | //n.bssid[n.ssid_len] = "\0"; | ||
86 | 92 | ||
@@ -89,7 +95,7 @@ typedef struct { | |||
89 | if ( n.net_type == 1 ) | 95 | if ( n.net_type == 1 ) |
90 | type == "managed"; | 96 | type = "managed"; |
91 | else | 97 | else |
92 | type == "adhoc"; | 98 | type = "adhoc"; |
93 | 99 | ||
94 | addNewItem( type, n.bssid, n.mac, n.wep, n.channel, 0 ); | 100 | addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 ); |
95 | 101 | ||
@@ -116,3 +122,3 @@ bool Wellenreiter::hasMessage() | |||
116 | tv.tv_sec = 0; | 122 | tv.tv_sec = 0; |
117 | tv.tv_usec = 0; | 123 | tv.tv_usec = 10; |
118 | int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv ); | 124 | int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv ); |
@@ -123,3 +129,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) | |||
123 | { | 129 | { |
124 | //qDebug( "checking for message..." ); | 130 | qDebug( "checking for message..." ); |
125 | 131 | ||
@@ -131,3 +137,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) | |||
131 | { | 137 | { |
132 | //qDebug( "no message :(" ); | 138 | qDebug( "no message :(" ); |
133 | } | 139 | } |
@@ -135,3 +141,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e ) | |||
135 | 141 | ||
136 | void Wellenreiter::addNewItem( QString type, QString essid, QString ap, bool wep, int channel, int signal ) | 142 | void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal ) |
137 | { | 143 | { |
@@ -151,3 +157,3 @@ void Wellenreiter::addNewItem( QString type, QString essid, QString ap, bool wep | |||
151 | qDebug( "found!" ); | 157 | qDebug( "found!" ); |
152 | new MScanListItem( item, type, essid, ap, wep, channel, signal ); | 158 | new MScanListItem( item, type, essid, macaddr, wep, channel, signal ); |
153 | } | 159 | } |
@@ -155,3 +161,3 @@ void Wellenreiter::addNewItem( QString type, QString essid, QString ap, bool wep | |||
155 | { | 161 | { |
156 | new MScanListItem( netview, type, essid, ap, wep, channel, signal ); | 162 | new MScanListItem( netview, type, essid, macaddr, wep, channel, signal ); |
157 | } | 163 | } |