Diffstat (limited to 'noncore/settings/networksettings2/wlan/wlan_NNI.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NNI.cpp | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp index 61969f2..0e4fc4c 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp +++ b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp @@ -81,7 +81,14 @@ void AWLan::commit( void ) { -bool AWLan::generateDataForCommonFile( - SystemFile & S, - long ) { +short AWLan::generateFileEmbedded( const QString & ID, + const QString & Path, + QTextStream & TS, + long DevNr ) { - S << " wireless_essid \"" + short rvl, rvd; + + rvl = 1; + + if( ID == "interfaces" ) { + Log(("Generate WLanNNI for %s\n", ID.latin1() )); + TS << " wireless_essid \"" << Data.ESSID @@ -95,3 +102,3 @@ bool AWLan::generateDataForCommonFile( Buf[99] = '\0'; // just to make sure - S << " wireless_nick " + TS << " wireless_nick " << Buf @@ -100,3 +107,3 @@ bool AWLan::generateDataForCommonFile( } else { - S << " wireless_nick \"" + TS << " wireless_nick \"" << Data.NodeName @@ -107,6 +114,5 @@ bool AWLan::generateDataForCommonFile( - char * M; + char * M = "Auto"; switch ( Data.Mode ) { case 0 : - M = "Auto"; break; @@ -120,3 +126,3 @@ bool AWLan::generateDataForCommonFile( - S << " wireless_mode " + TS << " wireless_mode " << M @@ -126,3 +132,3 @@ bool AWLan::generateDataForCommonFile( if( ! Data.Key[i].isEmpty() ) { - S << " wireless_key" + TS << " wireless_key" << i @@ -133,3 +139,3 @@ bool AWLan::generateDataForCommonFile( } - S << " wireless_keymode " + TS << " wireless_keymode " << ((Data.AcceptNonEncrypted) ? "open" : "restricted") @@ -137,3 +143,8 @@ bool AWLan::generateDataForCommonFile( } - return 0; + rvl = 0; + } + rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr); + + return (rvd == 2 || rvl == 2 ) ? 2 : + (rvd == 0 || rvl == 0 ) ? 0 : 1; } |