-rw-r--r-- | libopie2/opienet/onetwork.cpp | 23 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 4 |
2 files changed, 21 insertions, 6 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 915814d..e5b091f 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -115,64 +115,75 @@ void ONetwork::synchronize() | |||
115 | 115 | ||
116 | short ONetwork::wirelessExtensionVersion() | 116 | short ONetwork::wirelessExtensionVersion() |
117 | { | 117 | { |
118 | return WIRELESS_EXT; | 118 | return WIRELESS_EXT; |
119 | } | 119 | } |
120 | 120 | ||
121 | 121 | ||
122 | int ONetwork::count() const | 122 | int ONetwork::count() const |
123 | { | 123 | { |
124 | return _interfaces.count(); | 124 | return _interfaces.count(); |
125 | } | 125 | } |
126 | 126 | ||
127 | 127 | ||
128 | ONetworkInterface* ONetwork::interface( const QString& iface ) const | 128 | ONetworkInterface* ONetwork::interface( const QString& iface ) const |
129 | { | 129 | { |
130 | return _interfaces[iface]; | 130 | return _interfaces[iface]; |
131 | } | 131 | } |
132 | 132 | ||
133 | 133 | ||
134 | ONetwork* ONetwork::instance() | 134 | ONetwork* ONetwork::instance() |
135 | { | 135 | { |
136 | if ( !_instance ) _instance = new ONetwork(); | 136 | if ( !_instance ) _instance = new ONetwork(); |
137 | return _instance; | 137 | return _instance; |
138 | } | 138 | } |
139 | 139 | ||
140 | 140 | ||
141 | ONetwork::InterfaceIterator ONetwork::iterator() const | 141 | ONetwork::InterfaceIterator ONetwork::iterator() const |
142 | { | 142 | { |
143 | return ONetwork::InterfaceIterator( _interfaces ); | 143 | return ONetwork::InterfaceIterator( _interfaces ); |
144 | } | 144 | } |
145 | 145 | ||
146 | 146 | ||
147 | bool ONetwork::isPresent( const char* name ) const | ||
148 | { | ||
149 | int sfd = socket( AF_INET, SOCK_STREAM, 0 ); | ||
150 | struct ifreq ifr; | ||
151 | memset( &ifr, 0, sizeof( struct ifreq ) ); | ||
152 | strcpy( (char*) &ifr.ifr_name, name ); | ||
153 | int result = ::ioctl( sfd, SIOCGIFFLAGS, &ifr ); | ||
154 | return result != -1; | ||
155 | } | ||
156 | |||
157 | |||
147 | bool ONetwork::isWirelessInterface( const char* name ) const | 158 | bool ONetwork::isWirelessInterface( const char* name ) const |
148 | { | 159 | { |
149 | int sfd = socket( AF_INET, SOCK_STREAM, 0 ); | 160 | int sfd = socket( AF_INET, SOCK_STREAM, 0 ); |
150 | struct iwreq iwr; | 161 | struct iwreq iwr; |
151 | memset( &iwr, 0, sizeof( struct iwreq ) ); | 162 | memset( &iwr, 0, sizeof( struct iwreq ) ); |
152 | strcpy( (char*) &iwr.ifr_name, name ); | 163 | strcpy( (char*) &iwr.ifr_name, name ); |
153 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); | 164 | int result = ::ioctl( sfd, SIOCGIWNAME, &iwr ); |
154 | return result != -1; | 165 | return result != -1; |
155 | } | 166 | } |
156 | 167 | ||
157 | /*====================================================================================== | 168 | /*====================================================================================== |
158 | * ONetworkInterface | 169 | * ONetworkInterface |
159 | *======================================================================================*/ | 170 | *======================================================================================*/ |
160 | 171 | ||
161 | ONetworkInterface::ONetworkInterface( QObject* parent, const char* name ) | 172 | ONetworkInterface::ONetworkInterface( QObject* parent, const char* name ) |
162 | :QObject( parent, name ), | 173 | :QObject( parent, name ), |
163 | _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 ) | 174 | _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 ) |
164 | { | 175 | { |
165 | odebug << "ONetworkInterface::ONetworkInterface()" << oendl; | 176 | odebug << "ONetworkInterface::ONetworkInterface()" << oendl; |
166 | init(); | 177 | init(); |
167 | } | 178 | } |
168 | 179 | ||
169 | 180 | ||
170 | struct ifreq& ONetworkInterface::ifr() const | 181 | struct ifreq& ONetworkInterface::ifr() const |
171 | { | 182 | { |
172 | return _ifr; | 183 | return _ifr; |
173 | } | 184 | } |
174 | 185 | ||
175 | 186 | ||
176 | void ONetworkInterface::init() | 187 | void ONetworkInterface::init() |
177 | { | 188 | { |
178 | odebug << "ONetworkInterface::init()" << oendl; | 189 | odebug << "ONetworkInterface::init()" << oendl; |
@@ -553,69 +564,69 @@ void OWirelessNetworkInterface::buildInformation() | |||
553 | free(buffer); | 564 | free(buffer); |
554 | } | 565 | } |
555 | 566 | ||
556 | 567 | ||
557 | void OWirelessNetworkInterface::buildPrivateList() | 568 | void OWirelessNetworkInterface::buildPrivateList() |
558 | { | 569 | { |
559 | odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl; | 570 | odebug << "OWirelessNetworkInterface::buildPrivateList()" << oendl; |
560 | 571 | ||
561 | struct iw_priv_args priv[IW_MAX_PRIV_DEF]; | 572 | struct iw_priv_args priv[IW_MAX_PRIV_DEF]; |
562 | 573 | ||
563 | _iwr.u.data.pointer = (char*) &priv; | 574 | _iwr.u.data.pointer = (char*) &priv; |
564 | _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself | 575 | _iwr.u.data.length = IW_MAX_PRIV_DEF; // length in terms of number of (sizeof iw_priv_args), not (sizeof iw_priv_args) itself |
565 | _iwr.u.data.flags = 0; | 576 | _iwr.u.data.flags = 0; |
566 | 577 | ||
567 | if ( !wioctl( SIOCGIWPRIV ) ) | 578 | if ( !wioctl( SIOCGIWPRIV ) ) |
568 | { | 579 | { |
569 | owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl; | 580 | owarn << "OWirelessNetworkInterface::buildPrivateList(): Can't get private ioctl information." << oendl; |
570 | return; | 581 | return; |
571 | } | 582 | } |
572 | 583 | ||
573 | for ( int i = 0; i < _iwr.u.data.length; ++i ) | 584 | for ( int i = 0; i < _iwr.u.data.length; ++i ) |
574 | { | 585 | { |
575 | new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args ); | 586 | new OPrivateIOCTL( this, priv[i].name, priv[i].cmd, priv[i].get_args, priv[i].set_args ); |
576 | } | 587 | } |
577 | odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl; | 588 | odebug << "OWirelessNetworkInterface::buildPrivateList(): Private ioctl list constructed." << oendl; |
578 | } | 589 | } |
579 | 590 | ||
580 | 591 | ||
581 | void OWirelessNetworkInterface::dumpInformation() const | 592 | void OWirelessNetworkInterface::dumpInformation() const |
582 | { | 593 | { |
583 | odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl; | 594 | odebug << "OWirelessNetworkInterface::() -------------- dumping information block ----------------" << oendl; |
584 | 595 | ||
585 | qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", | 596 | qDebug( " - driver's idea of maximum throughput is %d bps = %d byte/s = %d Kb/s = %f.2 Mb/s", |
586 | _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 ); | 597 | _range.throughput, _range.throughput / 8, _range.throughput / 8 / 1024, float( _range.throughput ) / 8.0 / 1024.0 / 1024.0 ); |
587 | qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d", | 598 | qDebug( " - driver for '%s' (V%d) has been compiled against WE V%d", |
588 | name(), _range.we_version_source, _range.we_version_compiled ); | 599 | name(), _range.we_version_source, _range.we_version_compiled ); |
589 | 600 | ||
590 | if ( _range.we_version_compiled != WIRELESS_EXT ) | 601 | if ( _range.we_version_compiled != WIRELESS_EXT ) |
591 | { | 602 | { |
592 | owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl; | 603 | owarn << "Version mismatch! WE_DRIVER = " << _range.we_version_compiled << " and WE_OPIENET = " << WIRELESS_EXT << oendl; |
593 | } | 604 | } |
594 | 605 | ||
595 | odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl; | 606 | odebug << "OWirelessNetworkInterface::() ---------------------------------------------------------" << oendl; |
596 | } | 607 | } |
597 | 608 | ||
598 | 609 | ||
599 | int OWirelessNetworkInterface::channel() const | 610 | int OWirelessNetworkInterface::channel() const |
600 | { | 611 | { |
601 | //FIXME: When monitoring enabled, then use it | 612 | //FIXME: When monitoring enabled, then use it |
602 | //FIXME: to gather the current RF channel | 613 | //FIXME: to gather the current RF channel |
603 | //FIXME: Until then, get active channel from hopper. | 614 | //FIXME: Until then, get active channel from hopper. |
604 | if ( _hopper && _hopper->isActive() ) | 615 | if ( _hopper && _hopper->isActive() ) |
605 | return _hopper->channel(); | 616 | return _hopper->channel(); |
606 | 617 | ||
607 | if ( !wioctl( SIOCGIWFREQ ) ) | 618 | if ( !wioctl( SIOCGIWFREQ ) ) |
608 | { | 619 | { |
609 | return -1; | 620 | return -1; |
610 | } | 621 | } |
611 | else | 622 | else |
612 | { | 623 | { |
613 | return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ]; | 624 | return _channels[ static_cast<int>(double( _iwr.u.freq.m ) * pow( 10.0, _iwr.u.freq.e ) / 1000000) ]; |
614 | } | 625 | } |
615 | } | 626 | } |
616 | 627 | ||
617 | 628 | ||
618 | void OWirelessNetworkInterface::setChannel( int c ) const | 629 | void OWirelessNetworkInterface::setChannel( int c ) const |
619 | { | 630 | { |
620 | if ( !c ) | 631 | if ( !c ) |
621 | { | 632 | { |
@@ -943,81 +954,81 @@ OStationList* OWirelessNetworkInterface::scanNetwork() | |||
943 | { | 954 | { |
944 | odebug << "SIOCGIWESSID" << oendl; | 955 | odebug << "SIOCGIWESSID" << oendl; |
945 | stations->last()->ssid = we->u.essid.pointer; | 956 | stations->last()->ssid = we->u.essid.pointer; |
946 | break; | 957 | break; |
947 | } | 958 | } |
948 | case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break; | 959 | case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break; |
949 | case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break; | 960 | case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break; |
950 | case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break; /* Packet dropped to excessive retry */ | 961 | case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break; /* Packet dropped to excessive retry */ |
951 | case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break; /* Quality part of statistics (scan) */ | 962 | case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break; /* Quality part of statistics (scan) */ |
952 | case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break; /* Driver specific ascii string */ | 963 | case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break; /* Driver specific ascii string */ |
953 | case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */ | 964 | case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */ |
954 | case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break; /* Expired a node (AP mode) */ | 965 | case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break; /* Expired a node (AP mode) */ |
955 | default: odebug << "unhandled event" << oendl; | 966 | default: odebug << "unhandled event" << oendl; |
956 | } | 967 | } |
957 | 968 | ||
958 | offset += we->len; | 969 | offset += we->len; |
959 | we = (struct iw_event*) &buffer[offset]; | 970 | we = (struct iw_event*) &buffer[offset]; |
960 | } | 971 | } |
961 | return stations; | 972 | return stations; |
962 | 973 | ||
963 | return stations; | 974 | return stations; |
964 | 975 | ||
965 | } | 976 | } |
966 | else | 977 | else |
967 | { | 978 | { |
968 | odebug << " - no results (timeout) :(" << oendl; | 979 | odebug << " - no results (timeout) :(" << oendl; |
969 | return stations; | 980 | return stations; |
970 | } | 981 | } |
971 | } | 982 | } |
972 | 983 | ||
973 | 984 | ||
974 | int OWirelessNetworkInterface::signalStrength() const | 985 | int OWirelessNetworkInterface::signalStrength() const |
975 | { | 986 | { |
976 | iw_statistics stat; | 987 | iw_statistics stat; |
977 | ::memset( &stat, 0, sizeof stat ); | 988 | ::memset( &stat, 0, sizeof stat ); |
978 | _iwr.u.data.pointer = (char*) &stat; | 989 | _iwr.u.data.pointer = (char*) &stat; |
979 | _iwr.u.data.flags = 0; | 990 | _iwr.u.data.flags = 0; |
980 | _iwr.u.data.length = sizeof stat; | 991 | _iwr.u.data.length = sizeof stat; |
981 | 992 | ||
982 | if ( !wioctl( SIOCGIWSTATS ) ) | 993 | if ( !wioctl( SIOCGIWSTATS ) ) |
983 | { | 994 | { |
984 | return -1; | 995 | return -1; |
985 | } | 996 | } |
986 | 997 | ||
987 | int max = _range.max_qual.qual; | 998 | int max = _range.max_qual.qual; |
988 | int cur = stat.qual.qual; | 999 | int cur = stat.qual.qual; |
989 | int lev = stat.qual.level; //FIXME: Do something with them? | 1000 | int lev = stat.qual.level; //FIXME: Do something with them? |
990 | int noi = stat.qual.noise; //FIXME: Do something with them? | 1001 | int noi = stat.qual.noise; //FIXME: Do something with them? |
991 | 1002 | ||
992 | return cur*100/max; | 1003 | return cur*100/max; |
993 | } | 1004 | } |
994 | 1005 | ||
995 | 1006 | ||
996 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const | 1007 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const |
997 | { | 1008 | { |
998 | #ifndef NODEBUG | 1009 | #ifndef NODEBUG |
999 | int result = ::ioctl( _sfd, call, &iwreq ); | 1010 | int result = ::ioctl( _sfd, call, &iwreq ); |
1000 | 1011 | ||
1001 | if ( result == -1 ) | 1012 | if ( result == -1 ) |
1002 | odebug << "ONetworkInterface::wioctl (" << name() << ") call '" | 1013 | odebug << "ONetworkInterface::wioctl (" << name() << ") call '" |
1003 | << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl; | 1014 | << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl; |
1004 | else | 1015 | else |
1005 | odebug << "ONetworkInterface::wioctl (" << name() << ") call '" | 1016 | odebug << "ONetworkInterface::wioctl (" << name() << ") call '" |
1006 | << debugmapper->map( call ) << "' - Status: Ok." << oendl; | 1017 | << debugmapper->map( call ) << "' - Status: Ok." << oendl; |
1007 | 1018 | ||
1008 | return ( result != -1 ); | 1019 | return ( result != -1 ); |
1009 | #else | 1020 | #else |
1010 | return ::ioctl( _sfd, call, &iwreq ) != -1; | 1021 | return ::ioctl( _sfd, call, &iwreq ) != -1; |
1011 | #endif | 1022 | #endif |
1012 | } | 1023 | } |
1013 | 1024 | ||
1014 | 1025 | ||
1015 | bool OWirelessNetworkInterface::wioctl( int call ) const | 1026 | bool OWirelessNetworkInterface::wioctl( int call ) const |
1016 | { | 1027 | { |
1017 | strcpy( _iwr.ifr_name, name() ); | 1028 | strcpy( _iwr.ifr_name, name() ); |
1018 | return wioctl( call, _iwr ); | 1029 | return wioctl( call, _iwr ); |
1019 | } | 1030 | } |
1020 | 1031 | ||
1021 | 1032 | ||
1022 | /*====================================================================================== | 1033 | /*====================================================================================== |
1023 | * OMonitoringInterface | 1034 | * OMonitoringInterface |
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 0a51108..93b129f 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -65,64 +65,68 @@ class OMonitoringInterface; | |||
65 | * ONetwork | 65 | * ONetwork |
66 | *======================================================================================*/ | 66 | *======================================================================================*/ |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * @brief A container class for all network interfaces | 69 | * @brief A container class for all network interfaces |
70 | * | 70 | * |
71 | * This class provides access to all available network interfaces of your computer. | 71 | * This class provides access to all available network interfaces of your computer. |
72 | * | 72 | * |
73 | * @author Michael 'Mickey' Lauer <mickey@vanille.de> | 73 | * @author Michael 'Mickey' Lauer <mickey@vanille.de> |
74 | */ | 74 | */ |
75 | class ONetwork : public QObject | 75 | class ONetwork : public QObject |
76 | { | 76 | { |
77 | Q_OBJECT | 77 | Q_OBJECT |
78 | 78 | ||
79 | public: | 79 | public: |
80 | typedef QDict<ONetworkInterface> InterfaceMap; | 80 | typedef QDict<ONetworkInterface> InterfaceMap; |
81 | typedef QDictIterator<ONetworkInterface> InterfaceIterator; | 81 | typedef QDictIterator<ONetworkInterface> InterfaceIterator; |
82 | 82 | ||
83 | public: | 83 | public: |
84 | /** | 84 | /** |
85 | * @returns the number of available interfaces | 85 | * @returns the number of available interfaces |
86 | */ | 86 | */ |
87 | int count() const; | 87 | int count() const; |
88 | /** | 88 | /** |
89 | * @returns a pointer to the (one and only) @ref ONetwork instance. | 89 | * @returns a pointer to the (one and only) @ref ONetwork instance. |
90 | */ | 90 | */ |
91 | static ONetwork* instance(); | 91 | static ONetwork* instance(); |
92 | /** | 92 | /** |
93 | * @returns an iterator usable for iterating through all network interfaces. | 93 | * @returns an iterator usable for iterating through all network interfaces. |
94 | */ | 94 | */ |
95 | InterfaceIterator iterator() const; | 95 | InterfaceIterator iterator() const; |
96 | /** | 96 | /** |
97 | * @returns true, if the @a interface is present. | ||
98 | */ | ||
99 | bool isPresent( const char* interface ) const; | ||
100 | /** | ||
97 | * @returns true, if the @a interface supports the wireless extension protocol. | 101 | * @returns true, if the @a interface supports the wireless extension protocol. |
98 | */ | 102 | */ |
99 | bool isWirelessInterface( const char* interface ) const; | 103 | bool isWirelessInterface( const char* interface ) const; |
100 | /** | 104 | /** |
101 | * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found. | 105 | * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found. |
102 | * @see ONetworkInterface | 106 | * @see ONetworkInterface |
103 | */ | 107 | */ |
104 | ONetworkInterface* interface( const QString& interface ) const; | 108 | ONetworkInterface* interface( const QString& interface ) const; |
105 | /** | 109 | /** |
106 | * @internal Rebuild the internal interface database | 110 | * @internal Rebuild the internal interface database |
107 | * @note Sometimes it might be useful to call this from client code, | 111 | * @note Sometimes it might be useful to call this from client code, |
108 | * e.g. after issuing a cardctl insert | 112 | * e.g. after issuing a cardctl insert |
109 | */ | 113 | */ |
110 | void synchronize(); | 114 | void synchronize(); |
111 | /** | 115 | /** |
112 | * @returns the wireless extension version used at compile time. | 116 | * @returns the wireless extension version used at compile time. |
113 | **/ | 117 | **/ |
114 | static short wirelessExtensionVersion(); | 118 | static short wirelessExtensionVersion(); |
115 | 119 | ||
116 | protected: | 120 | protected: |
117 | ONetwork(); | 121 | ONetwork(); |
118 | 122 | ||
119 | private: | 123 | private: |
120 | static ONetwork* _instance; | 124 | static ONetwork* _instance; |
121 | InterfaceMap _interfaces; | 125 | InterfaceMap _interfaces; |
122 | }; | 126 | }; |
123 | 127 | ||
124 | 128 | ||
125 | /*====================================================================================== | 129 | /*====================================================================================== |
126 | * ONetworkInterface | 130 | * ONetworkInterface |
127 | *======================================================================================*/ | 131 | *======================================================================================*/ |
128 | 132 | ||