Diffstat (limited to 'noncore/settings/networksettings2/gprs/GPRS_NNI.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/gprs/GPRS_NNI.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp index 2f61cba..bf8cc59 100644 --- a/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp +++ b/noncore/settings/networksettings2/gprs/GPRS_NNI.cpp | |||
@@ -121,9 +121,9 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
121 | } else if( SF.name() == "peers" ) { | 121 | } else if( SF.name() == "peers" ) { |
122 | SF << "noauth" << oendl; | 122 | SF << "noauth" << oendl; |
123 | SF << "user " << Data.User << oendl; | 123 | SF << "user " << Data.User << oendl; |
124 | SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" | 124 | SF << "connect \"/usr/sbin/chat -s -v -f /etc/chatscripts/" |
125 | << removeSpaces( connection()->name() ) | 125 | << removeSpaces( networkSetup()->name() ) |
126 | << "\"" | 126 | << "\"" |
127 | << oendl; | 127 | << oendl; |
128 | SF << "ipcp-accept-local" << oendl; | 128 | SF << "ipcp-accept-local" << oendl; |
129 | SF << "ipcp-accept-remote" << oendl; | 129 | SF << "ipcp-accept-remote" << oendl; |
@@ -134,9 +134,9 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
134 | } | 134 | } |
135 | } | 135 | } |
136 | if( Data.Debug ) { | 136 | if( Data.Debug ) { |
137 | SF << "logfile /tmp/" | 137 | SF << "logfile /tmp/" |
138 | << removeSpaces( connection()->name() ) | 138 | << removeSpaces( networkSetup()->name() ) |
139 | << oendl; | 139 | << oendl; |
140 | for( int i = 0; i < Data.Debug; i ++ ) { | 140 | for( int i = 0; i < Data.Debug; i ++ ) { |
141 | SF << "debug" << oendl; | 141 | SF << "debug" << oendl; |
142 | } | 142 | } |
@@ -145,11 +145,11 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
145 | SF << "local" << oendl; | 145 | SF << "local" << oendl; |
146 | SF << "lcp-echo-interval 0" << oendl; | 146 | SF << "lcp-echo-interval 0" << oendl; |
147 | SF << "lcp-echo-failure 0" << oendl; | 147 | SF << "lcp-echo-failure 0" << oendl; |
148 | SF << "usepeerdns" << oendl; | 148 | SF << "usepeerdns" << oendl; |
149 | SF << "linkname " << removeSpaces( connection()->name() ) << oendl; | 149 | SF << "linkname " << removeSpaces( networkSetup()->name() ) << oendl; |
150 | SF << "nopersist" << oendl; | 150 | SF << "nopersist" << oendl; |
151 | SF << "ipparam " << removeSpaces( connection()->name() ) <<oendl; | 151 | SF << "ipparam " << removeSpaces( networkSetup()->name() ) <<oendl; |
152 | SF << "maxfail 1" << oendl; | 152 | SF << "maxfail 1" << oendl; |
153 | return 0; | 153 | return 0; |
154 | } else if( SF.name() == "extra" ) { | 154 | } else if( SF.name() == "extra" ) { |
155 | unsigned long Bits; | 155 | unsigned long Bits; |
@@ -191,17 +191,17 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
191 | if( ! Data.DNS1.isEmpty() ) { | 191 | if( ! Data.DNS1.isEmpty() ) { |
192 | SF << "nameserver " | 192 | SF << "nameserver " |
193 | << Data.DNS1 | 193 | << Data.DNS1 |
194 | << " # profile " | 194 | << " # profile " |
195 | << removeSpaces( connection()->name() ) | 195 | << removeSpaces( networkSetup()->name() ) |
196 | <<oendl; | 196 | <<oendl; |
197 | } | 197 | } |
198 | 198 | ||
199 | if( ! Data.DNS2.isEmpty() ) { | 199 | if( ! Data.DNS2.isEmpty() ) { |
200 | SF << "nameserver " | 200 | SF << "nameserver " |
201 | << Data.DNS2 | 201 | << Data.DNS2 |
202 | << " # profile " | 202 | << " # profile " |
203 | << removeSpaces( connection()->name() ) | 203 | << removeSpaces( networkSetup()->name() ) |
204 | <<oendl; | 204 | <<oendl; |
205 | } | 205 | } |
206 | } | 206 | } |
207 | return 1; | 207 | return 1; |
@@ -210,21 +210,21 @@ short AGPRSDevice::generateFile( SystemFile & SF, | |||
210 | bool AGPRSDevice::openFile( SystemFile & SF ) { | 210 | bool AGPRSDevice::openFile( SystemFile & SF ) { |
211 | if( SF.name() == "peers" ) { | 211 | if( SF.name() == "peers" ) { |
212 | SF.setPath( | 212 | SF.setPath( |
213 | QString( "/etc/ppp/peers/" ) + | 213 | QString( "/etc/ppp/peers/" ) + |
214 | removeSpaces( connection()->name() ) | 214 | removeSpaces( networkSetup()->name() ) |
215 | ); | 215 | ); |
216 | return 1; | 216 | return 1; |
217 | } else if ( SF.name() == "chatscripts" ) { | 217 | } else if ( SF.name() == "chatscripts" ) { |
218 | SF.setPath( | 218 | SF.setPath( |
219 | QString( "/etc/chatscripts/" ) + | 219 | QString( "/etc/chatscripts/" ) + |
220 | removeSpaces( connection()->name() ) | 220 | removeSpaces( networkSetup()->name() ) |
221 | ); | 221 | ); |
222 | return 1; | 222 | return 1; |
223 | } else if ( SF.name() == "extra" ) { | 223 | } else if ( SF.name() == "extra" ) { |
224 | SF.setPath( | 224 | SF.setPath( |
225 | QString( "/etc/ppp/" ) + | 225 | QString( "/etc/ppp/" ) + |
226 | removeSpaces( connection()->name() ) + ".fixed" | 226 | removeSpaces( networkSetup()->name() ) + ".fixed" |
227 | ); | 227 | ); |
228 | return 1; | 228 | return 1; |
229 | } | 229 | } |
230 | return 0; | 230 | return 0; |