RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #7711 from miri64/gnrc_netif2/fix/fail-fast

Browse Source 
gnrc_netif2: make gnrc_netif2_create idempotent and crash on error
This commit is contained in:
Martine Lenders 2017-10-10 21:42:18 +02:00 committed by GitHub
commit 9368b1deb6
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpu/nrf5x_common/radio/nrfmin/nrfmin_gnrc.c
View File

@ -218,11 +218,8 @@ void gnrc_nrfmin_init(void)
/* setup the NRFMIN driver */
nrfmin_setup();
#ifdef MODULE_GNRC_NETIF2
if (!gnrc_netif2_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO,
"nrfmin", (netdev_t *)&nrfmin_dev,
&gnrc_nrfmin_ops)) {
DEBUG("[nrfmin_dev] error initializing GNRC interface for nrfmin radio\n");
}
gnrc_netif2_create(stack, sizeof(stack), NRFMIN_GNRC_THREAD_PRIO, "nrfmin",
(netdev_t *)&nrfmin_dev, &gnrc_nrfmin_ops);
#else
/* initialize the GNRC plug struct */
plug.send = gnrc_nrfmin_send;

5
sys/include/net/gnrc/netif2.h
View File

@ -215,8 +215,11 @@ struct gnrc_netif2_ops {
* @note If @ref DEVELHELP is defined netif_params_t::name is used as the
* name of the network interface's thread.
*
* @attention Fails and crashes (assertion error with @ref DEVELHELP or
* segmentation fault without) if `GNRC_NETIF_NUMOF` is lower than
* the number of calls to this function.
*
* @return The network interface on success.
* @return NULL, on error.
*/
gnrc_netif2_t *gnrc_netif2_create(char *stack, int stacksize, char priority,
const char *name, netdev_t *dev,

5
sys/include/net/gnrc/netif2/ethernet.h
View File

@ -35,8 +35,11 @@ extern "C" {
*
* @see @ref gnrc_netif2_create()
*
* @attention Fails and crashes (assertion error with @ref DEVELHELP or
* segmentation fault without) if `GNRC_NETIF_NUMOF` is lower than
* the number of calls to this function.
*
* @return The network interface on success.
* @return NULL, on error.
*/
gnrc_netif2_t *gnrc_netif2_ethernet_create(char *stack, int stacksize, char priority,
char *name, netdev_t *dev);

12
sys/net/gnrc/netif2/gnrc_netif2.c
View File

@ -51,16 +51,14 @@ gnrc_netif2_t *gnrc_netif2_create(char *stack, int stacksize, char priority,
int res;
for (int i = 0; i < GNRC_NETIF_NUMOF; i++) {
if (_netifs[i].ops == NULL) {
if (_netifs[i].dev == netdev) {
return &_netifs[i];
}
if ((netif == NULL) && (_netifs[i].ops == NULL)) {
netif = &_netifs[i];
break;
}
}
if (netif == NULL) {
LOG_ERROR("gnrc_netif2: can not allocate network interface.\n"
"Set GNRC_NETIF_NUMOF to a higher value\n");
return NULL;
}
assert(netif != NULL);
rmutex_init(&netif->mutex);
netif->ops = ops;
assert(netif->dev == NULL);

3
tests/gnrc_netif2/main.c
View File

@ -91,7 +91,6 @@ static inline void _test_init(gnrc_netif2_t *netif)
static void test_creation(void)
{
char test_stack[4];
gnrc_netif2_t *ptr = NULL;
TEST_ASSERT_EQUAL_INT(0, gnrc_netif2_numof());
@ -131,8 +130,6 @@ static void test_creation(void)
TEST_ASSERT_NULL((ptr = gnrc_netif2_iter(ptr)));
}
TEST_ASSERT(init_called);
TEST_ASSERT_NULL(gnrc_netif2_create(test_stack, 4, GNRC_NETIF2_PRIO,
"netif", NULL, &default_ops));
}
static void test_get_by_pid(void)