From 4c4cdd76caea5a8be4a971892375c7c6b4f4a8b9 Mon Sep 17 00:00:00 2001
From: wimpie <wimpie>
Date: Tue, 11 Jan 2005 15:35:46 +0000
Subject: vpn should now work IF only the vpn plugin would do something.

shortened logical interface names (busybox only supports 10 characters
and then ONLY if you recompile it with mappings enabled)

Other small fixes
---
(limited to 'noncore/settings/networksettings2/network')

diff --git a/noncore/settings/networksettings2/network/network_NNI.cpp b/noncore/settings/networksettings2/network/network_NNI.cpp
index 78e6545..34dac54 100644
--- a/noncore/settings/networksettings2/network/network_NNI.cpp
+++ b/noncore/settings/networksettings2/network/network_NNI.cpp
@@ -116,10 +116,10 @@ short ANetwork::generateFile( SystemFile &SF,
       // we can safely call from here since device item is deeper
       if( Data.UseDHCP ) {
         SF << "iface " 
-           << NIC 
-           << "-c" 
+           << "A" 
            << connection()->number() 
-           << "-allowed inet dhcp" 
+           << NIC 
+           << " inet dhcp" 
            << endl;
         SF << "  up echo \"" 
            << NIC 
@@ -139,9 +139,10 @@ short ANetwork::generateFile( SystemFile &SF,
            << endl;
       } else {
         SF << "iface " 
-           << NIC << "-c" 
+           << "A" 
            << connection()->number() 
-           << "-allowed inet static" 
+           << NIC 
+           << " inet static" 
            << endl;
         SF << "  up echo \"" 
            << NIC 
diff --git a/noncore/settings/networksettings2/network/networkrun.cpp b/noncore/settings/networksettings2/network/networkrun.cpp
index 2c93d9d..74467ad 100644
--- a/noncore/settings/networksettings2/network/networkrun.cpp
+++ b/noncore/settings/networksettings2/network/networkrun.cpp
@@ -6,7 +6,7 @@
 State_t NetworkRun::detectState( void ) { 
     InterfaceInfo * II = nodeCollection()->assignedInterface();
 
-    Log(( "Interface %p : %d\n", II, (II) ? II->IsUp : 0 ));
+    Log(( "Interface %p %p : %d\n", II, nodeCollection(), (II) ? II->IsUp : 0 ));
     if( II && II->IsUp ) {
       // device has assigned interface
       return IsUp;
@@ -38,9 +38,10 @@ QString NetworkRun::setMyState( NodeCollection * NC, Action_t A, bool ) {
       return QString();
     }
 
-    SL << QString().sprintf( "%s=%s-c%d-allowed",
-                        II->Name.latin1(), II->Name.latin1(),
-                        nodeCollection()->number() );
+    SL << QString().sprintf( "%s=A%ld%s",
+                        II->Name.latin1(), 
+                        nodeCollection()->number(),
+                        II->Name.latin1() );
 
     if( ! NSResources->system().runAsRoot( SL ) ) {
       return QString("Cannot call %1").arg(SL.join(" "));
--
cgit v0.9.0.2