From e1cfd397869b4f4647af468212db71119030c254 Mon Sep 17 00:00:00 2001
From: "Srivats P." <pstavirs@gmail.com>
Date: Thu, 20 Mar 2014 06:35:40 +0530
Subject: [PATCH] NOX: SVLAN - Separated protocol and widget as per new
 framework

---
 common/ostproto.pro              |  4 ++--
 common/ostprotogui.pro           |  1 +
 common/protocolmanager.cpp       |  7 ++++---
 common/protocolwidgetfactory.cpp |  4 ++++
 common/svlan.cpp                 |  2 --
 common/svlanconfig.h             | 28 ++++++++++++++++++++++++++++
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 common/svlanconfig.h

diff --git a/common/ostproto.pro b/common/ostproto.pro
index deb3b12..331ebb2 100644
--- a/common/ostproto.pro
+++ b/common/ostproto.pro
@@ -49,6 +49,7 @@ HEADERS += \
     payload.h \
     dot3.h \
     vlan.h \
+    svlan.h \
     eth2.h \
     ip6.h
 
@@ -57,7 +58,6 @@ HEADERS1 += \
     snap.h \
     dot2llc.h \
     dot2snap.h \
-    svlan.h \
     vlanstack.h \
     arp.h \
     ip4.h \
@@ -90,6 +90,7 @@ SOURCES += \
     mac.cpp \
     payload.cpp \
     vlan.cpp \
+    svlan.cpp \
     dot3.cpp \
     eth2.cpp \
     ip6.cpp 
@@ -97,7 +98,6 @@ SOURCES += \
 SOURCES1 += \
     llc.cpp \
     snap.cpp \
-    svlan.cpp \
     arp.cpp \
     ip4.cpp \
     icmp.cpp \
diff --git a/common/ostprotogui.pro b/common/ostprotogui.pro
index f72f14f..b922dfe 100644
--- a/common/ostprotogui.pro
+++ b/common/ostprotogui.pro
@@ -49,6 +49,7 @@ HEADERS += \
     macconfig.h \ 
     payloadconfig.h \
     vlanconfig.h \
+    svlanconfig.h \
     dot3config.h \
     eth2config.h \
     ip6config.h   
diff --git a/common/protocolmanager.cpp b/common/protocolmanager.cpp
index aaeecb2..6a2f4de 100644
--- a/common/protocolmanager.cpp
+++ b/common/protocolmanager.cpp
@@ -46,7 +46,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 #include "mac.h"
 #include "payload.h"
 #include "dot3.h"    
-#include "vlan.h"    
+#include "vlan.h"
+#include "svlan.h"
 #include "eth2.h"    
 #include "ip6.h"
 #endif
@@ -68,8 +69,6 @@ ProtocolManager::ProtocolManager()
     registerProtocol(OstProto::Protocol::kDot2SnapFieldNumber,
             (void*) Dot2SnapProtocol::createInstance);
 
-    registerProtocol(OstProto::Protocol::kSvlanFieldNumber,
-            (void*) SVlanProtocol::createInstance);
     registerProtocol(OstProto::Protocol::kVlanStackFieldNumber,
             (void*) VlanStackProtocol::createInstance);
 
@@ -117,6 +116,8 @@ ProtocolManager::ProtocolManager()
 
     registerProtocol(OstProto::Protocol::kVlanFieldNumber,
             (void*) VlanProtocol::createInstance);
+    registerProtocol(OstProto::Protocol::kSvlanFieldNumber,
+            (void*) SVlanProtocol::createInstance);
 
     registerProtocol(OstProto::Protocol::kEth2FieldNumber,
             (void*) Eth2Protocol::createInstance);
diff --git a/common/protocolwidgetfactory.cpp b/common/protocolwidgetfactory.cpp
index 7a330f1..6203dc8 100644
--- a/common/protocolwidgetfactory.cpp
+++ b/common/protocolwidgetfactory.cpp
@@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 #include "payloadconfig.h"
 #include "dot3config.h"
 #include "vlanconfig.h"
+#include "svlanconfig.h"
 #include "eth2config.h"
 #include "ip6config.h"
 
@@ -49,6 +50,9 @@ ProtocolWidgetFactory::ProtocolWidgetFactory()
     OstProtocolWidgetFactory->registerProtocolConfigWidget(
             OstProto::Protocol::kVlanFieldNumber, 
             (void*) VlanConfigForm::createInstance);
+    OstProtocolWidgetFactory->registerProtocolConfigWidget(
+            OstProto::Protocol::kSvlanFieldNumber, 
+            (void*) SVlanConfigForm::createInstance);
 
     OstProtocolWidgetFactory->registerProtocolConfigWidget(
             OstProto::Protocol::kEth2FieldNumber, 
diff --git a/common/svlan.cpp b/common/svlan.cpp
index 893671d..9b5f65b 100644
--- a/common/svlan.cpp
+++ b/common/svlan.cpp
@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
 
-#include <qendian.h>
-
 #include "svlan.h"
 #include "svlan.pb.h"
 
diff --git a/common/svlanconfig.h b/common/svlanconfig.h
new file mode 100644
index 0000000..e5bd578
--- /dev/null
+++ b/common/svlanconfig.h
@@ -0,0 +1,28 @@
+/*
+Copyright (C) 2014 Srivats P.
+
+This file is part of "Ostinato"
+
+This is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+
+#ifndef _SVLAN_CONFIG_H
+#define _SVLAN_CONFIG_H
+
+#include "vlanconfig.h"
+
+typedef VlanConfigForm SVlanConfigForm;
+
+#endif
+