From c829f820ee870bffc60c7df688d2da8373553212 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Tue, 18 Feb 2020 10:30:41 +0100 Subject: [PATCH] pkg: Remove OONF API package The package has been flagged as deprecated in 07099d99d896cf98c9fa21818e7e6cd82e2d138c, due to lack of users, tests and maintenance. --- Makefile.dep | 9 - pkg/oonf_api/Makefile | 42 - pkg/oonf_api/Makefile.dep | 5 - pkg/oonf_api/Makefile.include | 5 - pkg/oonf_api/doc.txt | 11 - .../patches/0001-add-RIOT-support.patch | 252 -- .../patches/0002-port-tests-to-riot.patch | 180 -- .../patches/0003-port-example-to-riot.patch | 46 - .../patches/0004-fix-conflicting-types.patch | 50 - ...y-define-container_of-when-necessary.patch | 28 - .../patches/0006-if_index-is-not-used.patch | 23 - ...e-RIOT-s-container_of-implementation.patch | 44 - ...08-Dissolve-enum-into-single-defines.patch | 53 - .../patches/0009-Add-missing-include.patch | 23 - ...10-Change-index-of-array-from-0-to-1.patch | 24 - ...ay-subscript-has-type-char-Werror-ch.patch | 110 - ...t-implementation-of-riot-s-implement.patch | 2345 ----------------- 17 files changed, 3250 deletions(-) delete mode 100644 pkg/oonf_api/Makefile delete mode 100644 pkg/oonf_api/Makefile.dep delete mode 100644 pkg/oonf_api/Makefile.include delete mode 100644 pkg/oonf_api/doc.txt delete mode 100644 pkg/oonf_api/patches/0001-add-RIOT-support.patch delete mode 100644 pkg/oonf_api/patches/0002-port-tests-to-riot.patch delete mode 100644 pkg/oonf_api/patches/0003-port-example-to-riot.patch delete mode 100644 pkg/oonf_api/patches/0004-fix-conflicting-types.patch delete mode 100644 pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch delete mode 100644 pkg/oonf_api/patches/0006-if_index-is-not-used.patch delete mode 100644 pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch delete mode 100644 pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch delete mode 100644 pkg/oonf_api/patches/0009-Add-missing-include.patch delete mode 100644 pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch delete mode 100644 pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch delete mode 100644 pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch diff --git a/Makefile.dep b/Makefile.dep index 03396b5346..86e97d6b99 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -599,15 +599,6 @@ ifneq (,$(filter fib,$(USEMODULE))) USEMODULE += posix_headers endif -ifneq (,$(filter oonf_rfc5444,$(USEMODULE))) - USEMODULE += oonf_common -endif - -ifneq (,$(filter oonf_common,$(USEMODULE))) - USEPKG += oonf_api - USEMODULE += posix_sockets -endif - # if any log_* is used, also use LOG pseudomodule ifneq (,$(filter log_%,$(USEMODULE))) USEMODULE += log diff --git a/pkg/oonf_api/Makefile b/pkg/oonf_api/Makefile deleted file mode 100644 index dc0717569d..0000000000 --- a/pkg/oonf_api/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -PKG_NAME=oonf_api -PKG_URL=https://github.com/OLSR/OONF.git -PKG_VERSION=v0.3.0 -PKG_LICENSE=BSD-3-Clause - -include $(RIOTBASE)/pkg/pkg.mk - -MODULE:=$(PKG_NAME) - -# GCC 7.x fails on (intentional) fallthrough, thus disable implicit-fallthrough. -CFLAGS += -Wno-implicit-fallthrough - -COMBINED_ARCHIVE = $(BINDIR)/$(MODULE).a - -all: - "$(MAKE)" -C $(PKG_BUILDDIR) - "$(MAKE)" $(COMBINED_ARCHIVE) - -PARTIAL_ARCHIVES = $(wildcard $(BINDIR)/oonf_*.a) - -$(COMBINED_ARCHIVE): $(BINDIR)/$(MODULE).mri $(PARTIAL_ARCHIVES) - ar -M < $< - -define ADDLIB_TEMPLATE -addlib $1 - -endef - -define MRI_TEMPLATE -create $1 -$(foreach a,$2,$(call ADDLIB_TEMPLATE,$a)) -save -end -endef - -$(BINDIR)/$(MODULE).mri: - $(file >$@,$(call MRI_TEMPLATE,$(COMBINED_ARCHIVE),$(PARTIAL_ARCHIVES))) - @true - -ifneq (,$(filter -Wformat-nonliteral -Wformat=2, $(CFLAGS))) - CFLAGS += -Wno-format-nonliteral -endif diff --git a/pkg/oonf_api/Makefile.dep b/pkg/oonf_api/Makefile.dep deleted file mode 100644 index a4a7c6099c..0000000000 --- a/pkg/oonf_api/Makefile.dep +++ /dev/null @@ -1,5 +0,0 @@ -# avr-libc does not provide `strings.h` -FEATURES_BLACKLIST += arch_avr8 - -# msp430-libc does not provide `strftime` -FEATURES_BLACKLIST += arch_msp430 diff --git a/pkg/oonf_api/Makefile.include b/pkg/oonf_api/Makefile.include deleted file mode 100644 index ec6be727f0..0000000000 --- a/pkg/oonf_api/Makefile.include +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDES += -I$(PKGDIRBASE)/oonf_api/src-api - -ifeq ($(TOOLCHAIN), llvm) - CFLAGS += -Wno-keyword-macro -Wno-parentheses-equality -endif diff --git a/pkg/oonf_api/doc.txt b/pkg/oonf_api/doc.txt deleted file mode 100644 index dfb01f3d9d..0000000000 --- a/pkg/oonf_api/doc.txt +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @defgroup pkg_oonf_api OLSR.org Network Framework - * @ingroup pkg - * @ingroup net - * @brief The OLSR.org Network Framework (OONF) is a collection of libraries - * that can be used as the building blocks for networking daemons - * - * @deprecated The package has not been updated in 6 years, tests were never integrated - * into CI and with NHDP the only user of this package is being deprecated too. - * Will be removed after the 2020.04 release. - */ diff --git a/pkg/oonf_api/patches/0001-add-RIOT-support.patch b/pkg/oonf_api/patches/0001-add-RIOT-support.patch deleted file mode 100644 index e8ec40831b..0000000000 --- a/pkg/oonf_api/patches/0001-add-RIOT-support.patch +++ /dev/null @@ -1,252 +0,0 @@ -From 9e99bc8ed9f4e4d326a14589ad29607fef89e3a5 Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Wed, 5 Feb 2014 20:01:41 +0100 -Subject: [PATCH 01/10] add RIOT support - ---- - Makefile | 29 ++++++++++++++++++++ - external/regex/Makefile | 4 +++ - src-api/common/Makefile | 3 +++ - src-api/common/autobuf.c | 6 +++++ - src-api/common/common_types.h | 5 ++++ - src-api/common/daemonize.c | 2 +- - src-api/common/netaddr.c | 11 +++++++- - src-api/common/netaddr.h | 2 ++ - src-api/rfc5444/Makefile | 3 +++ - src-api/rfc5444/rfc5444_api_config.h | 51 ++++++++++++++++++++++++++++++++++++ - 10 files changed, 114 insertions(+), 2 deletions(-) - create mode 100644 Makefile - create mode 100644 external/regex/Makefile - create mode 100644 src-api/common/Makefile - create mode 100644 src-api/rfc5444/Makefile - create mode 100644 src-api/rfc5444/rfc5444_api_config.h - -diff --git a/Makefile b/Makefile -new file mode 100644 -index 0000000..1f1cd9c ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,29 @@ -+# -+# to use oonf_api in your RIOT project, -+# add the following to your Makefile: -+# -+# export OONFBASE = /path/to/this/directory -+# EXTERNAL_MODULES += $(OONFBASE) -+# -+# this provides the following modules: -+# oonf_common - avl tree, list, netaddr, regex, string functions -+# oonf_rfc5444 - packetBB implementation, requires oonf_common -+ -+ifneq (,$(filter oonf_common,$(USEMODULE))) -+ DIRS += src-api/common -+endif -+ifneq (,$(filter oonf_rfc5444,$(USEMODULE))) -+ DIRS += src-api/rfc5444 -+endif -+ifneq (,$(filter oonf_cunit,$(USEMODULE))) -+ DIRS += tests/cunit -+endif -+ifneq (,$(filter oonf_regex,$(USEMODULE))) -+ DIRS += external/regex -+endif -+ -+all: -+ mkdir -p $(BINDIR) -+ @for i in $(DIRS) ; do $(MAKE) -C $$i || exit 1; done ; -+ -+clean: -diff --git a/external/regex/Makefile b/external/regex/Makefile -new file mode 100644 -index 0000000..3bc1ce1 ---- /dev/null -+++ b/external/regex/Makefile -@@ -0,0 +1,4 @@ -+MODULE:=oonf_$(shell basename $(CURDIR)) -+INCLUDES += $(CURDIR)/.. -+ -+include $(RIOTBASE)/Makefile.base -diff --git a/src-api/common/Makefile b/src-api/common/Makefile -new file mode 100644 -index 0000000..5e0046d ---- /dev/null -+++ b/src-api/common/Makefile -@@ -0,0 +1,3 @@ -+MODULE:=oonf_$(shell basename $(CURDIR)) -+ -+include $(RIOTBASE)/Makefile.base -diff --git a/src-api/common/autobuf.c b/src-api/common/autobuf.c -index 77c519b..37e77ac 100644 ---- a/src-api/common/autobuf.c -+++ b/src-api/common/autobuf.c -@@ -51,6 +51,12 @@ - #include - #endif - -+#ifdef RIOT_VERSION -+int getpagesize(void) { -+ return 512; -+} -+#endif -+ - #include "common/autobuf.h" - - /** -diff --git a/src-api/common/common_types.h b/src-api/common/common_types.h -index c90cf46..b5f170a 100644 ---- a/src-api/common/common_types.h -+++ b/src-api/common/common_types.h -@@ -77,6 +77,11 @@ - #define PRINTF_SIZE_T_HEX_SPECIFIER "Ix" - #define PRINTF_SSIZE_T_SPECIFIER "Id" - #define PRINTF_PTRDIFF_T_SPECIFIER "Id" -+#elif defined(RIOT_VERSION) -+ #define PRINTF_SIZE_T_SPECIFIER "d" -+ #define PRINTF_SIZE_T_HEX_SPECIFIER "x" -+ #define PRINTF_SSIZE_T_SPECIFIER "d" -+ #define PRINTF_PTRDIFF_T_SPECIFIER "d" - #elif defined(__GNUC__) - #define PRINTF_SIZE_T_SPECIFIER "zu" - #define PRINTF_SIZE_T_HEX_SPECIFIER "zx" -diff --git a/src-api/common/daemonize.c b/src-api/common/daemonize.c -index 103c88f..8a6cd2b 100644 ---- a/src-api/common/daemonize.c -+++ b/src-api/common/daemonize.c -@@ -48,7 +48,7 @@ - #include "common/common_types.h" - #include "common/daemonize.h" - --#ifndef WIN32 -+#if (!defined(_WIN32)) && (!defined(RIOT_VERSION)) - /** - * Prepare the start of a daemon. Fork into background, - * but keep stdin/out/err open and a pipe connected to -diff --git a/src-api/common/netaddr.c b/src-api/common/netaddr.c -index dedab2c..6b214ee 100644 ---- a/src-api/common/netaddr.c -+++ b/src-api/common/netaddr.c -@@ -43,7 +43,11 @@ - #include - #include - #include -+#ifndef RIOT_VERSION - #include -+#else -+#define DONT_HAVE_SIN6_SCOPE_ID -+#endif - - #include "common/common_types.h" - #include "common/string.h" -@@ -326,7 +330,9 @@ netaddr_socket_init(union netaddr_socket *combined, const struct netaddr *addr, - /* ipv6 */ - memcpy(&combined->v6.sin6_addr, addr->_addr, 16); - combined->v6.sin6_port = htons(port); -+#ifndef DONT_HAVE_SIN6_SCOPE_ID - combined->v6.sin6_scope_id = if_index; -+#endif - break; - default: - /* unknown address type */ -@@ -561,6 +567,7 @@ netaddr_socket_to_string(struct netaddr_str *dst, const union netaddr_socket *sr - ntohs(src->v4.sin_port)); - } - else if (src->std.sa_family == AF_INET6) { -+#ifndef DONT_HAVE_SIN6_SCOPE_ID - if (src->v6.sin6_scope_id) { - char scope_buf[IF_NAMESIZE]; - -@@ -569,7 +576,9 @@ netaddr_socket_to_string(struct netaddr_str *dst, const union netaddr_socket *sr - ntohs(src->v6.sin6_port), - if_indextoname(src->v6.sin6_scope_id, scope_buf)); - } -- else { -+ else -+#endif -+ { - snprintf(dst->buf, sizeof(*dst), "[%s]:%d", - inet_ntop(AF_INET6, &src->v6.sin6_addr, buf.buf, sizeof(buf)), - ntohs(src->v6.sin6_port)); -diff --git a/src-api/common/netaddr.h b/src-api/common/netaddr.h -index 78fd5b4..cc8189c 100644 ---- a/src-api/common/netaddr.h -+++ b/src-api/common/netaddr.h -@@ -45,9 +45,11 @@ - - #ifndef _WIN32 - #include -+#ifndef RIOT_VERSION - #include - #include - #include -+#endif - #else - #include - #include -diff --git a/src-api/rfc5444/Makefile b/src-api/rfc5444/Makefile -new file mode 100644 -index 0000000..5e0046d ---- /dev/null -+++ b/src-api/rfc5444/Makefile -@@ -0,0 +1,3 @@ -+MODULE:=oonf_$(shell basename $(CURDIR)) -+ -+include $(RIOTBASE)/Makefile.base -diff --git a/src-api/rfc5444/rfc5444_api_config.h b/src-api/rfc5444/rfc5444_api_config.h -new file mode 100644 -index 0000000..9bf6622 ---- /dev/null -+++ b/src-api/rfc5444/rfc5444_api_config.h -@@ -0,0 +1,51 @@ -+ -+/* -+ * The olsr.org Optimized Link-State Routing daemon(olsrd) -+ * Copyright (c) 2004-2012, the olsr.org team - see HISTORY file -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * * Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * * Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in -+ * the documentation and/or other materials provided with the -+ * distribution. -+ * * Neither the name of olsr.org, olsrd nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ * -+ * Visit http://www.olsr.org for more information. -+ * -+ * If you find this software useful feel free to make a donation -+ * to the project. For more information see the website or contact -+ * the copyright holders. -+ * -+ */ -+ -+#ifndef RFC5444_API_CONFIG_H_ -+#define RFC5444_API_CONFIG_H_ -+ -+#define DISALLOW_CONSUMER_CONTEXT_DROP false -+#define WRITER_STATE_MACHINE true -+#define DEBUG_CLEANUP true -+#define DO_ADDR_COMPRESSION true -+#define CLEAR_ADDRESS_POSTFIX false -+ -+#endif /* RFC5444_API_CONFIG_H_ */ --- -1.9.1 diff --git a/pkg/oonf_api/patches/0002-port-tests-to-riot.patch b/pkg/oonf_api/patches/0002-port-tests-to-riot.patch deleted file mode 100644 index 1d613ca76d..0000000000 --- a/pkg/oonf_api/patches/0002-port-tests-to-riot.patch +++ /dev/null @@ -1,180 +0,0 @@ -From ccb37ece1a21325bbc1f3efba7d3f0ec0d6b26ac Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Tue, 23 Jul 2013 21:08:31 +0200 -Subject: [PATCH 02/10] port tests to riot - ---- - tests/common/.Makefile.template | 39 +++++++++++++++++++++++++++++++++++++ - tests/common/bin/.gitignore | 0 - tests/common/generate_makefiles.sh | 9 ++++++++ - tests/common/test_common_avl.c | 10 +++++----- - tests/cunit/Makefile | 3 +++ - tests/rfc5444/.Makefile.template | 32 ++++++++++++++++++++++++++++++ - tests/rfc5444/bin/.gitignore | 0 - tests/rfc5444/generate_makefiles.sh | 9 ++++++++ - 8 files changed, 91 insertions(+), 5 deletions(-) - create mode 100644 tests/common/.Makefile.template - create mode 100644 tests/common/bin/.gitignore - create mode 100755 tests/common/generate_makefiles.sh - create mode 100644 tests/cunit/Makefile - create mode 100644 tests/rfc5444/.Makefile.template - create mode 100644 tests/rfc5444/bin/.gitignore - create mode 100755 tests/rfc5444/generate_makefiles.sh - -diff --git a/tests/common/.Makefile.template b/tests/common/.Makefile.template -new file mode 100644 -index 0000000..afbaf0f ---- /dev/null -+++ b/tests/common/.Makefile.template -@@ -0,0 +1,39 @@ -+#### -+#### Sample Makefile for building apps with the RIOT OS -+#### -+#### The Sample Filesystem Layout is: -+#### /this makefile -+#### ../../RIOT -+#### ../../boards for board definitions (if you have one or more) -+#### -+ -+# name of your project -+export APPLICATION = %TESTNAME% -+ -+# for easy switching of boards -+export BOARD ?= native -+ -+# this has to be the absolute path of the RIOT-base dir -+export RIOTBASE =$(CURDIR)/../../../../../../../../.. -+ -+CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO -+WERROR = 0 -+ -+## Modules to include. -+ -+USEMODULE += oonf_cunit -+ifneq (,$(findstring regex,$(APPLICATION))) -+ USEMODULE += oonf_regex -+endif -+USEMODULE += oonf_common -+USEMODULE += gnrc_sock -+ -+ifneq (,$(findstring daemonize,$(APPLICATION))) -+ error daemonize is not supported on RIOT -+endif -+ -+INCLUDES += -I$(CURDIR)/../.. -+ -+QUIET ?= 1 -+ -+include $(RIOTBASE)/Makefile.include -diff --git a/tests/common/bin/.gitignore b/tests/common/bin/.gitignore -new file mode 100644 -index 0000000..e69de29 -diff --git a/tests/common/generate_makefiles.sh b/tests/common/generate_makefiles.sh -new file mode 100755 -index 0000000..8bf9faa ---- /dev/null -+++ b/tests/common/generate_makefiles.sh -@@ -0,0 +1,9 @@ -+#!/bin/bash -+ -+cd "$( dirname "${BASH_SOURCE[0]}" )" -+for file in *.c; do -+ test=$(basename $file .c) -+ mkdir -p $test -+ sed s/%TESTNAME%/$test/ .Makefile.template > $test/Makefile -+ cp $test\.c $test -+done -diff --git a/tests/common/test_common_avl.c b/tests/common/test_common_avl.c -index b5ee8c0..e4e5b26 100644 ---- a/tests/common/test_common_avl.c -+++ b/tests/common/test_common_avl.c -@@ -816,17 +816,17 @@ static void random_delete(uint32_t *array, int count) { - - /* insert/remove 1000's random numbers into tree and check if everything is okay */ - static void test_random_insert(void) { -- uint32_t array[1000]; -+ uint32_t array[100]; - struct tree_element *e, *ptr; - - srand(0); - START_TEST(); - avl_init(&head, avl_comp_uint32, true); - -- random_insert(array, 1000); -- random_delete(array, 500); -- random_insert(array, 400); -- random_delete(array, 600); -+ random_insert(array, 100); -+ random_delete(array, 50); -+ random_insert(array, 40); -+ random_delete(array, 60); - - avl_remove_all_elements(&head, e, node, ptr) { - free(e); -diff --git a/tests/cunit/Makefile b/tests/cunit/Makefile -new file mode 100644 -index 0000000..5e0046d ---- /dev/null -+++ b/tests/cunit/Makefile -@@ -0,0 +1,3 @@ -+MODULE:=oonf_$(shell basename $(CURDIR)) -+ -+include $(RIOTBASE)/Makefile.base -diff --git a/tests/rfc5444/.Makefile.template b/tests/rfc5444/.Makefile.template -new file mode 100644 -index 0000000..e472545 ---- /dev/null -+++ b/tests/rfc5444/.Makefile.template -@@ -0,0 +1,32 @@ -+#### -+#### Sample Makefile for building apps with the RIOT OS -+#### -+#### The Sample Filesystem Layout is: -+#### /this makefile -+#### ../../RIOT -+#### ../../boards for board definitions (if you have one or more) -+#### -+ -+# name of your project -+export APPLICATION = %TESTNAME% -+ -+# for easy switching of boards -+export BOARD ?= native -+ -+# this has to be the absolute path of the RIOT-base dir -+export RIOTBASE =$(CURDIR)/../../../../../../../../.. -+ -+CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO -+WERROR = 0 -+ -+## Modules to include. -+USEMODULE += oonf_cunit -+USEMODULE += oonf_common -+USEMODULE += oonf_rfc5444 -+USEMODULE += gnrc_sock -+ -+INCLUDES += -I$(CURDIR)/../.. -+ -+QUIET ?= 1 -+ -+include $(RIOTBASE)/Makefile.include -diff --git a/tests/rfc5444/bin/.gitignore b/tests/rfc5444/bin/.gitignore -new file mode 100644 -index 0000000..e69de29 -diff --git a/tests/rfc5444/generate_makefiles.sh b/tests/rfc5444/generate_makefiles.sh -new file mode 100755 -index 0000000..8bf9faa ---- /dev/null -+++ b/tests/rfc5444/generate_makefiles.sh -@@ -0,0 +1,9 @@ -+#!/bin/bash -+ -+cd "$( dirname "${BASH_SOURCE[0]}" )" -+for file in *.c; do -+ test=$(basename $file .c) -+ mkdir -p $test -+ sed s/%TESTNAME%/$test/ .Makefile.template > $test/Makefile -+ cp $test\.c $test -+done --- -1.9.1 diff --git a/pkg/oonf_api/patches/0003-port-example-to-riot.patch b/pkg/oonf_api/patches/0003-port-example-to-riot.patch deleted file mode 100644 index ce0b997cc4..0000000000 --- a/pkg/oonf_api/patches/0003-port-example-to-riot.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1eb568357ba8e0679ad8d9a4cc3be0ad54cfc955 Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Tue, 1 Oct 2013 17:39:03 +0200 -Subject: [PATCH 03/10] port example to riot - ---- - examples/rfc5444_reader_writer/Makefile | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - create mode 100644 examples/rfc5444_reader_writer/Makefile - -diff --git a/examples/rfc5444_reader_writer/Makefile b/examples/rfc5444_reader_writer/Makefile -new file mode 100644 -index 0000000..9d5653d ---- /dev/null -+++ b/examples/rfc5444_reader_writer/Makefile -@@ -0,0 +1,28 @@ -+#### -+#### Sample Makefile for building apps with the RIOT OS -+#### -+#### The Sample Filesystem Layout is: -+#### /this makefile -+#### ../../RIOT -+#### -+ -+# name of your project -+export APPLICATION := $(shell basename $(CURDIR)) -+ -+# for easy switching of boards -+export BOARD ?= native -+ -+# this has to be the absolute path of the RIOT-base dir -+export RIOTBASE =$(CURDIR)/../../../../.. -+ -+CFLAGS = -DOONF_LOG_INFO -DOONF_LOG_DEBUG_INFO -+ -+## Modules to include. -+ -+USEMODULE += oonf_rfc5444 -+ -+INCLUDES += -I$(CURDIR)/.. -+ -+QUIET ?= 1 -+ -+include $(RIOTBASE)/Makefile.include --- -1.9.1 diff --git a/pkg/oonf_api/patches/0004-fix-conflicting-types.patch b/pkg/oonf_api/patches/0004-fix-conflicting-types.patch deleted file mode 100644 index 331bcb3fdc..0000000000 --- a/pkg/oonf_api/patches/0004-fix-conflicting-types.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 228ac53093365c7c02feeb420fa6189e932e5a9f Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Sun, 18 May 2014 22:48:40 +0200 -Subject: [PATCH 04/10] fix conflicting types - ---- - src-api/rfc5444/rfc5444_reader.c | 10 +++++----- - src-api/rfc5444/rfc5444_reader.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src-api/rfc5444/rfc5444_reader.c b/src-api/rfc5444/rfc5444_reader.c -index 290f558..1ad344a 100644 ---- a/src-api/rfc5444/rfc5444_reader.c -+++ b/src-api/rfc5444/rfc5444_reader.c -@@ -62,15 +62,15 @@ static int _compare_tlvtypes(struct rfc5444_reader_tlvblock_entry *tlv, - static uint8_t _rfc5444_get_u8(uint8_t **ptr, uint8_t *end, enum rfc5444_result *result); - static uint16_t _rfc5444_get_u16(uint8_t **ptr, uint8_t *end, enum rfc5444_result *result); - static void _free_tlvblock(struct rfc5444_reader *parser, struct avl_tree *entries); --static int _parse_tlv(struct rfc5444_reader_tlvblock_entry *entry, uint8_t **ptr, -+static enum rfc5444_result _parse_tlv(struct rfc5444_reader_tlvblock_entry *entry, uint8_t **ptr, - uint8_t *eob, uint8_t addr_count); --static int _parse_tlvblock(struct rfc5444_reader *parser, -+static enum rfc5444_result _parse_tlvblock(struct rfc5444_reader *parser, - struct avl_tree *tlvblock, uint8_t **ptr, uint8_t *eob, uint8_t addr_count); --static int _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, -+static enum rfc5444_result _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, - struct rfc5444_reader_tlvblock_context *context, struct avl_tree *entries, uint8_t idx); --static int _parse_addrblock(struct rfc5444_reader_addrblock_entry *addr_entry, -+static enum rfc5444_result _parse_addrblock(struct rfc5444_reader_addrblock_entry *addr_entry, - struct rfc5444_reader_tlvblock_context *tlv_context, uint8_t **ptr, uint8_t *eob); --static int _handle_message(struct rfc5444_reader *parser, -+static enum rfc5444_result _handle_message(struct rfc5444_reader *parser, - struct rfc5444_reader_tlvblock_context *tlv_context, uint8_t **ptr, uint8_t *eob); - static struct rfc5444_reader_tlvblock_consumer *_add_consumer( - struct rfc5444_reader_tlvblock_consumer *, struct avl_tree *consumer_tree, -diff --git a/src-api/rfc5444/rfc5444_reader.h b/src-api/rfc5444/rfc5444_reader.h -index 6962741..c1ca7f6 100644 ---- a/src-api/rfc5444/rfc5444_reader.h -+++ b/src-api/rfc5444/rfc5444_reader.h -@@ -309,7 +309,7 @@ EXPORT void rfc5444_reader_remove_packet_consumer( - EXPORT void rfc5444_reader_remove_message_consumer( - struct rfc5444_reader *, struct rfc5444_reader_tlvblock_consumer *); - --EXPORT int rfc5444_reader_handle_packet( -+EXPORT enum rfc5444_result rfc5444_reader_handle_packet( - struct rfc5444_reader *parser, uint8_t *buffer, size_t length); - - EXPORT uint8_t *rfc5444_reader_get_tlv_value( --- -1.9.1 diff --git a/pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch b/pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch deleted file mode 100644 index c7248135bb..0000000000 --- a/pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4bcf115c22297af231b5d3d2873996a5a0695cf2 Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Fri, 10 Oct 2014 02:05:01 +0200 -Subject: [PATCH 05/10] only define container_of when necessary - ---- - src-api/common/container_of.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src-api/common/container_of.h b/src-api/common/container_of.h -index 9fd1893..fcb38fe 100644 ---- a/src-api/common/container_of.h -+++ b/src-api/common/container_of.h -@@ -58,10 +58,12 @@ - * @param member name of node inside struct - * @return pointer to surrounding struct - */ -+#ifndef container_of - #define container_of(ptr, type, member) ({ \ - const typeof(((type *)0)->member ) *__tempptr = (ptr); \ - (type *)((char *)__tempptr - offsetof(type,member)); \ - }) -+#endif - - /** - * Helper function for NULL safe container_of macro --- -1.9.1 diff --git a/pkg/oonf_api/patches/0006-if_index-is-not-used.patch b/pkg/oonf_api/patches/0006-if_index-is-not-used.patch deleted file mode 100644 index 14d7ed0101..0000000000 --- a/pkg/oonf_api/patches/0006-if_index-is-not-used.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 67549da2f1f5e22e7789443f23c6a8bb470bc3f9 Mon Sep 17 00:00:00 2001 -From: Benjamin Valentin -Date: Fri, 10 Oct 2014 02:08:32 +0200 -Subject: [PATCH 06/10] if_index is not used - ---- - src-api/common/netaddr.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src-api/common/netaddr.c b/src-api/common/netaddr.c -index 6b214ee..0b8fc1d 100644 ---- a/src-api/common/netaddr.c -+++ b/src-api/common/netaddr.c -@@ -317,6 +317,7 @@ netaddr_create_host_bin(struct netaddr *host, const struct netaddr *netmask, - int - netaddr_socket_init(union netaddr_socket *combined, const struct netaddr *addr, - uint16_t port, unsigned if_index) { -+ (void)if_index; - /* initialize memory block */ - memset(combined, 0, sizeof(*combined)); - --- -1.9.1 diff --git a/pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch b/pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch deleted file mode 100644 index 3ef8de31b4..0000000000 --- a/pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8395cf4c5753569ed964794ab98ba2fcb8af250b Mon Sep 17 00:00:00 2001 -From: Hinnerk van Bruinehsen -Date: Wed, 29 Oct 2014 11:37:05 +0100 -Subject: [PATCH 07/10] Use RIOT's container_of implementation - ---- - src-api/common/container_of.h | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - -diff --git a/src-api/common/container_of.h b/src-api/common/container_of.h -index fcb38fe..b49d836 100644 ---- a/src-api/common/container_of.h -+++ b/src-api/common/container_of.h -@@ -59,10 +59,24 @@ - * @return pointer to surrounding struct - */ - #ifndef container_of --#define container_of(ptr, type, member) ({ \ -- const typeof(((type *)0)->member ) *__tempptr = (ptr); \ -- (type *)((char *)__tempptr - offsetof(type,member)); \ -- }) -+#if __STDC_VERSION__ >= 201112L -+# define container_of(PTR, TYPE, MEMBER) \ -+ (_Generic((PTR), \ -+ const __typeof__ (((TYPE *) 0)->MEMBER) *: \ -+ ((TYPE *) ((char *) (PTR) - offsetof(TYPE, MEMBER))), \ -+ __typeof__ (((TYPE *) 0)->MEMBER) *: \ -+ ((TYPE *) ((char *) (PTR) - offsetof(TYPE, MEMBER))) \ -+ )) -+#elif defined __GNUC__ -+# define container_of(PTR, TYPE, MEMBER) \ -+ (__extension__ ({ \ -+ __extension__ const __typeof__ (((TYPE *) 0)->MEMBER) *__m____ = (PTR); \ -+ ((TYPE *) ((char *) __m____ - offsetof(TYPE, MEMBER))); \ -+ })) -+#else -+# define container_of(PTR, TYPE, MEMBER) \ -+ ((TYPE *) ((char *) (PTR) - offsetof(TYPE, MEMBER))) -+#endif - #endif - - /** --- -1.9.1 diff --git a/pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch b/pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch deleted file mode 100644 index 841bdb04b5..0000000000 --- a/pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d02b58b3cdd26c92f01e812cc1f6cf25703b7431 Mon Sep 17 00:00:00 2001 -From: Hinnerk van Bruinehsen -Date: Wed, 29 Oct 2014 12:05:11 +0100 -Subject: [PATCH 08/10] Dissolve enum into single defines - ---- - src-api/rfc5444/rfc5444.h | 26 ++++++++++++-------------- - 1 file changed, 12 insertions(+), 14 deletions(-) - -diff --git a/src-api/rfc5444/rfc5444.h b/src-api/rfc5444/rfc5444.h -index c5d6420..6b5576e 100644 ---- a/src-api/rfc5444/rfc5444.h -+++ b/src-api/rfc5444/rfc5444.h -@@ -43,25 +43,23 @@ - - #include "common/common_types.h" - --enum { -- /* timetlv_max = 14 * 2^28 * 1000 / 1024 = 14000 << 18 = 3 670 016 000 ms */ -- RFC5444_TIMETLV_MAX = 0xdac00000, -+/* timetlv_max = 14 * 2^28 * 1000 / 1024 = 14000 << 18 = 3 670 016 000 ms */ -+#define RFC5444_TIMETLV_MAX 0xdac00000 - -- /* timetlv_min = 1000/1024 ms */ -- RFC5444_TIMETLV_MIN = 0x00000001, -+/* timetlv_min = 1000/1024 ms */ -+#define RFC5444_TIMETLV_MIN 0x00000001 - -- /* metric_max = 1<<24 - 256 */ -- RFC5444_METRIC_MAX = 0xffff00, -+/* metric_max = 1<<24 - 256 */ -+#define RFC5444_METRIC_MAX 0xffff00 - -- /* metric_min = 1 */ -- RFC5444_METRIC_MIN = 0x000001, -+/* metric_min = 1 */ -+#define RFC5444_METRIC_MIN 0x000001 - -- /* larger than possible metric value */ -- RFC5444_METRIC_INFINITE = 0xffffff, -+/* larger than possible metric value */ -+#define RFC5444_METRIC_INFINITE 0xffffff - -- /* infinite path cost */ -- RFC5444_METRIC_INFINITE_PATH = 0xffffffff, --}; -+/* infinite path cost */ -+#define RFC5444_METRIC_INFINITE_PATH 0xffffffff - - EXPORT uint8_t rfc5444_timetlv_get_from_vector( - uint8_t *vector, size_t vector_length, uint8_t hopcount); --- -1.9.1 diff --git a/pkg/oonf_api/patches/0009-Add-missing-include.patch b/pkg/oonf_api/patches/0009-Add-missing-include.patch deleted file mode 100644 index 6f3f879957..0000000000 --- a/pkg/oonf_api/patches/0009-Add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 998e5800bedae1d1fb3fddd369ae92ae915ec7fa Mon Sep 17 00:00:00 2001 -From: Hinnerk van Bruinehsen -Date: Wed, 29 Oct 2014 12:11:29 +0100 -Subject: [PATCH 09/10] Add missing include - ---- - src-api/rfc5444/rfc5444_tlv_writer.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src-api/rfc5444/rfc5444_tlv_writer.h b/src-api/rfc5444/rfc5444_tlv_writer.h -index ace7313..8d0ce3a 100644 ---- a/src-api/rfc5444/rfc5444_tlv_writer.h -+++ b/src-api/rfc5444/rfc5444_tlv_writer.h -@@ -43,6 +43,7 @@ - #define RFC5444_TLV_WRITER_H_ - - #include "common/common_types.h" -+#include "rfc5444_context.h" - - struct rfc5444_tlv_writer_data { - uint8_t *buffer; --- -1.9.1 diff --git a/pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch b/pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch deleted file mode 100644 index 2972b1e506..0000000000 --- a/pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eef1038b2f96c6e83fad3a2b7beaa0439190d8a6 Mon Sep 17 00:00:00 2001 -From: Hinnerk van Bruinehsen -Date: Wed, 29 Oct 2014 12:13:27 +0100 -Subject: [PATCH 10/10] Change index of array from 0 to 1 - ---- - src-api/common/template.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src-api/common/template.h b/src-api/common/template.h -index d98fe77..7ca75a8 100644 ---- a/src-api/common/template.h -+++ b/src-api/common/template.h -@@ -64,7 +64,7 @@ struct abuf_template_storage_entry { - - struct abuf_template_storage { - size_t count; -- struct abuf_template_storage_entry indices[0]; -+ struct abuf_template_storage_entry indices[1]; - }; - - EXPORT struct abuf_template_storage *abuf_template_init ( --- -1.9.1 diff --git a/pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch b/pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch deleted file mode 100644 index dfbab387bd..0000000000 --- a/pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 7fc320bdc8d6e6d30cf4684889fb88acab9ab7b2 Mon Sep 17 00:00:00 2001 -From: Cenk Gündoğan -Date: Mon, 23 Nov 2015 16:21:37 +0100 -Subject: [PATCH] remove error: array subscript has type 'char' - [-Werror=char-subscripts] - ---- - src-api/common/netaddr.c | 6 +++--- - src-api/common/string.c | 18 +++++++++--------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src-api/common/netaddr.c b/src-api/common/netaddr.c -index 0b8fc1d..55868da 100644 ---- a/src-api/common/netaddr.c -+++ b/src-api/common/netaddr.c -@@ -453,7 +453,7 @@ netaddr_from_string(struct netaddr *dst, const char *src) { - ptr1 = str_trim(ptr1); - - ptr2 = ptr1; -- while (*ptr2 != 0 && !isspace(*ptr2) && *ptr2 != '/') { -+ while (*ptr2 != 0 && !isspace((unsigned char) *ptr2) && *ptr2 != '/') { - switch (*ptr2) { - case ':': - if (last_was_colon) { -@@ -478,11 +478,11 @@ netaddr_from_string(struct netaddr *dst, const char *src) { - - if (*ptr2) { - /* split strings */ -- while (isspace(*ptr2)) *ptr2++ = 0; -+ while (isspace((unsigned char) *ptr2)) *ptr2++ = 0; - if (*ptr2 == '/') { - *ptr2++ = 0; - } -- while (isspace(*ptr2)) *ptr2++ = 0; -+ while (isspace((unsigned char) *ptr2)) *ptr2++ = 0; - - if (*ptr2 == 0) { - /* prefixlength is missing */ -diff --git a/src-api/common/string.c b/src-api/common/string.c -index 422ec1c..f099ec6 100644 ---- a/src-api/common/string.c -+++ b/src-api/common/string.c -@@ -125,7 +125,7 @@ str_trim (char *ptr) { - } - - /* skip leading whitespaces */ -- while (isspace(*ptr)) { -+ while (isspace((unsigned char) *ptr)) { - ptr++; - } - -@@ -133,7 +133,7 @@ str_trim (char *ptr) { - end = ptr + strlen(ptr) - 1; - - /* remove trailing whitespaces */ -- while (end > ptr && isspace(*end)) { -+ while (end > ptr && isspace((unsigned char) *end)) { - *end-- = 0; - } - return ptr; -@@ -154,18 +154,18 @@ str_hasnextword (const char *buffer, const char *word) { - } - - /* skip whitespace prefix */ -- while (isblank(*buffer)) { -+ while (isblank((unsigned char) *buffer)) { - buffer++; - } - -- while (*word != 0 && *buffer != 0 && !isblank(*buffer) && tolower(*word) == tolower(*buffer)) { -+ while (*word != 0 && *buffer != 0 && !isblank((unsigned char) *buffer) && tolower((unsigned char) *word) == tolower((unsigned char) *buffer)) { - word++; - buffer++; - } - - /* complete match ? */ -- if (*word == 0 && (*buffer == 0 || isblank(*buffer))) { -- while (isblank(*buffer)) { -+ if (*word == 0 && (*buffer == 0 || isblank((unsigned char) *buffer))) { -+ while (isblank((unsigned char) *buffer)) { - buffer++; - } - return buffer; -@@ -192,13 +192,13 @@ str_cpynextword (char *dst, const char *src, size_t len) { - } - - /* skip whitespace prefix */ -- while (isblank(*src)) { -+ while (isblank((unsigned char) *src)) { - src++; - } - - /* copy next word */ - i = 0; -- while (*src != 0 && !isblank(*src) && i < len-1) { -+ while (*src != 0 && !isblank((unsigned char) *src) && i < len-1) { - dst[i++] = *src++; - } - -@@ -206,7 +206,7 @@ str_cpynextword (char *dst, const char *src, size_t len) { - dst[i] = 0; - - /* skip ahead in src */ -- while (isblank(*src)) { -+ while (isblank((unsigned char) *src)) { - src++; - } - --- -2.6.2 diff --git a/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch b/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch deleted file mode 100644 index 0ccd008b0d..0000000000 --- a/pkg/oonf_api/patches/0012-isolate-oonf-list-implementation-of-riot-s-implement.patch +++ /dev/null @@ -1,2345 +0,0 @@ -From 33b946ce29ea8d20c196df41918ee3d68b8f93fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADctor=20Ari=C3=B1o?= -Date: Wed, 11 Jan 2017 11:46:55 +0100 -Subject: [PATCH] isolate oonf list implementation of riot's implementation - ---- - docs/common/list.txt | 20 ++--- - src-api/common/avl.c | 26 +++--- - src-api/common/avl.h | 4 +- - src-api/common/list.h | 112 ++++++++++++------------- - src-api/core/oonf_logging.c | 10 +-- - src-api/core/oonf_logging_cfg.c | 18 ++-- - src-api/rfc5444/rfc5444_msg_generator.c | 36 ++++---- - src-api/rfc5444/rfc5444_pkt_generator.c | 4 +- - src-api/rfc5444/rfc5444_reader.c | 30 +++---- - src-api/rfc5444/rfc5444_writer.c | 48 +++++------ - src-api/rfc5444/rfc5444_writer.h | 4 +- - src-api/subsystems/oonf_class.c | 26 +++--- - src-api/subsystems/oonf_class.h | 2 +- - src-api/subsystems/oonf_interface.c | 14 ++-- - src-api/subsystems/oonf_layer2.c | 6 +- - src-api/subsystems/oonf_packet_socket.c | 18 ++-- - src-api/subsystems/oonf_packet_socket.h | 2 +- - src-api/subsystems/oonf_rfc5444.c | 8 +- - src-api/subsystems/oonf_socket.c | 14 ++-- - src-api/subsystems/oonf_stream_socket.c | 26 +++--- - src-api/subsystems/oonf_telnet.c | 4 +- - src-api/subsystems/oonf_telnet.h | 4 +- - src-api/subsystems/oonf_timer.c | 8 +- - src-api/subsystems/os_linux/os_routing_linux.c | 20 ++--- - src-api/subsystems/os_linux/os_system_linux.c | 28 +++---- - src-plugins/remotecontrol/remotecontrol.c | 12 +-- - tests/common/test_common_avl.c | 4 +- - tests/common/test_common_list.c | 110 ++++++++++++------------ - tests/config/test_config_list.c | 12 +-- - 29 files changed, 315 insertions(+), 315 deletions(-) - -diff --git a/docs/common/list.txt b/docs/common/list.txt -index 8567e6d..f5b7689 100644 ---- a/docs/common/list.txt -+++ b/docs/common/list.txt -@@ -43,25 +43,25 @@ macros. Because of this there is no list.c file. - 1) list lifecycle - ***************** - --Each list head must be initialized with the list_init() function, which -+Each list head must be initialized with the oonf_list_init() function, which - needs a pointer to the list_entity for the head of the list. - - The list API does not allocate memory at all, all list_entity structs - have to be allocated by the user. Because of this the API does NOT --contain a list_free() operation. -+contain a oonf_list_free() operation. - - - - 2) adding/removing elements to a list - ************************************* - --list_add_head() adds a new list element to the beginning of a list, --list_add_tail() adds it to the end of a list. -+oonf_list_add_head() adds a new list element to the beginning of a list, -+oonf_list_add_tail() adds it to the end of a list. - --list_add_before() adds a new element right before an existing one, --list_add_after() adds it after the existing element. -+oonf_list_add_before() adds a new element right before an existing one, -+oonf_list_add_after() adds it after the existing element. - --list_remove() removes an object from an list. Do not call this function -+oonf_list_remove() removes an object from an list. Do not call this function - for nodes NOT added to a list. - - -@@ -87,13 +87,13 @@ void iterate(struct list_entity *head) - { - struct my_node *my, *safe; - -- list_for_each_element(head, my, node) { -+ oonf_list_for_each_element(head, my, node) { - .... - } - -- list_for_each_element_safe(head, my, node, safe) { -+ oonf_list_for_each_element_safe(head, my, node, safe) { - if ( ... ) { -- list_remove(tree, my); -+ oonf_list_remove(tree, my); - } - } - } -diff --git a/src-api/common/avl.c b/src-api/common/avl.c -index ff8e245..d59bbdb 100644 ---- a/src-api/common/avl.c -+++ b/src-api/common/avl.c -@@ -71,7 +71,7 @@ static struct avl_node *_avl_local_min(struct avl_node *node); - void - avl_init(struct avl_tree *tree, avl_tree_comp comp, bool allow_dups) - { -- list_init_head(&tree->list_head); -+ oonf_list_init_head(&tree->list_head); - tree->root = NULL; - tree->count = 0; - tree->comp = comp; -@@ -119,7 +119,7 @@ avl_find_lessequal(const struct avl_tree *tree, const void *key) { - - /* go left as long as keylist_head, &node->list)) { -+ if (oonf_list_is_first(&tree->list_head, &node->list)) { - return NULL; - } - -@@ -131,7 +131,7 @@ avl_find_lessequal(const struct avl_tree *tree, const void *key) { - next = node; - while (diff >= 0) { - node = next; -- if (list_is_last(&tree->list_head, &node->list)) { -+ if (oonf_list_is_last(&tree->list_head, &node->list)) { - break; - } - -@@ -161,7 +161,7 @@ avl_find_greaterequal(const struct avl_tree *tree, const void *key) { - - /* go right as long as key>node.key */ - while (diff > 0) { -- if (list_is_last(&tree->list_head, &node->list)) { -+ if (oonf_list_is_last(&tree->list_head, &node->list)) { - return NULL; - } - -@@ -173,7 +173,7 @@ avl_find_greaterequal(const struct avl_tree *tree, const void *key) { - next = node; - while (diff <= 0) { - node = next; -- if (list_is_first(&tree->list_head, &node->list)) { -+ if (oonf_list_is_first(&tree->list_head, &node->list)) { - break; - } - -@@ -205,7 +205,7 @@ avl_insert(struct avl_tree *tree, struct avl_node *new) - new->follower = false; - - if (tree->root == NULL) { -- list_add_head(&tree->list_head, &new->list); -+ oonf_list_add_head(&tree->list_head, &new->list); - tree->root = new; - tree->count = 1; - return 0; -@@ -215,8 +215,8 @@ avl_insert(struct avl_tree *tree, struct avl_node *new) - - last = node; - -- while (!list_is_last(&tree->list_head, &last->list)) { -- next = list_next_element(last, list); -+ while (!oonf_list_is_last(&tree->list_head, &last->list)) { -+ next = oonf_list_next_element(last, list); - if (!next->follower) { - break; - } -@@ -284,8 +284,8 @@ avl_remove(struct avl_tree *tree, struct avl_node *node) - struct avl_node *right; - if (!node->follower) { - if (tree->allow_dups -- && !list_is_last(&tree->list_head, &node->list) -- && (next = list_next_element(node, list))->follower) { -+ && !oonf_list_is_last(&tree->list_head, &node->list) -+ && (next = oonf_list_next_element(node, list))->follower) { - next->follower = false; - next->balance = node->balance; - -@@ -511,7 +511,7 @@ _post_insert(struct avl_tree *tree, struct avl_node *node) - static void - _avl_insert_before(struct avl_tree *tree, struct avl_node *pos_node, struct avl_node *node) - { -- list_add_before(&pos_node->list, &node->list); -+ oonf_list_add_before(&pos_node->list, &node->list); - tree->count++; - } - -@@ -525,7 +525,7 @@ _avl_insert_before(struct avl_tree *tree, struct avl_node *pos_node, struct avl_ - static void - _avl_insert_after(struct avl_tree *tree, struct avl_node *pos_node, struct avl_node *node) - { -- list_add_after(&pos_node->list, &node->list); -+ oonf_list_add_after(&pos_node->list, &node->list); - tree->count++; - } - -@@ -538,7 +538,7 @@ _avl_insert_after(struct avl_tree *tree, struct avl_node *pos_node, struct avl_n - static void - _avl_remove(struct avl_tree *tree, struct avl_node *node) - { -- list_remove(&node->list); -+ oonf_list_remove(&node->list); - tree->count--; - } - -diff --git a/src-api/common/avl.h b/src-api/common/avl.h -index de75d28..6623224 100644 ---- a/src-api/common/avl.h -+++ b/src-api/common/avl.h -@@ -181,7 +181,7 @@ avl_is_empty(struct avl_tree *tree) { - */ - static INLINE bool - avl_is_node_added(struct avl_node *node) { -- return list_is_node_added(&node->list); -+ return oonf_list_is_node_added(&node->list); - } - - /** -@@ -591,7 +591,7 @@ avl_delete(struct avl_tree *tree, struct avl_node *node) { - #define avl_remove_all_elements(tree, element, node_member, ptr) \ - for (element = avl_first_element(tree, element, node_member), \ - ptr = avl_next_element(element, node_member), \ -- list_init_head(&(tree)->list_head), \ -+ oonf_list_init_head(&(tree)->list_head), \ - (tree)->root = NULL; \ - (tree)->count > 0; \ - element = ptr, ptr = avl_next_element(ptr, node_member), (tree)->count--) -diff --git a/src-api/common/list.h b/src-api/common/list.h -index 80da6ac..b545d53 100644 ---- a/src-api/common/list.h -+++ b/src-api/common/list.h -@@ -70,7 +70,7 @@ struct list_entity { - * @param pointer to list-head - */ - static INLINE void --list_init_head(struct list_entity *head) { -+oonf_list_init_head(struct list_entity *head) { - head->next = head->prev = head; - } - -@@ -79,7 +79,7 @@ list_init_head(struct list_entity *head) { - * @param pointer to list-node - */ - static INLINE void --list_init_node(struct list_entity *entity) { -+oonf_list_init_node(struct list_entity *entity) { - entity->next = entity->prev = NULL; - } - -@@ -90,7 +90,7 @@ list_init_node(struct list_entity *entity) { - * @param new node which will be added to the list between 'prev' and 'next' - */ - static INLINE void --__list_add(struct list_entity *prev, struct list_entity *next, struct list_entity *new) { -+__oonf_list_add(struct list_entity *prev, struct list_entity *next, struct list_entity *new) { - new->next = next; - new->prev = prev; - next->prev = new; -@@ -103,8 +103,8 @@ __list_add(struct list_entity *prev, struct list_entity *next, struct list_entit - * @param new node which will be added to the list - */ - static INLINE void --list_add_head(struct list_entity *head, struct list_entity *new) { -- __list_add(head, head->next, new); -+oonf_list_add_head(struct list_entity *head, struct list_entity *new) { -+ __oonf_list_add(head, head->next, new); - } - - /** -@@ -113,8 +113,8 @@ list_add_head(struct list_entity *head, struct list_entity *new) { - * @param new node which will be added to the list - */ - static INLINE void --list_add_tail(struct list_entity *head, struct list_entity *new) { -- __list_add(head->prev, head, new); -+oonf_list_add_tail(struct list_entity *head, struct list_entity *new) { -+ __oonf_list_add(head->prev, head, new); - } - - /** -@@ -123,8 +123,8 @@ list_add_tail(struct list_entity *head, struct list_entity *new) { - * @param new node which will be added to the list - */ - static INLINE void --list_add_before(struct list_entity *before, struct list_entity *new) { -- __list_add(before->prev, before, new); -+oonf_list_add_before(struct list_entity *before, struct list_entity *new) { -+ __oonf_list_add(before->prev, before, new); - } - - /** -@@ -133,8 +133,8 @@ list_add_before(struct list_entity *before, struct list_entity *new) { - * @param new node which will be added to the list - */ - static INLINE void --list_add_after(struct list_entity *after, struct list_entity *new) { -- __list_add(after, after->next, new); -+oonf_list_add_after(struct list_entity *after, struct list_entity *new) { -+ __oonf_list_add(after, after->next, new); - } - - /** -@@ -143,7 +143,7 @@ list_add_after(struct list_entity *after, struct list_entity *new) { - * @param next node after the removed part of the list - */ - static INLINE void --__list_remove(struct list_entity *prev, struct list_entity *next) { -+__oonf_list_remove(struct list_entity *prev, struct list_entity *next) { - prev->next = next; - next->prev = prev; - } -@@ -153,9 +153,9 @@ __list_remove(struct list_entity *prev, struct list_entity *next) { - * @param entity node to remove from the list - */ - static INLINE void --list_remove(struct list_entity *entity) { -- __list_remove(entity->prev, entity->next); -- list_init_node(entity); -+oonf_list_remove(struct list_entity *entity) { -+ __oonf_list_remove(entity->prev, entity->next); -+ oonf_list_init_node(entity); - } - - /** -@@ -164,7 +164,7 @@ list_remove(struct list_entity *entity) { - * @return true if list is empty, false otherwise - */ - static INLINE bool --list_is_empty(struct list_entity *head) { -+oonf_list_is_empty(struct list_entity *head) { - return head->next == head && head->prev == head; - } - -@@ -175,7 +175,7 @@ list_is_empty(struct list_entity *head) { - * false otherwise - */ - static INLINE bool --list_is_node_added(struct list_entity *node) { -+oonf_list_is_node_added(struct list_entity *node) { - return node->next != NULL && node->prev != NULL; - } - -@@ -186,7 +186,7 @@ list_is_node_added(struct list_entity *node) { - * @return true if node is first element of list, false otherwise - */ - static INLINE bool --list_is_first(const struct list_entity *head, const struct list_entity *entity) { -+oonf_list_is_first(const struct list_entity *head, const struct list_entity *entity) { - return head->next == entity; - } - -@@ -197,7 +197,7 @@ list_is_first(const struct list_entity *head, const struct list_entity *entity) - * @return true if node is last element of list, false otherwise - */ - static INLINE bool --list_is_last(const struct list_entity *head, const struct list_entity *entity) { -+oonf_list_is_last(const struct list_entity *head, const struct list_entity *entity) { - return head->prev == entity; - } - -@@ -208,8 +208,8 @@ list_is_last(const struct list_entity *head, const struct list_entity *entity) { - * of the first one - */ - static INLINE void --list_merge(struct list_entity *add_to, struct list_entity *remove_from) { -- if (list_is_empty(remove_from)) { -+oonf_list_merge(struct list_entity *add_to, struct list_entity *remove_from) { -+ if (oonf_list_is_empty(remove_from)) { - return; - } - -@@ -218,7 +218,7 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - add_to->next = remove_from->next; - remove_from->next->prev = add_to; - -- list_init_head(remove_from); -+ oonf_list_init_head(remove_from); - } - - /** -@@ -230,7 +230,7 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @return pointer to the first element of the list - * (automatically converted to type 'element') - */ --#define list_first_element(head, element, list_member) \ -+#define oonf_list_first_element(head, element, list_member) \ - container_of((head)->next, typeof(*(element)), list_member) - - /** -@@ -242,7 +242,7 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @return pointer to the last element of the list - * (automatically converted to type 'element') - */ --#define list_last_element(head, element, list_member) \ -+#define oonf_list_last_element(head, element, list_member) \ - container_of((head)->prev, typeof(*(element)), list_member) - - /** -@@ -255,7 +255,7 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @return pointer to the node after 'element' - * (automatically converted to type 'element') - */ --#define list_next_element(element, list_member) \ -+#define oonf_list_next_element(element, list_member) \ - container_of((&(element)->list_member)->next, typeof(*(element)), list_member) - - /** -@@ -268,7 +268,7 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @return pointer to the node before 'element' - * (automatically converted to type 'element') - */ --#define list_prev_element(element, list_member) \ -+#define oonf_list_prev_element(element, list_member) \ - container_of((&(element)->list_member)->prev, typeof(*(element)), list_member) - - /** -@@ -281,10 +281,10 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param element iterator pointer to list element struct - * @param list_member name of list_entity within list element struct - */ --#define list_for_element_range(first_element, last_element, element, list_member) \ -+#define oonf_list_for_element_range(first_element, last_element, element, list_member) \ - for (element = (first_element); \ - element->list_member.prev != &(last_element)->list_member; \ -- element = list_next_element(element, list_member)) -+ element = oonf_list_next_element(element, list_member)) - - /** - * Loop over a block of elements of a list backwards, used similar to a for() command. -@@ -296,10 +296,10 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param element iterator pointer to list element struct - * @param list_member name of list_entity within list element struct - */ --#define list_for_element_range_reverse(first_element, last_element, element, list_member) \ -+#define oonf_list_for_element_range_reverse(first_element, last_element, element, list_member) \ - for (element = (last_element); \ - element->list_member.next != &(first_element)->list_member; \ -- element = list_prev_element(element, list_member)) -+ element = oonf_list_prev_element(element, list_member)) - - /** - * Loop over all elements of a list, used similar to a for() command. -@@ -312,9 +312,9 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_each_element(head, element, list_member) \ -- list_for_element_range(list_first_element(head, element, list_member), \ -- list_last_element(head, element, list_member), \ -+#define oonf_list_for_each_element(head, element, list_member) \ -+ oonf_list_for_element_range(oonf_list_first_element(head, element, list_member), \ -+ oonf_list_last_element(head, element, list_member), \ - element, list_member) - - /** -@@ -328,9 +328,9 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_each_element_reverse(head, element, list_member) \ -- list_for_element_range_reverse(list_first_element(head, element, list_member), \ -- list_last_element(head, element, list_member), \ -+#define oonf_list_for_each_element_reverse(head, element, list_member) \ -+ oonf_list_for_element_range_reverse(oonf_list_first_element(head, element, list_member), \ -+ oonf_list_last_element(head, element, list_member), \ - element, list_member) - - /** -@@ -346,8 +346,8 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_element_to_last(head, first, element, list_member) \ -- list_for_element_range(first, list_last_element(head, element, list_member), element, list_member) -+#define oonf_list_for_element_to_last(head, first, element, list_member) \ -+ oonf_list_for_element_range(first, oonf_list_last_element(head, element, list_member), element, list_member) - - /** - * Loop over a block of elements of a list backwards, used similar to a for() command. -@@ -362,8 +362,8 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_element_to_last_reverse(head, first, element, list_member) \ -- list_for_element_range_reverse(first, list_last_element(head, element, list_member), element, list_member) -+#define oonf_list_for_element_to_last_reverse(head, first, element, list_member) \ -+ oonf_list_for_element_range_reverse(first, oonf_list_last_element(head, element, list_member), element, list_member) - - /** - * Loop over a block of elements of a list, used similar to a for() command. -@@ -378,8 +378,8 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_first_to_element(head, last, element, list_member) \ -- list_for_element_range(list_first_element(head, element, list_member), last, element, list_member) -+#define oonf_list_for_first_to_element(head, last, element, list_member) \ -+ oonf_list_for_element_range(oonf_list_first_element(head, element, list_member), last, element, list_member) - - /** - * Loop over a block of elements of a list backwards, used similar to a for() command. -@@ -394,8 +394,8 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param list_member name of the list_entity element inside the - * larger struct - */ --#define list_for_first_to_element_reverse(head, last, element, list_member) \ -- list_for_element_range_reverse(list_first_element(head, element, list_member), last, element, list_member) -+#define oonf_list_for_first_to_element_reverse(head, last, element, list_member) \ -+ oonf_list_for_element_range_reverse(oonf_list_first_element(head, element, list_member), last, element, list_member) - - /** - * Loop over a block of elements of a list, used similar to a for() command. -@@ -410,10 +410,10 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param ptr pointer to list element struct which is used to store - * the next node during the loop - */ --#define list_for_element_range_safe(first_element, last_element, element, list_member, ptr) \ -- for (element = (first_element), ptr = list_next_element(element, list_member); \ -+#define oonf_list_for_element_range_safe(first_element, last_element, element, list_member, ptr) \ -+ for (element = (first_element), ptr = oonf_list_next_element(element, list_member); \ - element->list_member.prev != &(last_element)->list_member; \ -- element = ptr, ptr = list_next_element(ptr, list_member)) -+ element = ptr, ptr = oonf_list_next_element(ptr, list_member)) - - /** - * Loop over a block of elements of a list backwards, used similar to a for() command. -@@ -428,10 +428,10 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param ptr pointer to list element struct which is used to store - * the previous node during the loop - */ --#define list_for_element_range_reverse_safe(first_element, last_element, element, list_member, ptr) \ -- for (element = (last_element), ptr = list_prev_element(element, list_member); \ -+#define oonf_list_for_element_range_reverse_safe(first_element, last_element, element, list_member, ptr) \ -+ for (element = (last_element), ptr = oonf_list_prev_element(element, list_member); \ - element->list_member.next != &(first_element)->list_member; \ -- element = ptr, ptr = list_prev_element(ptr, list_member)) -+ element = ptr, ptr = oonf_list_prev_element(ptr, list_member)) - - /** - * Loop over all elements of a list, used similar to a for() command. -@@ -447,9 +447,9 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param ptr pointer to an list element struct which is used to store - * the next node during the loop - */ --#define list_for_each_element_safe(head, element, list_member, ptr) \ -- list_for_element_range_safe(list_first_element(head, element, list_member), \ -- list_last_element(head, element, list_member), \ -+#define oonf_list_for_each_element_safe(head, element, list_member, ptr) \ -+ oonf_list_for_element_range_safe(oonf_list_first_element(head, element, list_member), \ -+ oonf_list_last_element(head, element, list_member), \ - element, list_member, ptr) - - /** -@@ -466,9 +466,9 @@ list_merge(struct list_entity *add_to, struct list_entity *remove_from) { - * @param ptr pointer to an list element struct which is used to store - * the next node during the loop - */ --#define list_for_each_element_reverse_safe(head, element, list_member, ptr) \ -- list_for_element_range_reverse_safe(list_first_element(head, element, list_member), \ -- list_last_element(head, element, list_member), \ -+#define oonf_list_for_each_element_reverse_safe(head, element, list_member, ptr) \ -+ oonf_list_for_element_range_reverse_safe(oonf_list_first_element(head, element, list_member), \ -+ oonf_list_last_element(head, element, list_member), \ - element, list_member, ptr) - - #endif /* LIST_H_ */ -diff --git a/src-api/core/oonf_logging.c b/src-api/core/oonf_logging.c -index 33db5f4..81d32d3 100644 ---- a/src-api/core/oonf_logging.c -+++ b/src-api/core/oonf_logging.c -@@ -53,7 +53,7 @@ - #include "core/oonf_logging.h" - #include "core/os_core.h" - --#define FOR_ALL_LOGHANDLERS(handler, iterator) list_for_each_element_safe(&_handler_list, handler, node, iterator) -+#define FOR_ALL_LOGHANDLERS(handler, iterator) oonf_list_for_each_element_safe(&_handler_list, handler, node, iterator) - - uint8_t log_global_mask[LOG_MAXIMUM_SOURCES]; - -@@ -102,7 +102,7 @@ oonf_log_init(const struct oonf_appdata *data, enum oonf_log_severity def_severi - _libdata = oonf_libdata_get(); - _source_count = LOG_CORESOURCE_COUNT; - -- list_init_head(&_handler_list); -+ oonf_list_init_head(&_handler_list); - - if (abuf_init(&_logbuffer)) { - fputs("Not enough memory for logging buffer\n", stderr); -@@ -171,7 +171,7 @@ oonf_log_cleanup(void) - void - oonf_log_addhandler(struct oonf_log_handler_entry *h) - { -- list_add_tail(&_handler_list, &h->node); -+ oonf_list_add_tail(&_handler_list, &h->node); - oonf_log_updatemask(); - } - -@@ -182,7 +182,7 @@ oonf_log_addhandler(struct oonf_log_handler_entry *h) - void - oonf_log_removehandler(struct oonf_log_handler_entry *h) - { -- list_remove(&h->node); -+ oonf_list_remove(&h->node); - oonf_log_updatemask(); - } - -@@ -390,7 +390,7 @@ oonf_log(enum oonf_log_severity severity, enum oonf_log_source source, bool no_h - param.prefixLength = p2; - - /* use stderr logger if nothing has been configured */ -- if (list_is_empty(&_handler_list)) { -+ if (oonf_list_is_empty(&_handler_list)) { - oonf_log_stderr(NULL, ¶m); - return; - } -diff --git a/src-api/core/oonf_logging_cfg.c b/src-api/core/oonf_logging_cfg.c -index 683bc52..4635fee 100644 ---- a/src-api/core/oonf_logging_cfg.c -+++ b/src-api/core/oonf_logging_cfg.c -@@ -114,13 +114,13 @@ oonf_logcfg_init(void) { - void - oonf_logcfg_cleanup(void) { - /* clean up former handlers */ -- if (list_is_node_added(&_stderr_handler.node)) { -+ if (oonf_list_is_node_added(&_stderr_handler.node)) { - oonf_log_removehandler(&_stderr_handler); - } -- if (list_is_node_added(&_syslog_handler.node)) { -+ if (oonf_list_is_node_added(&_syslog_handler.node)) { - oonf_log_removehandler(&_syslog_handler); - } -- if (list_is_node_added(&_file_handler.node)) { -+ if (oonf_list_is_node_added(&_file_handler.node)) { - FILE *f; - - f = _file_handler.custom; -@@ -169,7 +169,7 @@ oonf_logcfg_apply(struct cfg_db *db) { - - /* and finally modify the logging handlers */ - /* log.file */ -- if (activate_file && !list_is_node_added(&_file_handler.node)) { -+ if (activate_file && !oonf_list_is_node_added(&_file_handler.node)) { - FILE *f; - - f = fopen(file_name, "w"); -@@ -182,7 +182,7 @@ oonf_logcfg_apply(struct cfg_db *db) { - activate_file = false; - } - } -- else if (!activate_file && list_is_node_added(&_file_handler.node)) { -+ else if (!activate_file && oonf_list_is_node_added(&_file_handler.node)) { - FILE *f = _file_handler.custom; - oonf_log_removehandler(&_file_handler); - -@@ -195,10 +195,10 @@ oonf_logcfg_apply(struct cfg_db *db) { - activate_stderr |= !(activate_syslog || activate_file); - } - -- if (activate_stderr && !list_is_node_added(&_stderr_handler.node)) { -+ if (activate_stderr && !oonf_list_is_node_added(&_stderr_handler.node)) { - oonf_log_addhandler(&_stderr_handler); - } -- else if (!activate_stderr && list_is_node_added(&_stderr_handler.node)) { -+ else if (!activate_stderr && oonf_list_is_node_added(&_stderr_handler.node)) { - oonf_log_removehandler(&_stderr_handler); - } - -@@ -207,10 +207,10 @@ oonf_logcfg_apply(struct cfg_db *db) { - activate_syslog |= !(activate_stderr || activate_file); - } - -- if (activate_syslog && !list_is_node_added(&_syslog_handler.node)) { -+ if (activate_syslog && !oonf_list_is_node_added(&_syslog_handler.node)) { - oonf_log_addhandler(&_syslog_handler); - } -- else if (!activate_syslog && list_is_node_added(&_syslog_handler.node)) { -+ else if (!activate_syslog && oonf_list_is_node_added(&_syslog_handler.node)) { - oonf_log_removehandler(&_syslog_handler); - } - -diff --git a/src-api/rfc5444/rfc5444_msg_generator.c b/src-api/rfc5444/rfc5444_msg_generator.c -index 7ee7f5d..f7ad14e 100644 ---- a/src-api/rfc5444/rfc5444_msg_generator.c -+++ b/src-api/rfc5444/rfc5444_msg_generator.c -@@ -101,7 +101,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - #endif - - /* do nothing if no interface is defined */ -- if (list_is_empty(&writer->_targets)) { -+ if (oonf_list_is_empty(&writer->_targets)) { - return RFC5444_OKAY; - } - -@@ -128,7 +128,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - /* interface specific, but generic selector is used */ - enum rfc5444_result result; - -- list_for_each_element(&writer->_targets, interface, _target_node) { -+ oonf_list_for_each_element(&writer->_targets, interface, _target_node) { - /* check if we should send over this interface */ - if (!useIf(writer, interface, param)) { - continue; -@@ -148,7 +148,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - * and calculate message MTU - */ - max_msg_size = writer->msg_size; -- list_for_each_element(&writer->_targets, interface, _target_node) { -+ oonf_list_for_each_element(&writer->_targets, interface, _target_node) { - size_t interface_msg_mtu; - - /* check if we should send over this interface */ -@@ -204,7 +204,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - not_fragmented = true; - - /* no addresses ? */ -- if (list_is_empty(&msg->_addr_head)) { -+ if (oonf_list_is_empty(&msg->_addr_head)) { - _finalize_message_fragment(writer, msg, NULL, NULL, true, useIf, param); - #if WRITER_STATE_MACHINE == true - writer->_state = RFC5444_WRITER_NONE; -@@ -215,7 +215,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - - /* start address compression */ - first = true; -- addr = first_addr = list_first_element(&msg->_addr_head, addr, _addr_node); -+ addr = first_addr = oonf_list_first_element(&msg->_addr_head, addr, _addr_node); - - /* loop through addresses */ - idx = 0; -@@ -230,13 +230,13 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - - if (first) { - /* clear message specific tlvtype information for address compression */ -- list_for_each_element(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node) { -+ oonf_list_for_each_element(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node) { - memset(tlvtype->_tlvblock_count, 0, sizeof(tlvtype->_tlvblock_count)); - memset(tlvtype->_tlvblock_multi, 0, sizeof(tlvtype->_tlvblock_multi)); - } - - /* clear generic tlvtype information for address compression */ -- list_for_each_element(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node) { -+ oonf_list_for_each_element(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node) { - memset(tlvtype->_tlvblock_count, 0, sizeof(tlvtype->_tlvblock_count)); - memset(tlvtype->_tlvblock_multi, 0, sizeof(tlvtype->_tlvblock_multi)); - } -@@ -335,7 +335,7 @@ rfc5444_writer_create_message(struct rfc5444_writer *writer, uint8_t msgid, - } - - /* get last address */ -- addr = list_last_element(&msg->_addr_head, addr, _addr_node); -+ addr = oonf_list_last_element(&msg->_addr_head, addr, _addr_node); - - /* close all address blocks */ - _close_addrblock(acs, msg, addr, 0); -@@ -420,7 +420,7 @@ rfc5444_writer_forward_msg(struct rfc5444_writer *writer, uint8_t *msg, size_t l - - /* check if message is small enough to be forwarded */ - max_msg_size = 0; -- list_for_each_element(&writer->_targets, target, _target_node) { -+ oonf_list_for_each_element(&writer->_targets, target, _target_node) { - size_t max; - - if (!rfc5444_msg->forward_target_selector(target)) { -@@ -477,7 +477,7 @@ rfc5444_writer_forward_msg(struct rfc5444_writer *writer, uint8_t *msg, size_t l - } - - /* forward message */ -- list_for_each_element(&writer->_targets, target, _target_node) { -+ oonf_list_for_each_element(&writer->_targets, target, _target_node) { - if (!rfc5444_msg->forward_target_selector(target)) { - continue; - } -@@ -832,7 +832,7 @@ _compress_address(struct _rfc5444_internal_addr_compress_session *acs, - /* add size for address part (and header if necessary) */ - if (!first) { - /* get previous address */ -- last_addr = list_prev_element(addr, _addr_node); -+ last_addr = oonf_list_prev_element(addr, _addr_node); - - /* remember how many entries with the same prefixlength we had */ - if (netaddr_get_prefix_length(&last_addr->address) -@@ -1089,7 +1089,7 @@ _write_addresses(struct rfc5444_writer *writer, struct rfc5444_writer_message *m - tail_len = msg->addr_len - head_len - 1; - - /* calculate tail length and netmask length */ -- list_for_element_range(addr_start, addr_end, addr, _addr_node) { -+ oonf_list_for_element_range(addr_start, addr_end, addr, _addr_node) { - addr_ptr = netaddr_get_binptr(&addr->address); - - /* stop if no tail is left */ -@@ -1144,7 +1144,7 @@ _write_addresses(struct rfc5444_writer *writer, struct rfc5444_writer_message *m - } - #endif - /* loop through addresses in block for MID part */ -- list_for_element_range(addr_start, addr_end, addr, _addr_node) { -+ oonf_list_for_element_range(addr_start, addr_end, addr, _addr_node) { - addr_ptr = netaddr_get_binptr(&addr->address); - memcpy(ptr, &addr_ptr[head_len], mid_len); - ptr += mid_len; -@@ -1154,7 +1154,7 @@ _write_addresses(struct rfc5444_writer *writer, struct rfc5444_writer_message *m - if (addr_start->_block_multiple_prefixlen) { - /* multiple prefixlen */ - *flag |= RFC5444_ADDR_FLAG_MULTIPLEN; -- list_for_element_range(addr_start, addr_end, addr, _addr_node) { -+ oonf_list_for_element_range(addr_start, addr_end, addr, _addr_node) { - *ptr++ = netaddr_get_prefix_length(&addr->address); - } - } else if (netaddr_get_prefix_length(&addr_start->address)!= msg->addr_len * 8) { -@@ -1168,18 +1168,18 @@ _write_addresses(struct rfc5444_writer *writer, struct rfc5444_writer_message *m - ptr += 2; - - /* loop through all message specific address-tlv types */ -- list_for_each_element(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node) { -+ oonf_list_for_each_element(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node) { - ptr = _write_tlvtype(addr_start, addr_end, tlvtype, ptr); - } - - /* look through all generic address-tlv types */ -- list_for_each_element(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node) { -+ oonf_list_for_each_element(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node) { - ptr = _write_tlvtype(addr_start, addr_end, tlvtype, ptr); - } - - tlvblock_length[0] = (ptr - tlvblock_length - 2) >> 8; - tlvblock_length[1] = (ptr - tlvblock_length - 2) & 255; -- addr_start = list_next_element(addr_end, _addr_node); -+ addr_start = oonf_list_next_element(addr_end, _addr_node); - } while (addr_end != last_addr); - - /* store size of address(tlv) data */ -@@ -1290,7 +1290,7 @@ _finalize_message_fragment(struct rfc5444_writer *writer, struct rfc5444_writer_ - /* precalculate number of fixed bytes of message header */ - len = writer->_msg.header + writer->_msg.added; - -- list_for_each_element(&writer->_targets, interface, _target_node) { -+ oonf_list_for_each_element(&writer->_targets, interface, _target_node) { - /* do we need to handle this interface ? */ - if (!useIf(writer, interface, param)) { - continue; -diff --git a/src-api/rfc5444/rfc5444_pkt_generator.c b/src-api/rfc5444/rfc5444_pkt_generator.c -index cd86881..c470bdb 100644 ---- a/src-api/rfc5444/rfc5444_pkt_generator.c -+++ b/src-api/rfc5444/rfc5444_pkt_generator.c -@@ -78,7 +78,7 @@ _rfc5444_writer_begin_packet(struct rfc5444_writer *writer, - writer->_state = RFC5444_WRITER_ADD_PKTTLV; - #endif - /* add packet tlvs */ -- list_for_each_element(&writer->_pkthandlers, handler, _pkthandle_node) { -+ oonf_list_for_each_element(&writer->_pkthandlers, handler, _pkthandle_node) { - handler->addPacketTLVs(writer, target); - } - -@@ -121,7 +121,7 @@ rfc5444_writer_flush(struct rfc5444_writer *writer, - #endif - - /* finalize packet tlvs */ -- list_for_each_element_reverse(&writer->_pkthandlers, handler, _pkthandle_node) { -+ oonf_list_for_each_element_reverse(&writer->_pkthandlers, handler, _pkthandle_node) { - handler->finishPacketTLVs(writer, target); - } - -diff --git a/src-api/rfc5444/rfc5444_reader.c b/src-api/rfc5444/rfc5444_reader.c -index 1ad344a..e2c9e1d 100644 ---- a/src-api/rfc5444/rfc5444_reader.c -+++ b/src-api/rfc5444/rfc5444_reader.c -@@ -620,11 +620,11 @@ _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, struct rfc - } - - /* initialize consumer pointer */ -- if (list_is_empty(&consumer->_consumer_list)) { -+ if (oonf_list_is_empty(&consumer->_consumer_list)) { - cons_entry = NULL; - } - else { -- cons_entry = list_first_element(&consumer->_consumer_list, cons_entry, _node); -+ cons_entry = oonf_list_first_element(&consumer->_consumer_list, cons_entry, _node); - cons_entry->tlv = NULL; - } - -@@ -726,11 +726,11 @@ _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, struct rfc - constraints_failed |= cons_entry->mandatory && !match; - - /* advance consumer pointer */ -- if (list_is_last(&consumer->_consumer_list, &cons_entry->_node)) { -+ if (oonf_list_is_last(&consumer->_consumer_list, &cons_entry->_node)) { - cons_entry = NULL; - } - else { -- cons_entry = list_next_element(cons_entry, _node); -+ cons_entry = oonf_list_next_element(cons_entry, _node); - cons_entry->tlv = NULL; - } - } -@@ -753,7 +753,7 @@ _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, struct rfc - } - #if DISALLOW_CONSUMER_CONTEXT_DROP == false - if (result == RFC5444_DROP_TLV) { -- list_for_each_element(&consumer->_consumer_list, cons_entry, _node) { -+ oonf_list_for_each_element(&consumer->_consumer_list, cons_entry, _node) { - if (cons_entry->tlv != NULL && cons_entry->drop) { - _set_addr_bitarray(&cons_entry->tlv->int_drop_tlv, idx); - cons_entry->drop = false; -@@ -768,7 +768,7 @@ _schedule_tlvblock(struct rfc5444_reader_tlvblock_consumer *consumer, struct rfc - cleanup_handle_tlvblock: - #endif - #if DEBUG_CLEANUP == true -- list_for_each_element(&consumer->_consumer_list, cons_entry, _node) { -+ oonf_list_for_each_element(&consumer->_consumer_list, cons_entry, _node) { - cons_entry->tlv = NULL; - cons_entry->drop = false; - } -@@ -924,7 +924,7 @@ schedule_msgaddr_consumer(struct rfc5444_reader_tlvblock_consumer *consumer, - - /* consume address tlv block(s) */ - /* iterate over all address blocks */ -- list_for_each_element(addr_head, addr, list_node) { -+ oonf_list_for_each_element(addr_head, addr, list_node) { - uint8_t i, plen; - - /* iterate over all addresses in block */ -@@ -1047,7 +1047,7 @@ _handle_message(struct rfc5444_reader *parser, - result = RFC5444_OKAY; - same_order[0] = same_order[1] = NULL; - avl_init(&tlv_entries, avl_comp_uint16, true); -- list_init_head(&addr_head); -+ oonf_list_init_head(&addr_head); - tlv_context->_do_not_forward = false; - - /* remember start of message */ -@@ -1133,7 +1133,7 @@ _handle_message(struct rfc5444_reader *parser, - goto cleanup_parse_message; - } - -- list_add_tail(&addr_head, &addr->list_node); -+ oonf_list_add_tail(&addr_head, &addr->list_node); - } - - /* loop through list of message/address consumers */ -@@ -1213,7 +1213,7 @@ cleanup_parse_message: - } - - /* free address tlvblocks */ -- list_for_each_element_safe(&addr_head, addr, list_node, safe) { -+ oonf_list_for_each_element_safe(&addr_head, addr, list_node, safe) { - _free_tlvblock(parser, &addr->tlvblock); - parser->free_addrblock_entry(addr); - } -@@ -1248,26 +1248,26 @@ _add_consumer(struct rfc5444_reader_tlvblock_consumer *consumer, struct avl_tree - int i, o; - bool set; - -- list_init_head(&consumer->_consumer_list); -+ oonf_list_init_head(&consumer->_consumer_list); - - /* generate sorted list of entries */ - for (i=0; i_consumer_list, &entries[i]._node); -+ oonf_list_add_tail(&consumer->_consumer_list, &entries[i]._node); - } - else { - set = false; -- list_for_each_element_reverse(&consumer->_consumer_list, e, _node) { -+ oonf_list_for_each_element_reverse(&consumer->_consumer_list, e, _node) { - if (_calc_tlvconsumer_intorder(e) <= o) { -- list_add_after(&e->_node, &entries[i]._node); -+ oonf_list_add_after(&e->_node, &entries[i]._node); - set = true; - break; - } - } - if (!set) { -- list_add_head(&consumer->_consumer_list, &entries[i]._node); -+ oonf_list_add_head(&consumer->_consumer_list, &entries[i]._node); - } - } - -diff --git a/src-api/rfc5444/rfc5444_writer.c b/src-api/rfc5444/rfc5444_writer.c -index a37fe89..5bd1165 100644 ---- a/src-api/rfc5444/rfc5444_writer.c -+++ b/src-api/rfc5444/rfc5444_writer.c -@@ -91,15 +91,15 @@ rfc5444_writer_init(struct rfc5444_writer *writer) { - if (!writer->free_addrtlv_entry) - writer->free_addrtlv_entry = free; - -- list_init_head(&writer->_targets); -+ oonf_list_init_head(&writer->_targets); - - /* initialize packet buffer */ - writer->_msg.buffer = writer->msg_buffer; - _rfc5444_tlv_writer_init(&writer->_msg, 0, writer->msg_size); - -- list_init_head(&writer->_pkthandlers); -- list_init_head(&writer->_targets); -- list_init_head(&writer->_addr_tlvtype_head); -+ oonf_list_init_head(&writer->_pkthandlers); -+ oonf_list_init_head(&writer->_targets); -+ oonf_list_init_head(&writer->_addr_tlvtype_head); - - avl_init(&writer->_msgcreators, avl_comp_uint8, false); - -@@ -128,17 +128,17 @@ rfc5444_writer_cleanup(struct rfc5444_writer *writer) { - #endif - - /* remove all packet handlers */ -- list_for_each_element_safe(&writer->_pkthandlers, pkt, _pkthandle_node, safe_pkt) { -+ oonf_list_for_each_element_safe(&writer->_pkthandlers, pkt, _pkthandle_node, safe_pkt) { - rfc5444_writer_unregister_pkthandler(writer, pkt); - } - - /* remove all _targets */ -- list_for_each_element_safe(&writer->_targets, interf, _target_node, safe_interf) { -+ oonf_list_for_each_element_safe(&writer->_targets, interf, _target_node, safe_interf) { - rfc5444_writer_unregister_target(writer, interf); - } - - /* remove all generic address tlvtypes */ -- list_for_each_element_safe(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node, safe_tt) { -+ oonf_list_for_each_element_safe(&writer->_addr_tlvtype_head, tlvtype, _tlvtype_node, safe_tt) { - rfc5444_writer_unregister_addrtlvtype(writer, tlvtype); - } - -@@ -153,7 +153,7 @@ rfc5444_writer_cleanup(struct rfc5444_writer *writer) { - } - - /* remove all registered address tlvs */ -- list_for_each_element_safe(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node, safe_tt) { -+ oonf_list_for_each_element_safe(&msg->_msgspecific_tlvtype_head, tlvtype, _tlvtype_node, safe_tt) { - rfc5444_writer_unregister_addrtlvtype(writer, tlvtype); - } - -@@ -247,7 +247,7 @@ rfc5444_writer_add_address(struct rfc5444_writer *writer __attribute__ ((unused) - address->_orig_index = msg->_addr_tree.count; - - /* add address to address list */ -- list_add_tail(&msg->_addr_head, &address->_addr_node); -+ oonf_list_add_tail(&msg->_addr_head, &address->_addr_node); - - /* add address into message address tree */ - address->_addr_tree_node.key = &address->address; -@@ -302,12 +302,12 @@ rfc5444_writer_unregister_addrtlvtype(struct rfc5444_writer *writer, struct rfc5 - #if WRITER_STATE_MACHINE == true - assert(writer->_state == RFC5444_WRITER_NONE); - #endif -- if (!list_is_node_added(&tlvtype->_tlvtype_node)) { -+ if (!oonf_list_is_node_added(&tlvtype->_tlvtype_node)) { - return; - } - - _free_tlvtype_tlvs(writer, tlvtype); -- list_remove(&tlvtype->_tlvtype_node); -+ oonf_list_remove(&tlvtype->_tlvtype_node); - - if (tlvtype->_creator) { - /* message specific address tlv, see if we need to remove the message itself */ -@@ -460,7 +460,7 @@ rfc5444_writer_register_pkthandler(struct rfc5444_writer *writer, - assert(writer->_state == RFC5444_WRITER_NONE); - #endif - -- list_add_tail(&writer->_pkthandlers, &pkt->_pkthandle_node); -+ oonf_list_add_tail(&writer->_pkthandlers, &pkt->_pkthandle_node); - } - - /** -@@ -477,8 +477,8 @@ rfc5444_writer_unregister_pkthandler( - #if WRITER_STATE_MACHINE == true - assert(writer->_state == RFC5444_WRITER_NONE); - #endif -- if (list_is_node_added(&pkt->_pkthandle_node)) { -- list_remove(&pkt->_pkthandle_node); -+ if (oonf_list_is_node_added(&pkt->_pkthandle_node)) { -+ oonf_list_remove(&pkt->_pkthandle_node); - } - } - -@@ -501,7 +501,7 @@ rfc5444_writer_register_target(struct rfc5444_writer *writer, - - interf->_is_flushed = true; - -- list_add_tail(&writer->_targets, &interf->_target_node); -+ oonf_list_add_tail(&writer->_targets, &interf->_target_node); - } - - /** -@@ -519,8 +519,8 @@ rfc5444_writer_unregister_target( - #endif - - /* remove interface from writer */ -- if (list_is_node_added(&interf->_target_node)) { -- list_remove(&interf->_target_node); -+ if (oonf_list_is_node_added(&interf->_target_node)) { -+ oonf_list_remove(&interf->_target_node); - } - } - -@@ -557,10 +557,10 @@ _get_message(struct rfc5444_writer *writer, uint8_t msgid) { - /* initialize list/tree heads */ - avl_init(&msg->_provider_tree, avl_comp_uint32, true); - -- list_init_head(&msg->_msgspecific_tlvtype_head); -+ oonf_list_init_head(&msg->_msgspecific_tlvtype_head); - - avl_init(&msg->_addr_tree, avl_comp_netaddr, false); -- list_init_head(&msg->_addr_head); -+ oonf_list_init_head(&msg->_addr_head); - return msg; - } - -@@ -586,11 +586,11 @@ _register_addrtlvtype(struct rfc5444_writer *writer, - - if (msg) { - /* add to message creator list */ -- list_add_tail(&msg->_msgspecific_tlvtype_head, &tlvtype->_tlvtype_node); -+ oonf_list_add_tail(&msg->_msgspecific_tlvtype_head, &tlvtype->_tlvtype_node); - } - else { - /* add to generic address tlvtype list */ -- list_add_tail(&writer->_addr_tlvtype_head, &tlvtype->_tlvtype_node); -+ oonf_list_add_tail(&writer->_addr_tlvtype_head, &tlvtype->_tlvtype_node); - } - } - -@@ -643,7 +643,7 @@ _rfc5444_writer_free_addresses(struct rfc5444_writer *writer, struct rfc5444_wri - - avl_remove_all_elements(&msg->_addr_tree, addr, _addr_tree_node, safe_addr) { - /* remove from list too */ -- list_remove(&addr->_addr_node); -+ oonf_list_remove(&addr->_addr_node); - - avl_remove_all_elements(&addr->_addrtlv_tree, addrtlv, addrtlv_node, safe_addrtlv) { - /* remove from tlvtype too */ -@@ -665,8 +665,8 @@ _rfc5444_writer_free_addresses(struct rfc5444_writer *writer, struct rfc5444_wri - static void - _lazy_free_message(struct rfc5444_writer *writer, struct rfc5444_writer_message *msg) { - if (!msg->_registered -- && list_is_empty(&msg->_addr_head) -- && list_is_empty(&msg->_msgspecific_tlvtype_head) -+ && oonf_list_is_empty(&msg->_addr_head) -+ && oonf_list_is_empty(&msg->_msgspecific_tlvtype_head) - && avl_is_empty(&msg->_provider_tree)) { - avl_remove(&writer->_msgcreators, &msg->_msgcreator_node); - free(msg); -diff --git a/src-api/rfc5444/rfc5444_writer.h b/src-api/rfc5444/rfc5444_writer.h -index 43631c3..9f367d2 100644 ---- a/src-api/rfc5444/rfc5444_writer.h -+++ b/src-api/rfc5444/rfc5444_writer.h -@@ -57,8 +57,8 @@ struct rfc5444_writer_message; - * during message generation (finishMessageHeader/finishMessageTLVs - * callbacks) - */ --#define for_each_fragment_address(first, last, address, loop) list_for_element_range(first, last, address, addr_node, loop) --#define for_each_message_address(message, address, loop) list_for_each_element(&message->addr_head, address, addr_node, loop) -+#define for_each_fragment_address(first, last, address, loop) oonf_list_for_element_range(first, last, address, addr_node, loop) -+#define for_each_message_address(message, address, loop) oonf_list_for_each_element(&message->addr_head, address, addr_node, loop) - - /** - * state machine values for the writer. -diff --git a/src-api/subsystems/oonf_class.c b/src-api/subsystems/oonf_class.c -index 9625e6a..600b979 100644 ---- a/src-api/subsystems/oonf_class.c -+++ b/src-api/subsystems/oonf_class.c -@@ -122,8 +122,8 @@ oonf_class_add(struct oonf_class *ci) - } - - /* Init list heads */ -- list_init_head(&ci->_free_list); -- list_init_head(&ci->_extensions); -+ oonf_list_init_head(&ci->_free_list); -+ oonf_list_init_head(&ci->_extensions); - - OONF_DEBUG(LOG_CLASS, "Class %s added: %" PRINTF_SIZE_T_SPECIFIER " bytes\n", - ci->name, ci->total_size); -@@ -145,7 +145,7 @@ oonf_class_remove(struct oonf_class *ci) - _free_freelist(ci); - - /* remove all listeners */ -- list_for_each_element_safe(&ci->_extensions, ext, _node, iterator) { -+ oonf_list_for_each_element_safe(&ci->_extensions, ext, _node, iterator) { - oonf_class_extension_remove(ext); - } - -@@ -170,7 +170,7 @@ oonf_class_resize(struct oonf_class *ci) { - _free_freelist(ci); - - /* recalculate offsets */ -- list_for_each_element(&ci->_extensions, ext, _node) { -+ oonf_list_for_each_element(&ci->_extensions, ext, _node) { - ext->_offset = ci->total_size; - OONF_DEBUG(LOG_CLASS, "Class %s resized: " - " '%s' has offset %" PRINTF_SIZE_T_SPECIFIER " and size %" PRINTF_SIZE_T_SPECIFIER "\n", -@@ -203,7 +203,7 @@ oonf_class_malloc(struct oonf_class *ci) - /* - * Check first if we have reusable memory. - */ -- if (list_is_empty(&ci->_free_list)) { -+ if (oonf_list_is_empty(&ci->_free_list)) { - /* - * No reusable memory block on the free_list. - * Allocate a fresh one. -@@ -220,7 +220,7 @@ oonf_class_malloc(struct oonf_class *ci) - * Carve it out of the list, and clean. - */ - entity = ci->_free_list.next; -- list_remove(entity); -+ oonf_list_remove(entity); - - memset(entity, 0, ci->total_size); - ptr = entity; -@@ -262,7 +262,7 @@ oonf_class_free(struct oonf_class *ci, void *ptr) - || (ci->_free_list_size < ci->_current_usage / OONF_CLASS_FREE_THRESHOLD)) { - item = ptr; - -- list_add_tail(&ci->_free_list, item); -+ oonf_list_add_tail(&ci->_free_list, item); - - ci->_free_list_size++; - #ifdef OONF_LOG_DEBUG_INFO -@@ -310,7 +310,7 @@ oonf_class_extension_add(struct oonf_class_extension *ext) { - } - - /* add to class extension list */ -- list_add_tail(&c->_extensions, &ext->_node); -+ oonf_list_add_tail(&c->_extensions, &ext->_node); - - if (ext->size > 0) { - /* make sure freelist is empty */ -@@ -336,8 +336,8 @@ oonf_class_extension_add(struct oonf_class_extension *ext) { - */ - void - oonf_class_extension_remove(struct oonf_class_extension *ext) { -- if (list_is_node_added(&ext->_node)) { -- list_remove(&ext->_node); -+ if (oonf_list_is_node_added(&ext->_node)) { -+ oonf_list_remove(&ext->_node); - ext->_offset = 0; - } - } -@@ -357,7 +357,7 @@ oonf_class_event(struct oonf_class *c, void *ptr, enum oonf_class_event evt) { - - OONF_DEBUG(LOG_CLASS, "Fire '%s' event for %s", - OONF_CLASS_EVENT_NAME[evt], c->to_keystring(&buf, c, ptr)); -- list_for_each_element(&c->_extensions, ext, _node) { -+ oonf_list_for_each_element(&c->_extensions, ext, _node) { - if (evt == OONF_OBJECT_ADDED && ext->cb_add != NULL) { - OONF_DEBUG(LOG_CLASS, "Fire listener %s", ext->ext_name); - ext->cb_add(ptr); -@@ -392,11 +392,11 @@ _roundup(size_t size) { - */ - static void - _free_freelist(struct oonf_class *ci) { -- while (!list_is_empty(&ci->_free_list)) { -+ while (!oonf_list_is_empty(&ci->_free_list)) { - struct list_entity *item; - item = ci->_free_list.next; - -- list_remove(item); -+ oonf_list_remove(item); - free(item); - } - ci->_free_list_size = 0; -diff --git a/src-api/subsystems/oonf_class.h b/src-api/subsystems/oonf_class.h -index b738761..fadf50f 100644 ---- a/src-api/subsystems/oonf_class.h -+++ b/src-api/subsystems/oonf_class.h -@@ -209,7 +209,7 @@ oonf_class_get_extension(struct oonf_class_extension *ext, void *ptr) { - */ - static INLINE bool - oonf_class_is_extension_registered(struct oonf_class_extension *ext) { -- return list_is_node_added(&ext->_node); -+ return oonf_list_is_node_added(&ext->_node); - } - - #endif /* _OONF_CLASS_H */ -diff --git a/src-api/subsystems/oonf_interface.c b/src-api/subsystems/oonf_interface.c -index a87c410..bec6f5c 100644 ---- a/src-api/subsystems/oonf_interface.c -+++ b/src-api/subsystems/oonf_interface.c -@@ -103,7 +103,7 @@ _init(void) { - oonf_class_add(&_if_class); - - avl_init(&oonf_interface_tree, avl_comp_strcasecmp, false); -- list_init_head(&_interface_listener); -+ oonf_list_init_head(&_interface_listener); - - os_system_iflistener_add(&_iflistener); - return 0; -@@ -116,7 +116,7 @@ static void - _cleanup(void) { - struct oonf_interface_listener *listener, *l_it; - -- list_for_each_element_safe(&_interface_listener, listener, _node, l_it) { -+ oonf_list_for_each_element_safe(&_interface_listener, listener, _node, l_it) { - oonf_interface_remove_listener(listener); - } - -@@ -133,7 +133,7 @@ _cleanup(void) { - int - oonf_interface_add_listener( - struct oonf_interface_listener *listener) { -- if (list_is_node_added(&listener->_node)) { -+ if (oonf_list_is_node_added(&listener->_node)) { - return 0; - } - -@@ -144,7 +144,7 @@ oonf_interface_add_listener( - } - } - -- list_add_tail(&_interface_listener, &listener->_node); -+ oonf_list_add_tail(&_interface_listener, &listener->_node); - return 0; - } - -@@ -155,7 +155,7 @@ oonf_interface_add_listener( - void - oonf_interface_remove_listener( - struct oonf_interface_listener *listener) { -- if (!list_is_node_added(&listener->_node)) { -+ if (!oonf_list_is_node_added(&listener->_node)) { - return; - } - -@@ -163,7 +163,7 @@ oonf_interface_remove_listener( - _interface_remove(listener->interface, listener->mesh); - } - -- list_remove(&listener->_node); -+ oonf_list_remove(&listener->_node); - } - - /** -@@ -345,7 +345,7 @@ _cb_change_handler(void *ptr) { - memcpy(&interf->data, &new_data, sizeof(interf->data)); - - /* call listeners */ -- list_for_each_element_safe(&_interface_listener, listener, _node, l_it) { -+ oonf_list_for_each_element_safe(&_interface_listener, listener, _node, l_it) { - if (listener->process != NULL - && (listener->name == NULL - || strcasecmp(listener->name, interf->data.name) == 0)) { -diff --git a/src-api/subsystems/oonf_layer2.c b/src-api/subsystems/oonf_layer2.c -index 6e50087..059ad4d 100644 ---- a/src-api/subsystems/oonf_layer2.c -+++ b/src-api/subsystems/oonf_layer2.c -@@ -246,7 +246,7 @@ oonf_layer2_neigh_add(struct oonf_layer2_net *l2net, - if (netaddr_get_address_family(neigh) == AF_MAC48 - || netaddr_get_address_family(neigh) == AF_EUI64) { - /* initialize ring for IP addresses of neighbor */ -- list_init_head(&l2neigh->_neigh_ring); -+ oonf_list_init_head(&l2neigh->_neigh_ring); - } - - oonf_class_event(&_l2neighbor_class, l2neigh, OONF_OBJECT_ADDED); -@@ -391,8 +391,8 @@ _neigh_remove(struct oonf_layer2_neigh *l2neigh) { - oonf_class_event(&_l2neighbor_class, l2neigh, OONF_OBJECT_REMOVED); - - /* remove all connected IP defaults */ -- list_for_each_element_safe(&l2neigh->_neigh_ring, neigh, _neigh_ring, n_it) { -- list_remove(&neigh->_neigh_ring); -+ oonf_list_for_each_element_safe(&l2neigh->_neigh_ring, neigh, _neigh_ring, n_it) { -+ oonf_list_remove(&neigh->_neigh_ring); - } - - /* free resources for mac entry */ -diff --git a/src-api/subsystems/oonf_packet_socket.c b/src-api/subsystems/oonf_packet_socket.c -index 8797175..f3bb073 100644 ---- a/src-api/subsystems/oonf_packet_socket.c -+++ b/src-api/subsystems/oonf_packet_socket.c -@@ -90,7 +90,7 @@ static char _input_buffer[65536]; - */ - static int - _init(void) { -- list_init_head(&_packet_sockets); -+ oonf_list_init_head(&_packet_sockets); - return 0; - } - -@@ -101,8 +101,8 @@ static void - _cleanup(void) { - struct oonf_packet_socket *skt; - -- while (!list_is_empty(&_packet_sockets)) { -- skt = list_first_element(&_packet_sockets, skt, node); -+ while (!oonf_list_is_empty(&_packet_sockets)) { -+ skt = oonf_list_first_element(&_packet_sockets, skt, node); - - oonf_packet_remove(skt, true); - } -@@ -137,7 +137,7 @@ oonf_packet_add(struct oonf_packet_socket *pktsocket, - oonf_socket_add(&pktsocket->scheduler_entry); - - abuf_init(&pktsocket->out); -- list_add_tail(&_packet_sockets, &pktsocket->node); -+ oonf_list_add_tail(&_packet_sockets, &pktsocket->node); - memcpy(&pktsocket->local_socket, local, sizeof(pktsocket->local_socket)); - - if (pktsocket->config.input_buffer_length == 0) { -@@ -157,12 +157,12 @@ void - oonf_packet_remove(struct oonf_packet_socket *pktsocket, - bool force __attribute__((unused))) { - // TODO: implement non-force behavior for UDP sockets -- if (list_is_node_added(&pktsocket->node)) { -+ if (oonf_list_is_node_added(&pktsocket->node)) { - oonf_socket_remove(&pktsocket->scheduler_entry); - os_net_close(pktsocket->scheduler_entry.fd); - abuf_free(&pktsocket->out); - -- list_remove(&pktsocket->node); -+ oonf_list_remove(&pktsocket->node); - - pktsocket->scheduler_entry.fd = -1; - } -@@ -307,11 +307,11 @@ oonf_packet_send_managed(struct oonf_packet_managed *managed, - return 0; - } - -- if (list_is_node_added(&managed->socket_v4.scheduler_entry._node) -+ if (oonf_list_is_node_added(&managed->socket_v4.scheduler_entry._node) - && netaddr_socket_get_addressfamily(remote) == AF_INET) { - return oonf_packet_send(&managed->socket_v4, remote, data, length); - } -- if (list_is_node_added(&managed->socket_v6.scheduler_entry._node) -+ if (oonf_list_is_node_added(&managed->socket_v6.scheduler_entry._node) - && netaddr_socket_get_addressfamily(remote) == AF_INET6) { - return oonf_packet_send(&managed->socket_v6, remote, data, length); - } -@@ -572,7 +572,7 @@ _apply_managed_socket(struct oonf_packet_managed *managed, - return -1; - } - -- if (list_is_node_added(&packet->node)) { -+ if (oonf_list_is_node_added(&packet->node)) { - if (data == packet->interface - && memcmp(&sock, &packet->local_socket, sizeof(sock)) == 0) { - /* nothing changed */ -diff --git a/src-api/subsystems/oonf_packet_socket.h b/src-api/subsystems/oonf_packet_socket.h -index e8fb218..edaa031 100644 ---- a/src-api/subsystems/oonf_packet_socket.h -+++ b/src-api/subsystems/oonf_packet_socket.h -@@ -131,7 +131,7 @@ EXPORT bool oonf_packet_managed_is_active( - */ - static INLINE bool - oonf_packet_is_active(struct oonf_packet_socket *sock) { -- return list_is_node_added(&sock->node); -+ return oonf_list_is_node_added(&sock->node); - } - - #endif /* OONF_PACKET_SOCKET_H_ */ -diff --git a/src-api/subsystems/oonf_rfc5444.c b/src-api/subsystems/oonf_rfc5444.c -index 013ccac..94764df 100644 ---- a/src-api/subsystems/oonf_rfc5444.c -+++ b/src-api/subsystems/oonf_rfc5444.c -@@ -526,7 +526,7 @@ oonf_rfc5444_add_interface(struct oonf_rfc5444_protocol *protocol, - protocol->_msg_seqno = os_core_random() & 0xffff; - - /* initialize listener list */ -- list_init_head(&interf->_listener); -+ oonf_list_init_head(&interf->_listener); - - /* increase protocol refcount */ - protocol->_refcount++; -@@ -537,7 +537,7 @@ oonf_rfc5444_add_interface(struct oonf_rfc5444_protocol *protocol, - - if (listener) { - /* hookup listener */ -- list_add_tail(&interf->_listener, &listener->_node); -+ oonf_list_add_tail(&interf->_listener, &listener->_node); - listener->interface = interf; - } - return interf; -@@ -554,7 +554,7 @@ oonf_rfc5444_remove_interface(struct oonf_rfc5444_interface *interf, - struct oonf_rfc5444_target *target, *t_it; - - if (listener != NULL && listener->interface != NULL) { -- list_remove(&listener->_node); -+ oonf_list_remove(&listener->_node); - listener->interface = NULL; - } - -@@ -1230,7 +1230,7 @@ _cb_interface_changed(struct oonf_packet_managed *managed, bool changed) { - oonf_rfc5444_reconfigure_interface(interf, NULL); - } - -- list_for_each_element(&interf->_listener, l, _node) { -+ oonf_list_for_each_element(&interf->_listener, l, _node) { - l->cb_interface_changed(l, changed); - } - } -diff --git a/src-api/subsystems/oonf_socket.c b/src-api/subsystems/oonf_socket.c -index 8837bb7..3fc16d8 100644 ---- a/src-api/subsystems/oonf_socket.c -+++ b/src-api/subsystems/oonf_socket.c -@@ -74,7 +74,7 @@ struct oonf_subsystem oonf_socket_subsystem = { - */ - static int - _init(void) { -- list_init_head(&oonf_socket_head); -+ oonf_list_init_head(&oonf_socket_head); - return 0; - } - -@@ -87,8 +87,8 @@ _cleanup(void) - { - struct oonf_socket_entry *entry, *iterator; - -- list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { -- list_remove(&entry->_node); -+ oonf_list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { -+ oonf_list_remove(&entry->_node); - os_net_close(entry->fd); - } - } -@@ -107,7 +107,7 @@ oonf_socket_add(struct oonf_socket_entry *entry) - - OONF_DEBUG(LOG_SOCKET, "Adding socket entry %d to scheduler\n", entry->fd); - -- list_add_before(&oonf_socket_head, &entry->_node); -+ oonf_list_add_before(&oonf_socket_head, &entry->_node); - } - - /** -@@ -119,7 +119,7 @@ oonf_socket_remove(struct oonf_socket_entry *entry) - { - OONF_DEBUG(LOG_SOCKET, "Removing socket entry %d\n", entry->fd); - -- list_remove(&entry->_node); -+ oonf_list_remove(&entry->_node); - } - - /** -@@ -171,7 +171,7 @@ oonf_socket_handle(bool (*stop_scheduler)(void), uint64_t stop_time) - FD_ZERO(&obits); - - /* Adding file-descriptors to FD set */ -- list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { -+ oonf_list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { - if (entry->process == NULL) { - continue; - } -@@ -229,7 +229,7 @@ oonf_socket_handle(bool (*stop_scheduler)(void), uint64_t stop_time) - if (oonf_clock_update()) { - return -1; - } -- list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { -+ oonf_list_for_each_element_safe(&oonf_socket_head, entry, _node, iterator) { - if (entry->process == NULL) { - continue; - } -diff --git a/src-api/subsystems/oonf_stream_socket.c b/src-api/subsystems/oonf_stream_socket.c -index 9c9a33a..342435b 100644 ---- a/src-api/subsystems/oonf_stream_socket.c -+++ b/src-api/subsystems/oonf_stream_socket.c -@@ -96,7 +96,7 @@ static int - _init(void) { - oonf_class_add(&_connection_cookie); - oonf_timer_add(&_connection_timeout); -- list_init_head(&oonf_stream_head); -+ oonf_list_init_head(&oonf_stream_head); - return 0; - } - -@@ -107,8 +107,8 @@ static void - _cleanup(void) { - struct oonf_stream_socket *comport; - -- while (!list_is_empty(&oonf_stream_head)) { -- comport = list_first_element(&oonf_stream_head, comport, node); -+ while (!oonf_list_is_empty(&oonf_stream_head)) { -+ comport = oonf_list_first_element(&oonf_stream_head, comport, node); - - oonf_stream_remove(comport, true); - } -@@ -175,8 +175,8 @@ oonf_stream_add(struct oonf_stream_socket *stream_socket, - stream_socket->config.maximum_input_buffer = 65536; - } - -- list_init_head(&stream_socket->session); -- list_add_tail(&oonf_stream_head, &stream_socket->node); -+ oonf_list_init_head(&stream_socket->session); -+ oonf_list_add_tail(&oonf_stream_head, &stream_socket->node); - - return 0; - -@@ -205,22 +205,22 @@ oonf_stream_remove(struct oonf_stream_socket *stream_socket, bool force) { - return; - } - -- if (!list_is_node_added(&stream_socket->node)) { -+ if (!oonf_list_is_node_added(&stream_socket->node)) { - return; - } - -- list_for_each_element_safe(&stream_socket->session, session, node, ptr) { -+ oonf_list_for_each_element_safe(&stream_socket->session, session, node, ptr) { - if (force || (abuf_getlen(&session->out) == 0 && !session->busy)) { - /* close everything that doesn't need to send data anymore */ - oonf_stream_close(session, force); - } - } - -- if (!list_is_empty(&stream_socket->session)) { -+ if (!oonf_list_is_empty(&stream_socket->session)) { - return; - } - -- list_remove(&stream_socket->node); -+ oonf_list_remove(&stream_socket->node); - - if (stream_socket->scheduler_entry.fd) { - /* only for server sockets */ -@@ -298,7 +298,7 @@ oonf_stream_close(struct oonf_stream_session *session, bool force) { - return; - } - -- if (!list_is_node_added(&session->node)) { -+ if (!oonf_list_is_node_added(&session->node)) { - return; - } - -@@ -309,7 +309,7 @@ oonf_stream_close(struct oonf_stream_session *session, bool force) { - oonf_timer_stop(&session->timeout); - - session->comport->config.allowed_sessions++; -- list_remove(&session->node); -+ oonf_list_remove(&session->node); - - os_net_close(session->scheduler_entry.fd); - oonf_socket_remove(&session->scheduler_entry); -@@ -400,7 +400,7 @@ _apply_managed_socket(struct oonf_stream_managed *managed, - return -1; - } - -- if (list_is_node_added(&stream->scheduler_entry._node)) { -+ if (oonf_list_is_node_added(&stream->scheduler_entry._node)) { - if (memcmp(&sock, &stream->local_socket, sizeof(sock)) == 0) { - /* nothing changed */ - return 0; -@@ -540,7 +540,7 @@ _create_session(struct oonf_stream_socket *stream_socket, - OONF_DEBUG(LOG_STREAM, "Got connection through socket %d with %s.\n", - sock, netaddr_to_string(&buf, remote_addr)); - -- list_add_tail(&stream_socket->session, &session->node); -+ oonf_list_add_tail(&stream_socket->session, &session->node); - return session; - - parse_request_error: -diff --git a/src-api/subsystems/oonf_telnet.c b/src-api/subsystems/oonf_telnet.c -index 5f1dd6a..7d1a86a 100644 ---- a/src-api/subsystems/oonf_telnet.c -+++ b/src-api/subsystems/oonf_telnet.c -@@ -284,7 +284,7 @@ _cb_telnet_init(struct oonf_stream_session *session) { - telnet_session->data.out = &telnet_session->session.out; - telnet_session->data.remote = &telnet_session->session.remote_address; - -- list_init_head(&telnet_session->data.cleanup_list); -+ oonf_list_init_head(&telnet_session->data.cleanup_list); - - return 0; - } -@@ -305,7 +305,7 @@ _cb_telnet_cleanup(struct oonf_stream_session *session) { - oonf_telnet_stop(&telnet_session->data); - - /* call all cleanup handlers */ -- list_for_each_element_safe(&telnet_session->data.cleanup_list, handler, node, it) { -+ oonf_list_for_each_element_safe(&telnet_session->data.cleanup_list, handler, node, it) { - /* remove from list first */ - oonf_telnet_remove_cleanup(handler); - -diff --git a/src-api/subsystems/oonf_telnet.h b/src-api/subsystems/oonf_telnet.h -index 490a389..ddc84a5 100644 ---- a/src-api/subsystems/oonf_telnet.h -+++ b/src-api/subsystems/oonf_telnet.h -@@ -168,7 +168,7 @@ static INLINE void - oonf_telnet_add_cleanup(struct oonf_telnet_data *data, - struct oonf_telnet_cleanup *cleanup) { - cleanup->data = data; -- list_add_tail(&data->cleanup_list, &cleanup->node); -+ oonf_list_add_tail(&data->cleanup_list, &cleanup->node); - } - - /** -@@ -177,7 +177,7 @@ oonf_telnet_add_cleanup(struct oonf_telnet_data *data, - */ - static INLINE void - oonf_telnet_remove_cleanup(struct oonf_telnet_cleanup *cleanup) { -- list_remove(&cleanup->node); -+ oonf_list_remove(&cleanup->node); - } - - /** -diff --git a/src-api/subsystems/oonf_timer.c b/src-api/subsystems/oonf_timer.c -index 5fe0e82..812bd21 100644 ---- a/src-api/subsystems/oonf_timer.c -+++ b/src-api/subsystems/oonf_timer.c -@@ -90,7 +90,7 @@ _init(void) - avl_init(&_timer_tree, _avlcomp_timer, true); - _scheduling_now = false; - -- list_init_head(&oonf_timer_info_list); -+ oonf_list_init_head(&oonf_timer_info_list); - return 0; - } - -@@ -103,7 +103,7 @@ _cleanup(void) - struct oonf_timer_info *ti, *iterator; - - /* free all timerinfos */ -- list_for_each_element_safe(&oonf_timer_info_list, ti, _node, iterator) { -+ oonf_list_for_each_element_safe(&oonf_timer_info_list, ti, _node, iterator) { - oonf_timer_remove(ti); - } - } -@@ -116,7 +116,7 @@ void - oonf_timer_add(struct oonf_timer_info *ti) { - assert (ti->callback); - assert (ti->name); -- list_add_tail(&oonf_timer_info_list, &ti->_node); -+ oonf_list_add_tail(&oonf_timer_info_list, &ti->_node); - } - - /** -@@ -134,7 +134,7 @@ oonf_timer_remove(struct oonf_timer_info *info) { - } - } - -- list_remove(&info->_node); -+ oonf_list_remove(&info->_node); - } - - /** -diff --git a/src-api/subsystems/os_linux/os_routing_linux.c b/src-api/subsystems/os_linux/os_routing_linux.c -index 86f98d7..702ad4a 100644 ---- a/src-api/subsystems/os_linux/os_routing_linux.c -+++ b/src-api/subsystems/os_linux/os_routing_linux.c -@@ -101,7 +101,7 @@ _init(void) { - if (os_system_netlink_add(&_rtnetlink_socket, NETLINK_ROUTE)) { - return -1; - } -- list_init_head(&_rtnetlink_feedback); -+ oonf_list_init_head(&_rtnetlink_feedback); - return 0; - } - -@@ -112,7 +112,7 @@ static void - _cleanup(void) { - struct os_route *rt, *rt_it; - -- list_for_each_element_safe(&_rtnetlink_feedback, rt, _internal._node, rt_it) { -+ oonf_list_for_each_element_safe(&_rtnetlink_feedback, rt, _internal._node, rt_it) { - _routing_finished(rt, 1); - } - -@@ -191,7 +191,7 @@ os_routing_set(struct os_route *route, bool set, bool del_similar) { - seq = os_system_netlink_send(&_rtnetlink_socket, msg); - - if (route->cb_finished) { -- list_add_tail(&_rtnetlink_feedback, &route->_internal._node); -+ oonf_list_add_tail(&_rtnetlink_feedback, &route->_internal._node); - route->_internal.nl_seq = seq; - } - return 0; -@@ -229,7 +229,7 @@ os_routing_query(struct os_route *route) { - return -1; - } - -- list_add_tail(&_rtnetlink_feedback, &route->_internal._node); -+ oonf_list_add_tail(&_rtnetlink_feedback, &route->_internal._node); - route->_internal.nl_seq = seq; - return 0; - } -@@ -251,9 +251,9 @@ os_routing_interrupt(struct os_route *route) { - */ - static void - _routing_finished(struct os_route *route, int error) { -- if (list_is_node_added(&route->_internal._node)) { -+ if (oonf_list_is_node_added(&route->_internal._node)) { - /* remove first to prevent any kind of recursive cleanup */ -- list_remove(&route->_internal._node); -+ oonf_list_remove(&route->_internal._node); - - if (route->cb_finished) { - route->cb_finished(route, error); -@@ -462,7 +462,7 @@ _cb_rtnetlink_message(struct nlmsghdr *msg) { - return; - } - -- list_for_each_element(&_rtnetlink_feedback, filter, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, filter, _internal._node) { - OONF_DEBUG_NH(LOG_OS_ROUTING, " Compare with seq: %d", filter->_internal.nl_seq); - if (msg->nlmsg_seq == filter->_internal.nl_seq) { - if (filter->cb_get != NULL && _match_routes(filter, &rt)) { -@@ -487,7 +487,7 @@ _cb_rtnetlink_error(uint32_t seq, int error) { - /* transform into errno number */ - error = -error; - -- list_for_each_element(&_rtnetlink_feedback, route, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, route, _internal._node) { - if (seq == route->_internal.nl_seq) { - _routing_finished(route, error); - break; -@@ -504,7 +504,7 @@ _cb_rtnetlink_timeout(void) { - - OONF_DEBUG(LOG_OS_ROUTING, "Got timeout"); - -- list_for_each_element_safe(&_rtnetlink_feedback, route, _internal._node, rt_it) { -+ oonf_list_for_each_element_safe(&_rtnetlink_feedback, route, _internal._node, rt_it) { - _routing_finished(route, -1); - } - } -@@ -519,7 +519,7 @@ _cb_rtnetlink_done(uint32_t seq) { - - OONF_DEBUG(LOG_OS_ROUTING, "Got done: %u", seq); - -- list_for_each_element(&_rtnetlink_feedback, route, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, route, _internal._node) { - if (seq == route->_internal.nl_seq) { - _routing_finished(route, 0); - break; -diff --git a/src-api/subsystems/os_linux/os_system_linux.c b/src-api/subsystems/os_linux/os_system_linux.c -index 37daf7c..d7bc4b3 100644 ---- a/src-api/subsystems/os_linux/os_system_linux.c -+++ b/src-api/subsystems/os_linux/os_system_linux.c -@@ -179,8 +179,8 @@ _init(void) { - } - - oonf_timer_add(&_netlink_timer); -- list_init_head(&_ifchange_listener); -- list_init_head(&_rtnetlink_feedback); -+ oonf_list_init_head(&_ifchange_listener); -+ oonf_list_init_head(&_rtnetlink_feedback); - return 0; - } - -@@ -239,12 +239,12 @@ os_system_set_interface_state(const char *dev, bool up) { - - void - os_system_iflistener_add(struct os_system_if_listener *listener) { -- list_add_tail(&_ifchange_listener, &listener->_node); -+ oonf_list_add_tail(&_ifchange_listener, &listener->_node); - } - - void - os_system_iflistener_remove(struct os_system_if_listener *listener) { -- list_remove(&listener->_node); -+ oonf_list_remove(&listener->_node); - } - - /** -@@ -469,7 +469,7 @@ os_system_ifaddr_set(struct os_system_address *addr) { - seq = os_system_netlink_send(&_rtnetlink_receiver, msg); - - if (addr->cb_finished) { -- list_add_tail(&_rtnetlink_feedback, &addr->_internal._node); -+ oonf_list_add_tail(&_rtnetlink_feedback, &addr->_internal._node); - addr->_internal.nl_seq = seq; - } - return 0; -@@ -477,9 +477,9 @@ os_system_ifaddr_set(struct os_system_address *addr) { - - void - os_system_ifaddr_interrupt(struct os_system_address *addr) { -- if (list_is_node_added(&addr->_internal._node)) { -+ if (oonf_list_is_node_added(&addr->_internal._node)) { - /* remove first to prevent any kind of recursive cleanup */ -- list_remove(&addr->_internal._node); -+ oonf_list_remove(&addr->_internal._node); - - if (addr->cb_finished) { - addr->cb_finished(addr, -1); -@@ -669,7 +669,7 @@ _cb_rtnetlink_message(struct nlmsghdr *hdr) { - } - - OONF_DEBUG(LOG_OS_SYSTEM, "Linkstatus of interface '%s' changed", if_name); -- list_for_each_element(&_ifchange_listener, listener, _node) { -+ oonf_list_for_each_element(&_ifchange_listener, listener, _node) { - listener->if_changed(if_name, (ifi->ifi_flags & IFF_UP) == 0); - } - } -@@ -684,7 +684,7 @@ _cb_rtnetlink_message(struct nlmsghdr *hdr) { - } - - OONF_DEBUG(LOG_OS_SYSTEM, "Address of interface '%s' changed", if_name); -- list_for_each_element(&_ifchange_listener, listener, _node) { -+ oonf_list_for_each_element(&_ifchange_listener, listener, _node) { - listener->if_changed(if_name, false); - } - } -@@ -704,7 +704,7 @@ _cb_rtnetlink_error(uint32_t seq, int error) { - /* transform into errno number */ - error = -error; - -- list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { - if (seq == addr->_internal.nl_seq) { - _address_finished(addr, error); - break; -@@ -721,7 +721,7 @@ _cb_rtnetlink_timeout(void) { - - OONF_DEBUG(LOG_OS_SYSTEM, "Got timeout"); - -- list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { - _address_finished(addr, -1); - } - } -@@ -736,7 +736,7 @@ _cb_rtnetlink_done(uint32_t seq) { - - OONF_DEBUG(LOG_OS_SYSTEM, "Got done: %u", seq); - -- list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { -+ oonf_list_for_each_element(&_rtnetlink_feedback, addr, _internal._node) { - if (seq == addr->_internal.nl_seq) { - _address_finished(addr, 0); - break; -@@ -752,9 +752,9 @@ _cb_rtnetlink_done(uint32_t seq) { - */ - static void - _address_finished(struct os_system_address *addr, int error) { -- if (list_is_node_added(&addr->_internal._node)) { -+ if (oonf_list_is_node_added(&addr->_internal._node)) { - /* remove first to prevent any kind of recursive cleanup */ -- list_remove(&addr->_internal._node); -+ oonf_list_remove(&addr->_internal._node); - - if (addr->cb_finished) { - addr->cb_finished(addr, error); -diff --git a/src-plugins/remotecontrol/remotecontrol.c b/src-plugins/remotecontrol/remotecontrol.c -index c37c88f..574e28c 100644 ---- a/src-plugins/remotecontrol/remotecontrol.c -+++ b/src-plugins/remotecontrol/remotecontrol.c -@@ -196,7 +196,7 @@ _init(void) - size_t i; - - netaddr_acl_add(&_remotecontrol_config.acl); -- list_init_head(&_remote_sessions); -+ oonf_list_init_head(&_remote_sessions); - - for (i=0; icleanup.data); - } - -@@ -253,7 +253,7 @@ static void - _print_timer(struct autobuf *buf) { - struct oonf_timer_info *t; - -- list_for_each_element(&oonf_timer_info_list, t, _node) { -+ oonf_list_for_each_element(&oonf_timer_info_list, t, _node) { - abuf_appendf(buf, "%-25s (TIMER) usage: %u changes: %u\n", - t->name, t->usage, t->changes); - } -@@ -739,7 +739,7 @@ static struct _remotecontrol_session * - _get_remotecontrol_session(struct oonf_telnet_data *data) { - struct _remotecontrol_session *cl; - -- list_for_each_element(&_remote_sessions, cl, node) { -+ oonf_list_for_each_element(&_remote_sessions, cl, node) { - if (cl->cleanup.data == data) { - return cl; - } -@@ -760,7 +760,7 @@ _get_remotecontrol_session(struct oonf_telnet_data *data) { - oonf_log_mask_copy(cl->mask, log_global_mask); - - /* add to remote telnet list */ -- list_add_tail(&_remote_sessions, &cl->node); -+ oonf_list_add_tail(&_remote_sessions, &cl->node); - - return cl; - } -@@ -774,6 +774,6 @@ _cb_handle_session_cleanup(struct oonf_telnet_cleanup *cleanup) { - struct _remotecontrol_session *session; - - session = cleanup->custom; -- list_remove(&session->node); -+ oonf_list_remove(&session->node); - free(session); - } -diff --git a/tests/common/test_common_avl.c b/tests/common/test_common_avl.c -index e4e5b26..e7d0a29 100644 ---- a/tests/common/test_common_avl.c -+++ b/tests/common/test_common_avl.c -@@ -197,9 +197,9 @@ static void check_tree(const char *name, int line) { - CHECK_NAMED_TRUE((head.root != NULL) == (head.count > 0), name, line, "No root pointer, but tree not empty"); - CHECK_NAMED_TRUE(head.list_head.next != NULL, name, line, "bad next-iterator"); - CHECK_NAMED_TRUE(head.list_head.prev != NULL, name, line, "bad prev-iterator"); -- CHECK_NAMED_TRUE((head.root == NULL) == list_is_empty(&head.list_head), name, line, "iterator list empty, but tree not empty"); -+ CHECK_NAMED_TRUE((head.root == NULL) == oonf_list_is_empty(&head.list_head), name, line, "iterator list empty, but tree not empty"); - if (head.count == 0 || head.root == NULL -- || head.list_head.next == NULL || head.list_head.prev == NULL || list_is_empty(&head.list_head)) { -+ || head.list_head.next == NULL || head.list_head.prev == NULL || oonf_list_is_empty(&head.list_head)) { - return; - } - -diff --git a/tests/common/test_common_list.c b/tests/common/test_common_list.c -index 95af584..dd043e7 100644 ---- a/tests/common/test_common_list.c -+++ b/tests/common/test_common_list.c -@@ -74,13 +74,13 @@ static void clear_elements(void) { - static void add_elements(struct list_element *elements, bool add_head) { - int i; - for (i=0; inext"); -@@ -109,7 +109,7 @@ static void test_add_head(void) { - int i; - - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - add_elements(elements1, true); - - CHECK_TRUE(head.next == &elements1[COUNT-1].node, "head->next"); -@@ -128,10 +128,10 @@ static void test_add_head(void) { - - static void test_add_before(void) { - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - add_elements(elements1, false); - -- list_add_before(&elements1[3].node, &elements2[0].node); -+ oonf_list_add_before(&elements1[3].node, &elements2[0].node); - - CHECK_TRUE(elements1[2].node.next == &elements2[0].node, "elements1[2]->next"); - CHECK_TRUE(elements1[3].node.prev == &elements2[0].node, "elements1[3]->prev"); -@@ -142,10 +142,10 @@ static void test_add_before(void) { - - static void test_add_after(void) { - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - add_elements(elements1, false); - -- list_add_after(&elements1[2].node, &elements2[0].node); -+ oonf_list_add_after(&elements1[2].node, &elements2[0].node); - - CHECK_TRUE(elements1[2].node.next == &elements2[0].node, "elements1[2]->next"); - CHECK_TRUE(elements1[3].node.prev == &elements2[0].node, "elements1[3]->prev"); -@@ -156,10 +156,10 @@ static void test_add_after(void) { - - static void test_remove(void) { - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - add_elements(elements1, false); - -- list_remove(&elements1[2].node); -+ oonf_list_remove(&elements1[2].node); - - CHECK_TRUE(elements1[1].node.next == &elements1[3].node, "elements1[1]->next"); - CHECK_TRUE(elements1[3].node.prev == &elements1[1].node, "elements1[3]->prev"); -@@ -170,20 +170,20 @@ static void test_remove(void) { - - static void test_conditions(void) { - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - -- CHECK_TRUE(list_is_empty(&head), "list_is_empty (1)"); -- CHECK_TRUE(!list_is_node_added(&elements1[0].node), "list_node_added (1)"); -+ CHECK_TRUE(oonf_list_is_empty(&head), "list_is_empty (1)"); -+ CHECK_TRUE(!oonf_list_is_node_added(&elements1[0].node), "list_node_added (1)"); - - add_elements(elements1, false); - -- CHECK_TRUE(!list_is_empty(&head), "list_is_empty (1)"); -- CHECK_TRUE(list_is_node_added(&elements1[0].node), "list_node_added (1)"); -+ CHECK_TRUE(!oonf_list_is_empty(&head), "list_is_empty (1)"); -+ CHECK_TRUE(oonf_list_is_node_added(&elements1[0].node), "list_node_added (1)"); - -- CHECK_TRUE(list_is_first(&head, &elements1[0].node), "list_is_first (1)"); -- CHECK_TRUE(list_is_last(&head, &elements1[COUNT-1].node), "list_is_last (1)"); -- CHECK_TRUE(!list_is_first(&head, &elements1[1].node), "list_is_first (2)"); -- CHECK_TRUE(!list_is_last(&head, &elements1[1].node), "list_is_last (2)"); -+ CHECK_TRUE(oonf_list_is_first(&head, &elements1[0].node), "list_is_first (1)"); -+ CHECK_TRUE(oonf_list_is_last(&head, &elements1[COUNT-1].node), "list_is_last (1)"); -+ CHECK_TRUE(!oonf_list_is_first(&head, &elements1[1].node), "list_is_first (2)"); -+ CHECK_TRUE(!oonf_list_is_last(&head, &elements1[1].node), "list_is_last (2)"); - END_TEST(); - } - -@@ -193,36 +193,36 @@ static void test_merge(void) { - struct list_element *e; - - START_TEST(); -- list_init_head(&head); -- list_init_head(&head2); -+ oonf_list_init_head(&head); -+ oonf_list_init_head(&head2); - -- CHECK_TRUE(list_is_empty(&head), "list_is_empty (1)"); -- CHECK_TRUE(!list_is_node_added(&elements1[0].node), "list_node_added (1)"); -- CHECK_TRUE(!list_is_node_added(&elements2[0].node), "list_node_added (1)"); -+ CHECK_TRUE(oonf_list_is_empty(&head), "list_is_empty (1)"); -+ CHECK_TRUE(!oonf_list_is_node_added(&elements1[0].node), "list_node_added (1)"); -+ CHECK_TRUE(!oonf_list_is_node_added(&elements2[0].node), "list_node_added (1)"); - - add_elements(elements1, false); - - for (i=0; inode); -+ oonf_list_remove(&e->node); - i++; - } - CHECK_TRUE(i == COUNT, "for_each_save only had %d of %d iterations", i, COUNT); -- CHECK_TRUE(list_is_empty(&head), "for_each_save list not empty after loop with remove"); -+ CHECK_TRUE(oonf_list_is_empty(&head), "for_each_save list not empty after loop with remove"); - END_TEST(); - } - -@@ -360,19 +360,19 @@ static void test_for_each_reverse_save_macro(void) { - int i,j; - - START_TEST(); -- list_init_head(&head); -+ oonf_list_init_head(&head); - add_elements(elements1, false); - - i = 0; - j = COUNT - 1; -- list_for_each_element_reverse_safe(&head, e, node, ptr) { -+ oonf_list_for_each_element_reverse_safe(&head, e, node, ptr) { - CHECK_TRUE(e == &elements1[j], "for_each_save iteration %d failed", i); -- list_remove(&e->node); -+ oonf_list_remove(&e->node); - i++; - j--; - } - CHECK_TRUE(i == COUNT, "for_each_save only had %d of %d iterations", i, COUNT); -- CHECK_TRUE(list_is_empty(&head), "for_each_save list not empty after loop with remove"); -+ CHECK_TRUE(oonf_list_is_empty(&head), "for_each_save list not empty after loop with remove"); - END_TEST(); - } - -diff --git a/tests/config/test_config_list.c b/tests/config/test_config_list.c -index de22ea2..41ac6e6 100644 ---- a/tests/config/test_config_list.c -+++ b/tests/config/test_config_list.c -@@ -61,7 +61,7 @@ static struct cfg_schema_section section = - - - static void --test_list_1(void) { -+test_oonf_list_1(void) { - struct cfg_db *db; - struct cfg_entry *entry1, *entry2, *entry3; - char *ptr; -@@ -127,7 +127,7 @@ test_list_1(void) { - } - - static void --test_list_2(void) { -+test_oonf_list_2(void) { - struct cfg_db *db; - struct cfg_entry *entry1, *entry2, *entry3; - char *ptr; -@@ -193,7 +193,7 @@ test_list_2(void) { - } - - static void --test_list_3(void) { -+test_oonf_list_3(void) { - struct cfg_db *db; - struct cfg_entry *entry1, *entry2, *entry3; - char *ptr; -@@ -265,9 +265,9 @@ main(int argc __attribute__ ((unused)), char **argv __attribute__ ((unused))) { - - BEGIN_TESTING(NULL); - -- test_list_1(); -- test_list_2(); -- test_list_3(); -+ test_oonf_list_1(); -+ test_oonf_list_2(); -+ test_oonf_list_3(); - - cfg_schema_remove_section(&schema, §ion); - --- -1.9.1 -