From 448e282ff3b46c96255f2b4050bdb03a70faefd1 Mon Sep 17 00:00:00 2001 From: PeterKietzmann Date: Fri, 2 Aug 2019 10:35:39 +0200 Subject: [PATCH 1/3] pkg/ccn-lite: bump version --- pkg/ccn-lite/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile index 58ee622b60..8d126bdba1 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=f85a2a055db92b5978f2d4f92b830b5b6b9acb42 +PKG_VERSION=b9e22be23ab534015061b03c39348445a2e9bb4b PKG_LICENSE=ISC .PHONY: all ..cmake_version_supported From 89c3c4e20e6f91643ca395f1068219595cb7a0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= Date: Mon, 6 May 2019 14:29:49 +0200 Subject: [PATCH 2/3] shell/ccn-lite: type fixes --- sys/shell/commands/sc_ccnl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/shell/commands/sc_ccnl.c b/sys/shell/commands/sc_ccnl.c index 249c840a25..e8e78468a7 100644 --- a/sys/shell/commands/sc_ccnl.c +++ b/sys/shell/commands/sc_ccnl.c @@ -113,24 +113,25 @@ int _ccnl_content(int argc, char **argv) arg_len = strlen(buf); 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); + size_t offs = CCNL_MAX_PACKET_SIZE; + size_t reslen = 0; + arg_len = ccnl_ndntlv_prependContent(prefix, (unsigned char*) buf, arg_len, NULL, NULL, &offs, _out, &reslen); ccnl_prefix_free(prefix); unsigned char *olddata; unsigned char *data = olddata = _out + offs; - int len; - unsigned typ; + size_t len; + uint64_t typ; - if (ccnl_ndntlv_dehead(&data, &arg_len, (int*) &typ, &len) || + if (ccnl_ndntlv_dehead(&data, &reslen, &typ, &len) || typ != NDN_TLV_Data) { return -1; } struct ccnl_content_s *c = 0; - struct ccnl_pkt_s *pk = ccnl_ndntlv_bytes2pkt(typ, olddata, &data, &arg_len); + struct ccnl_pkt_s *pk = ccnl_ndntlv_bytes2pkt(typ, olddata, &data, &reslen); c = ccnl_content_new(&pk); c->flags |= CCNL_CONTENT_FLAGS_STATIC; msg_t m = { .type = CCNL_MSG_CS_ADD, .content.ptr = c }; From 0cc91a47e17b6d44072330e34cb48f833c3de9d4 Mon Sep 17 00:00:00 2001 From: PeterKietzmann Date: Mon, 5 Aug 2019 08:23:37 +0200 Subject: [PATCH 3/3] pkg/ccn-lite: suppress llvm error --- pkg/ccn-lite/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile index 8d126bdba1..2534e8f2e7 100644 --- a/pkg/ccn-lite/Makefile +++ b/pkg/ccn-lite/Makefile @@ -10,6 +10,10 @@ CMAKE_MINIMAL_VERSION = 3.6.0 RIOT_CFLAGS = $(INCLUDES) +ifeq (llvm,$(TOOLCHAIN)) + RIOT_CFLAGS += -Wno-char-subscripts +endif + TOOLCHAIN_FILE=$(PKG_BUILDDIR)/xcompile-toolchain.cmake all: $(PKG_BUILDDIR)/src/Makefile