RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

clean up ccnl_get_face_or_create

Browse Source
This commit is contained in:
Christian Mehlis 2013-12-06 20:43:32 +01:00
parent 32e0ce5b12
commit ff9f557e21
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,15 +383,9 @@ int ccnl_addr_cmp(sockunion *s1, sockunion *s2)
struct ccnl_face_s *
ccnl_get_face_or_create(struct ccnl_relay_s *ccnl, int ifndx, uint16_t sender_id)
{
DEBUGMSG(1, "ifndx=%d sender_id=%d\n", ifndx, sender_id);
static int i;
struct ccnl_face_s *f;
for (f = ccnl->faces; f; f = f->next) {
DEBUGMSG(1, "f=%p\n", (void *) f);
if (ifndx == f->ifndx && (f->faceid == sender_id)) {
DEBUGMSG(1, "face found! ifidx=%d sender_id=%d faceid=%d\n", ifndx, sender_id, f->faceid);
ccnl_get_timeval(&f->last_used);
@ -399,26 +393,14 @@ ccnl_get_face_or_create(struct ccnl_relay_s *ccnl, int ifndx, uint16_t sender_id
}
}
if (ifndx == -1) {
for (i = 0; i < ccnl->ifcount; i++) {
ifndx = i;
break;
}
if (ifndx == -1) { // no suitable interface found
return NULL;
}
}
f = (struct ccnl_face_s *) ccnl_calloc(1, sizeof(struct ccnl_face_s));
if (!f) {
return NULL;
}
f->faceid = sender_id;
DEBUGMSG(1, "faceid=%d\n", f->faceid);
f->ifndx = ifndx;
if (sender_id == RIOT_BROADCAST) {
f->flags |= CCNL_FACE_FLAGS_BROADCAST;
}