commit 2fd7436e012569e0b43e9bd1a0371ec85de42ba0
author akmhoque <akmhoque@gmail.com> Mon Aug 27 14:45:08 2012 -0500
committer akmhoque <akmhoque@gmail.com> Mon Aug 27 14:45:08 2012 -0500
tree 7f682245d6ff5d1d89cd0d0938359d482faec78e
parent b7b46394e79b6855c15b7c8cf445287b0e71de5c

Update in sending Info Interest

nlsr_ndn.c

diff --git a/nlsr_ndn.c b/nlsr_ndn.c
index ef8b587..8c94606 100644
--- a/nlsr_ndn.c
+++ b/nlsr_ndn.c
@@ -55,6 +55,7 @@
 	    	struct ccn_charbuf*c;
 		c=ccn_charbuf_create();
 		ccn_uri_append(c,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name]-info->pi->offset[CCN_PI_B_Name],0);
+		ccn_uri_append(c,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name],0);
 		//ccn_name_chop(c,NULL,-1);
 		printf("%s\n",ccn_charbuf_as_string(c));
 		ccn_charbuf_destroy(&c);
@@ -374,7 +375,8 @@
 
 	struct ccn_charbuf*c;
 	c=ccn_charbuf_create();
-	ccn_uri_append(c,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name]-info->pi->offset[CCN_PI_B_Name],0);
+	//ccn_uri_append(c,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name]-info->pi->offset[CCN_PI_B_Name],0);
+	ccn_uri_append(c,info->interest_ccnb,info->pi->offset[CCN_PI_E_Name],0);
 	printf("%s\n",ccn_charbuf_as_string(c));
 	ccn_charbuf_destroy(&c);
 
@@ -512,8 +514,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_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);
 	
 	sp.template_ccnb=ccn_charbuf_create();
 	ccn_charbuf_append_tt(sp.template_ccnb,CCN_DTAG_SignedInfo, CCN_DTAG);
@@ -521,12 +523,8 @@
 	sp.sp_flags |= CCN_SP_TEMPL_FRESHNESS;
 	ccn_charbuf_append_closer(sp.template_ccnb);	
 
-	struct ccn_charbuf *c=ccn_charbuf_create();
-	ccn_charbuf_reset(c);
-	ccn_charbuf_putf(c, "%ld", nlsr->lsdb_synch_interval);
-	//ccn_charbuf_append_string(data,ccn_charbuf_as_string(c));	   
-
-	res= ccn_sign_content(nlsr->ccn, data, name, &sp, c->buf, c->length); 
+	
+	res= ccn_sign_content(nlsr->ccn, data, name, &sp, "info", strlen("info")); 
 	if(res >= 0)
 		printf("Signing Content is successful \n");
 
@@ -535,7 +533,6 @@
 		printf("Sending Info Content is successful \n");
 
 	ccn_charbuf_destroy(&data);
-	ccn_charbuf_destroy(&c);
 	ccn_charbuf_destroy(&name);
 	ccn_charbuf_destroy(&sp.template_ccnb);