Merge remote-tracking branch 'upstream/nfn' into nfn

RIOT-OS · May 21, 2014 · 9095d4b · 9095d4b
2 parents 439f1ef + 5b2b709
commit 9095d4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ccnl-core.c b/ccnl-core.c
@@ -821,6 +821,13 @@ ccnl_content_serve_pending(struct ccnl_relay_s *ccnl, struct ccnl_content_s *c)
     int cnt = 0;
     DEBUGMSG(99, "ccnl_content_serve_pending\n");
 
+
+    DEBUGMSG(99, "PIT, serving content %s:\n", ccnl_prefix_to_path(c->name));
+    struct ccnl_interest_s *i_it;
+    for(i_it = ccnl->pit; i_it; i_it = i_it->next){
+        fprintf(stderr, "         -------------------- %s\n", ccnl_prefix_to_path(i_it->prefix));
+    }
+
     for (f = ccnl->faces; f; f = f->next){
 	f->flags &= ~CCNL_FACE_FLAGS_SERVED; // reply on a face only once
     }

diff --git a/krivine.c b/krivine.c
@@ -294,10 +294,7 @@ int choose_parameter(struct configuration_s *config){
     int num;
     DEBUGMSG(99, "choose_parameter(%d)\n", param_to_choose);
     for(num = config->fox_state->num_of_params-1; num >=0; --num){
-	DEBUGMSG(99, "num: %d \n", num);
-        DEBUGMSG(99, "content %s\n", config->fox_state->params[num]);
     	if(iscontent(config->fox_state->params[num])){
-	   DEBUGMSG(99, "iscontent\n");
 	   --param_to_choose; 
            if(param_to_choose <= 0)
 		return num;