Diffstat (limited to 'noncore/settings/networksettings2/network/networkrun.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/network/networkrun.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp index 74467ad..7039a36 100644 --- a/noncore/settings/networksettings2/network/networkrun.cpp +++ b/noncore/settings/networksettings2/network/networkrun.cpp | |||
@@ -1,29 +1,28 @@ | |||
1 | #include <system.h> | 1 | #include <system.h> |
2 | #include <netnode.h> | 2 | #include <netnode.h> |
3 | #include <resources.h> | 3 | #include <resources.h> |
4 | #include "networkrun.h" | 4 | #include "networkrun.h" |
5 | 5 | ||
6 | State_t NetworkRun::detectState( void ) { | 6 | State_t NetworkRun::detectState( void ) { |
7 | InterfaceInfo * II = nodeCollection()->assignedInterface(); | 7 | InterfaceInfo * II = networkSetup()->assignedInterface(); |
8 | 8 | ||
9 | Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 )); | ||
10 | if( II && II->IsUp ) { | 9 | if( II && II->IsUp ) { |
11 | // device has assigned interface | 10 | // device has assigned interface |
12 | return IsUp; | 11 | return IsUp; |
13 | } | 12 | } |
14 | 13 | ||
15 | // had no interface or interface is no longer up -> release | 14 | // had no interface or interface is no longer up -> release |
16 | nodeCollection()->assignInterface( 0 ); | 15 | networkSetup()->assignInterface( 0 ); |
17 | 16 | ||
18 | return Unknown; | 17 | return Unknown; |
19 | } | 18 | } |
20 | 19 | ||
21 | QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 20 | QString NetworkRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
22 | // we handle UP and DOWN | 21 | // we handle UP and DOWN |
23 | InterfaceInfo * II = NC->assignedInterface(); | 22 | InterfaceInfo * II = NC->assignedInterface(); |
24 | 23 | ||
25 | if( ! II ) { | 24 | if( ! II ) { |
26 | Log(( "no interface assigned." )); | 25 | Log(( "no interface assigned." )); |
27 | return QString(); | 26 | return QString(); |
28 | } | 27 | } |
29 | 28 | ||
@@ -35,17 +34,17 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | |||
35 | } else if( A == Down ) { | 34 | } else if( A == Down ) { |
36 | SL << "ifdown"; | 35 | SL << "ifdown"; |
37 | } else { | 36 | } else { |
38 | return QString(); | 37 | return QString(); |
39 | } | 38 | } |
40 | 39 | ||
41 | SL << QString().sprintf( "%s=A%ld%s", | 40 | SL << QString().sprintf( "%s=A%ld%s", |
42 | II->Name.latin1(), | 41 | II->Name.latin1(), |
43 | nodeCollection()->number(), | 42 | networkSetup()->number(), |
44 | II->Name.latin1() ); | 43 | II->Name.latin1() ); |
45 | 44 | ||
46 | if( ! NSResources->system().runAsRoot( SL ) ) { | 45 | if( ! NSResources->system().runAsRoot( SL ) ) { |
47 | return QString("Cannot call %1").arg(SL.join(" ")); | 46 | return QString("Cannot call %1").arg(SL.join(" ")); |
48 | } | 47 | } |
49 | 48 | ||
50 | return QString(); | 49 | return QString(); |
51 | } | 50 | } |