commit 887fc0cd28d1b43902706dfcad44b91c96da7273
author akmhoque <akmhoque@gmail.com> Mon Aug 27 15:06:06 2012 -0500
committer akmhoque <akmhoque@gmail.com> Mon Aug 27 15:06:06 2012 -0500
tree 64cf2622193c1fe6294bf13a5195e9171da19c89
parent 2fd7436e012569e0b43e9bd1a0371ec85de42ba0

Update in sending Info Interest

nlsr.c

diff --git a/nlsr.c b/nlsr.c
index 0040473..9f16325 100644
--- a/nlsr.c
+++ b/nlsr.c
@@ -519,7 +519,7 @@
 
 	nlsr->sched = ccn_schedule_create(nlsr, &ndn_rtr_ticker);
 
-	nlsr->event_build_name_lsa = ccn_schedule_event(nlsr->sched, 500000, &initial_build_name_lsa, NULL, 0);
+	nlsr->event_build_name_lsa = ccn_schedule_event(nlsr->sched, 500, &initial_build_name_lsa, NULL, 0);
 	nlsr->event_send_info_interest = ccn_schedule_event(nlsr->sched, 1000000, &send_info_interest, NULL, 0);
 	
 

nlsr_lsdb.c

diff --git a/nlsr_lsdb.c b/nlsr_lsdb.c
index e3cf480..c8c4160 100644
--- a/nlsr_lsdb.c
+++ b/nlsr_lsdb.c
@@ -20,6 +20,7 @@
 #include "nlsr.h"
 #include "nlsr_lsdb.h"
 #include "utility.h"
+#include "nlsr_ndn.h"
 
 void
 make_name_lsa_key(struct ccn_charbuf *key, struct ccn_charbuf *orig_router, unsigned int ls_type, long int nlsa_id, long int orig_time)
@@ -161,6 +162,8 @@
 
 	print_name_lsdb();
 
+	//nlsr->event_send_info_interest = ccn_schedule_event(nlsr->sched, 1, &send_info_interest, NULL, 0);
+
 	return 0;
 }
 

nlsr_ndn.c

diff --git a/nlsr_ndn.c b/nlsr_ndn.c
index 8c94606..721d50f 100644
--- a/nlsr_ndn.c
+++ b/nlsr_ndn.c
@@ -476,7 +476,6 @@
 	    	struct ccn_signing_params sp=CCN_SIGNING_PARAMS_INIT;
 
 		ccn_charbuf_append(name, info->interest_ccnb + info->pi->offset[CCN_PI_B_Name],info->pi->offset[CCN_PI_E_Name] - info->pi->offset[CCN_PI_B_Name]); 
-		//ccn_name_append_str(name,"0000000000000001");
 		
 		sp.template_ccnb=ccn_charbuf_create();
 		ccn_charbuf_append_tt(sp.template_ccnb,CCN_DTAG_SignedInfo, CCN_DTAG);
@@ -514,9 +513,8 @@
     	struct ccn_charbuf *name=ccn_charbuf_create();
     	struct ccn_signing_params sp=CCN_SIGNING_PARAMS_INIT;
 
-	//ccn_charbuf_append(name, info->interest_ccnb + info->pi->offset[CCN_PI_B_Name],info->pi->offset[CCN_PI_E_Name] - info->pi->offset[CCN_PI_B_Name]); 
-	ccn_uri_append(name,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name],0);
-	
+	ccn_charbuf_append(name, info->interest_ccnb + info->pi->offset[CCN_PI_B_Name],info->pi->offset[CCN_PI_E_Name] - info->pi->offset[CCN_PI_B_Name]);	
+
 	sp.template_ccnb=ccn_charbuf_create();
 	ccn_charbuf_append_tt(sp.template_ccnb,CCN_DTAG_SignedInfo, CCN_DTAG);
 	ccnb_tagged_putf(sp.template_ccnb, CCN_DTAG_FreshnessSeconds, "%ld", 10);