merge with inet-framework, integration

aarizaq · Jun 22, 2012 · 929f824 · 929f824
1 parent 3db1a92
commit 929f824
Show file tree

Hide file tree

Showing 133 changed files with 10,554 additions and 6,142 deletions.
diff --git a/.oppfeatures b/.oppfeatures
@@ -229,6 +229,34 @@
         compileFlags = ""
         linkerFlags = ""
         />
+    <feature
+        id="DHCP"
+        name="DHCP"
+        description = "DHCP protocol that can be installed as an UDP application"
+        initiallyEnabled = "true"
+        requires = "UDP"
+        labels = "protocols dhcp"
+        nedPackages = "
+                       inet.applications.dhcp
+                      "
+        extraSourceFolders = ""
+        compileFlags = "-DWITH_DHCP"
+        linkerFlags = ""
+        />
+    <feature
+        id="DHCP_examples"
+        name="DHCP examples"
+        description = "DHCP examples"
+        initiallyEnabled = "true"
+        requires = "DHCP"
+        labels = ""
+        nedPackages = "
+                       inet.examples.dhcp
+                      "
+        extraSourceFolders = ""
+        compileFlags = ""
+        linkerFlags = ""
+        />
     <feature
         id="Ethernet"
         name="Ethernet"
@@ -450,30 +478,45 @@
         linkerFlags = ""
         />
     <feature
-        id="radio"
-        name="Radio"
-        description = "Radio support for wireless simulations"
-        requires = ""
+        id="traci"
+        name="TraCI"
+        description = "Integraion modules for TraCI"
+        initiallyEnabled = "true"
+        requires = "IPv4 mobility"
         labels = ""
         nedPackages = "
-                       inet.battery.models
-                       inet.linklayer.radio
-                       inet.world.radio
+                       inet.applications.traci
+                       inet.world.traci
                       "
         extraSourceFolders = ""
-        compileFlags = ""
+        compileFlags = "-DWITH_TRACI"
         linkerFlags = ""
         />
     <feature
-        id="MF80211"
-        name="802.11b (Mobility Framework)"
-        description = "IEEE 802.11b ad-hoc mode wireless NIC from the Mobility Framework 1.x"
+        id="traci_examples"
+        name="TraCI Examples"
+        description = "Simple examples for TraCI modules"
         initiallyEnabled = "true"
-        requires = "IPv4 mobility radio"
-        labels = "nic wireless"
+        requires = "traci radio Ieee80211 UDP"
+        labels = ""
         nedPackages = "
-                       inet.linklayer.mf80211
-                       inet.nodes.mf80211
+                       inet.examples.traci
+                       inet.examples.traci_launchd
+                      "
+        extraSourceFolders = ""
+        compileFlags = ""
+        linkerFlags = ""
+        />
+    <feature
+        id="radio"
+        name="Radio"
+        description = "Radio support for wireless simulations"
+        requires = ""
+        labels = ""
+        nedPackages = "
+                       inet.battery.models
+                       inet.linklayer.radio
+                       inet.world.radio
                       "
         extraSourceFolders = ""
         compileFlags = ""
@@ -498,7 +541,7 @@
         name="wireless examples"
         description = "wireless examples"
         initiallyEnabled = "true"
-        requires = "TCP_INET UDP IPv4 Ethernet Ieee80211 MF80211"
+        requires = "TCP_INET UDP IPv4 Ethernet Ieee80211"
         labels = "nic wireless"
         nedPackages = "
                        inet.examples.adhoc
@@ -535,7 +578,7 @@
         extraSourceFolders = ""
         compileFlags = ""
         linkerFlags = ""
-        />  
+        />
     <feature
         id="HttpTools"
         name="HttpTools"
@@ -568,7 +611,7 @@
         compileFlags = ""
         linkerFlags = ""
         />
-      <feature
+    <feature
         id="HttpTools_examples_socket"
         name="HttpTools examples with socket mode"
         description = "HttpTools examples that include the simulation of TCP and lower layers as well"
@@ -581,7 +624,7 @@
         extraSourceFolders = ""
         compileFlags = ""
         linkerFlags = ""
-        />   
+        />
     <feature
         id="DiffServ"
         name="DiffServ"
@@ -689,35 +732,6 @@
         compileFlags = ""
         linkerFlags = ""
         />
-
-    <feature
-        id="DHCP"
-        name="IPv4 DHCP"
-        description = "DHCP protocol"
-        initiallyEnabled = "true"
-        requires = "UDP IPv4 Ethernet Ieee80211"
-        labels = ""
-        nedPackages = "
-                       inet.applications.dhcp
-                      "
-        extraSourceFolders = ""
-        compileFlags = "-DWITH_DHCP"
-        linkerFlags = ""
-        />
-    <feature
-        id="DHCP_examples"
-        name="DHCP examples"
-        description = "DHCP examples"
-        initiallyEnabled = "true"
-        requires = "DHCP"
-        labels = ""
-        nedPackages = "
-                       inet.examples.dhcp
-                      "
-        extraSourceFolders = ""
-        compileFlags = ""
-        linkerFlags = ""
-        />
     <feature
         id="HIP"
         name="Host Identity Protocol"
@@ -746,7 +760,7 @@
                        inet.linklayer.ieee80211mesh
                       "
         extraSourceFolders = ""
-        compileFlags = ""
+        compileFlags = "-DWITH_80211MESH"
         linkerFlags = ""
         />
 </features>