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

Merge pull request #11952 from PeterKietzmann/pr_ccnl_update_and_bump

Browse Source 
pkg/ccn-lite: bump version and adapt shell functions accordingly
This commit is contained in:
Martine Lenders 2019-08-05 10:27:43 +02:00 committed by GitHub
commit 4139370a87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/ccn-lite/Makefile
View File

@ -1,6 +1,6 @@
PKG_NAME=ccn-lite PKG_NAME=ccn-lite
PKG_URL=https://github.com/cn-uofbasel/ccn-lite/ PKG_URL=https://github.com/cn-uofbasel/ccn-lite/
PKG_VERSION=f85a2a055db92b5978f2d4f92b830b5b6b9acb42 PKG_VERSION=b9e22be23ab534015061b03c39348445a2e9bb4b
PKG_LICENSE=ISC PKG_LICENSE=ISC
.PHONY: all ..cmake_version_supported .PHONY: all ..cmake_version_supported
@ -10,6 +10,10 @@ CMAKE_MINIMAL_VERSION = 3.6.0
RIOT_CFLAGS = $(INCLUDES) RIOT_CFLAGS = $(INCLUDES)
ifeq (llvm,$(TOOLCHAIN))
RIOT_CFLAGS += -Wno-char-subscripts
endif
TOOLCHAIN_FILE=$(PKG_BUILDDIR)/xcompile-toolchain.cmake TOOLCHAIN_FILE=$(PKG_BUILDDIR)/xcompile-toolchain.cmake
all: $(PKG_BUILDDIR)/src/Makefile all: $(PKG_BUILDDIR)/src/Makefile

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

@ -113,24 +113,25 @@ int _ccnl_content(int argc, char **argv)
arg_len = strlen(buf); arg_len = strlen(buf);
struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL); struct ccnl_prefix_s *prefix = ccnl_URItoPrefix(argv[1], CCNL_SUITE_NDNTLV, NULL);
int offs = CCNL_MAX_PACKET_SIZE; size_t offs = CCNL_MAX_PACKET_SIZE;
arg_len = ccnl_ndntlv_prependContent(prefix, (unsigned char*) buf, arg_len, NULL, NULL, &offs, _out); size_t reslen = 0;
arg_len = ccnl_ndntlv_prependContent(prefix, (unsigned char*) buf, arg_len, NULL, NULL, &offs, _out, &reslen);
ccnl_prefix_free(prefix); ccnl_prefix_free(prefix);
unsigned char *olddata; unsigned char *olddata;
unsigned char *data = olddata = _out + offs; unsigned char *data = olddata = _out + offs;
int len; size_t len;
unsigned typ; 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) { typ != NDN_TLV_Data) {
return -1; return -1;
} }
struct ccnl_content_s *c = 0; 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 = ccnl_content_new(&pk);
c->flags |= CCNL_CONTENT_FLAGS_STATIC; c->flags |= CCNL_CONTENT_FLAGS_STATIC;
msg_t m = { .type = CCNL_MSG_CS_ADD, .content.ptr = c }; msg_t m = { .type = CCNL_MSG_CS_ADD, .content.ptr = c };