1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00

Merge pull request https://github.com/RIOT-OS/applications/pull/71 from fjmolinas/pr_bump_version

RIOT: bump version to 2020.01
This commit is contained in:
Alexandre Abadie 2020-02-05 11:25:26 +01:00 committed by chrysn
commit 5b40f96f9d
3 changed files with 15 additions and 7 deletions

View File

@ -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

2
RIOT

@ -1 +1 @@
Subproject commit 1b9ec8eef77af116b7c1b6aaf00b044a29345811
Subproject commit 8735f8176a84446bc15a6df33331b5ee0129df1f

View File

@ -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)