Diffstat (limited to 'noncore/settings/networksettings2/wlan') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NN.cpp | 23 | ||||
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NN.h | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NNI.cpp | 35 | ||||
-rw-r--r-- | noncore/settings/networksettings2/wlan/wlan_NNI.h | 20 |
4 files changed, 33 insertions, 54 deletions
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp index ce8a734..e4c3f60 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp +++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp | |||
@@ -40,25 +40,2 @@ const char * WLanNetNode::provides( void ) { | |||
40 | 40 | ||
41 | bool WLanNetNode::generateProperFilesFor( | ||
42 | ANetNodeInstance * ) { | ||
43 | return 0; | ||
44 | } | ||
45 | |||
46 | bool WLanNetNode::hasDataFor( const QString & S ) { | ||
47 | return S == "interfaces"; | ||
48 | } | ||
49 | |||
50 | bool WLanNetNode::generateDeviceDataForCommonFile( | ||
51 | SystemFile & S, | ||
52 | long DevNr ) { | ||
53 | QString NIC = genNic( DevNr ); | ||
54 | |||
55 | if( S.name() == "interfaces" ) { | ||
56 | // generate mapping stanza for this interface | ||
57 | S << "# check if " << NIC << " can be brought UP" << endl; | ||
58 | S << "mapping " << NIC << endl; | ||
59 | S << " script networksettings2-request" << endl << endl; | ||
60 | } | ||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | QString WLanNetNode::genNic( long nr ) { | 41 | QString WLanNetNode::genNic( long nr ) { |
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h index b5ff3fd..c13c05c 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NN.h +++ b/noncore/settings/networksettings2/wlan/wlan_NN.h | |||
@@ -20,5 +20,3 @@ public: | |||
20 | virtual const QString nodeDescription() ; | 20 | virtual const QString nodeDescription() ; |
21 | |||
22 | virtual ANetNodeInstance * createInstance( void ); | 21 | virtual ANetNodeInstance * createInstance( void ); |
23 | |||
24 | virtual const char ** needs( void ); | 22 | virtual const char ** needs( void ); |
@@ -26,11 +24,4 @@ public: | |||
26 | 24 | ||
27 | virtual bool generateProperFilesFor( ANetNodeInstance * NNI ); | ||
28 | |||
29 | virtual bool hasDataFor( const QString & S ); | ||
30 | virtual bool generateDeviceDataForCommonFile( | ||
31 | SystemFile & SF, long DevNr ); | ||
32 | |||
33 | virtual long instanceCount( void ) | 25 | virtual long instanceCount( void ) |
34 | { return InstanceCount; } | 26 | { return InstanceCount; } |
35 | |||
36 | virtual QString genNic( long ); | 27 | virtual QString genNic( long ); |
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 ) { | |||
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 |
@@ -95,3 +102,3 @@ bool AWLan::generateDataForCommonFile( | |||
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 |
@@ -100,3 +107,3 @@ bool AWLan::generateDataForCommonFile( | |||
100 | } else { | 107 | } else { |
101 | S << " wireless_nick \"" | 108 | TS << " wireless_nick \"" |
102 | << Data.NodeName | 109 | << Data.NodeName |
@@ -107,6 +114,5 @@ bool AWLan::generateDataForCommonFile( | |||
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; |
@@ -120,3 +126,3 @@ bool AWLan::generateDataForCommonFile( | |||
120 | 126 | ||
121 | S << " wireless_mode " | 127 | TS << " wireless_mode " |
122 | << M | 128 | << M |
@@ -126,3 +132,3 @@ bool AWLan::generateDataForCommonFile( | |||
126 | if( ! Data.Key[i].isEmpty() ) { | 132 | if( ! Data.Key[i].isEmpty() ) { |
127 | S << " wireless_key" | 133 | TS << " wireless_key" |
128 | << i | 134 | << i |
@@ -133,3 +139,3 @@ bool AWLan::generateDataForCommonFile( | |||
133 | } | 139 | } |
134 | S << " wireless_keymode " | 140 | TS << " wireless_keymode " |
135 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") | 141 | << ((Data.AcceptNonEncrypted) ? "open" : "restricted") |
@@ -137,3 +143,8 @@ bool AWLan::generateDataForCommonFile( | |||
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 | } |
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.h b/noncore/settings/networksettings2/wlan/wlan_NNI.h index 2211c47..a9be65f 100644 --- a/noncore/settings/networksettings2/wlan/wlan_NNI.h +++ b/noncore/settings/networksettings2/wlan/wlan_NNI.h | |||
@@ -16,2 +16,7 @@ public : | |||
16 | 16 | ||
17 | RuntimeInfo * runtime( void ) | ||
18 | { return | ||
19 | ( RT ) ? RT : ( RT = new WLanRun( this, Data ) ); | ||
20 | } | ||
21 | |||
17 | QWidget * edit( QWidget * parent ); | 22 | QWidget * edit( QWidget * parent ); |
@@ -20,8 +25,2 @@ public : | |||
20 | 25 | ||
21 | RuntimeInfo * runtime( void ) | ||
22 | { if( RT == 0 ) | ||
23 | RT = new WLanRun( this, Data ); | ||
24 | return RT; | ||
25 | } | ||
26 | |||
27 | virtual void * data( void ) | 26 | virtual void * data( void ) |
@@ -29,6 +28,7 @@ public : | |||
29 | 28 | ||
30 | virtual bool hasDataFor( const QString & ) | 29 | virtual short generateFileEmbedded( const QString & ID, |
31 | { return 1; } | 30 | const QString & Path, |
32 | virtual bool generateDataForCommonFile( | 31 | QTextStream & TS, |
33 | SystemFile & SF, long DevNr ); | 32 | long DevNr ); |
33 | |||
34 | protected : | 34 | protected : |