Diffstat (limited to 'noncore/settings/networksettings2/network') (more/less context) (ignore whitespace changes)
4 files changed, 13 insertions, 14 deletions
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp index 2fa31bd..80a7fac 100644 --- a/noncore/settings/networksettings2/network/network_NN.cpp +++ b/noncore/settings/networksettings2/network/network_NN.cpp | |||
@@ -11,9 +11,9 @@ static const char * NetworkNeeds[] = | |||
11 | 0 | 11 | 0 |
12 | }; | 12 | }; |
13 | 13 | ||
14 | static const char * NetworkProvides[] = | 14 | static const char * NetworkProvides[] = |
15 | { "connection", | 15 | { "NetworkSetup", |
16 | 0 | 16 | 0 |
17 | }; | 17 | }; |
18 | 18 | ||
19 | /** | 19 | /** |
diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp index 34dac54..c183d5e 100644 --- a/noncore/settings/networksettings2/network/network_NNI.cpp +++ b/noncore/settings/networksettings2/network/network_NNI.cpp | |||
@@ -116,16 +116,16 @@ short ANetwork::generateFile( SystemFile &SF, | |||
116 | // we can safely call from here since device item is deeper | 116 | // we can safely call from here since device item is deeper |
117 | if( Data.UseDHCP ) { | 117 | if( Data.UseDHCP ) { |
118 | SF << "iface " | 118 | SF << "iface " |
119 | << "A" | 119 | << "A" |
120 | << connection()->number() | 120 | << networkSetup()->number() |
121 | << NIC | 121 | << NIC |
122 | << " inet dhcp" | 122 | << " inet dhcp" |
123 | << endl; | 123 | << endl; |
124 | SF << " up echo \"" | 124 | SF << " up echo \"" |
125 | << NIC | 125 | << NIC |
126 | << "\" > /tmp/profile-" | 126 | << "\" > /tmp/profile-" |
127 | << connection()->number() | 127 | << networkSetup()->number() |
128 | << ".up" | 128 | << ".up" |
129 | << endl; | 129 | << endl; |
130 | if( Data.SendHostname ) { | 130 | if( Data.SendHostname ) { |
131 | SF << " hostname " | 131 | SF << " hostname " |
@@ -133,26 +133,26 @@ short ANetwork::generateFile( SystemFile &SF, | |||
133 | << endl; | 133 | << endl; |
134 | } | 134 | } |
135 | 135 | ||
136 | SF << " down rm -f /tmp/profile-" | 136 | SF << " down rm -f /tmp/profile-" |
137 | << connection()->number() | 137 | << networkSetup()->number() |
138 | << ".up" | 138 | << ".up" |
139 | << endl; | 139 | << endl; |
140 | } else { | 140 | } else { |
141 | SF << "iface " | 141 | SF << "iface " |
142 | << "A" | 142 | << "A" |
143 | << connection()->number() | 143 | << networkSetup()->number() |
144 | << NIC | 144 | << NIC |
145 | << " inet static" | 145 | << " inet static" |
146 | << endl; | 146 | << endl; |
147 | SF << " up echo \"" | 147 | SF << " up echo \"" |
148 | << NIC | 148 | << NIC |
149 | << "\" > /tmp/profile-" | 149 | << "\" > /tmp/profile-" |
150 | << connection()->number() | 150 | << networkSetup()->number() |
151 | << ".up" | 151 | << ".up" |
152 | << endl; | 152 | << endl; |
153 | SF << " down rm -f /tmp/profile-" | 153 | SF << " down rm -f /tmp/profile-" |
154 | << connection()->number() | 154 | << networkSetup()->number() |
155 | << ".up" | 155 | << ".up" |
156 | << endl; | 156 | << endl; |
157 | SF << " address " | 157 | SF << " address " |
158 | << Data.IPAddress | 158 | << Data.IPAddress |
@@ -210,9 +210,9 @@ short ANetwork::generateFile( SystemFile &SF, | |||
210 | rvl = 0; | 210 | rvl = 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | // embed other info in it | 213 | // embed other info in it |
214 | rvd = connection()->getToplevel()->generateFileEmbedded( SF, DevNr ); | 214 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( SF, DevNr ); |
215 | 215 | ||
216 | return (rvd == 2 || rvl == 2 ) ? 2 : | 216 | return (rvd == 2 || rvl == 2 ) ? 2 : |
217 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | 217 | (rvd == 0 || rvl == 0 ) ? 0 : 1; |
218 | } | 218 | } |
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 | |||
@@ -3,23 +3,22 @@ | |||
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 ) { |
@@ -39,9 +38,9 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | |||
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(" ")); |
diff --git a/noncore/settings/networksettings2/network/networkrun.h b/noncore/settings/networksettings2/network/networkrun.h index 78a1694..ac186e7 100644 --- a/noncore/settings/networksettings2/network/networkrun.h +++ b/noncore/settings/networksettings2/network/networkrun.h | |||
@@ -15,6 +15,6 @@ public : | |||
15 | State_t detectState( void ); | 15 | State_t detectState( void ); |
16 | 16 | ||
17 | protected : | 17 | protected : |
18 | 18 | ||
19 | QString setMyState( NodeCollection * , Action_t, bool ); | 19 | QString setMyState( NetworkSetup * , Action_t, bool ); |
20 | }; | 20 | }; |