X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=common%2Ftr_config.c;h=4d05d4b7d58409f331cad0ecbca8fe0195f155e9;hb=add2ac18ca50d11a28a40d50a989ecb936b9493e;hp=6a3d4dc93d561ff7e2769b3f18670f8db6b067c2;hpb=bdfe6a5b5ad57649ca51d902aec87ab4e85a3a58;p=trust_router.git

diff --git a/common/tr_config.c b/common/tr_config.c
index 6a3d4dc..4d05d4b 100644
--- a/common/tr_config.c
+++ b/common/tr_config.c
@@ -98,6 +98,7 @@ static TR_CFG_RC tr_cfg_parse_internal (TR_CFG *trc, json_t *jcfg) {
   json_t *jcfgsettle = NULL;
   json_t *jroutesweep = NULL;
   json_t *jrouteupdate = NULL;
+  json_t *jrouteconnect = NULL;
 
   if ((!trc) || (!jcfg))
     return TR_CFG_BAD_PARAMS;
@@ -165,21 +166,41 @@ static TR_CFG_RC tr_cfg_parse_internal (TR_CFG *trc, json_t *jcfg) {
 	return TR_CFG_NOPARSE;
       }
     }
-    if (NULL != (jroutesweep = json_object_get(jint, "route_sweep_interval"))) {
+
+    if (NULL != (jrouteconnect = json_object_get(jint, "trp_connect_interval"))) {
+      if (json_is_number(jrouteconnect)) {
+	trc->internal->trp_connect_interval = json_integer_value(jrouteconnect);
+      } else {
+	tr_debug("tr_cfg_parse_internal: Parsing error, trp_connect_interval is not a number.");
+	return TR_CFG_NOPARSE;
+      }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_connect_interval=TR_DEFAULT_TRP_CONNECT_INTERVAL;
+    }
+
+    if (NULL != (jroutesweep = json_object_get(jint, "trp_sweep_interval"))) {
       if (json_is_number(jroutesweep)) {
-	trc->internal->route_sweep_interval = json_integer_value(jroutesweep);
+	trc->internal->trp_sweep_interval = json_integer_value(jroutesweep);
       } else {
-	tr_debug("tr_cfg_parse_internal: Parsing error, route_sweep_interval is not a number.");
+	tr_debug("tr_cfg_parse_internal: Parsing error, trp_sweep_interval is not a number.");
 	return TR_CFG_NOPARSE;
       }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_sweep_interval=TR_DEFAULT_TRP_SWEEP_INTERVAL;
     }
-    if (NULL != (jrouteupdate = json_object_get(jint, "route_update_interval"))) {
+
+    if (NULL != (jrouteupdate = json_object_get(jint, "trp_update_interval"))) {
       if (json_is_number(jrouteupdate)) {
-	trc->internal->route_update_interval = json_integer_value(jrouteupdate);
+	trc->internal->trp_update_interval = json_integer_value(jrouteupdate);
       } else {
-	tr_debug("tr_cfg_parse_internal: Parsing error, route_update_interval is not a number.");
+	tr_debug("tr_cfg_parse_internal: Parsing error, trp_update_interval is not a number.");
 	return TR_CFG_NOPARSE;
       }
+    } else {
+      /* if not configured, use the default */
+      trc->internal->trp_update_interval=TR_DEFAULT_TRP_UPDATE_INTERVAL;
     }
 
     if (NULL != (jlog = json_object_get(jint, "logging"))) {