Strict Hierarchical Check of Trust Chain Final
diff --git a/nlsr_ndn.c b/nlsr_ndn.c
index aa58904..b43a57d 100644
--- a/nlsr_ndn.c
+++ b/nlsr_ndn.c
@@ -499,7 +499,6 @@
writeLogg(__FILE__,__FUNCTION__,__LINE__,"process_incoming_content_info"
" called \n");
- //int res;
struct name_prefix *nbr=(struct name_prefix *)malloc(sizeof(struct name_prefix ));
get_nbr(nbr,selfp,info);
@@ -513,54 +512,38 @@
if ( contain_key_name(info->content_ccnb, info->pco) == 1){
- //struct ccn_charbuf *key_name=get_key_name(info->content_ccnb, info->pco);
- //struct ccn_charbuf *orig_router_kn=ccn_charbuf_create();
- //res=get_orig_router_from_key_name(orig_router_kn,key_name);
- //if( res == 0){
- //struct ccn_charbuf *rtr_uri = ccn_charbuf_create();
- //ccn_uri_append(rtr_uri, orig_router_kn->buf,
- // orig_router_kn->length, 0);
- //printf("Orig Router from Key name: %s\n",
- // ccn_charbuf_as_string(rtr_uri));
-
- //if( strcmp(nbr->name,ccn_charbuf_as_string(rtr_uri)) == 0){
- int res_verify=verify_key(info->content_ccnb,info->pco);
+ int res_verify=verify_key(info->content_ccnb,info->pco,0);
- if ( res_verify != 0 ){
- printf("Error in verfiying keys !! :( \n");
- }
- else{
- printf("Key verification is successful :)\n");
- update_adjacent_timed_out_zero_to_adl(nbr);
- update_adjacent_status_to_adl(nbr,NBR_ACTIVE);
- print_adjacent_from_adl();
+ if ( res_verify != 0 ){
+ printf("Error in verfiying keys !! :( \n");
+ }
+ else{
+ printf("Key verification is successful :)\n");
+ update_adjacent_timed_out_zero_to_adl(nbr);
+ update_adjacent_status_to_adl(nbr,NBR_ACTIVE);
+ print_adjacent_from_adl();
- if(!nlsr->is_build_adj_lsa_sheduled){
- if ( nlsr->debugging )
- printf("Scheduling Build and Install Adj LSA...\n");
- if ( nlsr->detailed_logging )
- writeLogg(__FILE__,__FUNCTION__,__LINE__,"Scheduling"
+ if(!nlsr->is_build_adj_lsa_sheduled){
+ if ( nlsr->debugging )
+ printf("Scheduling Build and Install Adj LSA...\n");
+ if ( nlsr->detailed_logging )
+ writeLogg(__FILE__,__FUNCTION__,__LINE__,"Scheduling"
"Build and Install Adj LSA...\n");
- nlsr->event_build_adj_lsa = ccn_schedule_event(
+ nlsr->event_build_adj_lsa = ccn_schedule_event(
nlsr->sched, 100000,
&build_and_install_adj_lsa, NULL, 0);
- nlsr->is_build_adj_lsa_sheduled=1;
- }
- else{
- if ( nlsr->debugging )
- printf("Build and Install Adj LSA already scheduled\n");
- if ( nlsr->detailed_logging )
- writeLogg(__FILE__,__FUNCTION__,__LINE__,"Build and Install Adj LSA"
+ nlsr->is_build_adj_lsa_sheduled=1;
+ }
+ else{
+ if ( nlsr->debugging )
+ printf("Build and Install Adj LSA already scheduled\n");
+ if ( nlsr->detailed_logging )
+ writeLogg(__FILE__,__FUNCTION__,__LINE__,"Build and Install Adj LSA"
" already scheduled\n");
- }
+ }
- }
- //}
- //ccn_charbuf_destroy(&rtr_uri);
- //}
- //ccn_charbuf_destroy(&key_name);
- //ccn_charbuf_destroy(&orig_router_kn);
+ }
}
/*
update_adjacent_timed_out_zero_to_adl(nbr);