From 5955c6f2294ad519fd52f4dc7e0501a86928e752 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 5 Feb 2020 10:04:18 +0100 Subject: [PATCH 1/3] RIOT: bump version to 2020.01 --- RIOT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RIOT b/RIOT index 1b9ec8eef7..8735f8176a 160000 --- a/RIOT +++ b/RIOT @@ -1 +1 @@ -Subproject commit 1b9ec8eef77af116b7c1b6aaf00b044a29345811 +Subproject commit 8735f8176a84446bc15a6df33331b5ee0129df1f From e0e2e400df8e9e11fa4cc03afae13f3cee3f0e69 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 5 Feb 2020 10:04:35 +0100 Subject: [PATCH 2/3] README: fix submodule initialization --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5909c83ddf..e5c6ac6e92 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,15 @@ cd applications RIOTBASE="../RIOT" BOARD=samr21-xpro make -C sniffer flash ``` -Alternatively, you can step into the submodule and check out the current master: +Alternatively you can use RIOT as a submodule. To initialize the submodule, from the +root of the repository run: + +```sh +git submodule update --init --recursive +``` + +If you want to use master then simply step into the submodule and checkout master or +any other desired branch. ```sh cd RIOT From b0307a432dbb398b8abf8770c7f1df9e75e3e108 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 5 Feb 2020 10:12:07 +0100 Subject: [PATCH 3/3] coap-chat/coap.c: apply api changes --- coap-chat/coap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coap-chat/coap.c b/coap-chat/coap.c index f2b4729c14..ac3af71199 100644 --- a/coap-chat/coap.c +++ b/coap-chat/coap.c @@ -63,8 +63,8 @@ static size_t _send(uint8_t *buf, size_t len, char *addr_str) remote.family = AF_INET6; /* parse for interface */ - int iface = ipv6_addr_split_iface(addr_str); - if (iface == -1) { + char *iface = ipv6_addr_split_iface(addr_str); + if (!iface) { if (gnrc_netif_numof() == 1) { /* assign the single interface found in gnrc_netif_numof() */ remote.netif = (uint16_t)gnrc_netif_iter(NULL)->pid; @@ -74,11 +74,11 @@ static size_t _send(uint8_t *buf, size_t len, char *addr_str) } } else { - if (gnrc_netif_get_by_pid(iface) == NULL) { + if (gnrc_netif_get_by_pid(atoi(iface)) == NULL) { DEBUG("[CoAP] interface not valid"); return 0; } - remote.netif = iface; + remote.netif = atoi(iface); } /* parse destination address */ @@ -95,7 +95,7 @@ static size_t _send(uint8_t *buf, size_t len, char *addr_str) /* parse port */ remote.port = GCOAP_PORT; - return gcoap_req_send2(buf, len, &remote, NULL); + return gcoap_req_send(buf, len, &remote, NULL, NULL); } int coap_post(char *addr, char *msgbuf, size_t msglen)