author | wimpie <wimpie> | 2004-08-12 12:46:55 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-08-12 12:46:55 (UTC) |
commit | 8f215ba9ceb395f262517855a99d7d2d303ca760 (patch) (unidiff) | |
tree | aa5f9b14c249217b4d3fc30f4771bdaf1c3545d3 /noncore/settings/networksettings2/wlan/wlan_NNI.cpp | |
parent | ef64880308b5035cc8ca2e4e79325db613af525b (diff) | |
download | opie-8f215ba9ceb395f262517855a99d7d2d303ca760.zip opie-8f215ba9ceb395f262517855a99d7d2d303ca760.tar.gz opie-8f215ba9ceb395f262517855a99d7d2d303ca760.tar.bz2 |
MANY changes
- now generates peers/pap-chap secrets files
(no chatscript yet)
(not all usefull ppp options included yet)
- still not ready for prime time yet
Diffstat (limited to 'noncore/settings/networksettings2/wlan/wlan_NNI.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NNI.cpp | 107 |
1 files changed, 59 insertions, 48 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 | |||
@@ -80,61 +80,72 @@ void AWLan::commit( void ) { | |||
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; |
87 | << Data.ESSID | ||
88 | << "\"" | ||
89 | << endl; | ||
90 | 88 | ||
91 | if( ! Data.NodeName.isEmpty() ) { | 89 | rvl = 1; |
92 | if( Data.NodeName == tr("<UseHostName>") ) { | 90 | |
93 | char Buf[100]; | 91 | if( ID == "interfaces" ) { |
94 | if( gethostname(Buf, sizeof(Buf) ) == 0 ) { | 92 | Log(("Generate WLanNNI for %s\n", ID.latin1() )); |
95 | Buf[99] = '\0'; // just to make sure | 93 | TS << " wireless_essid \"" |
96 | S << " wireless_nick " | 94 | << Data.ESSID |
97 | << Buf | 95 | << "\"" |
98 | << endl; | 96 | << endl; |
97 | |||
98 | if( ! Data.NodeName.isEmpty() ) { | ||
99 | if( Data.NodeName == tr("<UseHostName>") ) { | ||
100 | char Buf[100]; | ||
101 | if( gethostname(Buf, sizeof(Buf) ) == 0 ) { | ||
102 | Buf[99] = '\0'; // just to make sure | ||
103 | TS << " wireless_nick " | ||
104 | << Buf | ||
105 | << endl; | ||
106 | } | ||
107 | } else { | ||
108 | TS << " wireless_nick \"" | ||
109 | << Data.NodeName | ||
110 | << "\"" | ||
111 | << endl; | ||
99 | } | 112 | } |
100 | } else { | ||
101 | S << " wireless_nick \"" | ||
102 | << Data.NodeName | ||
103 | << "\"" | ||
104 | << endl; | ||
105 | } | 113 | } |
106 | } | ||
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"; | 118 | break; |
112 | break; | 119 | case 1 : |
113 | case 1 : | 120 | M = "Managed"; |
114 | M = "Managed"; | 121 | break; |
115 | break; | 122 | case 2 : |
116 | case 2 : | 123 | M = "Ad-Hoc"; |
117 | M = "Ad-Hoc"; | 124 | break; |
118 | break; | 125 | } |
119 | } | ||
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; |
138 | } | ||
132 | } | 139 | } |
140 | TS << " wireless_keymode " | ||
141 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") | ||
142 | << endl; | ||
133 | } | 143 | } |
134 | S << " wireless_keymode " | 144 | rvl = 0; |
135 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") | ||
136 | << endl; | ||
137 | } | 145 | } |
138 | return 0; | 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 | ||