RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

ccnl: fix function name

Browse Source
This commit is contained in:
Christian Mehlis 2014-07-18 20:50:37 +02:00
parent 0aad35f33c
commit 54bf710c69
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1143,9 +1143,8 @@ ccnl_forward_remove(struct ccnl_relay_s *ccnl, struct ccnl_forward_s *fwd)
return fwd2; return fwd2;
} }
bool ccnl_is_timeouted(struct timeval *now, struct timeval *last_used, uint32_t timeout_s, uint32_t timeout_us) bool ccnl_is_timed_out(struct timeval *now, struct timeval *last_used, uint32_t timeout_s, uint32_t timeout_us)
{ {
timex_t time = timex_set(timeout_s, timeout_us); timex_t time = timex_set(timeout_s, timeout_us);
timex_normalize(&time); timex_normalize(&time);
struct timeval abs_timeout = { last_used->tv_sec + time.seconds, last_used->tv_usec + time.microseconds }; struct timeval abs_timeout = { last_used->tv_sec + time.seconds, last_used->tv_usec + time.microseconds };
@ -1191,7 +1190,7 @@ void ccnl_do_nonce_timeout(void *ptr, void *dummy)
//DEBUGMSG(99, "ccnl_do_nonce_timeout: %lu:%lu\n", now.tv_sec, now.tv_usec); //DEBUGMSG(99, "ccnl_do_nonce_timeout: %lu:%lu\n", now.tv_sec, now.tv_usec);
for (struct ccnl_nonce_s *n = relay->nonces; n;) { for (struct ccnl_nonce_s *n = relay->nonces; n;) {
if (ccnl_is_timeouted(&now, &n->created, CCNL_NONCE_TIMEOUT_SEC, CCNL_NONCE_TIMEOUT_USEC)) { if (ccnl_is_timed_out(&now, &n->created, CCNL_NONCE_TIMEOUT_SEC, CCNL_NONCE_TIMEOUT_USEC)) {
n = ccnl_nonce_remove(relay, n); n = ccnl_nonce_remove(relay, n);
} else { } else {
n = n->next; n = n->next;
@ -1214,7 +1213,7 @@ void ccnl_do_ageing(void *ptr, void *dummy)
//DEBUGMSG(999, "ccnl_do_ageing %ld:%ld\n", now.tv_sec, now.tv_usec); //DEBUGMSG(999, "ccnl_do_ageing %ld:%ld\n", now.tv_sec, now.tv_usec);
while (i) { while (i) {
if (ccnl_is_timeouted(&now, &i->last_used, CCNL_INTEREST_TIMEOUT_SEC, if (ccnl_is_timed_out(&now, &i->last_used, CCNL_INTEREST_TIMEOUT_SEC,
CCNL_INTEREST_TIMEOUT_USEC)) { CCNL_INTEREST_TIMEOUT_USEC)) {
if (i->from->ifndx == RIOT_MSG_IDX) { if (i->from->ifndx == RIOT_MSG_IDX) {
/* this interest was requested by an app from this node */ /* this interest was requested by an app from this node */
@ -1229,7 +1228,7 @@ void ccnl_do_ageing(void *ptr, void *dummy)
} }
while (c) { while (c) {
if (ccnl_is_timeouted(&now, &c->last_used, CCNL_CONTENT_TIMEOUT_SEC, CCNL_CONTENT_TIMEOUT_USEC) if (ccnl_is_timed_out(&now, &c->last_used, CCNL_CONTENT_TIMEOUT_SEC, CCNL_CONTENT_TIMEOUT_USEC)
&& !(c->flags & CCNL_CONTENT_FLAGS_STATIC)) { && !(c->flags & CCNL_CONTENT_FLAGS_STATIC)) {
c = ccnl_content_remove(relay, c); c = ccnl_content_remove(relay, c);
} }
@ -1240,7 +1239,7 @@ void ccnl_do_ageing(void *ptr, void *dummy)
while (f) { while (f) {
if (!(f->flags & CCNL_FACE_FLAGS_STATIC) if (!(f->flags & CCNL_FACE_FLAGS_STATIC)
&& ccnl_is_timeouted(&now, &f->last_used, CCNL_FACE_TIMEOUT_SEC, CCNL_FACE_TIMEOUT_USEC)) { && ccnl_is_timed_out(&now, &f->last_used, CCNL_FACE_TIMEOUT_SEC, CCNL_FACE_TIMEOUT_USEC)) {
f = ccnl_face_remove(relay, f); f = ccnl_face_remove(relay, f);
} }
else { else {
@ -1251,7 +1250,7 @@ void ccnl_do_ageing(void *ptr, void *dummy)
struct ccnl_forward_s *fwd = relay->fib; struct ccnl_forward_s *fwd = relay->fib;
while (fwd) { while (fwd) {
if (!(fwd->flags & CCNL_FORWARD_FLAGS_STATIC) if (!(fwd->flags & CCNL_FORWARD_FLAGS_STATIC)
&& ccnl_is_timeouted(&now, &fwd->last_used, CCNL_FWD_TIMEOUT_SEC, CCNL_FWD_TIMEOUT_USEC)) { && ccnl_is_timed_out(&now, &fwd->last_used, CCNL_FWD_TIMEOUT_SEC, CCNL_FWD_TIMEOUT_USEC)) {
fwd = ccnl_forward_remove(relay, fwd); fwd = ccnl_forward_remove(relay, fwd);
} }
else { else {