[fwbuilder-commits] r1989 - in branches/v3_1: . src/compiler_lib src/gui

[<va...@in...>]

Author: vadim
Date: 2009-11-30 18:32:58 -0800 (Mon, 30 Nov 2009)
New Revision: 1989

Modified:
   branches/v3_1/build_num
   branches/v3_1/src/compiler_lib/interfaceProperties.cpp
   branches/v3_1/src/gui/ClusterInterfaceWidget.cpp
   branches/v3_1/src/gui/FirewallSelectorWidget.cpp
Log:
fixes #759  - create loopback interface for a new cluster

Modified: branches/v3_1/build_num
===================================================================
--- branches/v3_1/build_num	2009-12-01 02:27:32 UTC (rev 1988)
+++ branches/v3_1/build_num	2009-12-01 02:32:58 UTC (rev 1989)
@@ -1 +1 @@
-#define BUILD_NUM 1987
+#define BUILD_NUM 1988

Modified: branches/v3_1/src/compiler_lib/interfaceProperties.cpp
===================================================================
--- branches/v3_1/src/compiler_lib/interfaceProperties.cpp	2009-12-01 02:27:32 UTC (rev 1988)
+++ branches/v3_1/src/compiler_lib/interfaceProperties.cpp	2009-12-01 02:32:58 UTC (rev 1989)
@@ -395,7 +395,7 @@
     string interface_type = intf->getOptionsObject()->getStr("type");
 
     if (intf->isBridgePort()) return false;
-    if (intf->isLoopback()) return false;
+    //if (intf->isLoopback()) return false;
 
     if (interface_type.empty()) interface_type = "ethernet";
     if (interface_type == "8021q") return true;

Modified: branches/v3_1/src/gui/ClusterInterfaceWidget.cpp
===================================================================
--- branches/v3_1/src/gui/ClusterInterfaceWidget.cpp	2009-12-01 02:27:32 UTC (rev 1988)
+++ branches/v3_1/src/gui/ClusterInterfaceWidget.cpp	2009-12-01 02:32:58 UTC (rev 1989)
@@ -84,7 +84,7 @@
         for ( ; iter != iter.end() ; ++iter )
         {
             Interface *iface = Interface::cast(*iter);
-            if (iface->isLoopback()) continue;
+            //if (iface->isLoopback()) continue;
             QTreeWidgetItem *ifaceitem = new QTreeWidgetItem(firewall, QStringList() << QString::fromUtf8(iface->getName().c_str()));
             ifaceitem->setData(0, Qt::UserRole, qVariantFromValue(iface));//QVariant(QVariant::UserType, iface));
             ifaceitem->setIcon(0, QIcon(":/Icons/Interface/icon-tree"));
@@ -97,7 +97,7 @@
             FWObjectTypedChildIterator iter2 = iface->findByType(Interface::TYPENAME);
             for ( ; iter2 != iter2.end() ; ++iter2 )
             {
-                if (iface->isLoopback()) return;
+                //if (iface->isLoopback()) return;
                 Interface *subiface = Interface::cast(*iter2);
                 QTreeWidgetItem *subitem = new QTreeWidgetItem(ifaceitem, QStringList() << QString::fromUtf8(subiface->getName().c_str()));
                 subitem->setData(0, Qt::UserRole, qVariantFromValue(subiface));//QVariant(QVariant::UserType, subitem));

Modified: branches/v3_1/src/gui/FirewallSelectorWidget.cpp
===================================================================
--- branches/v3_1/src/gui/FirewallSelectorWidget.cpp	2009-12-01 02:27:32 UTC (rev 1988)
+++ branches/v3_1/src/gui/FirewallSelectorWidget.cpp	2009-12-01 02:32:58 UTC (rev 1989)
@@ -161,7 +161,7 @@
         FWObjectTypedChildIterator intrs =  fws.first().first->findByType(Interface::TYPENAME);
         for ( ; intrs!=intrs.end(); ++intrs )
         {
-            if (Interface::cast(*intrs)->isLoopback()) continue;
+            //if (Interface::cast(*intrs)->isLoopback()) continue;
             string name = Interface::cast(*intrs)->getName();
             int got = 0;
             for ( int j = 0; j < fws.count(); j++)