Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RIOT: update submodule to 2020.04 #70

Merged
merged 1 commit into from
May 4, 2020
+14 −10
Merged

RIOT: update submodule to 2020.04 #70

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RIOT
Submodule RIOT updated 6761 files
2 changes: 1 addition & 1 deletion task-08/main.c
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@

#include <stdio.h>

#include "tlsf-malloc.h"
#include "tlsf.h"
#include "msg.h"
#include "shell.h"
#include "ccn-lite-riot.h"
2 changes: 1 addition & 1 deletion task-09/main.c
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ static void *_ipv6_fwd_eventloop(void *arg)
gnrc_pktsnip_t *pkt = msg.content.ptr;
if(msg.type == GNRC_NETAPI_MSG_TYPE_SND) {
gnrc_pktsnip_t *ipv6 = gnrc_pktsnip_search_type(pkt, GNRC_NETTYPE_IPV6);
ipv6_addr_t addrs[GNRC_NETIF_IPV6_ADDRS_NUMOF];
ipv6_addr_t addrs[CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF];
int res;
ipv6 = ipv6->data;

18 changes: 11 additions & 7 deletions task-09/udp.c
View file
Original file line number Diff line number Diff line change
@@ -39,14 +39,18 @@ static gnrc_netreg_entry_t server = GNRC_NETREG_ENTRY_INIT_PID(GNRC_NETREG_DEMUX
static void send(char *addr_str, char *port_str, char *data, unsigned int num,
unsigned int delay)
{
int iface;
char *iface;
gnrc_netif_t *netif = NULL;
uint16_t port;
ipv6_addr_t addr;

/* get interface, if available */
iface = ipv6_addr_split_iface(addr_str);
if ((iface < 0) && (gnrc_netif_numof() == 1)) {
iface = gnrc_netif_iter(NULL)->pid;
if ((!iface) && (gnrc_netif_numof() == 1)) {
netif = gnrc_netif_iter(NULL);
}
else if (iface) {
netif = gnrc_netif_get_by_pid(atoi(iface));
}
/* parse destination address */
if (ipv6_addr_from_str(&addr, addr_str) == NULL) {
@@ -86,11 +90,11 @@ static void send(char *addr_str, char *port_str, char *data, unsigned int num,
return;
}
/* add netif header, if interface was given */
if (iface > 0) {
gnrc_pktsnip_t *netif = gnrc_netif_hdr_build(NULL, 0, NULL, 0);
if (netif) {
gnrc_pktsnip_t *netif_hdr = gnrc_netif_hdr_build(NULL, 0, NULL, 0);

((gnrc_netif_hdr_t *)netif->data)->if_pid = (kernel_pid_t)iface;
LL_PREPEND(ip, netif);
((gnrc_netif_hdr_t *)netif_hdr->data)->if_pid = netif->pid;
LL_PREPEND(ip, netif_hdr);
}
/* send packet */
if (!gnrc_netapi_dispatch_send(GNRC_NETTYPE_UDP, GNRC_NETREG_DEMUX_CTX_ALL, ip)) {