From a3bd67da2b55e9f40961068b5d4a3b29186dcf89 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 9 Dec 2015 00:10:37 +0100 Subject: [PATCH 1/3] shell ccnl: PRNG should be initialized only once Initialization of PRNG is taken care of by CCN-Lite. --- sys/shell/commands/sc_ccnl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/commands/sc_ccnl.c index fb61e65062..96976185b1 100644 --- a/sys/shell/commands/sc_ccnl.c +++ b/sys/shell/commands/sc_ccnl.c @@ -159,9 +159,6 @@ int _ccnl_interest(int argc, char **argv) return -1; } - /* XXX: https://xkcd.com/221/ */ - genrand_init(0x4); - /* initialize address with 0xFF for broadcast */ size_t addr_len = MAX_ADDR_LEN; uint8_t relay_addr[MAX_ADDR_LEN]; From 395141fd221dc1e37c38a50b701e9f389839958a Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 9 Dec 2015 00:11:23 +0100 Subject: [PATCH 2/3] shell ccnl: break & print after receiving content --- sys/shell/commands/sc_ccnl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/commands/sc_ccnl.c index 96976185b1..91f879ca79 100644 --- a/sys/shell/commands/sc_ccnl.c +++ b/sys/shell/commands/sc_ccnl.c @@ -169,8 +169,12 @@ int _ccnl_interest(int argc, char **argv) for (int cnt = 0; cnt < CCNL_INTEREST_RETRIES; cnt++) { ccnl_send_interest(CCNL_SUITE_NDNTLV, argv[1], relay_addr, addr_len, NULL, _int_buf, BUF_SIZE); - ccnl_wait_for_chunk(_cont_buf, BUF_SIZE); + if (ccnl_wait_for_chunk(_cont_buf, BUF_SIZE) > 0) { + printf("Content received: %s\n", _cont_buf); + return 0; + } } + printf("Timeout! No content received in response to the Interest for %s.\n", argv[1]); - return 0; + return -1; } From 759ec83514727490224828ad2d0f390994cc952d Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 9 Dec 2015 00:26:47 +0100 Subject: [PATCH 3/3] shell ccnl: properly initialize buffers --- sys/shell/commands/sc_ccnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/commands/sc_ccnl.c index 91f879ca79..b4388b090a 100644 --- a/sys/shell/commands/sc_ccnl.c +++ b/sys/shell/commands/sc_ccnl.c @@ -167,6 +167,8 @@ int _ccnl_interest(int argc, char **argv) addr_len = gnrc_netif_addr_from_str(relay_addr, sizeof(relay_addr), argv[2]); } + memset(_int_buf, '\0', BUF_SIZE); + memset(_cont_buf, '\0', BUF_SIZE); for (int cnt = 0; cnt < CCNL_INTEREST_RETRIES; cnt++) { ccnl_send_interest(CCNL_SUITE_NDNTLV, argv[1], relay_addr, addr_len, NULL, _int_buf, BUF_SIZE); if (ccnl_wait_for_chunk(_cont_buf, BUF_SIZE) > 0) {