Diffstat (limited to 'noncore/settings/networksettings2/ppp/ppp_NNI.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/ppp/ppp_NNI.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp index 9e3bb64..7286d96 100644 --- a/noncore/settings/networksettings2/ppp/ppp_NNI.cpp +++ b/noncore/settings/networksettings2/ppp/ppp_NNI.cpp | |||
@@ -140,96 +140,96 @@ QString APPP::acceptable( void ) { | |||
140 | return ( GUI ) ? GUI->acceptable( ) : QString(); | 140 | return ( GUI ) ? GUI->acceptable( ) : QString(); |
141 | } | 141 | } |
142 | 142 | ||
143 | void APPP::commit( void ) { | 143 | void APPP::commit( void ) { |
144 | if( GUI && GUI->commit( Data ) ) { | 144 | if( GUI && GUI->commit( Data ) ) { |
145 | setModified( 1 ); | 145 | setModified( 1 ); |
146 | } | 146 | } |
147 | } | 147 | } |
148 | 148 | ||
149 | bool APPP::openFile( SystemFile & SF ) { | 149 | bool APPP::openFile( SystemFile & SF ) { |
150 | if( SF.name() == "peers" ) { | 150 | if( SF.name() == "peers" ) { |
151 | SF.setPath( removeSpaces( | 151 | SF.setPath( removeSpaces( |
152 | QString( "/tmp/ppp/peers/" ) + connection()->name() ) ); | 152 | QString( "/tmp/ppp/peers/" ) + networkSetup()->name() ) ); |
153 | return 1; | 153 | return 1; |
154 | } else if ( SF.name() == "chatscripts" ) { | 154 | } else if ( SF.name() == "chatscripts" ) { |
155 | SF.setPath( removeSpaces( | 155 | SF.setPath( removeSpaces( |
156 | QString( "/tmp/chatscripts/" ) + connection()->name() ) ); | 156 | QString( "/tmp/chatscripts/" ) + networkSetup()->name() ) ); |
157 | return 1; | 157 | return 1; |
158 | } | 158 | } |
159 | return 0; | 159 | return 0; |
160 | } | 160 | } |
161 | 161 | ||
162 | short APPP::generateFile( SystemFile & SF, long DevNr ) { | 162 | short APPP::generateFile( SystemFile & SF, long DevNr ) { |
163 | short rvl, rvd; | 163 | short rvl, rvd; |
164 | 164 | ||
165 | rvl = 1; | 165 | rvl = 1; |
166 | rvd = 1; | 166 | rvd = 1; |
167 | 167 | ||
168 | if( SF.name() == "pap-secrets" ) { | 168 | if( SF.name() == "pap-secrets" ) { |
169 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 169 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
170 | 170 | ||
171 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) { | 171 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode == 0 ) { |
172 | SF << "# secrets for " | 172 | SF << "# secrets for " |
173 | << connection()->name().latin1() | 173 | << networkSetup()->name().latin1() |
174 | << endl; | 174 | << endl; |
175 | SF << Data.Auth.Client | 175 | SF << Data.Auth.Client |
176 | << " " | 176 | << " " |
177 | << Data.Auth.Server | 177 | << Data.Auth.Server |
178 | << " " | 178 | << " " |
179 | << Data.Auth.Secret | 179 | << Data.Auth.Secret |
180 | << endl; | 180 | << endl; |
181 | rvl = 0; | 181 | rvl = 0; |
182 | rvd = connection()->getToplevel()->generateFileEmbedded( | 182 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
183 | SF, DevNr ); | 183 | SF, DevNr ); |
184 | } | 184 | } |
185 | } else if( SF.name() == "chap-secrets" ) { | 185 | } else if( SF.name() == "chap-secrets" ) { |
186 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 186 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
187 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) { | 187 | if( Data.Auth.Mode == 1 && Data.Auth.PCEMode != 0 ) { |
188 | // used for both EAP and Chap | 188 | // used for both EAP and Chap |
189 | SF << "# secrets for " | 189 | SF << "# secrets for " |
190 | << connection()->name().latin1() | 190 | << networkSetup()->name().latin1() |
191 | << endl; | 191 | << endl; |
192 | SF << Data.Auth.Client | 192 | SF << Data.Auth.Client |
193 | << " " | 193 | << " " |
194 | << Data.Auth.Server | 194 | << Data.Auth.Server |
195 | << " " | 195 | << " " |
196 | << Data.Auth.Secret | 196 | << Data.Auth.Secret |
197 | << endl; | 197 | << endl; |
198 | 198 | ||
199 | rvl = 0; | 199 | rvl = 0; |
200 | rvd = connection()->getToplevel()->generateFileEmbedded( | 200 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
201 | SF, DevNr ); | 201 | SF, DevNr ); |
202 | } | 202 | } |
203 | } else if ( SF.name() == "peers" ) { | 203 | } else if ( SF.name() == "peers" ) { |
204 | 204 | ||
205 | QFileInfo FI(SF.path()); | 205 | QFileInfo FI(SF.path()); |
206 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 206 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
207 | 207 | ||
208 | SF << "connect \"/usr/sbin/chat -v -f /etc/chatscripts/" | 208 | SF << "connect \"/usr/sbin/chat -v -f /etc/chatscripts/" |
209 | << FI.baseName() | 209 | << FI.baseName() |
210 | << "\"" | 210 | << "\"" |
211 | << endl; | 211 | << endl; |
212 | 212 | ||
213 | if( Data.IP.GWIsDefault ) { | 213 | if( Data.IP.GWIsDefault ) { |
214 | SF << "defaultroute" | 214 | SF << "defaultroute" |
215 | << endl; | 215 | << endl; |
216 | } | 216 | } |
217 | 217 | ||
218 | SF << "linkname " | 218 | SF << "linkname " |
219 | << removeSpaces( SF.name().latin1() ) | 219 | << removeSpaces( SF.name().latin1() ) |
220 | << endl; | 220 | << endl; |
221 | 221 | ||
222 | // insert other data here | 222 | // insert other data here |
223 | rvl = 0; | 223 | rvl = 0; |
224 | rvd = connection()->getToplevel()->generateFileEmbedded( | 224 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
225 | SF, DevNr ); | 225 | SF, DevNr ); |
226 | } else if ( SF.name() == "chatscripts" ) { | 226 | } else if ( SF.name() == "chatscripts" ) { |
227 | Log(("Generate PPP for %s\n", SF.name().latin1() )); | 227 | Log(("Generate PPP for %s\n", SF.name().latin1() )); |
228 | rvl = 0; | 228 | rvl = 0; |
229 | rvd = connection()->getToplevel()->generateFileEmbedded( | 229 | rvd = networkSetup()->getToplevel()->generateFileEmbedded( |
230 | SF, DevNr ); | 230 | SF, DevNr ); |
231 | } | 231 | } |
232 | 232 | ||
233 | return (rvd == 2 || rvl == 2 ) ? 2 : | 233 | return (rvd == 2 || rvl == 2 ) ? 2 : |
234 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | 234 | (rvd == 0 || rvl == 0 ) ? 0 : 1; |
235 | } | 235 | } |