| -rw-r--r-- | libopie2/opienet/onetwork.cpp | 38 | ||||
| -rw-r--r-- | libopie2/opienet/onetwork.h | 3 | ||||
| -rw-r--r-- | libopie2/opienet/ostation.h | 2 |
3 files changed, 38 insertions, 5 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 546be9e..0a74019 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -37,8 +37,9 @@ /* QT */ #include <qfile.h> #include <qtextstream.h> +#include <qapplication.h> /* UNIX */ #include <assert.h> @@ -52,8 +53,9 @@ #include <sys/types.h> #include <unistd.h> #include <linux/sockios.h> #include <net/if_arp.h> +#include <net/ethernet.h> #include <stdarg.h> #ifndef NODEBUG #include <opie2/odebugmapper.h> @@ -490,8 +492,16 @@ bool OWirelessNetworkInterface::isAssociated() const return !(associatedAP() == OMacAddress::unknown); } +void OWirelessNetworkInterface::setAssociatedAP( const OMacAddress& mac ) const +{ + _iwr.u.ap_addr.sa_family = ARPHRD_ETHER; + ::memcpy(_iwr.u.ap_addr.sa_data, mac.native(), ETH_ALEN); + wioctl( SIOCSIWAP ); +} + + OMacAddress OWirelessNetworkInterface::associatedAP() const { if ( ioctl( SIOCGIWAP ) ) return (const unsigned char*) &_ifr.ifr_hwaddr.sa_data[0]; @@ -905,15 +915,13 @@ OStationList* OWirelessNetworkInterface::scanNetwork() } else if ( errno == EAGAIN) { odebug << "ONetworkInterface::scanNetwork() - scan in progress..." << oendl; - #if 0 if ( qApp ) { qApp->processEvents( 100 ); continue; } - #endif tv.tv_sec = 0; tv.tv_usec = 100000; continue; } @@ -1126,9 +1134,12 @@ OStationList* OWirelessNetworkInterface::scanNetwork() } case SIOCGIWFREQ: { odebug << "SIOCGIWFREQ" << oendl; - stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ]; + if ( we->u.freq.m > 1000 ) + stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ]; + else + stations->last()->channel = static_cast<int>(((double) we->u.freq.m) * pow( 10.0, we->u.freq.e )); break; } case SIOCGIWESSID: { @@ -1137,12 +1148,29 @@ OStationList* OWirelessNetworkInterface::scanNetwork() stations->last()->ssid = static_cast<const char*> (we->u.essid.pointer); odebug << "ESSID: " << stations->last()->ssid << oendl; break; } + case IWEVQUAL: + { + odebug << "IWEVQUAL" << oendl; + stations->last()->level = static_cast<int>(we->u.qual.level); + break; /* Quality part of statistics (scan) */ + } + case SIOCGIWENCODE: + { + odebug << "SIOCGIWENCODE" << oendl; + stations->last()->encrypted = !(we->u.data.flags & IW_ENCODE_DISABLED); + break; + } + + case SIOCGIWRATE: + { + odebug << "SIOCGIWRATE" << oendl; + stations->last()->rates.append(we->u.bitrate.value); + break; + } case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break; - case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break; case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break; /* Packet dropped to excessive retry */ - case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break; /* Quality part of statistics (scan) */ case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break; /* Driver specific ascii string */ case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */ case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break; /* Expired a node (AP mode) */ default: odebug << "unhandled event" << oendl; diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 4d9912d..fa9f39f 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h @@ -412,8 +412,11 @@ class OWirelessNetworkInterface : public ONetworkInterface * @returns true if the interface is associated to an access point * @note: This information is only valid if the interface is in managed mode. */ virtual bool isAssociated() const; + /** Set the @a mac associated AP address. + */ + virtual void setAssociatedAP( const OMacAddress& mac ) const; /** * @returns the MAC address of the Access Point if the device is in infrastructure mode. * @returns a (more or less random) cell ID address if the device is in adhoc mode. */ diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h index 5219d92..86c9a52 100644 --- a/libopie2/opienet/ostation.h +++ b/libopie2/opienet/ostation.h @@ -36,8 +36,9 @@ #include <qlist.h> #include <qstring.h> #include <qhostaddress.h> #include <qobject.h> +#include <qvaluelist.h> #include <sys/types.h> namespace Opie { @@ -70,8 +71,9 @@ class OStation OMacAddress apAddress; int channel; int level; bool encrypted; + QValueList <int> rates; private: class Private; Private *d; }; |