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

Merge pull request #7028 from PeterKietzmann/pr_shell_ccnl_retrans

Browse Source 
shell/ccnl: remove interest retransmission
This commit is contained in:
Cenk Gündoğan 2017-05-19 16:07:24 +02:00 committed by GitHub
commit b2c692b65f
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/shell/commands/sc_ccnl.c
View File

@ -26,11 +26,6 @@
#define BUF_SIZE (64) #define BUF_SIZE (64)
/**
* Maximum number of Interest retransmissions
*/
#define CCNL_INTEREST_RETRIES (3)
#define MAX_ADDR_LEN (8U) #define MAX_ADDR_LEN (8U)
static unsigned char _int_buf[BUF_SIZE]; static unsigned char _int_buf[BUF_SIZE];
@ -214,7 +209,7 @@ int _ccnl_interest(int argc, char **argv)
memset(_int_buf, '\0', BUF_SIZE); memset(_int_buf, '\0', BUF_SIZE);
memset(_cont_buf, '\0', BUF_SIZE); memset(_cont_buf, '\0', BUF_SIZE);
for (int cnt = 0; cnt < CCNL_INTEREST_RETRIES; cnt++) {
gnrc_netreg_entry_t _ne = gnrc_netreg_entry_t _ne =
GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL, GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL,
sched_active_pid); sched_active_pid);
@ -223,17 +218,18 @@ int _ccnl_interest(int argc, char **argv)
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL, 0); struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL, 0);
ccnl_send_interest(prefix, _int_buf, BUF_SIZE); ccnl_send_interest(prefix, _int_buf, BUF_SIZE);
int res = 0;
if (ccnl_wait_for_chunk(_cont_buf, BUF_SIZE, 0) > 0) { if (ccnl_wait_for_chunk(_cont_buf, BUF_SIZE, 0) > 0) {
gnrc_netreg_unregister(GNRC_NETTYPE_CCN_CHUNK, &_ne);
printf("Content received: %s\n", _cont_buf); printf("Content received: %s\n", _cont_buf);
return 0; }
else {
printf("Timeout! No content received in response to the Interest for %s.\n", argv[1]);
res = -1;
} }
free_prefix(prefix); free_prefix(prefix);
gnrc_netreg_unregister(GNRC_NETTYPE_CCN_CHUNK, &_ne); gnrc_netreg_unregister(GNRC_NETTYPE_CCN_CHUNK, &_ne);
}
printf("Timeout! No content received in response to the Interest for %s.\n", argv[1]);
return -1; return res;
} }
static void _ccnl_fib_usage(char *argv) static void _ccnl_fib_usage(char *argv)