From eb52492e1d6cf88995ed26979e02c75a702a7d33 Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sat, 16 Apr 2011 15:50:18 +0100
Subject: [PATCH] Refactored MooseHelper into generic Link Layer Helper

---
 .../{moose-helper.cc => link-layer-helper.cc} | 29 ++++++++++++-------
 .../{moose-helper.h => link-layer-helper.h}   | 10 +++----
 src/helper/wscript                            |  4 +--
 3 files changed, 25 insertions(+), 18 deletions(-)
 rename src/helper/{moose-helper.cc => link-layer-helper.cc} (90%)
 rename src/helper/{moose-helper.h => link-layer-helper.h} (93%)

diff --git a/src/helper/moose-helper.cc b/src/helper/link-layer-helper.cc
similarity index 90%
rename from src/helper/moose-helper.cc
rename to src/helper/link-layer-helper.cc
index 0cd64a7..c0b6385 100644
--- a/src/helper/moose-helper.cc
+++ b/src/helper/link-layer-helper.cc
@@ -20,18 +20,18 @@
 
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/kruskal_min_spanning_tree.hpp>
-#include "moose-helper.h"
+#include "link-layer-helper.h"
 #include "ns3/moose-prefix-address.h"
 #include "ns3/log.h"
 
 #include <vector>
 #include <algorithm>
 
-NS_LOG_COMPONENT_DEFINE ("MooseHelper");
+NS_LOG_COMPONENT_DEFINE ("LinkLayerHelper");
 
 namespace ns3 {
 
-MooseHelper::MooseHelper(){
+LinkLayerHelper::LinkLayerHelper(){
 	// Sensible defaults.
 
 	// Medium
@@ -51,27 +51,34 @@ MooseHelper::MooseHelper(){
 	routing = true; 	// Simulation based routing
 }
 
-MooseHelper::~MooseHelper(){
+LinkLayerHelper::~LinkLayerHelper(){
 
 }
 
-void MooseHelper::SetMoose(){
-	moose = true;
+bool LinkLayerHelper::SupportsLinkLayer(std::string linkLayer){
+	if(linkLayer == "moose" || linkLayer == "ethernet"){
+		return true;
+	}
+	return false;
 }
 
-void MooseHelper::SetEthernet(){
-	moose = false;
+void LinkLayerHelper::SetLinkLayer(std::string linkLayer){
+	if(linkLayer == "moose"){
+		moose = true;
+	} else if(linkLayer == "ethernet"){
+		moose = false;
+	}
 }
 
-void MooseHelper::EnableDynamicRouting(){
+void LinkLayerHelper::EnableDynamicRouting(){
 	routing = false;
 }	
 
-void MooseHelper::DisableDynamicRouting(){
+void LinkLayerHelper::DisableDynamicRouting(){
 	routing = true;
 }
 
-MooseHelper::Network MooseHelper::Create(Topology& t){
+LinkLayerHelper::Network LinkLayerHelper::Create(Topology& t){
 
 	// Create the bridges and hosts
 
diff --git a/src/helper/moose-helper.h b/src/helper/link-layer-helper.h
similarity index 93%
rename from src/helper/moose-helper.h
rename to src/helper/link-layer-helper.h
index dc72fed..d09d4da 100644
--- a/src/helper/moose-helper.h
+++ b/src/helper/link-layer-helper.h
@@ -44,7 +44,7 @@ namespace ns3 {
  * 
  * \brief Helper to create Ethernet / MOOSE bridged networks
  */
-class MooseHelper {
+class LinkLayerHelper {
 
 public:
 
@@ -77,13 +77,13 @@ public:
 	MooseBridgeHelper mooseHelper;
 	BridgeHelper ethernetHelper;
 
-	MooseHelper();
+	LinkLayerHelper();
 
-	~MooseHelper();
+	~LinkLayerHelper();
 
-	void SetMoose();
+	bool SupportsLinkLayer(std::string linkLayer);
 
-	void SetEthernet();
+	void SetLinkLayer(std::string linkLayer);
 
 	void EnableDynamicRouting();
 
diff --git a/src/helper/wscript b/src/helper/wscript
index 7c410ef..0fb2393 100644
--- a/src/helper/wscript
+++ b/src/helper/wscript
@@ -28,7 +28,7 @@ def build(bld):
         'ipv4-routing-helper.cc',
         'aodv-helper.cc',
         'mesh-helper.cc',
-        'moose-helper.cc',
+        'link-layer-helper.cc',
         'dot11s-installer.cc',
         'flame-installer.cc',
         'athstats-helper.cc',
@@ -79,7 +79,7 @@ def build(bld):
         'ipv4-routing-helper.h',
         'aodv-helper.h',
         'mesh-helper.h',
-        'moose-helper.h',
+        'link-layer-helper.h',
         'mesh-stack-installer.h',
         'dot11s-installer.h',
         'flame-installer.h',
-- 
2.34.1