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

Merge pull request #832 from mehlis/ccn-lite-follow-up-11

Browse Source 
ccnl: added documentation and proper event handling for dropped packets
This commit is contained in:
Christian Mehlis 2014-03-03 17:25:23 +01:00
commit 1ec20ce2f1
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/net/ccn_lite/ccn-lite-relay.c
View File

@ -353,6 +353,7 @@ int ccnl_io_loop(struct ccnl_relay_s *ccnl)
switch (in.type) {
case PKT_PENDING:
/* msg from transceiver */
hwtimer_remove(hwtimer_id);
p = (radio_packet_t *) in.content.ptr;
DEBUGMSG(1, "\tLength:\t%u\n", p->length);
@ -369,6 +370,7 @@ int ccnl_io_loop(struct ccnl_relay_s *ccnl)
break;
case (CCNL_RIOT_MSG):
/* msg from device local client */
hwtimer_remove(hwtimer_id);
m = (riot_ccnl_msg_t *) in.content.ptr;
DEBUGMSG(1, "\tLength:\t%u\n", m->size);
@ -379,6 +381,7 @@ int ccnl_io_loop(struct ccnl_relay_s *ccnl)
break;
case (CCNL_RIOT_HALT):
/* cmd to stop the relay */
hwtimer_remove(hwtimer_id);
DEBUGMSG(1, "\tSrc:\t%u\n", in.sender_pid);
DEBUGMSG(1, "\tNumb:\t%" PRIu32 "\n", in.content.value);
@ -388,6 +391,7 @@ int ccnl_io_loop(struct ccnl_relay_s *ccnl)
#if RIOT_CCNL_POPULATE
case (CCNL_RIOT_POPULATE):
/* cmd to polulate the cache */
hwtimer_remove(hwtimer_id);
DEBUGMSG(1, "\tSrc:\t%u\n", in.sender_pid);
DEBUGMSG(1, "\tNumb:\t%" PRIu32 "\n", in.content.value);
@ -396,15 +400,22 @@ int ccnl_io_loop(struct ccnl_relay_s *ccnl)
break;
#endif
case (CCNL_RIOT_PRINT_STAT):
/* cmd to print face statistics */
hwtimer_remove(hwtimer_id);
for (struct ccnl_face_s *f = ccnl->faces; f; f = f->next) {
ccnl_face_print_stat(f);
}
break;
case (CCNL_RIOT_TIMEOUT):
/* ccn timeout from hwtimer, run pending events */
timeout = ccnl_run_events();
us = timeout->tv_sec * 1000 * 1000 + timeout->tv_usec;
break;
case (ENOBUFFER):
/* transceiver has not enough buffer to store incoming packets, one packet is dropped */
hwtimer_remove(hwtimer_id);
DEBUGMSG(1, "transceiver: one packet is dropped because buffers are full\n");
break;
default:
hwtimer_remove(hwtimer_id);
DEBUGMSG(1, "%s Packet waiting\n", riot_ccnl_event_to_string(in.type));

3
sys/net/ccn_lite/ccnl-riot-compat.c
View File

@ -111,6 +111,9 @@ char *riot_ccnl_event_to_string(ccnl_riot_event_t event)
case CCNL_RIOT_PRINT_STAT:
return "CCNL_RIOT_PRINT_STAT";
case ENOBUFFER:
return "ENOBUFFER";
default:
return "UNKNOWN";
}