Merge remote-tracking branch 'upstream/nfn_merge' into nacks

RIOT-OS · Jun 17, 2014 · 4a42fe5 · 4a42fe5
2 parents 42ad0cc + 035051a
commit 4a42fe5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/BSDmakefile b/BSDmakefile
@@ -37,7 +37,7 @@ ccn-lite-relay: ccn-lite-relay.c ${CCNB_LIB} ${NDNTLV_LIB} BSDmakefile\
 	ccnl-ext-http.c \
 	ccnl-ext-sched.c ccnl-ext-frag.c ccnl-ext-mgmt.c \
 	ccnl-ext-crypto.c BSDmakefile
-	${CC} -o $@ ${MYCFLAGS} $< ${EXTLIBS} -DCCNL_NACK
+	${CC} -o $@ ${MYCFLAGS} $< ${EXTLIBS} -DCCNL_NACK -DCCNL_NFN_MONITOR
 
 
 datastruct.pdf: datastruct.dot

diff --git a/Makefile b/Makefile
@@ -59,7 +59,7 @@ ccn-lite-relay: ccn-lite-relay.c ${CCNB_LIB} ${NDNTLV_LIB} Makefile\
 	ccnl-ext-http.c \
 	ccnl-ext-sched.c ccnl-ext-frag.c ccnl-ext-mgmt.c \
 	ccnl-ext-crypto.c Makefile
-	${CC} -o $@ ${MYCFLAGS} $< ${EXTLIBS} -DCCNL_NACK
+	${CC} -o $@ ${MYCFLAGS} $< ${EXTLIBS} -DCCNL_NACK -DCCNL_NFN_MONITOR
 
 
 ccn-lite-simu: ccn-lite-simu.c  ${CCNB_LIB} ${NDNTLV_LIB} Makefile\

diff --git a/ccnl-core.c b/ccnl-core.c
@@ -38,6 +38,9 @@
 void
 ccnl_nfn_continue_computation(struct ccnl_relay_s *ccnl, int configid, int continue_from_remove);
 
+void ccnl_nack_reply(struct ccnl_relay_s *ccnl, struct ccnl_prefix_s *prefix,
+                     struct ccnl_face_s *from, int suite);
+
 int
 ccnl_content_serve_pending(struct ccnl_relay_s *ccnl, struct ccnl_content_s *c);