From 990a76c80c926a41761e4b865c1e16739f43da1d Mon Sep 17 00:00:00 2001
From: smlng <s@mlng.net>
Date: Fri, 10 Aug 2018 10:21:24 +0200
Subject: [PATCH] pkg: update ccn-lite and adapt shell commands
This updates the ccn-lite package version which brings in the
latest upstream fixes for some compiler issues found on macOS
with clang and newer GCC versions.
A minor adaption of the RIOT shell commands is also included.
---
pkg/ccn-lite/Makefile | 2 +-
sys/shell/commands/sc_ccnl.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile
index 4a3ba49aab..bc63c1fb94 100644
--- a/pkg/ccn-lite/Makefile
+++ b/pkg/ccn-lite/Makefile
@@ -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
diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/commands/sc_ccnl.c
index 5a3b62571d..a522d2f8db 100644
--- a/sys/shell/commands/sc_ccnl.c
+++ b/sys/shell/commands/sc_ccnl.c
@@ -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;
--
GitLab