-rw-r--r-- | libopie2/opienet/onetwork.cpp | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 16fa8ae..36f409b 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -1,16 +1,16 @@ /*
This file is part of the Opie Project
- Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de>
- =.
+ Copyright (C) 2003-2004 by Michael 'Mickey' Lauer
+ =. <mickey@Vanille.de>
.=l.
.>+-=
_;:, .> :=|. This program is free software; you can
.> <`_, > . <= redistribute it and/or modify it under
:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
.="- .-=="i, .._ License as published by the Free Software
- . .-<_> .<> Foundation; either version 2 of the License,
._= =} : or (at your option) any later version.
.%`+i> _;_.
.i_,=:_. -<s. This program is distributed in the hope that
+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
: .. .:, . . . without even the implied warranty of
@@ -573,26 +573,33 @@ void OWirelessNetworkInterface::buildPrivateList() for ( int i = 0; i < _iwr.u.data.length; ++i )
{
new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args );
}
odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl;
}
void OWirelessNetworkInterface::dumpInformation() const
{
odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl;
- qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );
- qDebug( " - driver for '%s' has been compiled against WE V%d (source=V%d)", name(), _range.we_version_compiled, _range.we_version_source );
+ qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s",
+ _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 );
+ qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d",
+ name(), _range.we_version_source, _range.we_version_compiled );
+
+ if ( _range.we_version_compiled != WIRELESS_EXT )
+ {
+ owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl;
+ }
odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl;
}
int OWirelessNetworkInterface::channel() const
{
//FIXME: When monitoring enabled, then use it
//FIXME: to gather the current RF channel
//FIXME: Until then, get active channel from hopper.
if ( _hopper && _hopper->isActive() )
return _hopper->channel();
@@ -957,27 +964,41 @@ OStationList* OWirelessNetworkInterface::scanNetwork() }
else
{
odebug << " - no results (timeout) :(" << oendl;
return stations;
}
}
int OWirelessNetworkInterface::signalStrength() const
{
- int max = _range.max_qual.level;
- odebug << "signalStrength(): max quality seems to be " << max << "dBM" << oendl;
- return 50;
+ iw_statistics stat;
+ ::memset( &stat, 0, sizeof stat );
+ _iwr.u.data.pointer = (char*) &stat;
+ _iwr.u.data.flags = 0;
+ _iwr.u.data.length = sizeof stat;
+
+ if ( !wioctl( SIOCGIWSTATS ) )
+ {
+ return -1;
+ }
+
+ int max = _range.max_qual.qual;
+ int cur = stat.qual.qual;
+ int lev = stat.qual.level; //FIXME: Do something with them?
+ int noi = stat.qual.noise; //FIXME: Do something with them?
+
+ return cur*100/max;
}
bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
{
#ifndef NODEBUG
int result = ::ioctl( _sfd, call, &iwreq );
if ( result == -1 )
odebug << "ONetworkInterface::wioctl (" << name() << ") call '"
<< debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;
else
|