RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19870 #19900 #19902

Browse Source 
19870: tests/gcoap_fileserver: only enable test with GCC r=benpicco a=benpicco





19900: gnrc_ipv6_nib: fix for border router with non-6lo interfaces r=benpicco a=benpicco





19902: tests/pkg/relic: skip CI testing with samr21-xpro and llvm toolchain r=benpicco a=aabadie



Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
Co-authored-by: Benjamin Valentin <benjamin.valentin@bht-berlin.de>
Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
This commit is contained in:
bors[bot] 2023-08-24 14:28:41 +00:00 committed by GitHub
commit 8e5a67b088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/gnrc/network_layer/ipv6/nib/_nib-internal.h
View File

@ -794,6 +794,8 @@ _nib_offl_entry_t *_nib_abr_iter_pfx(const _nib_abr_entry_t *abr,
* @return NULL, if @p last is the last ABR in the NIB.
*/
_nib_abr_entry_t *_nib_abr_iter(const _nib_abr_entry_t *last);
#else
#define _nib_abr_iter(abr) NULL
#endif
/**

20
sys/net/gnrc/network_layer/ipv6/nib/_nib-router.c
View File

@ -86,18 +86,18 @@ void _handle_snd_mc_ra(gnrc_netif_t *netif)
void _snd_rtr_advs(gnrc_netif_t *netif, const ipv6_addr_t *dst, bool final)
{
#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_P6C)
_nib_abr_entry_t *abr = NULL;
if (IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_MULTIHOP_P6C) && gnrc_netif_is_6lr(netif)) {
_nib_abr_entry_t *abr = NULL;
DEBUG("nib: Send router advertisements for each border router:\n");
while ((abr = _nib_abr_iter(abr))) {
DEBUG(" - %s\n", ipv6_addr_to_str(addr_str, &abr->addr,
sizeof(addr_str)));
_snd_ra(netif, dst, final, abr);
DEBUG("nib: Send router advertisements for each border router:\n");
while ((abr = _nib_abr_iter(abr))) {
DEBUG(" - %s\n", ipv6_addr_to_str(addr_str, &abr->addr,
sizeof(addr_str)));
_snd_ra(netif, dst, final, abr);
}
} else {
_snd_ra(netif, dst, final, NULL);
}
#else /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_P6C */
_snd_ra(netif, dst, final, NULL);
#endif /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_P6C */
}
static gnrc_pktsnip_t *_offl_to_pio(_nib_offl_entry_t *offl,

2
tests/net/gcoap_fileserver/Makefile
View File

@ -23,6 +23,8 @@ USEMODULE += shell_cmd_md5sum
# automated test only works on native
TEST_ON_CI_WHITELIST += native
# FIXME: for some reason the test fails very often when built with clang
TOOLCHAINS_BLACKLIST += llvm
# use small blocksize for test to increase chance for errors
CFLAGS += -DCONFIG_NANOCOAP_BLOCKSIZE_DEFAULT=COAP_BLOCKSIZE_16

5
tests/pkg/relic/Makefile
View File

@ -32,6 +32,11 @@ CFLAGS += -DTHREAD_STACKSIZE_MAIN=\(6*THREAD_STACKSIZE_DEFAULT\)
USEPKG += relic
USEMODULE += embunit
ifeq (llvm,$(TOOLCHAIN))
# FIXME: automated test is failing on samr21-xpro
TEST_ON_CI_BLACKLIST += samr21-xpro
endif
# -DWSIZE=32 : Specifies the word width of the target system. This is
# currently not automatically detected so adjusted to your target
# platform.