From 79d8a6c16b549bb22e7310f933f2d5b434636eb6 Mon Sep 17 00:00:00 2001
From: Vladimir Vesely <ivesely@fit.vutbr.cz>
Date: Mon, 8 Feb 2016 13:37:21 +0100
Subject: [PATCH] :birthday: 1000th commit referential release :beers: :tada:

Referential release with all the neat features like fragmentation or DAF
enrollment
---
 LICENSE                                       |  4 ++-
 README.md                                     | 11 +++++---
 examples/Basics/AllNodes/omnetpp.ini          |  4 +--
 examples/Basics/SimpleRelay/omnetpp.ini       | 14 +++++-----
 examples/Basics/SingleCS/omnetpp.ini          |  2 +-
 examples/Basics/SmallNetwork/omnetpp.ini      |  2 +-
 examples/Basics/TwoCSs/omnetpp.ini            |  8 +++---
 examples/Basics/TwoCSsMultipleAEs/omnetpp.ini |  2 +-
 examples/Basics/TwoCSsSimple/omnetpp.ini      |  2 +-
 examples/Congestion/DCCongestion/omnetpp.ini  | 26 +++++++++----------
 .../SimpleRelayCongestion/omnetpp.ini         |  2 +-
 examples/Congestion/StopAndWait/omnetpp.ini   |  5 ++--
 examples/Demos/UseCase1/omnetpp.ini           |  2 +-
 examples/Demos/UseCase2/omnetpp.ini           |  2 +-
 examples/Demos/UseCase3/omnetpp.ini           |  2 +-
 examples/Demos/UseCase4/omnetpp.ini           |  2 +-
 examples/Demos/UseCase5/omnetpp.ini           |  2 +-
 examples/LB/DDCLB/omnetpp.ini                 |  2 +-
 examples/Routing/DDC/omnetpp.ini              |  4 +--
 examples/Routing/FatTreeTopology/omnetpp.ini  |  5 ----
 .../Routing/FatTreeTopologyPref/omnetpp.ini   |  2 +-
 examples/Routing/RCoreNet/omnetpp.ini         |  2 +-
 examples/Routing/SmallNetRouting/omnetpp.ini  |  7 ++---
 examples/Routing/SmallRandNet/omnetpp.ini     |  9 +------
 examples/Routing/UnreliableLinks/omnetpp.ini  |  2 +-
 scripts/slocstats.sh                          | 12 ++++-----
 26 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/LICENSE b/LICENSE
index 7c27358a..d2e4ad78 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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
diff --git a/README.md b/README.md
index d318c273..67602432 100644
--- a/README.md
+++ b/README.md
@@ -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  
@@ -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
 	
@@ -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
diff --git a/examples/Basics/AllNodes/omnetpp.ini b/examples/Basics/AllNodes/omnetpp.ini
index fe0cb60b..d815d341 100644
--- a/examples/Basics/AllNodes/omnetpp.ini
+++ b/examples/Basics/AllNodes/omnetpp.ini
@@ -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"
@@ -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"
diff --git a/examples/Basics/SimpleRelay/omnetpp.ini b/examples/Basics/SimpleRelay/omnetpp.ini
index 6938f446..493c837e 100644
--- a/examples/Basics/SimpleRelay/omnetpp.ini
+++ b/examples/Basics/SimpleRelay/omnetpp.ini
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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
diff --git a/examples/Basics/SingleCS/omnetpp.ini b/examples/Basics/SingleCS/omnetpp.ini
index 0034a7d1..ee5609d9 100644
--- a/examples/Basics/SingleCS/omnetpp.ini
+++ b/examples/Basics/SingleCS/omnetpp.ini
@@ -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"
diff --git a/examples/Basics/SmallNetwork/omnetpp.ini b/examples/Basics/SmallNetwork/omnetpp.ini
index 9dc37322..bee993c0 100644
--- a/examples/Basics/SmallNetwork/omnetpp.ini
+++ b/examples/Basics/SmallNetwork/omnetpp.ini
@@ -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"
diff --git a/examples/Basics/TwoCSs/omnetpp.ini b/examples/Basics/TwoCSs/omnetpp.ini
index 6900e008..51e89e2a 100644
--- a/examples/Basics/TwoCSs/omnetpp.ini
+++ b/examples/Basics/TwoCSs/omnetpp.ini
@@ -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"
@@ -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"
@@ -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"
@@ -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
diff --git a/examples/Basics/TwoCSsMultipleAEs/omnetpp.ini b/examples/Basics/TwoCSsMultipleAEs/omnetpp.ini
index 7f674052..5973983b 100644
--- a/examples/Basics/TwoCSsMultipleAEs/omnetpp.ini
+++ b/examples/Basics/TwoCSsMultipleAEs/omnetpp.ini
@@ -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"
diff --git a/examples/Basics/TwoCSsSimple/omnetpp.ini b/examples/Basics/TwoCSsSimple/omnetpp.ini
index 822acb0d..93badbc4 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 = "0a21-da4e"
+fingerprint = "e23b-ed94"
 #PingApp setup
 **.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
diff --git a/examples/Congestion/DCCongestion/omnetpp.ini b/examples/Congestion/DCCongestion/omnetpp.ini
index 1962cc05..3d49b7ed 100644
--- a/examples/Congestion/DCCongestion/omnetpp.ini
+++ b/examples/Congestion/DCCongestion/omnetpp.ini
@@ -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"
@@ -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"
@@ -317,7 +317,7 @@ seed-set = ${runnumber}
 
 
 [Config CongestionStream-2Nodes]
-#fingerprint = "ade4-60c6"
+fingerprint = "1d26-9a63"
 
 #Specify AE as Streaming app
 **.applicationEntity.aeType = "AEStream"
@@ -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"
@@ -415,7 +415,7 @@ seed-set = ${runnumber}
 
 
 [Config CongestionStream-3Nodes]
-#fingerprint = "ade4-60c6"
+fingerprint = "cb62-caeb"
 
 #Specify AE as Streaming app
 **.applicationEntity.aeType = "AEStream"
@@ -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"
@@ -515,7 +515,7 @@ seed-set = ${runnumber}
 
 
 [Config CongestionStream-4Nodes]
-#fingerprint = "ade4-60c6"
+fingerprint = "0caf-9d14"
 
 #Specify AE as Streaming app
 **.applicationEntity.aeType = "AEStream"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
diff --git a/examples/Congestion/SimpleRelayCongestion/omnetpp.ini b/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
index 6c9e4291..c9867960 100644
--- a/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
+++ b/examples/Congestion/SimpleRelayCongestion/omnetpp.ini
@@ -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"
diff --git a/examples/Congestion/StopAndWait/omnetpp.ini b/examples/Congestion/StopAndWait/omnetpp.ini
index d4c0809e..be1e3054 100644
--- a/examples/Congestion/StopAndWait/omnetpp.ini
+++ b/examples/Congestion/StopAndWait/omnetpp.ini
@@ -77,7 +77,7 @@ network = StopAndWait
 **.ipcProcess[*].**.printAtEnd = true
 
 [Config DQ2BE]
-
+fingerprint = "928b-64cf"
 **.r*.ipcProcess[*].**.queueAllocPolicyName = "SingleQueue"
 **.r*.ipcProcess[*].**.queueIdGenName = "SingleID"
 
@@ -93,6 +93,7 @@ network = StopAndWait
 
 
 [Config DQ2Iterative]
+fingerprint = "9e47-badd"
 **.r*.ipcProcess[*].**.queueAllocPolicyName = "QueuePerNFlow"
 **.r*.ipcProcess[*].**.queueIdGenName = "IDPerNFlow"
 
@@ -117,7 +118,7 @@ network = StopAndWait
 
 
 [Config DQ2SW]
-
+fingerprint = "1969-2cc3"
 **.r*.ipcProcess[*].**.queueAllocPolicyName = "QueuePerNFlow"
 **.r*.ipcProcess[*].**.queueIdGenName = "IDPerNFlow"
 
diff --git a/examples/Demos/UseCase1/omnetpp.ini b/examples/Demos/UseCase1/omnetpp.ini
index d51f8ff4..e311f687 100644
--- a/examples/Demos/UseCase1/omnetpp.ini
+++ b/examples/Demos/UseCase1/omnetpp.ini
@@ -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"
diff --git a/examples/Demos/UseCase2/omnetpp.ini b/examples/Demos/UseCase2/omnetpp.ini
index 76250f44..a4360a39 100644
--- a/examples/Demos/UseCase2/omnetpp.ini
+++ b/examples/Demos/UseCase2/omnetpp.ini
@@ -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"
diff --git a/examples/Demos/UseCase3/omnetpp.ini b/examples/Demos/UseCase3/omnetpp.ini
index b0fd264b..68be6235 100644
--- a/examples/Demos/UseCase3/omnetpp.ini
+++ b/examples/Demos/UseCase3/omnetpp.ini
@@ -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"
diff --git a/examples/Demos/UseCase4/omnetpp.ini b/examples/Demos/UseCase4/omnetpp.ini
index c2731db9..44f02426 100644
--- a/examples/Demos/UseCase4/omnetpp.ini
+++ b/examples/Demos/UseCase4/omnetpp.ini
@@ -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"
diff --git a/examples/Demos/UseCase5/omnetpp.ini b/examples/Demos/UseCase5/omnetpp.ini
index 0fda31e7..5c1bda14 100644
--- a/examples/Demos/UseCase5/omnetpp.ini
+++ b/examples/Demos/UseCase5/omnetpp.ini
@@ -65,7 +65,7 @@ debug-on-errors = true
 **.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")
 
 [Config Ping]
-fingerprint = "900a-3f10"
+fingerprint = "071c-ee94"
 #PingApp setup
 **.forceOrder = true
 **.HostA.applicationProcess1.applicationEntity.iae.dstApName = "DestinationB"
diff --git a/examples/LB/DDCLB/omnetpp.ini b/examples/LB/DDCLB/omnetpp.ini
index 2b0352d4..41c20769 100644
--- a/examples/LB/DDCLB/omnetpp.ini
+++ b/examples/LB/DDCLB/omnetpp.ini
@@ -371,7 +371,7 @@ seed-set = 55
 **.infection.toFabric = false
 **.infection.toSpines = false
 
-fingerprint="8a8a-66c0"
+fingerprint = "4ca9-d799"
 
 #Routing settings
 **.relayIpc.resourceAllocator.pdufgPolicyName = "SimpleHopMEntries"
diff --git a/examples/Routing/DDC/omnetpp.ini b/examples/Routing/DDC/omnetpp.ini
index f85f9033..8e2f015c 100644
--- a/examples/Routing/DDC/omnetpp.ini
+++ b/examples/Routing/DDC/omnetpp.ini
@@ -357,7 +357,7 @@ seed-set = 55
 
 
 [Config SimpleTable]
-fingerprint="8a8a-66c0"
+fingerprint = "60d1-a0fa"
 
 #Routing settings
 **.relayIpc.resourceAllocator.pdufgPolicyName = "SimpleHopMEntries"
@@ -370,7 +370,7 @@ fingerprint="8a8a-66c0"
 
 
 [Config DCForwarding]
-fingerprint="661e-1952"
+fingerprint = "f03b-70c3"
 
 #Routing settings
 **.relayIpc.resourceAllocator.pdufgPolicyName = "SimpleDCGenerator"
diff --git a/examples/Routing/FatTreeTopology/omnetpp.ini b/examples/Routing/FatTreeTopology/omnetpp.ini
index f2c2229e..a2291e5a 100644
--- a/examples/Routing/FatTreeTopology/omnetpp.ini
+++ b/examples/Routing/FatTreeTopology/omnetpp.ini
@@ -171,8 +171,3 @@ fingerprint = "9dbf-27ba"
 **.Server1.applicationProcess1.applicationEntity.iae.rate 		= 5
 **.Server1.applicationProcess1.applicationEntity.iae.stopAt 	= 11s
 
-<<<<<<< HEAD
-**.enrollment.isSelfEnrolled = true
-=======
-**.enrollment.isSelfEnrolled = true
->>>>>>> CNET Examples adjusted to work with last sim version
diff --git a/examples/Routing/FatTreeTopologyPref/omnetpp.ini b/examples/Routing/FatTreeTopologyPref/omnetpp.ini
index efa8a445..80ed5a6e 100644
--- a/examples/Routing/FatTreeTopologyPref/omnetpp.ini
+++ b/examples/Routing/FatTreeTopologyPref/omnetpp.ini
@@ -271,7 +271,7 @@ fingerprint="db06-30ae"
 **.AS*.relayIpc.routingPolicyName = "DomainRouting"
 
 [Config DomsDV_LS]
-fingerprint="3d81-3183"
+fingerprint = "f4e9-d10e"
 
 **.Server*.ipcProcess1.resourceAllocator.pdufgPolicyName = "BiDomainGenerator"
 **.TOR*.relayIpc.resourceAllocator.pdufgPolicyName = "BiDomainGenerator"
diff --git a/examples/Routing/RCoreNet/omnetpp.ini b/examples/Routing/RCoreNet/omnetpp.ini
index 70592822..38e58a86 100644
--- a/examples/Routing/RCoreNet/omnetpp.ini
+++ b/examples/Routing/RCoreNet/omnetpp.ini
@@ -1,6 +1,6 @@
 [General]
 #--gaixas1 : Maintain example 
-
+fingerprint = "8bdd-3518"
 network = RCoreNet
 sim-time-limit =  25s
 
diff --git a/examples/Routing/SmallNetRouting/omnetpp.ini b/examples/Routing/SmallNetRouting/omnetpp.ini
index 57438735..08907137 100644
--- a/examples/Routing/SmallNetRouting/omnetpp.ini
+++ b/examples/Routing/SmallNetRouting/omnetpp.ini
@@ -9,7 +9,7 @@ sim-time-limit = 5min
 seed-set = ${runnumber}
 
 
-fingerprint = "ee43-a777"
+fingerprint = "3ae6-5d00"
 
 #
 # Naming.
@@ -153,12 +153,9 @@ fingerprint = "ee43-a777"
 **.host*.**.enrollment.isSelfEnrolled = true
 **.router*.**.enrollment.isSelfEnrolled = true
 
-<<<<<<< HEAD
-=======
 [Config SmallNetRouting]
-
 fingerprint = "6062-6a74"
->>>>>>> CNET Examples adjusted to work with last sim version
+
 
 **.host1.applicationProcess1.applicationEntity.iae.dstApName	= "App5"
 **.host1.applicationProcess1.applicationEntity.iae.dstAeName 	= "Ping"
diff --git a/examples/Routing/SmallRandNet/omnetpp.ini b/examples/Routing/SmallRandNet/omnetpp.ini
index f8459bec..77f988cf 100644
--- a/examples/Routing/SmallRandNet/omnetpp.ini
+++ b/examples/Routing/SmallRandNet/omnetpp.ini
@@ -178,12 +178,9 @@ fingerprint = "9d18-931d"
 **.H*.ipcProcess1.routingPolicyName = "SimpleDV"
 **.R*.relayIpc.routingPolicyName = "SimpleDV"
 
-<<<<<<< HEAD
-=======
+
 [Config DistanceVector]
 fingerprint = "2f1e-2b01"
-
->>>>>>> CNET Examples adjusted to work with last sim version
 **.H9.AP[0].applicationEntity.iae.dstApName	= "App0Host5"
 **.H9.AP[0].applicationEntity.iae.dstAeName = "Ping"
 **.H9.AP[0].applicationEntity.iae.startAt 	= 210s
@@ -199,10 +196,6 @@ fingerprint = "2f1e-2b01"
 **.R*.difAllocator.configData = xmldoc("config.xml", "Configuration/Node[@id='all']/DA")
 **.R*.difAllocator.directory.configData = xmldoc("config.xml", "Configuration/Node[@id='all']/DA")
 
-<<<<<<< HEAD
-
-=======
->>>>>>> CNET Examples adjusted to work with last sim version
 #
 # QoS Cube sets.
 #
diff --git a/examples/Routing/UnreliableLinks/omnetpp.ini b/examples/Routing/UnreliableLinks/omnetpp.ini
index 1349d74a..bc89e19e 100644
--- a/examples/Routing/UnreliableLinks/omnetpp.ini
+++ b/examples/Routing/UnreliableLinks/omnetpp.ini
@@ -108,7 +108,7 @@ fingerprint = "4576-a0d8"
 **.relayIpc.relayAndMux.ForwardingPolicyName = "MultiMiniTable"
 
 [Config HopsFloodMEntries]
-fingerprint = "1af3-5fdc"
+fingerprint = "3764-633f"
 
 **.ipcProcess1.resourceAllocator.pdufgPolicyName = "HopsSingleMEntries"
 **.relayIpc.resourceAllocator.pdufgPolicyName = "HopsSingleMEntries"
diff --git a/scripts/slocstats.sh b/scripts/slocstats.sh
index 01f5226c..10626561 100644
--- a/scripts/slocstats.sh
+++ b/scripts/slocstats.sh
@@ -5,18 +5,18 @@ 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`
+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`
+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 2>/dev/null | wc -l`
-simexc=`git ls-files .. | grep -E '*.ini|*.xml' | xargs cat 2>/dev/null | sed '/\s*#.*$/d' | sed '/^\s*$/d' | wc -l`
+simall=`git ls-files .. | grep -E '\.ini|\.xml' | xargs cat 2>/dev/null | wc -l`
+simexc=`git ls-files .. | grep -E '\.ini|\.xml' | xargs cat 2>/dev/null | sed '/\s*#.*$/d' | sed '/^\s*$/d' | wc -l`
 printf "OMNeT++    *.ini *.xml\t$simall\t$simexc\t\tempty #\n"
 printf "===============================================================\n"