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 #9756 from smlng/pr/ccnlite/versionbump

Browse Source 
pkg: update ccn-lite and adapt shell commands
This commit is contained in:
Cenk Gündoğan 2018-08-13 11:03:11 +02:00 committed by GitHub
commit ba6d386c5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ccn-lite/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=ccn-lite
PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
PKG_VERSION=48b17ebee7600b2e79b3acf0728217473d7a4ee8
PKG_VERSION=f85a2a055db92b5978f2d4f92b830b5b6b9acb42
PKG_LICENSE=ISC
.PHONY: all

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

@ -110,7 +110,7 @@ int _ccnl_content(int argc, char **argv)
arg_len = strlen(buf);
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL, NULL);
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL);
int offs = CCNL_MAX_PACKET_SIZE;
arg_len = ccnl_ndntlv_prependContent(prefix, (unsigned char*) buf, arg_len, NULL, NULL, &offs, _out);
@ -167,7 +167,7 @@ static struct ccnl_face_s *_intern_face_get(char *addr_str)
static int _intern_fib_add(char *pfx, char *addr_str)
{
int suite = CCNL_SUITE_NDNTLV;
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(pfx, suite, NULL, 0);
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(pfx, suite, NULL);
if (!prefix) {
puts("Error: prefix could not be created!");
return -1;
@ -210,7 +210,7 @@ int _ccnl_interest(int argc, char **argv)
memset(_int_buf, '\0', BUF_SIZE);
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);
int res = ccnl_send_interest(prefix, _int_buf, BUF_SIZE, NULL);
ccnl_prefix_free(prefix);
@ -239,7 +239,7 @@ int _ccnl_fib(int argc, char **argv)
else if ((argc == 3) && (strncmp(argv[1], "del", 3) == 0)) {
int suite = CCNL_SUITE_NDNTLV;
if (strchr(argv[2], '/')) {
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[2], suite, NULL, 0);
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[2], suite, NULL);
if (!prefix) {
puts("Error: prefix could not be created!");
return -1;