-rw-r--r-- | examples/networksettings/config.in | 2 | ||||
-rw-r--r-- | examples/networksettings/example.pro | 5 | ||||
-rw-r--r-- | examples/networksettings/exampleiface.cpp | 5 | ||||
-rw-r--r-- | examples/networksettings/examplemodule.cpp | 10 |
4 files changed, 13 insertions, 9 deletions
diff --git a/examples/networksettings/config.in b/examples/networksettings/config.in index 4bbbb4e..e1a68cc 100644 --- a/examples/networksettings/config.in +++ b/examples/networksettings/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config EXAMPLE_VPN | 1 | config EXAMPLE_VPN |
2 | boolean "opie-networksettingsplugin-example (VPN module)" | 2 | boolean "opie-networksettingsplugin-example (VPN module)" |
3 | default "n" if NETWORKSETUP | 3 | default "n" if NETWORKSETUP |
4 | depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && EXAMPLES | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && EXAMPLES |
diff --git a/examples/networksettings/example.pro b/examples/networksettings/example.pro index 835dbd0..7bfa1ed 100644 --- a/examples/networksettings/example.pro +++ b/examples/networksettings/example.pro | |||
@@ -1,17 +1,14 @@ | |||
1 | #TEMPLATE = app | ||
2 | # | ||
3 | TEMPLATE = lib | 1 | TEMPLATE = lib |
4 | #CONFIG += qt plugin warn_on | ||
5 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
6 | DESTDIR = $(OPIEDIR)/plugins/networksettings | 3 | DESTDIR = $(OPIEDIR)/plugins/networksettings |
7 | HEADERS = exampleiface.h examplemodule.h | 4 | HEADERS = exampleiface.h examplemodule.h |
8 | SOURCES = exampleiface.cpp examplemodule.cpp | 5 | SOURCES = exampleiface.cpp examplemodule.cpp |
9 | INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces | 6 | INCLUDEPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces |
10 | DEPENDPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces | 7 | DEPENDPATH+= $(OPIEDIR)/include $(OPIEDIR)/noncore/settings/networksettings $(OPIEDIR)/noncore/settings/networksettings/interfaces |
11 | LIBS += -lqpe -linterfaces | 8 | LIBS += -lqpe -linterfaces -lopiecore2 |
12 | TARGET = example_vpn | 9 | TARGET = example_vpn |
13 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
14 | 11 | ||
15 | 12 | ||
16 | 13 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 14 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/examples/networksettings/exampleiface.cpp b/examples/networksettings/exampleiface.cpp index 5267a9c..8012bb2 100644 --- a/examples/networksettings/exampleiface.cpp +++ b/examples/networksettings/exampleiface.cpp | |||
@@ -1,43 +1,46 @@ | |||
1 | #include "exampleiface.h" | 1 | #include "exampleiface.h" |
2 | 2 | ||
3 | #include <opie2/odebug.h> | ||
4 | using namespace Opie::Core; | ||
5 | |||
3 | VirtualInterface::VirtualInterface( QObject* parent, | 6 | VirtualInterface::VirtualInterface( QObject* parent, |
4 | const char* name, | 7 | const char* name, |
5 | bool status ) | 8 | bool status ) |
6 | : Interface(parent, name, status ) | 9 | : Interface(parent, name, status ) |
7 | { | 10 | { |
8 | } | 11 | } |
9 | 12 | ||
10 | VirtualInterface::~VirtualInterface() { | 13 | VirtualInterface::~VirtualInterface() { |
11 | } | 14 | } |
12 | 15 | ||
13 | bool VirtualInterface::refresh() { | 16 | bool VirtualInterface::refresh() { |
14 | /* we do VPN over ppp | 17 | /* we do VPN over ppp |
15 | * so replace the interfaceName with | 18 | * so replace the interfaceName with |
16 | * something actual existing | 19 | * something actual existing |
17 | * I take wlan0 in my case | 20 | * I take wlan0 in my case |
18 | */ | 21 | */ |
19 | QString old = getInterfaceName(); | 22 | QString old = getInterfaceName(); |
20 | qWarning("Interface name was " + old ); | 23 | odebug << "Interface name was " << old << oendl; |
21 | setInterfaceName( "wlan0" ); | 24 | setInterfaceName( "wlan0" ); |
22 | 25 | ||
23 | bool b =Interface::refresh(); | 26 | bool b =Interface::refresh(); |
24 | setInterfaceName( old ); | 27 | setInterfaceName( old ); |
25 | 28 | ||
26 | /* new and old interface name */ | 29 | /* new and old interface name */ |
27 | emit updateInterface(this); | 30 | emit updateInterface(this); |
28 | return b; | 31 | return b; |
29 | } | 32 | } |
30 | 33 | ||
31 | 34 | ||
32 | void VirtualInterface::start() { | 35 | void VirtualInterface::start() { |
33 | // call pptp | 36 | // call pptp |
34 | setStatus(true); | 37 | setStatus(true); |
35 | refresh(); | 38 | refresh(); |
36 | emit updateMessage("VPN started"); | 39 | emit updateMessage("VPN started"); |
37 | } | 40 | } |
38 | 41 | ||
39 | void VirtualInterface::stop() { | 42 | void VirtualInterface::stop() { |
40 | setStatus(false ); | 43 | setStatus(false ); |
41 | refresh(); | 44 | refresh(); |
42 | emit updateMessage("VPN halted"); | 45 | emit updateMessage("VPN halted"); |
43 | } | 46 | } |
diff --git a/examples/networksettings/examplemodule.cpp b/examples/networksettings/examplemodule.cpp index d7fd718..703e6bd 100644 --- a/examples/networksettings/examplemodule.cpp +++ b/examples/networksettings/examplemodule.cpp | |||
@@ -1,30 +1,34 @@ | |||
1 | #include <qwidget.h> | 1 | #include "exampleiface.h" |
2 | #include "examplemodule.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
2 | 7 | ||
3 | #include <interfaces/interfaceinformationimp.h> | 8 | #include <interfaces/interfaceinformationimp.h> |
4 | 9 | ||
5 | #include "exampleiface.h" | 10 | #include <qwidget.h> |
6 | #include "examplemodule.h" | ||
7 | 11 | ||
8 | VirtualModule::VirtualModule() { | 12 | VirtualModule::VirtualModule() { |
9 | Interface* iface = new VirtualInterface( 0 ); | 13 | Interface* iface = new VirtualInterface( 0 ); |
10 | iface->setHardwareName( "vpn" ); | 14 | iface->setHardwareName( "vpn" ); |
11 | iface->setInterfaceName( "Test VPN" ); | 15 | iface->setInterfaceName( "Test VPN" ); |
12 | m_interfaces.append( iface ); | 16 | m_interfaces.append( iface ); |
13 | 17 | ||
14 | // If we set up VPN via pptp | 18 | // If we set up VPN via pptp |
15 | // and networksettins was closed and now opened | 19 | // and networksettins was closed and now opened |
16 | // we need to hide the ppp device behind us | 20 | // we need to hide the ppp device behind us |
17 | // One can do this by calling setHandledInterfaceNames | 21 | // One can do this by calling setHandledInterfaceNames |
18 | // setHandledInterfaceNames(); | 22 | // setHandledInterfaceNames(); |
19 | } | 23 | } |
20 | 24 | ||
21 | VirtualModule::~VirtualModule() { | 25 | VirtualModule::~VirtualModule() { |
22 | m_interfaces.setAutoDelete( true ); | 26 | m_interfaces.setAutoDelete( true ); |
23 | m_interfaces.clear(); | 27 | m_interfaces.clear(); |
24 | } | 28 | } |
25 | 29 | ||
26 | 30 | ||
27 | /* | 31 | /* |
28 | * We're a VPN module | 32 | * We're a VPN module |
29 | */ | 33 | */ |
30 | bool VirtualModule::isOwner( Interface* iface ) { | 34 | bool VirtualModule::isOwner( Interface* iface ) { |