From ab4a0e08c7c175d317f785802176a97a760f5c8a Mon Sep 17 00:00:00 2001
From: Joakim Eriksson <joakime@sics.se>
Date: Fri, 2 Oct 2015 07:41:57 +0200
Subject: [PATCH] fixed simulation files to be closer to defaults in
 configuration

---
 regression-tests/12-rpl/04-rpl-large-network.csc         | 3 +--
 regression-tests/21-large-rpl/code/node/client.c         | 7 +++++++
 regression-tests/21-large-rpl/code/router/project-conf.h | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/regression-tests/12-rpl/04-rpl-large-network.csc b/regression-tests/12-rpl/04-rpl-large-network.csc
index 88d3774bf..145cad14c 100644
--- a/regression-tests/12-rpl/04-rpl-large-network.csc
+++ b/regression-tests/12-rpl/04-rpl-large-network.csc
@@ -1,4 +1,3 @@
-<<<<<<< 1d90b9290e293eedcb6451dd86c474ec168f688c
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
   <project EXPORT="discard">[APPS_DIR]/mrm</project>
@@ -7058,4 +7057,4 @@ while(true) {&#xD;
     <location_x>603</location_x>
     <location_y>43</location_y>
   </plugin>
-</simconf>
+</simconf>
\ No newline at end of file
diff --git a/regression-tests/21-large-rpl/code/node/client.c b/regression-tests/21-large-rpl/code/node/client.c
index 3616c1aad..36dc40923 100644
--- a/regression-tests/21-large-rpl/code/node/client.c
+++ b/regression-tests/21-large-rpl/code/node/client.c
@@ -105,6 +105,13 @@ PROCESS_THREAD(http_example_process, ev, data)
       http_socket_get(&s, "http://www.contiki-os.org/", 0, 0,
 		      callback, NULL);
       connect = 0;
+    } else if(connect) {
+      connect++;
+      /* If connect have been "tried" 5 timer we quit trying now... */
+      if(connect > 5)  {
+	restart();
+	connect = 0;
+      }
     }
   }
 
diff --git a/regression-tests/21-large-rpl/code/router/project-conf.h b/regression-tests/21-large-rpl/code/router/project-conf.h
index 7f338deca..857ab6929 100644
--- a/regression-tests/21-large-rpl/code/router/project-conf.h
+++ b/regression-tests/21-large-rpl/code/router/project-conf.h
@@ -7,5 +7,5 @@
 #undef NBR_TABLE_CONF_MAX_NEIGHBORS
 #define NBR_TABLE_CONF_MAX_NEIGHBORS             8
 
-#define RPL_CONF_DEFAULT_LIFETIME_UNIT           60
-#define RPL_CONF_DEFAULT_LIFETIME                3
+/* #define RPL_CONF_DEFAULT_LIFETIME_UNIT           60 */
+/* #define RPL_CONF_DEFAULT_LIFETIME                10 */