summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-28 19:13:34 (UTC)
committer mickeyl <mickeyl>2003-10-28 19:13:34 (UTC)
commitd5d9b307e950d9038215e4d63e64bc9cd5d85352 (patch) (side-by-side diff)
treeccef170352625a48c9c7ff0e7ff119f8d23e2331
parent5acd7ce51829c317f6218ff059d0d2f63cdb0871 (diff)
downloadopie-d5d9b307e950d9038215e4d63e64bc9cd5d85352.zip
opie-d5d9b307e950d9038215e4d63e64bc9cd5d85352.tar.gz
opie-d5d9b307e950d9038215e4d63e64bc9cd5d85352.tar.bz2
catch up with API changes in libopienet
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index 7ce096f..e7d6ff5 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -342,26 +342,26 @@ void WLANImp::rescanNeighbourhood()
wiface->setPromiscuousMode( true );
if ( devicetype == "cisco" ) wiface->setMonitoring( new OCiscoMonitoringInterface( wiface, false ) );
else if ( devicetype == "hostap" ) wiface->setMonitoring( new OHostAPMonitoringInterface( wiface, false ) );
else if ( devicetype == "wlan-ng" ) wiface->setMonitoring( new OWlanNGMonitoringInterface( wiface, false ) );
else if ( devicetype == "orinoco" ) wiface->setMonitoring( new OOrinocoMonitoringInterface( wiface, false ) );
else
{
qDebug( "rescanNeighbourhood(): unsupported device type for monitoring :(" );
return;
}
- wiface->setMonitorMode( true );
- if ( !wiface->monitorMode() )
+ wiface->setMode( "monitor" );
+ if ( wiface->mode() != "monitor" )
{
qWarning( "rescanNeighbourhood(): Unable to bring device into monitor mode (%s).", strerror( errno ) );
return;
}
// open a packet capturer
OPacketCapturer* cap = new OPacketCapturer();
cap->open( name );
if ( !cap->isOpen() )
{
qWarning( "rescanNeighbourhood(): Unable to open libpcap (%s).", strerror( errno ) );
return;
@@ -401,26 +401,26 @@ void WLANImp::rescanNeighbourhood()
if ( !p )
{
qDebug( "rescanNeighbourhood(): nothing received on channel %d", i );
}
else
{
qDebug( "rescanNeighbourhood(): TADAA - something came in on channel %d", i );
handlePacket( p );
}
}
cap->close();
- wiface->setMonitorMode( false );
- wiface->setPromiscuousMode( true );
+ wiface->setMode( "managed" ); // TODO: use previous mode
+ wiface->setPromiscuousMode( false );
splash->hide();
delete splash;
}
void WLANImp::handlePacket( OPacket* p )
{
// check if we received a beacon frame
OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) );
if ( beacon && beacon->managementType() == "Beacon" )