Dsr changes

examples/manetrouting/grid_aodv/omnetppT.ini

@@ -0,0 +1,250 @@
+[General]
+#debug-on-errors = true
+sim-time-limit = 1500s
+seed-0-mt = 5
+num-rngs = 2
+network = MobileGrid
+
+cmdenv-express-mode = true
+tkenv-plugin-path = ../../../etc/plugins
+#tkenv-default-run=1
+
+description = "Aodv Simple test"
+
+**.vector-recording = false
+cmdenv-express-mode = true
+
+*.numHosts = 30
+*.nodeSeparation = 150
+**.constraintAreaMinX = 0m
+**.constraintAreaMinY = 0m
+**.constraintAreaMinZ = 0m
+**.constraintAreaMaxX = 1000m
+**.constraintAreaMaxY = 1000m
+**.constraintAreaMaxZ = 0m
+
+**.channelNumber = 0
+**.numberOfChannels = 1
+**.debug = true
+**.coreDebug = false
+
+# channel physical parameters
+*.channelControl.carrierFrequency = 2.4GHz
+*.channelControl.pMax = 2.0mW
+*.channelControl.sat = -110dBm
+*.channelControl.alpha = 2
+*.channelControl.numChannels = 1
+
+# udp apps (on)
+**.host[*].numUdpApps=1
+**.host[*].udpApp[0].typename="UDPBasicBurst"
+
+**.host[0..29].udpApp[0].destAddresses = moduleListByPath("**.host[*]")
+**.host[*].udpApp[0].destAddresses=""
+
+**.udpApp[0].localPort = 1234
+**.udpApp[0].destPort = 1234
+**.udpApp[0].messageLength = 512B # Bytes
+**.udpApp[0].sendInterval = 1s + uniform(-0.001s,0.001s,1)
+**.udpApp[0].burstDuration = 0s #uniform(1s,4s,1)
+**.udpApp[0].sleepDuration = 0s
+**.udpApp[0].chooseDestAddrMode = "perSend"
+**.udpApp[0].startTime = uniform(1s,60s,1)
+**.udpApp[0].delayLimit =20s
+**.udpApp[0].destAddrRNG = 1
+
+
+#**.host*.mobilityType = "StationaryMobility"
+#**.mobility.initFromDisplayString = false
+#**.host*.mobility.updateInterval = 0.1s
+#**.host*.mobility.scrollX = 50
+#**.host*.mobility.scrollY = 50
+#**.host*.mobility.nodeId = -1
+
+#**.host*.mobilityType = "MassMobility"
+#**.mobility.initFromDisplayString = false
+#**.host*.mobility.updateInterval = 0.1s
+#**.mobility.changeInterval = 5s
+#**.mobility.changeAngleBy = normal(0deg, 30deg)
+#**.mobility.speed = 50mps
+
+
+## ...........................................##
+#     random way point mobility                #
+##............................................##
+**.mobilityType = "RandomWPMobility"
+**.mobility.speed =3mps#${speed=2mps,3mps,4mps}#${speed=1mps,2mps,3mps,4mps}
+**.mobility.waitTime = uniform (1s,10s)#${waitTime=50s,100s}
+**.mobility.updateInterval = 0.1s
+**.mobility.initFromDisplayString = false
+
+**.globalARP = true
+
+# ip settings
+**.routingFile=""
+**.ip.procDelay=10us
+# **.IPForward=false
+
+# ARP configuration
+**.networkLayer.proxyARP = true  # Host's is hardwired "false"
+**.arp.cacheTimeout = 100s
+
+# nic settings
+**.wlan[*].bitrate = 54Mbps
+**.wlan[*].opMode = "g"
+
+**.wlan[*].mgmt.frameCapacity = 10
+**.wlan[*].mac.address = "auto"
+**.wlan[*].mac.maxQueueSize = 14
+**.wlan[*].mac.rtsThresholdBytes = 3000B
+**.wlan[*].mac.basicBitrate = 24Mbps  # 24Mbps
+**.wlan[*].mac.retryLimit = 7
+**.wlan[*].mac.cwMinData = 31
+**.wlan[*].mac.cwMinBroadcast = 31
+**.wlan[*].mac.slotTime = 9us #
+**.wlan[*].mac.AIFSN = 2 #DIFS
+
+
+**.wlan[*].radio.transmitterPower = 2.0mW
+**.wlan[*].radio.pathLossAlpha = 2
+**.wlan[*].radio.snirThreshold = 4dB  # in dB
+**.wlan[*].radio.thermalNoise = -110dBm
+**.wlan[*].radio.sensitivity = -85dBm
+**.wlan[*].radio.channelModel = "RAYLEIGH" #1/2  rayleigh/awgn
+**.wlan[*].radio.berTableFile = "per_table_80211g_Trivellato.dat"
+
+**.broadCastDelay=uniform(0s,0.005s)
+#seed-0-mt = 1209575029
+#seed-1-mt = 449294716
+#**.host*.mobility.traceFile = "esce_0-1_no_pause.1"
+
+
+
+#/ parameters : DYMO
+[Config DYMO]
+**.routingProtocol = "DYMO"
+**.no_path_acc_ = false
+**.reissue_rreq_ = false
+**.s_bit_ = false
+**.hello_ival_ = 0
+**.MaxPktSec = 20 #// 10
+**.promiscuous = false
+**.NetDiameter = 10
+**.RouteTimeOut = 3000
+**.RouteDeleteTimeOut = 3000*5 #//5*RouteTimeOut
+**.RREQWaitTime = 1000
+**.RREQTries = 3
+**.noRouteBehaviour = 1
+
+#/ parameters : DYMOUM
+[Config DYMOUM]
+**.routingProtocol = "DYMOUM"
+**.no_path_acc_ = false
+**.reissue_rreq_ = false
+**.s_bit_ = false
+**.hello_ival_ = 0
+**.MaxPktSec = 20 #// 10
+**.promiscuous = false
+**.NetDiameter = 10
+**.RouteTimeOut = 3000
+**.RouteDeleteTimeOut = 3000*5 #//5*RouteTimeOut
+**.RREQWaitTime = 1000
+**.RREQTries = 3
+**.noRouteBehaviour = 1
+
+#/ parameters : AODVUU
+[Config AODVUU]
+**.routingProtocol = "AODVUU"
+**.log_to_file = false
+**.hello_jittering = true
+**.optimized_hellos = true
+**.expanding_ring_search = true
+**.local_repair = true
+**.rreq_gratuitous = true
+#**.debug = false
+**.rt_log_interval = 0
+**.unidir_hack = 0
+**.internet_gw_mode = 0
+**.receive_n_hellos = 1
+**.ratelimit = 1000
+**.llfeedback = false# //1000
+**.wait_on_reboot = 0
+**.active_timeout = 6000ms
+**.internet_gw_address = "0.0.0.0"
+
+#  //  parameters: DSRUU;
+[Config DSRUU]
+**.routingProtocol = "DSRUU"
+**.PrintDebug = true
+**.FlushLinkCache = true
+**.PromiscOperation = false
+**.UseNetworkLayerAck = false
+**.BroadcastJitter = 20 # 20  ms
+**.RouteCacheTimeout = 300 #300 seconds
+**.SendBufferTimeout = 300# //30 s
+**.SendBufferSize = -1
+**.RequestTableSize = -1
+**.RequestTableIds = -1
+**.MaxRequestRexmt = -1 #// 16,
+**.MaxRequestPeriod = 10 #//10 SECONDS
+**.RequestPeriod = 500 #//500  MILLISECONDS
+**.NonpropRequestTimeout = 30# //30  MILLISECONDS
+**.RexmtBufferSize = -1 #//MAINT_BUF_MAX_LEN
+**.MaintHoldoffTime = 250# //250 MILLISECONDS
+**.MaxMaintRexmt = 2 # //2
+**.TryPassiveAcks = true #//1
+**.PassiveAckTimeout = 100# //100 MILLISECONDS
+**.GratReplyHoldOff = 1 #, //1 SECONDS
+**.MAX_SALVAGE_COUNT = 15 # //15
+**.LifoSize = 20
+**.PathCache = true
+**.ETX_Active = false
+**.ETXHelloInterval = 1 #, // Second
+**.ETXWindowNumHello = 10
+**.ETXRetryBeforeFail = -1
+**.RREPDestinationOnly = false
+**.RREQMaxVisit = 5 # // Max Number that a RREQ can be processes by a node
+
+#// Olsr
+[Config OLSR]
+**.routingProtocol = "OLSR"
+**.Willingness = 3
+**.Hello_ival = 2s
+**.Tc_ival = 5s
+**.Mid_ival = 5s
+**.use_mac = 0 #1
+**.Mpr_algorithm = 1
+**.routing_algorithm = 1
+**.Link_quality = 2
+**.Fish_eye = false
+**.Tc_redundancy = 3
+**.Link_delay = true #//default false
+**.C_alpha = 0.2
+
+#// Olsr_ETX
+[Config OLSR_ETX]
+**.routingProtocol = "OLSR_ETX"
+**.Willingness = 3
+**.Hello_ival = 2s
+**.Tc_ival = 5s
+**.Mid_ival = 5s
+**.use_mac = 0 #1
+**.Mpr_algorithm = 1
+**.routing_algorithm = 1
+**.Link_quality = 2
+**.Fish_eye = false
+**.Tc_redundancy = 3
+**.Link_delay = true #//default false
+**.C_alpha = 0.2
+
+#// DSDV
+[Config DSDV_2]
+**.routingProtocol = "DSDV_2"
+**.manetrouting.hellomsgperiod_DSDV = 1s # //Period of DSDV hello message generation [seconds]
+**.manetrouting.routeLifetime = 5s # // ;[seconds]
+**.netmask = "255.255.0.0" # //
+**.MaxVariance_DSDV = 1
+**.RNGseed_DSDV = 0
+
+[Config Batman]
+**.routingProtocol = "Batman"

src/linklayer/ieee80211/mac/Ieee80211Mac.cc

@@ -1334,11 +1334,11 @@ void Ieee80211Mac::handleWithFSM(cMessage *msg)
             FSMA_Event_Transition(Receive-ACK-TXOP-Empty,
                                   isLowerMsg(msg) && isForUs(frame) && frameType == ST_ACK && txop && transmissionQueue(oldcurrentAC)->size() == 1,
                                   DEFER,
-                                  nb->fireChangeNotification(NF_TX_ACKED,0);// added by aaq
                                   currentAC = oldcurrentAC;
                                   if (retryCounter() == 0) numSentWithoutRetry()++;
                                   numSent()++;
                                   fr = getCurrentTransmission();
+                                  sendNotification(NF_TX_ACKED, fr);// added by aaq
                                   numBits += fr->getBitLength();
                                   bits() += fr->getBitLength();
                                   macDelay()->record(simTime() - fr->getMACArrive());
@@ -1357,11 +1357,11 @@ void Ieee80211Mac::handleWithFSM(cMessage *msg)
             FSMA_Event_Transition(Receive-ACK-TXOP,
                                   isLowerMsg(msg) && isForUs(frame) && frameType == ST_ACK && txop,
                                   WAITSIFS,
-                                  nb->fireChangeNotification(NF_TX_ACKED,0);// added by aaq
                                   currentAC = oldcurrentAC;
                                   if (retryCounter() == 0) numSentWithoutRetry()++;
                                   numSent()++;
                                   fr = getCurrentTransmission();
+                                  sendNotification(NF_TX_ACKED, fr);// added by aaq
                                   numBits += fr->getBitLength();
                                   bits() += fr->getBitLength();
 
@@ -1401,12 +1401,12 @@ void Ieee80211Mac::handleWithFSM(cMessage *msg)
              FSMA_Event_Transition(Receive-ACK,
                                   isLowerMsg(msg) && isForUs(frame) && frameType == ST_ACK,
                                   DEFER,
-                                  nb->fireChangeNotification(NF_TX_ACKED,0);// added by mhn **************************************
                                   currentAC = oldcurrentAC;
                                   if (retryCounter() == 0)
                                       numSentWithoutRetry()++;
                                   numSent()++;
                                   fr = getCurrentTransmission();
+                                  sendNotification(NF_TX_ACKED, fr);// added by mhn **************************************
                                   numBits += fr->getBitLength();
                                   bits() += fr->getBitLength();
 

src/networklayer/manetrouting/DSRUU.ned

@@ -71,6 +71,7 @@ simple DSRUU like IManetRouting
         volatile double broadcastDelay @unit("s") = default(uniform(0s,0.005s));  // the delay added to broadcast operations if EqualDelay is set (used to model processing time)
         volatile double unicastDelay @unit("s") = default(0s);  // a delay added to unicast messaged (i.e. data packet forwarding) (used to model processing time)
         bool manetPurgeRoutingTables = default(true);
+        bool refreshIntermediate = default(false);// if true also refresh expire timeout in the routes to intemediate nodes
     gates:
         input from_ip;
         output to_ip;