Skip to content

Commit

Permalink
🎂 1000th commit referential release 🍻 🎉
Browse files Browse the repository at this point in the history
Referential release with all the neat features like fragmentation or DAF
enrollment
  • Loading branch information
kvetak committed Feb 8, 2016
1 parent 9a8c315 commit 79d8a6c
Show file tree
Hide file tree
Showing 26 changed files with 65 additions and 72 deletions.
4 changes: 3 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
//The MIT License (MIT)
//
// Copyright (c) 2014, 2015
// Copyright (c) 2014 - 2016
// FIT-BUT: Vladimir Vesely, Marcel Marek, Tomas Hykel, Kamil Jerabek
// CREATE-NET: Kewin Rausch
// UPC: Sergio Leon Gaixas
// UiO: Peyman Teymoori
// IMT-TSP: Fatma Hrizi
// TSSG: Ehsan Elahi
//
//Permission is hereby granted, free of charge, to any person obtaining a copy of
//this software and associated documentation files (the "Software"), to deal in
Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ RINA Simulator
====

###Version changelog
* <yet-to-be-named 2015> Added support for fragmentation/concatenation in delimiting.

* October 2015-February 2016 - Trento meeting version, Fragmentation/Concatenation in Delimiting,
DAF level Enrollment, scenario split
* July-September 2015 - RIBd notifiers, pre-EFCPv6 updates, CDAPProcessingBase interface,
merging partner's contribution (namely routing and congestion control),
added Hop Count to PDU header
Expand Down Expand Up @@ -36,13 +36,17 @@ RINA Simulator
/Basics ... simple testing scenarios
/Congestion ... congestion control
/Demos ... use-cases for tutorials and demo sessions
/LB ... load-balancing
/Routing ... routing in topologies
/playground ... unsupported/obsolete scenarios
/src ... source codes' folder
/Common ... shared basic classes
/CS ... computing system simulation nodes
/DAF ... DAF components
/DIF ... DIF component
/Other ... non-essential user-requested core components

/policies ... all programable RINA policies

Expand Down Expand Up @@ -128,7 +132,8 @@ RINA Simulator
used with "SmartMonitor"s
/LongestQFirst ... pick the queue which contains the most PDUs
/Routing ... routing policies
/DomainRouting ... routing policy based on domains. A domain is defined as a sub-set of the DIF, with its own metrics and routing algorithm.
/DomainRouting ... routing policy based on domains. A domain is defined as a sub-set
of the DIF, with its own metrics and routing algorithm.
/DV ... simple distance vector algorithm for DomainRouting
/LS ... simple link-state algorithm for DomainRouting
/DummyRouting ... noop
Expand Down
4 changes: 2 additions & 2 deletions examples/Basics/AllNodes/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ sim-time-limit = 5min
**.printAtEnd = true

[Config Ping]
fingerprint = "342a-f491"
fingerprint = "a4ee-88c1"
#PingApp setup
**.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
**.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -115,7 +115,7 @@ fingerprint = "342a-f491"
**.applicationProcess1.applicationEntity.iae.forceOrder = true

[Config PingWithDrop]
fingerprint = "cb0e-44b7"
fingerprint = "81fa-2f47"
#PingApp setup
**.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
**.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
14 changes: 7 additions & 7 deletions examples/Basics/SimpleRelay/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ seed-set = ${runnumber}
**.printAtEnd = true

[Config Ping]
fingerprint = "3138-1821"
fingerprint = "055c-ba1c"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -66,7 +66,7 @@ fingerprint = "3138-1821"
**.host1.applicationProcess1.applicationEntity.iae.stopAt = 200s

[Config PingBigSDU]
fingerprint = "346b-44e0"
fingerprint = "b4cc-5c28"
#This config is for Sergio Gaixas to test non-fragment on big SDUs
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
Expand All @@ -87,7 +87,7 @@ fingerprint = "346b-44e0"
**.efcp.delimitDelay = 0.0s

[Config PingFragment]
fingerprint = "ebfa-ed88"
fingerprint = "349b-7453"
#This config tests EFCP's fragmentation capability
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
Expand All @@ -107,7 +107,7 @@ fingerprint = "ebfa-ed88"
**.host1.ipcProcess0.efcp.delimitDelay = 0.15s

[Config PingFragmentATime]
fingerprint = "1a8f-ad97"
fingerprint = "4acf-8992"
#This config tests EFCP's fragmentation capability
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
Expand All @@ -130,7 +130,7 @@ fingerprint = "1a8f-ad97"
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSetATime")

[Config PingRendez]
fingerprint = "8491-1612"
fingerprint = "8f87-4eef"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -141,7 +141,7 @@ fingerprint = "8491-1612"
**.host2.ipcProcess1.efcp.interrupter = true

[Config PingWithPreallocation]
fingerprint = "7f06-9887"
fingerprint = "f32b-a111"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 20s
Expand All @@ -154,7 +154,7 @@ fingerprint = "7f06-9887"
xmldoc("config.xml", "Configuration/ConnectionSets/ConnectionSet[@id='PingWithPreallocation']/")

[Config PingWithDiffServ]
fingerprint = "9333-6a5f"
fingerprint = "1e6e-802e"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/SingleCS/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sim-time-limit = 5min
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")

[Config Ping]
fingerprint = "3c19-ab96"
fingerprint = "8aaa-a2df"
**.applicationProcess1.apName = "App1"
**.applicationProcess2.apName = "App2"
**.iae.aeName = "Ping"
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/SmallNetwork/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ seed-set = ${runnumber}


[Config Ping]
fingerprint = "d0d3-b3d9"
fingerprint = "58f7-92ea"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App5"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
8 changes: 4 additions & 4 deletions examples/Basics/TwoCSs/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sim-time-limit = 5min
**.host2.**.enrollment.isSelfEnrolled = true

[Config PingFC] #FIXME
fingerprint = "a939-5f81"
fingerprint = "be89-8430"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -56,7 +56,7 @@ fingerprint = "a939-5f81"
**.host*.ipcProcess0.efcp.efcp.rtt = 7s

[Config PingRX] #FIXME
fingerprint = "9c75-a3d8"
fingerprint = "689e-9983"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -67,7 +67,7 @@ fingerprint = "9c75-a3d8"
**.host1.ipcProcess1.efcp.efcp.pduDroppingEnabled = true

[Config Ping]
fingerprint = "d386-a77f"
fingerprint = "26ec-448d"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -80,7 +80,7 @@ fingerprint = "d386-a77f"
#**.host*.ipcProcess0.relayAndMux.RxQueuingTime = 0.5s

[Config Ping-AppQos]
fingerprint = "d386-a77f"
fingerprint = "26ec-448d"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/TwoCSsMultipleAEs/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sim-time-limit = 5min
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")

[Config Ping]
fingerprint = "f198-90b6"
fingerprint = "3c1f-69ea"
#PingApp setup
**.hostA.applicationProcess[*].applicationEntity[*].iae.dstApName = "DestinationB"
**.hostA.applicationProcess[*].applicationEntity[*].iae.dstAeName = "MyPing"
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/TwoCSsSimple/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ seed-set = ${runnumber}
**.host2.**.enrollment.isSelfEnrolled = true

[Config PingFC]
fingerprint = "0a21-da4e"
fingerprint = "e23b-ed94"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
26 changes: 13 additions & 13 deletions examples/Congestion/DCCongestion/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ seed-set = ${runnumber}
#**.fa.createRequestTimeout = 15s
#**.host1.applicationProcess1.applicationEntity.iae.forceOrder = true
#[Config CongestionPing]
#fingerprint = "5e81-cb4c"
fingerprint = "0000-0000"
#
##Specify AE
#**.applicationEntity.aeType = "AEPing"
Expand All @@ -269,7 +269,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess0.efcp.efcp.rcvCredit = 3

[Config CongestionStream-1Node]
#fingerprint = "ade4-60c6"
fingerprint = "c683-b5a7"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -317,7 +317,7 @@ seed-set = ${runnumber}


[Config CongestionStream-2Nodes]
#fingerprint = "ade4-60c6"
fingerprint = "1d26-9a63"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -364,7 +364,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-2NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "56ae-5113"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -415,7 +415,7 @@ seed-set = ${runnumber}


[Config CongestionStream-3Nodes]
#fingerprint = "ade4-60c6"
fingerprint = "cb62-caeb"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -462,7 +462,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-3NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "9ade-450e"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -515,7 +515,7 @@ seed-set = ${runnumber}


[Config CongestionStream-4Nodes]
#fingerprint = "ade4-60c6"
fingerprint = "0caf-9d14"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -562,7 +562,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-4NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "d0e3-37f5"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -616,7 +616,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-5Nodes]
#fingerprint = "ade4-60c6"
fingerprint = "5d09-483a"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -663,7 +663,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-5NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "6ca2-1de4"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -719,7 +719,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-6Nodes]
#fingerprint = "ade4-60c6"
fingerprint = "d467-3241"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -766,7 +766,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-10NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "eb17-c6d8"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down Expand Up @@ -832,7 +832,7 @@ seed-set = ${runnumber}
#**.host2.ipcProcess1.efcp.efcp.rcvrAckPolicy = "RcvrAckPolicyLG"

[Config CongestionStream-20NodesT]
#fingerprint = "ade4-60c6"
fingerprint = "1e25-6a32"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down
2 changes: 1 addition & 1 deletion examples/Congestion/SimpleRelayCongestion/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fingerprint = "5e81-cb4c"
**.host2.ipcProcess0.efcp.efcp.rcvCredit = 3

[Config CongestionStream]
fingerprint = "ade4-60c6"
fingerprint = "c60f-f065"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down
5 changes: 3 additions & 2 deletions examples/Congestion/StopAndWait/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ network = StopAndWait
**.ipcProcess[*].**.printAtEnd = true

[Config DQ2BE]

fingerprint = "928b-64cf"
**.r*.ipcProcess[*].**.queueAllocPolicyName = "SingleQueue"
**.r*.ipcProcess[*].**.queueIdGenName = "SingleID"

Expand All @@ -93,6 +93,7 @@ network = StopAndWait


[Config DQ2Iterative]
fingerprint = "9e47-badd"
**.r*.ipcProcess[*].**.queueAllocPolicyName = "QueuePerNFlow"
**.r*.ipcProcess[*].**.queueIdGenName = "IDPerNFlow"

Expand All @@ -117,7 +118,7 @@ network = StopAndWait


[Config DQ2SW]

fingerprint = "1969-2cc3"
**.r*.ipcProcess[*].**.queueAllocPolicyName = "QueuePerNFlow"
**.r*.ipcProcess[*].**.queueIdGenName = "IDPerNFlow"

Expand Down
2 changes: 1 addition & 1 deletion examples/Demos/UseCase1/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sim-time-limit = 5min
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")

[Config Ping]
fingerprint = "3c19-ab96"
fingerprint = "8aaa-a2df"
**.applicationProcess1.apName = "Source"
**.applicationProcess2.apName = "Destination"
**.iae.aeName = "MyPing"
Expand Down
2 changes: 1 addition & 1 deletion examples/Demos/UseCase2/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sim-time-limit = 5min
#Enrollment
**.hostB.**.enrollment.isSelfEnrolled = true
[Config Ping]
fingerprint = "43bf-50c5"
fingerprint = "25a1-0b22"
#PingApp setup
**.hostA.applicationProcess1.applicationEntity.iae.dstApName = "DestinationB"
**.hostA.applicationProcess1.applicationEntity.iae.dstAeName = "MyPing"
Expand Down
2 changes: 1 addition & 1 deletion examples/Demos/UseCase3/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sim-time-limit = 5min
#QoS settings
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")
[Config Ping]
fingerprint = "00da-c2c8"
fingerprint = "5ea0-42f0"
#PingApp setup
**.hostA.applicationProcess1.applicationEntity.iae.dstApName = "DestinationB"
**.hostA.applicationProcess1.applicationEntity.iae.dstAeName = "MyPing"
Expand Down
2 changes: 1 addition & 1 deletion examples/Demos/UseCase4/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ debug-on-errors = true
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")

[Config Ping]
fingerprint = "66c5-0668"
fingerprint = "bf42-903b"
#PingApp setup
**.hostA.applicationProcess1.applicationEntity.iae.dstApName = "DestinationB"
**.hostA.applicationProcess1.applicationEntity.iae.dstAeName = "MyPing"
Expand Down
Loading

0 comments on commit 79d8a6c

Please sign in to comment.