diff --git a/Makefile.dep b/Makefile.dep index 0bdcebd297a46febab9808796896e7177aba9371..f5a3edada4dacce53b8b11bd62bed6e5b9aa30a3 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -5,7 +5,6 @@ endif ifneq (,$(filter nhdp,$(USEMODULE))) USEMODULE += conn_udp USEMODULE += vtimer - USEMODULE += oonf_common USEMODULE += oonf_rfc5444 endif @@ -307,9 +306,13 @@ ifneq (,$(filter fib,$(USEMODULE))) USEMODULE += xtimer endif +ifneq (,$(filter oonf_rfc5444,$(USEMODULE))) + USEMODULE += oonf_common +endif + ifneq (,$(filter oonf_common,$(USEMODULE))) USEPKG += oonf_api - USEMODULE += socket_base + USEMODULE += posix_sockets endif ifneq (,$(filter %_conn_ip,$(USEMODULE))) diff --git a/pkg/oonf_api/0001-add-RIOT-support.patch b/pkg/oonf_api/0001-add-RIOT-support.patch index 68b3c95b7ce8adcc07eb69af851ed80c12507264..e8ec40831b7728039c2d8b066813240f7827dc87 100644 Binary files a/pkg/oonf_api/0001-add-RIOT-support.patch and b/pkg/oonf_api/0001-add-RIOT-support.patch differ diff --git a/pkg/oonf_api/0002-port-tests-to-riot.patch b/pkg/oonf_api/0002-port-tests-to-riot.patch index 7ad8a98f8abff1a098e9628830a85f8409fd95bb..1326d2c1f91d954e6ef36cbdad7ad28073cc6c93 100644 Binary files a/pkg/oonf_api/0002-port-tests-to-riot.patch and b/pkg/oonf_api/0002-port-tests-to-riot.patch differ diff --git a/pkg/oonf_api/0003-port-example-to-riot.patch b/pkg/oonf_api/0003-port-example-to-riot.patch index 013d10c9b784813aba2b719f5243de4c82971ae0..bbf7ac3ca356b59c21ae9b388c115a5f81570f7c 100644 Binary files a/pkg/oonf_api/0003-port-example-to-riot.patch and b/pkg/oonf_api/0003-port-example-to-riot.patch differ diff --git a/pkg/oonf_api/0004-fix-conflicting-types.patch b/pkg/oonf_api/0004-fix-conflicting-types.patch index ebc0a8160fa2dff9f4bd405a1a520627263ee603..331bcb3fdc447b073d3cc564599b6ec277843437 100644 Binary files a/pkg/oonf_api/0004-fix-conflicting-types.patch and b/pkg/oonf_api/0004-fix-conflicting-types.patch differ diff --git a/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch b/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch index fd2d8e19889ac2df638524800705abf3c68ea482..c7248135bbb05dc45b82819ed5d60188ff8278f6 100644 Binary files a/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch and b/pkg/oonf_api/0005-only-define-container_of-when-necessary.patch differ diff --git a/pkg/oonf_api/0006-if_index-is-not-used.patch b/pkg/oonf_api/0006-if_index-is-not-used.patch index 461c194643dec8cef38cad0e7f3df03242615d84..14d7ed0101e2eed42b1be90b7bafe46d1e6d4ce1 100644 Binary files a/pkg/oonf_api/0006-if_index-is-not-used.patch and b/pkg/oonf_api/0006-if_index-is-not-used.patch differ diff --git a/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch b/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch index a57d4bab0cf59c3a20388a09bc7c84ba8414cb20..3ef8de31b4ce01f1b20fab80ee375d11fdafe8f6 100644 Binary files a/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch and b/pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch differ diff --git a/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch b/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch index 4784dff022d6a2cada07b2bcfda5f92ea2a5d9ab..841bdb04b51c578e5e0fc388c48dfa56f1236369 100644 Binary files a/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch and b/pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch differ diff --git a/pkg/oonf_api/0009-Add-missing-include.patch b/pkg/oonf_api/0009-Add-missing-include.patch index 6d799f91d539f11e3e3b750daaeb671111a2a76d..6f3f879957cad0693124177e369800956fadb1dc 100644 Binary files a/pkg/oonf_api/0009-Add-missing-include.patch and b/pkg/oonf_api/0009-Add-missing-include.patch differ diff --git a/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch b/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch index 71a22b8688e79a13c2a399428c3cfdb4c64932f4..2972b1e50665146b26c1b49cc4c7d15335ddaea2 100644 Binary files a/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch and b/pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch differ