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

Kconfig: Expose gnrc/ipv6/blacklist configurations #12922

Merged
merged 2 commits into from
Dec 20, 2019
Merged

Kconfig: Expose gnrc/ipv6/blacklist configurations #12922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e61da
net/gnrc/ipv6_blacklist: Move config macros to 'CONFIG_' namespace
leandrolanzieri Dec 11, 2019
3383bae
Kconfig: Expose gnrc/ipv6/blacklist configurations
leandrolanzieri Dec 11, 2019
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
4 changes: 2 additions & 2 deletions sys/include/net/gnrc/ipv6/blacklist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ extern "C" {
/**
* Maximum size of the blacklist.
*/
#ifndef GNRC_IPV6_BLACKLIST_SIZE
#define GNRC_IPV6_BLACKLIST_SIZE (8)
#ifndef CONFIG_GNRC_IPV6_BLACKLIST_SIZE
#define CONFIG_GNRC_IPV6_BLACKLIST_SIZE (8)
#endif
/** @} */

Expand Down
1 change: 1 addition & 0 deletions sys/net/gnrc/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
menu "GNRC Network stack"
depends on MODULE_GNRC

rsource "network_layer/ipv6/blacklist/Kconfig"
rsource "network_layer/ipv6/whitelist/Kconfig"

endmenu # GNRC Network Stack
19 changes: 19 additions & 0 deletions sys/net/gnrc/network_layer/ipv6/blacklist/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright (c) 2019 HAW Hamburg
#
# This file is subject to the terms and conditions of the GNU Lesser
# General Public License v2.1. See the file LICENSE in the top level
# directory for more details.
#
menuconfig KCONFIG_MODULE_GNRC_IPV6_BLACKLIST
bool "Configure GNRC IPv6 Blacklisting"
depends on MODULE_GNRC_IPV6_BLACKLIST
help
Configure GNRC IPv6 Blacklisting module using Kconfig.

if KCONFIG_MODULE_GNRC_IPV6_BLACKLIST

config GNRC_IPV6_BLACKLIST_SIZE
int "Maximum size of the blacklist"
default 8

endif # KCONFIG_MODULE_GNRC_IPV6_BLACKLIST
10 changes: 5 additions & 5 deletions sys/net/gnrc/network_layer/ipv6/blacklist/gnrc_ipv6_blacklist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
#define ENABLE_DEBUG (0)
#include "debug.h"

ipv6_addr_t gnrc_ipv6_blacklist[GNRC_IPV6_BLACKLIST_SIZE];
BITFIELD(gnrc_ipv6_blacklist_set, GNRC_IPV6_BLACKLIST_SIZE);
ipv6_addr_t gnrc_ipv6_blacklist[CONFIG_GNRC_IPV6_BLACKLIST_SIZE];
BITFIELD(gnrc_ipv6_blacklist_set, CONFIG_GNRC_IPV6_BLACKLIST_SIZE);

static char addr_str[IPV6_ADDR_MAX_STR_LEN];

int gnrc_ipv6_blacklist_add(const ipv6_addr_t *addr)
{
for (int i = 0; i < GNRC_IPV6_BLACKLIST_SIZE; i++) {
for (int i = 0; i < CONFIG_GNRC_IPV6_BLACKLIST_SIZE; i++) {
if (!bf_isset(gnrc_ipv6_blacklist_set, i)) {
bf_set(gnrc_ipv6_blacklist_set, i);
memcpy(&gnrc_ipv6_blacklist[i], addr, sizeof(*addr));
Expand All @@ -43,7 +43,7 @@ int gnrc_ipv6_blacklist_add(const ipv6_addr_t *addr)

void gnrc_ipv6_blacklist_del(const ipv6_addr_t *addr)
{
for (int i = 0; i < GNRC_IPV6_BLACKLIST_SIZE; i++) {
for (int i = 0; i < CONFIG_GNRC_IPV6_BLACKLIST_SIZE; i++) {
if (ipv6_addr_equal(addr, &gnrc_ipv6_blacklist[i])) {
bf_unset(gnrc_ipv6_blacklist_set, i);
DEBUG("IPv6 blacklist: unblacklisted %s\n",
Expand All @@ -54,7 +54,7 @@ void gnrc_ipv6_blacklist_del(const ipv6_addr_t *addr)

bool gnrc_ipv6_blacklisted(const ipv6_addr_t *addr)
{
for (int i = 0; i < GNRC_IPV6_BLACKLIST_SIZE; i++) {
for (int i = 0; i < CONFIG_GNRC_IPV6_BLACKLIST_SIZE; i++) {
if (bf_isset(gnrc_ipv6_blacklist_set, i) &&
ipv6_addr_equal(addr, &gnrc_ipv6_blacklist[i])) {
return true;
Expand Down
6 changes: 3 additions & 3 deletions sys/net/gnrc/network_layer/ipv6/blacklist/gnrc_ipv6_blacklist_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

#include "net/gnrc/ipv6/blacklist.h"

extern ipv6_addr_t gnrc_ipv6_blacklist[GNRC_IPV6_BLACKLIST_SIZE];
extern BITFIELD(gnrc_ipv6_blacklist_set, GNRC_IPV6_BLACKLIST_SIZE);
extern ipv6_addr_t gnrc_ipv6_blacklist[CONFIG_GNRC_IPV6_BLACKLIST_SIZE];
extern BITFIELD(gnrc_ipv6_blacklist_set, CONFIG_GNRC_IPV6_BLACKLIST_SIZE);

void gnrc_ipv6_blacklist_print(void)
{
char addr_str[IPV6_ADDR_MAX_STR_LEN];
for (int i = 0; i < GNRC_IPV6_BLACKLIST_SIZE; i++) {
for (int i = 0; i < CONFIG_GNRC_IPV6_BLACKLIST_SIZE; i++) {
if (bf_isset(gnrc_ipv6_blacklist_set, i)) {
puts(ipv6_addr_to_str(addr_str, &gnrc_ipv6_blacklist[i], sizeof(addr_str)));
}
Expand Down