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 | |||
@@ -76,65 +76,76 @@ QString AWLan::acceptable( void ) { | |||
76 | 76 | ||
77 | void AWLan::commit( void ) { | 77 | void AWLan::commit( void ) { |
78 | if( GUI && GUI->commit( Data ) ) | 78 | if( GUI && GUI->commit( Data ) ) |
79 | setModified( 1 ); | 79 | setModified( 1 ); |
80 | } | 80 | } |
81 | 81 | ||
82 | bool AWLan::generateDataForCommonFile( | 82 | short AWLan::generateFileEmbedded( const QString & ID, |
83 | SystemFile & S, | 83 | const QString & Path, |
84 | long ) { | 84 | QTextStream & TS, |
85 | long DevNr ) { | ||
85 | 86 | ||
86 | S << " wireless_essid \"" | 87 | short rvl, rvd; |
88 | |||
89 | rvl = 1; | ||
90 | |||
91 | if( ID == "interfaces" ) { | ||
92 | Log(("Generate WLanNNI for %s\n", ID.latin1() )); | ||
93 | TS << " wireless_essid \"" | ||
87 | << Data.ESSID | 94 | << Data.ESSID |
88 | << "\"" | 95 | << "\"" |
89 | << endl; | 96 | << endl; |
90 | 97 | ||
91 | if( ! Data.NodeName.isEmpty() ) { | 98 | if( ! Data.NodeName.isEmpty() ) { |
92 | if( Data.NodeName == tr("<UseHostName>") ) { | 99 | if( Data.NodeName == tr("<UseHostName>") ) { |
93 | char Buf[100]; | 100 | char Buf[100]; |
94 | if( gethostname(Buf, sizeof(Buf) ) == 0 ) { | 101 | if( gethostname(Buf, sizeof(Buf) ) == 0 ) { |
95 | Buf[99] = '\0'; // just to make sure | 102 | Buf[99] = '\0'; // just to make sure |
96 | S << " wireless_nick " | 103 | TS << " wireless_nick " |
97 | << Buf | 104 | << Buf |
98 | << endl; | 105 | << endl; |
99 | } | 106 | } |
100 | } else { | 107 | } else { |
101 | S << " wireless_nick \"" | 108 | TS << " wireless_nick \"" |
102 | << Data.NodeName | 109 | << Data.NodeName |
103 | << "\"" | 110 | << "\"" |
104 | << endl; | 111 | << endl; |
105 | } | 112 | } |
106 | } | 113 | } |
107 | 114 | ||
108 | char * M; | 115 | char * M = "Auto"; |
109 | switch ( Data.Mode ) { | 116 | switch ( Data.Mode ) { |
110 | case 0 : | 117 | case 0 : |
111 | M = "Auto"; | ||
112 | break; | 118 | break; |
113 | case 1 : | 119 | case 1 : |
114 | M = "Managed"; | 120 | M = "Managed"; |
115 | break; | 121 | break; |
116 | case 2 : | 122 | case 2 : |
117 | M = "Ad-Hoc"; | 123 | M = "Ad-Hoc"; |
118 | break; | 124 | break; |
119 | } | 125 | } |
120 | 126 | ||
121 | S << " wireless_mode " | 127 | TS << " wireless_mode " |
122 | << M | 128 | << M |
123 | << endl; | 129 | << endl; |
124 | if( Data.Encrypted ) { | 130 | if( Data.Encrypted ) { |
125 | for( int i = 0; i < 4; i ++ ) { | 131 | for( int i = 0; i < 4; i ++ ) { |
126 | if( ! Data.Key[i].isEmpty() ) { | 132 | if( ! Data.Key[i].isEmpty() ) { |
127 | S << " wireless_key" | 133 | TS << " wireless_key" |
128 | << i | 134 | << i |
129 | << " " | 135 | << " " |
130 | << Data.Key[i] | 136 | << Data.Key[i] |
131 | << endl; | 137 | << endl; |
132 | } | 138 | } |
133 | } | 139 | } |
134 | S << " wireless_keymode " | 140 | TS << " wireless_keymode " |
135 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") | 141 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") |
136 | << endl; | 142 | << endl; |
137 | } | 143 | } |
138 | return 0; | 144 | rvl = 0; |
145 | } | ||
146 | rvd = ANetNodeInstance::generateFileEmbedded( ID, Path, TS, DevNr); | ||
147 | |||
148 | return (rvd == 2 || rvl == 2 ) ? 2 : | ||
149 | (rvd == 0 || rvl == 0 ) ? 0 : 1; | ||
139 | } | 150 | } |
140 | 151 | ||