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

Merge pull request #8155 from RIOT-OS/revert-8009-revert-7238-pr_sc_ccnl_chunkdump

Browse Source 
Revert "Revert "shell/ccnl: remove use of ccnl_wait_for chunk()""
This commit is contained in:
Peter Kietzmann 2017-11-28 21:36:38 +01:00 committed by GitHub
commit eb2c0e29ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ccn-lite-relay/Makefile
View File

@ -31,6 +31,8 @@ USEMODULE += shell_commands
# NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present
USEMODULE += gnrc_netdev_default USEMODULE += gnrc_netdev_default
USEMODULE += auto_init_gnrc_netif USEMODULE += auto_init_gnrc_netif
# This application dumps received packets to STDIO using the pktdump module
USEMODULE += gnrc_pktdump
USEMODULE += timex USEMODULE += timex
USEMODULE += xtimer USEMODULE += xtimer
USEMODULE += random USEMODULE += random

7
examples/ccn-lite-relay/main.c
View File

@ -25,6 +25,7 @@
#include "shell.h" #include "shell.h"
#include "ccn-lite-riot.h" #include "ccn-lite-riot.h"
#include "net/gnrc/netif.h" #include "net/gnrc/netif.h"
#include "net/gnrc/pktdump.h"
/* main thread's message queue */ /* main thread's message queue */
#define MAIN_QUEUE_SIZE (8) #define MAIN_QUEUE_SIZE (8)
@ -55,6 +56,12 @@ int main(void)
return -1; return -1;
} }
#ifdef MODULE_NETIF
gnrc_netreg_entry_t dump = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL,
gnrc_pktdump_pid);
gnrc_netreg_register(GNRC_NETTYPE_CCN_CHUNK, &dump);
#endif
char line_buf[SHELL_DEFAULT_BUFSIZE]; char line_buf[SHELL_DEFAULT_BUFSIZE];
shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE); shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE);
return 0; return 0;

6
sys/net/gnrc/pktdump/gnrc_pktdump.c
View File

@ -88,6 +88,12 @@ static void _dump_snip(gnrc_pktsnip_t *pkt)
udp_hdr_print(pkt->data); udp_hdr_print(pkt->data);
break; break;
#endif #endif
#ifdef MODULE_CCN_LITE_UTILS
case GNRC_NETTYPE_CCN_CHUNK:
printf("GNRC_NETTYPE_CCN_CHUNK (%i)\n", pkt->type);
printf("Content is: %.*s\n", pkt->size, (char*)pkt->data);
break;
#endif
#ifdef TEST_SUITES #ifdef TEST_SUITES
case GNRC_NETTYPE_TEST: case GNRC_NETTYPE_TEST:
printf("NETTYPE_TEST (%i)\n", pkt->type); printf("NETTYPE_TEST (%i)\n", pkt->type);

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

@ -29,7 +29,6 @@
#define MAX_ADDR_LEN (GNRC_NETIF_L2ADDR_MAXLEN) #define MAX_ADDR_LEN (GNRC_NETIF_L2ADDR_MAXLEN)
static unsigned char _int_buf[BUF_SIZE]; static unsigned char _int_buf[BUF_SIZE];
static unsigned char _cont_buf[BUF_SIZE];
static const char *_default_content = "Start the RIOT!"; static const char *_default_content = "Start the RIOT!";
static unsigned char _out[CCNL_MAX_PACKET_SIZE]; static unsigned char _out[CCNL_MAX_PACKET_SIZE];
@ -206,26 +205,10 @@ 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);
gnrc_netreg_entry_t _ne =
GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX_CTX_ALL,
sched_active_pid);
/* register for content chunks */
gnrc_netreg_register(GNRC_NETTYPE_CCN_CHUNK, &_ne);
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); int res = ccnl_send_interest(prefix, _int_buf, BUF_SIZE);
int res = 0;
if (ccnl_wait_for_chunk(_cont_buf, BUF_SIZE, 0) > 0) {
printf("Content received: %s\n", _cont_buf);
}
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);
return res; return res;
} }