Skip to content

Commit

Permalink
Merge with inet
Browse files Browse the repository at this point in the history
  • Loading branch information
aarizaq committed Jun 6, 2014
1 parent 4db20b5 commit dbc06ba
Show file tree
Hide file tree
Showing 101 changed files with 4,226 additions and 272 deletions.
36 changes: 34 additions & 2 deletions .cproject
Expand Up @@ -49,6 +49,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.529631020" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -74,6 +78,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.541669033" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -115,6 +123,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.164668854" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -140,6 +152,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1205441703" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand All @@ -151,7 +167,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="underTest/Ieee80211|underTest/wimax|underTest/_4gsim|underTest/hip|underTest/ieee8021d|applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry excluding="underTest/ieee8021d|underTest/Ieee80211|underTest/wimax|underTest/_4gsim|underTest/hip|applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down Expand Up @@ -200,6 +216,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1288707802" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -225,6 +245,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1382867862" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -266,6 +290,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.803078146" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand All @@ -291,6 +319,10 @@
<listOptionValue builtIn="false" value="WITH_80215"/>
<listOptionValue builtIn="false" value="WITH_BMAC"/>
<listOptionValue builtIn="false" value="WITH_80211MESH"/>
<listOptionValue builtIn="false" value="WITH_AODV"/>
<listOptionValue builtIn="false" value="WITH_RIP"/>
<listOptionValue builtIn="false" value="WITH_RADIO"/>
<listOptionValue builtIn="false" value="WITH_IEEE80211"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1633345790" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand All @@ -302,7 +334,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="underTest/Ieee80211|underTest/wimax|underTest/_4gsim|underTest/hip|underTest/ieee8021d|applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
<entry excluding="underTest/ieee8021d|underTest/Ieee80211|underTest/wimax|underTest/_4gsim|underTest/hip|applications/voipstream|transport/tcp_nsc|transport/tcp_lwip" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down
25 changes: 20 additions & 5 deletions .oppfeatures
Expand Up @@ -206,7 +206,7 @@
name="SCTP"
description = "SCTP Protocol support"
initiallyEnabled = "true"
requires = "IPv4"
requires = "IPv4 IPv6"
labels = ""
nedPackages = "
inet.applications.sctpapp
Expand Down Expand Up @@ -438,6 +438,21 @@
compileFlags = ""
linkerFlags = ""
/>
<feature
id="AODV"
name="AODV"
description = "Ad hoc On-Demand Distance Vector (AODV) Routing"
initiallyEnabled = "true"
requires = "UDP IPv4 Ieee80211"
labels = "routing"
nedPackages = "
inet.networklayer.routing.aodv
inet.nodes.aodv
"
extraSourceFolders = ""
compileFlags = "-DWITH_AODV"
linkerFlags = ""
/>
<feature
id="GPSR"
name="GPSR"
Expand Down Expand Up @@ -465,7 +480,7 @@
inet.nodes.rip
"
extraSourceFolders = ""
compileFlags = ""
compileFlags = "-DWITH_RIP"
linkerFlags = ""
/>
<feature
Expand Down Expand Up @@ -583,7 +598,7 @@
inet.world.radio
"
extraSourceFolders = ""
compileFlags = ""
compileFlags = "-DWITH_RADIO"
linkerFlags = ""
/>
<feature
Expand All @@ -598,7 +613,7 @@
inet.nodes.wireless
"
extraSourceFolders = ""
compileFlags = ""
compileFlags = "-DWITH_IEEE80211"
linkerFlags = ""
/>
<feature
Expand Down Expand Up @@ -637,7 +652,7 @@
<feature
id="VoIPStream"
name="VoIPStream"
description = "Voice over IP tool. Required external libraries: libavcodec, libavformat libavutil"
description = "Voice over IP tool. Required external libraries: libavcodec libavformat libavresample libavutil"
initiallyEnabled = "false"
requires = "UDP"
labels = ""
Expand Down
59 changes: 59 additions & 0 deletions examples/aodv/AODVNetwork.ned
@@ -0,0 +1,59 @@
//
// Copyright (C) 2014 OpenSim Ltd.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see http://www.gnu.org/licenses/.
//

package inet.examples.aodv;

import inet.base.LifecycleController;
import inet.networklayer.autorouting.ipv4.IPv4NetworkConfigurator;
import inet.networklayer.ipv4.RoutingTableRecorder;
import inet.nodes.aodv.AODVRouter;
import inet.world.radio.IdealChannelModel;
import inet.world.scenario.ScenarioManager;

network AODVNetwork
{
parameters:
int numHosts;
submodules:
channelControl: IdealChannelModel {
parameters:
@display("p=50,50");
}
configurator: IPv4NetworkConfigurator {
parameters:
config = xml("<config><interface hosts='*' address='145.236.x.x' netmask='255.255.0.0'/></config>");
@display("p=50,100");
}
routingTableRecorder: RoutingTableRecorder {
parameters:
@display("p=50,150");
}
lifecycleController: LifecycleController {
parameters:
@display("p=50,200");
}
scenarioManager: ScenarioManager {
parameters:
script = default(xml("<scenario/>"));
@display("p=50,250");
}
host[numHosts]: AODVRouter {
parameters:
@display("i=device/pocketpc_s;r=,,#707070");
}
connections allowunconnected:
}

0 comments on commit dbc06ba

Please sign in to comment.