riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ccnl: find bogus looping content

Browse Source
This commit is contained in:
Christian Mehlis 2014-04-08 20:30:47 +02:00
parent 066d743c35
commit 206e6688a7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/net/ccn_lite/ccnl-core.c
View File

@ -994,7 +994,8 @@ ccnl_content_add2cache(struct ccnl_relay_s *ccnl, struct ccnl_content_s *c)
// but only one copy per face // but only one copy per face
// returns: number of forwards // returns: number of forwards
int ccnl_content_serve_pending(struct ccnl_relay_s *ccnl, int ccnl_content_serve_pending(struct ccnl_relay_s *ccnl,
struct ccnl_content_s *c) struct ccnl_content_s *c,
struct ccnl_face_s *from)
{ {
struct ccnl_interest_s *i; struct ccnl_interest_s *i;
struct ccnl_face_s *f; struct ccnl_face_s *f;
@ -1021,6 +1022,13 @@ int ccnl_content_serve_pending(struct ccnl_relay_s *ccnl,
continue; continue;
} }
if (pi->face == from) {
// the existing pending interest is from the same face
// as the newly arrived content is...no need to send content back
DEBUGMSG(1, " detected looping content, before loop could happen\n");
continue;
}
pi->face->flags |= CCNL_FACE_FLAGS_SERVED; pi->face->flags |= CCNL_FACE_FLAGS_SERVED;
DEBUGMSG(6, " forwarding content <%s>\n", DEBUGMSG(6, " forwarding content <%s>\n",
@ -1385,7 +1393,7 @@ int ccnl_core_RX_i_or_c(struct ccnl_relay_s *relay, struct ccnl_face_s *from,
c = ccnl_content_new(relay, &buf, &p, &ppkd, content, contlen); c = ccnl_content_new(relay, &buf, &p, &ppkd, content, contlen);
if (c) { // CONFORM: Step 2 (and 3) if (c) { // CONFORM: Step 2 (and 3)
if (!ccnl_content_serve_pending(relay, c)) { // unsolicited content if (!ccnl_content_serve_pending(relay, c, from)) { // unsolicited content
// CONFORM: "A node MUST NOT forward unsolicited data [...]" // CONFORM: "A node MUST NOT forward unsolicited data [...]"
DEBUGMSG(7, " removed because no matching interest\n"); DEBUGMSG(7, " removed because no matching interest\n");
free_content(c); free_content(c);