From 316f5149f76d0ed5f436b60b3212ff0ebe5d2713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vesel=C3=BD?= <ivesely@fit.vutbr.cz>
Date: Wed, 7 Oct 2015 19:14:50 +0200
Subject: [PATCH] :trollface: :trollface:  :trollface: July-September RINASim
 release  :trollface: :trollface: :trollface:

Updating README.txt
Updating fingerprints
---
 README.md                                     | 14 ++++++-
 examples/Basics/AllNodes/omnetpp.ini          |  4 +-
 .../ExtendedPingTwoCSsSimple/omnetpp.ini      |  2 +-
 examples/Basics/SimpleRelay/omnetpp.ini       |  6 +--
 examples/Basics/SingleCS/omnetpp.ini          |  2 +-
 examples/Basics/SmallNetwork/omnetpp.ini      |  2 +-
 examples/Basics/SmallNetwork2/omnetpp.ini     |  2 +-
 examples/Basics/TwoCSs/omnetpp.ini            |  8 ++--
 examples/Basics/TwoCSsSimple/omnetpp.ini      |  2 +-
 .../SimpleRelayCongestion/omnetpp.ini         |  4 +-
 examples/Routing/BigRandNet/omnetpp.ini       |  2 +-
 examples/Routing/DC/omnetpp.ini               |  2 +-
 examples/Routing/FatTreeTopology/omnetpp.ini  |  2 +-
 examples/Routing/SmallNetRouting/omnetpp.ini  |  2 +-
 examples/Routing/SmallRandNet/omnetpp.ini     |  2 +-
 scripts/slocstats.sh                          | 41 ++++++++++++++-----
 16 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index b2618c9e..38717215 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@ RINA Simulator
 ====
 
 ###Version changelog
-
+* 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  
 * May/June 2015 - Enrollment, (N-1)-data/management separation, MIT relicensing,
                   EFCPv4+ updates, separation of QoSCubes and QoS requirements,
                   change of QoSCube-id datatype, source code split between
@@ -16,11 +18,15 @@ RINA Simulator
 * November 2014 - Brussels RV1 with AllNodes examples
 * October 2014  - Madrid F2F meeting with working SimpleRelay and TwoCSs scenarios
 
-###Links
+###Resources
 * [OpenSourceProject Git with archived RINASim releases](https://opensourceprojects.eu/p/pristine/rinasimulator/rinasim/ci/b323f721944033c9f31924c02e2b67ba9c92c712/tree/)
 * [VMWare Out-of-the-box virtual machine with RINASim](http://nes.fit.vutbr.cz/ivesely/vm/RINASim.zip)
 * [PRISTINE webpage](http://ict-pristine.eu/)	 
 * [Developer's mailing-list](https://www.fit.vutbr.cz/mailman/listinfo/rinasim)
+* [Deliverable 2.4 describing RINASim basics](http://ict-pristine.eu/wp-content/uploads/2013/12/PRISTINE-D24-RINASim-draft.pdf)
+
+###Papers
+* [V.Vesely, M.Marek, T.Hykel, O.Rysavy; Skip This Paper - RINASim: Your Recursive InterNetwork Architecture Simulator](http://arxiv.org/abs/1509.03550)
 
 ###Directory structure
 
@@ -37,6 +43,10 @@ RINA Simulator
 		/DIF 					... DIF component
 	
 	/policies				    ... all programable RINA policies
+	
+	/scripts
+		fingerprints.sh			... batch for checking/updating fingerprints
+		slocstats.sh			... counts source lines of code
 
 ###Available policies
 	/DAF                           ... DAF policies
diff --git a/examples/Basics/AllNodes/omnetpp.ini b/examples/Basics/AllNodes/omnetpp.ini
index f16e9483..ce1b5b5b 100644
--- a/examples/Basics/AllNodes/omnetpp.ini
+++ b/examples/Basics/AllNodes/omnetpp.ini
@@ -101,7 +101,7 @@ sim-time-limit = 5min
 **.printAtEnd = true
 
 [Config Ping]
-fingerprint = "6fd3-42b1"
+fingerprint = "d5be-6971"
 #PingApp setup
 **.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
 **.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
@@ -113,7 +113,7 @@ fingerprint = "6fd3-42b1"
 **.applicationProcess1.applicationEntity.iae.forceOrder = true
 
 [Config PingWithDrop]
-fingerprint = "f055-7f53"
+fingerprint = "08b2-1d18"
 #PingApp setup
 **.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
 **.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
diff --git a/examples/Basics/ExtendedPingTwoCSsSimple/omnetpp.ini b/examples/Basics/ExtendedPingTwoCSsSimple/omnetpp.ini
index d8d24604..05bf9fac 100644
--- a/examples/Basics/ExtendedPingTwoCSsSimple/omnetpp.ini
+++ b/examples/Basics/ExtendedPingTwoCSsSimple/omnetpp.ini
@@ -31,7 +31,7 @@ seed-set = ${runnumber}
 
 
 [Config Ping]
-fingerprint = "78ba-057b"
+fingerprint = "f758-f77f"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
diff --git a/examples/Basics/SimpleRelay/omnetpp.ini b/examples/Basics/SimpleRelay/omnetpp.ini
index c40d2e9d..ac98e4f9 100644
--- a/examples/Basics/SimpleRelay/omnetpp.ini
+++ b/examples/Basics/SimpleRelay/omnetpp.ini
@@ -53,7 +53,7 @@ seed-set = ${runnumber}
 **.printAtEnd = true
 
 [Config Ping]
-fingerprint = "0107-fc77"
+fingerprint = "be83-f0a5"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
@@ -63,7 +63,7 @@ fingerprint = "0107-fc77"
 **.host1.applicationProcess1.applicationEntity.iae.stopAt = 200s
 
 [Config PingWithPreallocation]
-fingerprint = "d012-d9be"
+fingerprint = "c6fe-4ac8"
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
 **.host1.applicationProcess1.applicationEntity.iae.startAt = 20s
@@ -76,7 +76,7 @@ fingerprint = "d012-d9be"
     xmldoc("config.xml", "Configuration/ConnectionSets/ConnectionSet[@id='PingWithPreallocation']/")
 
 [Config PingWithDiffServ]
-fingerprint = "ae58-c4b7"
+fingerprint = "17a3-f1c9"
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
 **.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
diff --git a/examples/Basics/SingleCS/omnetpp.ini b/examples/Basics/SingleCS/omnetpp.ini
index de77a9ae..1885212a 100644
--- a/examples/Basics/SingleCS/omnetpp.ini
+++ b/examples/Basics/SingleCS/omnetpp.ini
@@ -13,7 +13,7 @@ sim-time-limit = 5min
 **.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")
 
 [Config Ping]
-fingerprint = "2e11-5c30"
+fingerprint = "82a5-b954"
 **.applicationProcess1.apName = "App1"
 **.applicationProcess2.apName = "App2"
 **.iae.aeName = "Ping"
diff --git a/examples/Basics/SmallNetwork/omnetpp.ini b/examples/Basics/SmallNetwork/omnetpp.ini
index 5f15ffe3..4a406297 100644
--- a/examples/Basics/SmallNetwork/omnetpp.ini
+++ b/examples/Basics/SmallNetwork/omnetpp.ini
@@ -96,7 +96,7 @@ seed-set = ${runnumber}
 
 
 [Config Ping]
-fingerprint = "1d36-9dc1"
+fingerprint = "2fba-1b8d"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App5"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
diff --git a/examples/Basics/SmallNetwork2/omnetpp.ini b/examples/Basics/SmallNetwork2/omnetpp.ini
index 88d6ace6..5bf0f62d 100644
--- a/examples/Basics/SmallNetwork2/omnetpp.ini
+++ b/examples/Basics/SmallNetwork2/omnetpp.ini
@@ -92,7 +92,7 @@ seed-set = ${runnumber}
 
 
 [Config Ping]
-fingerprint = "b113-cddc"
+fingerprint = "9443-3a2f"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App4"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Stream4"
diff --git a/examples/Basics/TwoCSs/omnetpp.ini b/examples/Basics/TwoCSs/omnetpp.ini
index a9e03d62..9f8ed4de 100644
--- a/examples/Basics/TwoCSs/omnetpp.ini
+++ b/examples/Basics/TwoCSs/omnetpp.ini
@@ -37,7 +37,7 @@ sim-time-limit = 5min
 **.host2.**.enrollment.isSelfEnrolled = true
 
 [Config PingFC] #FIXME
-fingerprint = "bd6d-4978"
+fingerprint = "9a06-9084"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
@@ -54,7 +54,7 @@ fingerprint = "bd6d-4978"
 **.host*.ipcProcess0.efcp.efcp.rtt = 7s
 
 [Config PingRX] #FIXME
-fingerprint = "b6ce-c23f"
+fingerprint = "0f9a-cddd"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
@@ -65,7 +65,7 @@ fingerprint = "b6ce-c23f"
 **.host1.ipcProcess1.efcp.efcp.pduDroppingEnabled = true
 
 [Config Ping]
-fingerprint = "bd6d-4978"
+fingerprint = "9a06-9084"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
@@ -78,7 +78,7 @@ fingerprint = "bd6d-4978"
 #**.host*.ipcProcess0.relayAndMux.RxQueuingTime = 0.5s
 
 [Config Ping-AppQos]
-fingerprint = "bd6d-4978"
+fingerprint = "9a06-9084"
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
 **.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
diff --git a/examples/Basics/TwoCSsSimple/omnetpp.ini b/examples/Basics/TwoCSsSimple/omnetpp.ini
index 27b0298f..39019cb3 100644
--- a/examples/Basics/TwoCSsSimple/omnetpp.ini
+++ b/examples/Basics/TwoCSsSimple/omnetpp.ini
@@ -29,7 +29,7 @@ seed-set = ${runnumber}
 **.host2.**.enrollment.isSelfEnrolled = true
 
 [Config PingFC]
-fingerprint = "04ba-1ab5"
+fingerprint = "ae9c-f3b1"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
diff --git a/examples/Congestion/SimpleRelayCongestion/omnetpp.ini b/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
index fc1a1265..3a37e531 100644
--- a/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
+++ b/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
@@ -44,7 +44,7 @@ seed-set = ${runnumber}
 #**.fa.createRequestTimeout = 15s
 #**.host1.applicationProcess1.applicationEntity.iae.forceOrder = true
 [Config CongestionPing]
-fingerprint = "3572-500c"
+fingerprint = "1dc5-1e70"
 
 #Specify AE
 **.applicationEntity.aeType = "AEPing"
@@ -71,7 +71,7 @@ fingerprint = "3572-500c"
 **.host2.ipcProcess0.efcp.efcp.rcvCredit = 3
 
 [Config CongestionStream]
-fingerprint = "8c5c-4ff0"
+fingerprint = "b049-b35f"
 
 #Specify AE as Streaming app
 **.applicationEntity.aeType = "AEStream"
diff --git a/examples/Routing/BigRandNet/omnetpp.ini b/examples/Routing/BigRandNet/omnetpp.ini
index f521dc8b..c17484df 100644
--- a/examples/Routing/BigRandNet/omnetpp.ini
+++ b/examples/Routing/BigRandNet/omnetpp.ini
@@ -7,7 +7,7 @@ sim-time-limit = 5min
 **.iae.aeName = "Ping"
 
 [Config DistanceVector]
-fingerprint = "f35f-97c4"
+fingerprint = "483b-15fa"
 
 # forwarding generator policies
 **.H*.ipcProcess1.resourceAllocator.pdufgPolicyName = "SimpleGenerator"
diff --git a/examples/Routing/DC/omnetpp.ini b/examples/Routing/DC/omnetpp.ini
index 1ea3b1d5..04fbeb07 100644
--- a/examples/Routing/DC/omnetpp.ini
+++ b/examples/Routing/DC/omnetpp.ini
@@ -1,5 +1,5 @@
 [Config DistanceVector]
-fingerprint = "6ecd-720b"
+fingerprint = "3dfe-550b"
 **.applicationEntity.aeType 							= "AEPing"
 **.iae.aeName 											= "Ping"
 
diff --git a/examples/Routing/FatTreeTopology/omnetpp.ini b/examples/Routing/FatTreeTopology/omnetpp.ini
index 540a8092..2ea3a861 100644
--- a/examples/Routing/FatTreeTopology/omnetpp.ini
+++ b/examples/Routing/FatTreeTopology/omnetpp.ini
@@ -152,7 +152,7 @@ debug-on-errors = true
     xmldoc("config.xml", "Configuration/ConnectionSets/ConnectionSet[@id='all']/")
 
 [Config FatTreeTopology]
-fingerprint = "2ec4-a849"
+fingerprint = "7b96-1500"
 #
 # AEs don't do anything. We're only evaluating the routing table now.
 #
diff --git a/examples/Routing/SmallNetRouting/omnetpp.ini b/examples/Routing/SmallNetRouting/omnetpp.ini
index 01a14586..b6113057 100644
--- a/examples/Routing/SmallNetRouting/omnetpp.ini
+++ b/examples/Routing/SmallNetRouting/omnetpp.ini
@@ -162,7 +162,7 @@ seed-set = ${runnumber}
 #
 # AEs todo:
 #
-fingerprint = "b2eb-c808"
+fingerprint = "91be-6ce7"
 **.host1.applicationProcess1.applicationEntity.iae.dstApName	= "App5"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName 	= "Ping"
 **.host1.applicationProcess1.applicationEntity.iae.startAt 		= 100s
diff --git a/examples/Routing/SmallRandNet/omnetpp.ini b/examples/Routing/SmallRandNet/omnetpp.ini
index eb501c58..5b174a52 100644
--- a/examples/Routing/SmallRandNet/omnetpp.ini
+++ b/examples/Routing/SmallRandNet/omnetpp.ini
@@ -8,7 +8,7 @@ simtime-scale = -11
 **.iae.aeName = "Ping"
 
 [Config DistanceVector]
-fingerprint = "3bae-08de"
+fingerprint = "9551-1eef"
 
 # RMT Forwarding policies
 **.H*.ipcProcess1.relayAndMux.ForwardingPolicyName = "SimpleTable"
diff --git a/scripts/slocstats.sh b/scripts/slocstats.sh
index 384fadd2..654a8b10 100644
--- a/scripts/slocstats.sh
+++ b/scripts/slocstats.sh
@@ -1,12 +1,31 @@
 #!/bin/bash
-echo "This script counts SLOCs of RINASim project"
-echo "C++ code (*.cc, *.h)"
-git ls-files .. | grep -E '*.cc|*.h'| xargs cat | wc -l
-echo "OMNeT++ code (*.msg, *.ned)"
-git ls-files .. | grep -E '*.msg|*.ned'| xargs cat | wc -l
-echo "Simulation code (*.ini, *.xml)"
-git ls-files .. | grep -E '*.ini|*.xml'| xargs cat | wc -l
-echo "Whole project code (*.cc, *.h, *.msg, *.ned, *.ini, *.xml)"
-git ls-files .. | grep -E '*.cc|*.h|*.msg|*.ned|*.xml|*.ini'| xargs cat | wc -l
-echo "All files watched by GIT"
-git ls-files .. | xargs cat | wc -l 
\ No newline at end of file
+printf "This script counts SLOCs of RINASim project\n"
+printf "===============================================================\n"
+printf "language   extension\tall\texcl.comments\texcl.pattern\n"
+printf "===============================================================\n"
+
+#C++
+cppall=`git ls-files .. | grep -E '*.cc|*.h' | xargs cat | wc -l`
+cppexc=`git ls-files .. | grep -E '*.cc|*.h' | xargs cat | sed '/\/\//d' | sed '/^\s*$/d' | sed '/\/\*/,/*\//d' | wc -l`
+printf "C++        *.cc  *.h\t$cppall\t$cppexc\t\tempty // /**/\n"
+
+#OMNeT
+omnall=`git ls-files .. | grep -E '*.msg|*.ned' | xargs cat | wc -l`
+omnexc=`git ls-files .. | grep -E '*.msg|*.ned' | xargs cat | sed '/\/\//d' | sed '/^\s*$/d' | wc -l`
+printf "NED        *.msg *.ned\t$omnall\t$omnexc\t\tempty //\n"
+
+#Simul
+simall=`git ls-files .. | grep -E '*.ini|*.xml' | xargs cat | wc -l`
+simexc=`git ls-files .. | grep -E '*.ini|*.xml' | xargs cat |  sed '/\s*#.*$/d' | sed '/^\s*$/d' | wc -l`
+printf "OMNeT++    *.ini *.xml\t$simall\t$simexc\t\tempty #\n"
+printf "===============================================================\n"
+
+#All
+sumall=`expr $cppall + $omnall + $simall`
+sumexc=`expr $cppexc + $omnexc + $simexc`
+printf "Summary    \t\t$sumall\t$sumexc\n"
+
+printf "===============================================================\n"
+gitall=`git ls-files .. | xargs cat | wc -l`
+gitexc=`git ls-files .. | xargs cat | sed '/^\s*$/d' | wc -l`
+printf "GIT        *.*\t\t$gitall\t$gitexc\t\tempty\n"