author | mickeyl <mickeyl> | 2003-03-30 03:06:07 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-03-30 03:06:07 (UTC) |
commit | 8e1504c3e8b8e5af509147f0b33f4e92a7c1c041 (patch) (unidiff) | |
tree | bb3b73b0d14c5f304405d473ed6a3ed381240652 | |
parent | e1c4cb3364f8f7ff68da88b5ec26053ee561c8a1 (diff) | |
download | opie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.zip opie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.tar.gz opie-8e1504c3e8b8e5af509147f0b33f4e92a7c1c041.tar.bz2 |
very interesting: gcc 2.9x does not handle operator? with mixed types, e.g. operator?(bool,QString,char*), while gcc 3.x does the necessary format conversion.
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index 5bdc1b3..3bff7c4 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -113,33 +113,33 @@ void Wellenreiter::receivePacket(OPacket* p) | |||
113 | // static_cast is justified here | 113 | // static_cast is justified here |
114 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); | 114 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); |
115 | if ( !beacon ) return; | 115 | if ( !beacon ) return; |
116 | QString type; | 116 | QString type; |
117 | 117 | ||
118 | //FIXME: Can stations in ESS mode can be distinguished from APs? | 118 | //FIXME: Can stations in ESS mode can be distinguished from APs? |
119 | //FIXME: Apparently yes, but not by listening to beacons, because | 119 | //FIXME: Apparently yes, but not by listening to beacons, because |
120 | //FIXME: they simply don't send beacons in infrastructure mode. | 120 | //FIXME: they simply don't send beacons in infrastructure mode. |
121 | //FIXME: so we also have to listen to data packets | 121 | //FIXME: so we also have to listen to data packets |
122 | 122 | ||
123 | if ( beacon->canIBSS() ) | 123 | if ( beacon->canIBSS() ) |
124 | type = "adhoc"; | 124 | type = "adhoc"; |
125 | else | 125 | else |
126 | type = "managed"; | 126 | type = "managed"; |
127 | 127 | ||
128 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 128 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
129 | QString essid = ssid ? ssid->ID() : "<unknown>"; | 129 | QString essid = ssid ? ssid->ID() : QString("<unknown>"); |
130 | OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); | 130 | OWaveLanManagementDS* ds = static_cast<OWaveLanManagementDS*>( p->child( "802.11 DS" ) ); |
131 | int channel = ds ? ds->channel() : -1; | 131 | int channel = ds ? ds->channel() : -1; |
132 | 132 | ||
133 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); | 133 | OWaveLanPacket* header = static_cast<OWaveLanPacket*>( p->child( "802.11" ) ); |
134 | netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 ); | 134 | netView()->addNewItem( type, essid, header->macAddress2().toString(), header->usesWep(), channel, 0 ); |
135 | } | 135 | } |
136 | 136 | ||
137 | void Wellenreiter::startStopClicked() | 137 | void Wellenreiter::startStopClicked() |
138 | { | 138 | { |
139 | if ( sniffing ) | 139 | if ( sniffing ) |
140 | { | 140 | { |
141 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 141 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); |
142 | 142 | ||
143 | iface->setChannelHopping(); // stop hopping channels | 143 | iface->setChannelHopping(); // stop hopping channels |
144 | pcap->close(); | 144 | pcap->close(); |
145 | sniffing = false; | 145 | sniffing = false; |