Error in generation of files

5 files changed, 31 insertions, 6 deletions

diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 5a26e41..e1e20c0 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -44,4 +44,4 @@ bool WLanNetNode::generateProperFilesFor(
 
-bool WLanNetNode::hasDataFor( const QString & ) {
-      return 0;
+bool WLanNetNode::hasDataFor( const QString & S, bool DS ) {
+      return DS && S == "interfaces";
 }
@@ -49,4 +49,4 @@ bool WLanNetNode::hasDataFor( const QString & ) {
 bool WLanNetNode::generateDataForCommonFile( 
-                                SystemFile & , 
-                                long,
+                                SystemFile &, 
+                                long ,
                                 ANetNodeInstance * ) {
@@ -55,2 +55,9 @@ bool WLanNetNode::generateDataForCommonFile(
 
+bool WLanNetNode::generateDeviceDataForCommonFile( 
+                                SystemFile & S, 
+                                long DevNr,
+                                ANetNodeInstance * NNI ) {
+      return ((AWLan *)NNI)->generateDeviceDataForCommonFile(S, DevNr);
+}
+
 extern "C" {
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.h b/noncore/settings/networksettings2/wlan/wlan_NN.h
index 0728a79..9111995 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.h
@@ -30,5 +30,7 @@ public:
     virtual bool generateProperFilesFor( ANetNodeInstance * NNI );
-    virtual bool hasDataFor( const QString & S );
+    virtual bool hasDataFor( const QString & S, bool DS );
     virtual bool generateDataForCommonFile( 
         SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
+    virtual bool generateDeviceDataForCommonFile( 
+        SystemFile & SF, long DevNr, ANetNodeInstance * NNI );
 
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
index 92f3457..8b948e0 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.cpp
@@ -30 +30,13 @@ void AWLan::commit( void ) {
 
+bool AWLan::generateDeviceDataForCommonFile( SystemFile & S, long DevNr ) {
+    AsDevice * Dev = runtime()->device();
+    QString NIC = Dev->genNic( DevNr );
+
+    if( S.name() == "interfaces" ) {
+      // generate mapping stanza for this interface
+      S << "# check if " << NIC << " can be brought UP" << endl;
+      S << "mapping " << NIC << endl;
+      S << "  script networksettings2-request" << endl << endl;
+    }
+    return 0;
+}
diff --git a/noncore/settings/networksettings2/wlan/wlan_NNI.h b/noncore/settings/networksettings2/wlan/wlan_NNI.h
index 8b695b5..e464c84 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NNI.h
+++ b/noncore/settings/networksettings2/wlan/wlan_NNI.h
@@ -29,2 +29,4 @@ public :
 
+      bool generateDeviceDataForCommonFile( SystemFile & S, long DevNr );
+
 protected :
diff --git a/noncore/settings/networksettings2/wlan/wlanrun.h b/noncore/settings/networksettings2/wlan/wlanrun.h
index 4cbb059..b853262 100644
--- a/noncore/settings/networksettings2/wlan/wlanrun.h
+++ b/noncore/settings/networksettings2/wlan/wlanrun.h
@@ -21,3 +21,5 @@ public :
       virtual AsDevice * device( void ) 
-        { return asDevice(); }
+        { return (AsDevice *)this; }
+      virtual AsDevice * asDevice( void ) 
+        { return (AsDevice *)this; }