summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.h1
-rw-r--r--noncore/settings/networksettings/wlan/wextensions.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index b13c7a3..370ad59 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -24,48 +24,49 @@
24 If not, write to the Free Software Foundation, 24 If not, write to the Free Software Foundation,
25 Inc., 59 Temple Place - Suite 330, 25 Inc., 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA. 26 Boston, MA 02111-1307, USA.
27 27
28*/ 28*/
29 29
30#ifndef ONETWORK_H 30#ifndef ONETWORK_H
31#define ONETWORK_H 31#define ONETWORK_H
32 32
33/* OPIE */ 33/* OPIE */
34#include <opie2/onetutils.h> 34#include <opie2/onetutils.h>
35#include <opie2/ostation.h> 35#include <opie2/ostation.h>
36 36
37/* QT */ 37/* QT */
38#include <qvaluelist.h> 38#include <qvaluelist.h>
39#include <qdict.h> 39#include <qdict.h>
40#include <qmap.h> 40#include <qmap.h>
41#include <qobject.h> 41#include <qobject.h>
42#include <qhostaddress.h> 42#include <qhostaddress.h>
43 43
44/* STD */ 44/* STD */
45// hacky workarounds until we have a true user space wireless.h 45// hacky workarounds until we have a true user space wireless.h
46#include <net/if.h> 46#include <net/if.h>
47#define _LINUX_IF_H 47#define _LINUX_IF_H
48#include <linux/types.h>
48#include <linux/wireless.h> 49#include <linux/wireless.h>
49#ifndef IW_MAX_PRIV_DEF 50#ifndef IW_MAX_PRIV_DEF
50#define IW_MAX_PRIV_DEF 128 51#define IW_MAX_PRIV_DEF 128
51#endif 52#endif
52 53
53namespace Opie { 54namespace Opie {
54namespace Net { 55namespace Net {
55class ONetworkInterface; 56class ONetworkInterface;
56class OWirelessNetworkInterface; 57class OWirelessNetworkInterface;
57class OChannelHopper; 58class OChannelHopper;
58class OMonitoringInterface; 59class OMonitoringInterface;
59 60
60/*====================================================================================== 61/*======================================================================================
61 * ONetwork 62 * ONetwork
62 *======================================================================================*/ 63 *======================================================================================*/
63 64
64/** 65/**
65 * @brief A container class for all network interfaces 66 * @brief A container class for all network interfaces
66 * 67 *
67 * This class provides access to all available network interfaces of your computer. 68 * This class provides access to all available network interfaces of your computer.
68 * 69 *
69 * @author Michael 'Mickey' Lauer <mickey@vanille.de> 70 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
70 */ 71 */
71class ONetwork : public QObject 72class ONetwork : public QObject
diff --git a/noncore/settings/networksettings/wlan/wextensions.h b/noncore/settings/networksettings/wlan/wextensions.h
index a89e33a..aceb672 100644
--- a/noncore/settings/networksettings/wlan/wextensions.h
+++ b/noncore/settings/networksettings/wlan/wextensions.h
@@ -1,30 +1,32 @@
1#ifndef WEXTENSIONS_H 1#ifndef WEXTENSIONS_H
2#define WEXTENSIONS_H 2#define WEXTENSIONS_H
3 3
4#include <qstring.h> 4#include <qstring.h>
5 5
6#include <net/if.h>
6#include <netinet/ip.h> 7#include <netinet/ip.h>
8#include <linux/types.h>
7#include <linux/wireless.h> 9#include <linux/wireless.h>
8 10
9class WExtensions { 11class WExtensions {
10 12
11public: 13public:
12 WExtensions(QString interfaceName); 14 WExtensions(QString interfaceName);
13 QString getInterfaceName(){return interface;}; 15 QString getInterfaceName(){return interface;};
14 bool doesHaveWirelessExtensions(){return hasWirelessExtensions;}; 16 bool doesHaveWirelessExtensions(){return hasWirelessExtensions;};
15 QString station(); 17 QString station();
16 QString essid(); 18 QString essid();
17 QString mode(); 19 QString mode();
18 double frequency(); 20 double frequency();
19 int channel(); 21 int channel();
20 double rate(); 22 double rate();
21 QString ap(); 23 QString ap();
22 bool stats( int &signal, int &noise, int &quality); 24 bool stats( int &signal, int &noise, int &quality);
23 25
24private: 26private:
25 bool hasWirelessExtensions; 27 bool hasWirelessExtensions;
26 QString interface; 28 QString interface;
27 29
28 // Used in we calls 30 // Used in we calls
29 struct iwreq iwr; 31 struct iwreq iwr;
30 int fd; 32 int fd;