diff --git a/package/gluon-mesh-olsrd/Makefile b/package/gluon-mesh-olsrd/Makefile index adf1a07a4bc..b7658c97f50 100644 --- a/package/gluon-mesh-olsrd/Makefile +++ b/package/gluon-mesh-olsrd/Makefile @@ -12,7 +12,10 @@ define Package/gluon-mesh-olsrd @IPV6 \ +oonf-olsrd2 \ +firewall \ - +gluon-mesh-layer3-common + +gluon-mesh-layer3-common \ + +gluon-l3roamd \ + +gluon-radvd \ + +gluon-state-check PROVIDES:=gluon-mesh-provider endef diff --git a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf index 880dc31fd4b..1c1d04a594f 100755 --- a/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf +++ b/package/gluon-mesh-olsrd/luasrc/lib/gluon/upgrade/360-gluon-mesh-olsrd-setup-intf @@ -4,6 +4,8 @@ local uci = require('simple-uci').cursor() local site = require 'gluon.site' local util = require 'gluon.util' local wireless = require 'gluon.wireless' +local l3 = require 'gluon.l3' + local mesh_interfaces = util.get_role_interfaces(uci, 'mesh') local uplink_interfaces = util.get_role_interfaces(uci, 'uplink') local client_interfaces = util.get_role_interfaces(uci, 'client') @@ -51,7 +53,6 @@ if pcall(function() require 'gluon.mesh-vpn' end) then end end -table.insert(intf.wired_mesh, 'loopback') local has_uplink_mesh = false local has_other_mesh = false @@ -73,14 +74,15 @@ if has_other_mesh then end uci:delete_all('olsrd2', 'interface') +uci:delete_all('olsrd2', 'lan_import') if site.mesh.olsrd.v2.enable(true) then os.execute('/etc/init.d/olsrd2 enable') local addrs = { } - local lan = { } + local lan = nil + local orig = { } local cfg = site.mesh.olsrd.v2 - local config = uci:get_first("olsrd2", "olsrv2") -- set global config local olsr2Config = { @@ -115,11 +117,26 @@ if site.mesh.olsrd.v2.enable(true) then table.insert(addrs, '-127.0.0.1/8') table.insert(addrs, '-::1/128') + local addr = uci:get('network', 'loopback', 'ip6addr') + table.insert(orig, addr) table.insert(addrs, 'default_accept') + table.insert(orig, 'default_reject') + + local client_ranges_v6 = {} + local l3roamd_ranges = {} + + table.insert(client_ranges_v6, site.prefix6()) + table.insert(client_ranges_v6, 'default_reject') - uci:set("olsrd2", config, "originator", addrs) - uci:set("olsrd2", config, "lan", lan) + table.insert(l3roamd_ranges, l3.node_client_prefix6()) + table.insert(l3roamd_ranges, 'default_reject') + + uci:delete_all('olsrd2', 'olsrv2') + uci:section('olsrd2', 'olsrv2', nil, { + originator = orig, + lan = lan, + }) if #intf.wired_mesh then uci:section('olsrd2', 'interface', 'wired_mesh', { @@ -142,9 +159,20 @@ if site.mesh.olsrd.v2.enable(true) then }) end + local loopback_addrs = { + uci:get('network', 'loopback', 'ip6addr'), + 'default_reject', + } + uci:section('olsrd2', 'interface', 'loopback', { ifname = { 'loopback' }, - bindto = addrs, + routeable = loopback_addrs, + bindto = loopback_addrs, + }) + + uci:section('olsrd2', 'lan_import', 'l3roamd_prefix', { + name = 'l3roamd_ranges', + matches = l3roamd_ranges, }) uci:section('firewall', 'rule', 'allow_olsr2_mesh', { diff --git a/patches/packages/routing/0005-oonf-olsrd2-fix-building-with-multiple-plugins.patch b/patches/packages/routing/0005-oonf-olsrd2-fix-building-with-multiple-plugins.patch new file mode 100644 index 00000000000..df37b7e8036 --- /dev/null +++ b/patches/packages/routing/0005-oonf-olsrd2-fix-building-with-multiple-plugins.patch @@ -0,0 +1,22 @@ +From: Maciej Krüger +Date: Mon, 2 Jan 2023 01:45:37 +0100 +Subject: oonf-olsrd2: fix building with multiple plugins + +Code to replace colons wasn't working (debian stable) +Took it from stackoverflow, works now + +diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile +index 40190edb72547587bc53bb3bee150398b7413aa2..6067003a846340fb0e6221c2473959480b12fb4b 100644 +--- a/oonf-olsrd2/Makefile ++++ b/oonf-olsrd2/Makefile +@@ -17,8 +17,8 @@ CMAKE_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk + include $(INCLUDE_DIR)/cmake.mk + +-SPACE:= +-SPACE+= ++# ref https://stackoverflow.com/a/10571900/3990041 ++SPACE:= $(subst ,, ) + CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ + $(if $(filter y,$(CONFIG_OONF_NHDP_AUTOLL4)),auto_ll4,) \ + $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN_IMPORT)),lan_import,) \ diff --git a/patches/packages/routing/0006-oonf-olsrd2-add-missing-static-plugin-olsrv2_lan.patch b/patches/packages/routing/0006-oonf-olsrd2-add-missing-static-plugin-olsrv2_lan.patch new file mode 100644 index 00000000000..7d9c3a4bc16 --- /dev/null +++ b/patches/packages/routing/0006-oonf-olsrd2-add-missing-static-plugin-olsrv2_lan.patch @@ -0,0 +1,40 @@ +From: Patrick Grimm +Date: Sun, 8 Jan 2023 18:14:36 +0100 +Subject: oonf-olsrd2: add missing static plugin olsrv2_lan + +Signed-off-by: Patrick Grimm + +diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in +index 1cc037aff3ebc9a2a1ea2d2c94857d62b8b28006..b0d7d7cb2767f7b12d089ccd44042e6788dcf9de 100644 +--- a/oonf-olsrd2/Config.in ++++ b/oonf-olsrd2/Config.in +@@ -44,4 +44,16 @@ + The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol + default n + ++ config OONF_OLSRV2_LAN ++ bool "New config option for Locally attached entries" ++ help ++ Adds the 'lan' section to the config to configure LANs without setting multiple settings in a single key/value pair ++ default y ++ ++ config OONF_OLSRV2_OLD_LAN ++ bool "Legacy option for Locally attached entries" ++ help ++ Adds the olsr 'lan' config key in the olsrv2 section ++ default n ++ + endmenu +diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile +index 6067003a846340fb0e6221c2473959480b12fb4b..f3d81fcfe61936635280afd997ec487ed0ffa2fc 100644 +--- a/oonf-olsrd2/Makefile ++++ b/oonf-olsrd2/Makefile +@@ -27,6 +27,8 @@ CMAKE_OPTIONAL_PLUGINS:= $(subst $(SPACE),;,$(strip \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_REMOTECONTROL)),remotecontrol,) \ + $(if $(filter y,$(CONFIG_OONF_OLSRV2_MPR)),mpr,) \ + $(if $(filter y,$(CONFIG_OONF_GENERIC_HTTP)),http,) \ ++ $(if $(filter y,$(CONFIG_OONF_OLSRV2_LAN)),olsrv2_lan,) \ ++ $(if $(filter y,$(CONFIG_OONF_OLSRV2_OLD_LAN)),olsrv2_old_lan,) \ + )) + + BUILD_TYPE:= $(if $(filter y,$(CONFIG_DEBUG)),Debug,Release) diff --git a/patches/packages/routing/0007-oonf-init-scripts-start-olsrd2-10-seceond-after-boot.-Workaround.patch b/patches/packages/routing/0007-oonf-init-scripts-start-olsrd2-10-seceond-after-boot.-Workaround.patch new file mode 100644 index 00000000000..677e7d760e7 --- /dev/null +++ b/patches/packages/routing/0007-oonf-init-scripts-start-olsrd2-10-seceond-after-boot.-Workaround.patch @@ -0,0 +1,33 @@ +From: Patrick Grimm +Date: Fri, 13 Jan 2023 20:52:36 +0100 +Subject: oonf-init-scripts: start olsrd2 10 seceond after boot. Workaround. + +Signed-off-by: Patrick Grimm + +diff --git a/oonf-init-scripts/Makefile b/oonf-init-scripts/Makefile +index 8bfbf6ede32c1fa02edae41aefbda30074d6bf41..7abd3b950af1d4fb17dd2a81d25c61611aae1008 100644 +--- a/oonf-init-scripts/Makefile ++++ b/oonf-init-scripts/Makefile +@@ -3,7 +3,7 @@ include $(INCLUDE_DIR)/kernel.mk + + PKG_NAME:=oonf-init-scripts + PKG_VERSION:=0.9.1-r3 +-PKG_RELEASE:=1 ++PKG_RELEASE:=2 + PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + + include $(INCLUDE_DIR)/package.mk +diff --git a/oonf-init-scripts/files/oonf_init.sh b/oonf-init-scripts/files/oonf_init.sh +index 8ab5b3b90661fcbe01b884e191d9159af87c1b0a..509e15bdc50792ed747adbce73726050e510d12d 100755 +--- a/oonf-init-scripts/files/oonf_init.sh ++++ b/oonf-init-scripts/files/oonf_init.sh +@@ -118,3 +118,9 @@ reload() + oonf_add_devices_to_configuration + oonf_reread_config + } ++ ++boot() { ++ sleep 10 ++ logger -t olsrd2init "boot delay" ++ start ++} diff --git a/patches/packages/routing/0008-oonf-olsrd2-change-to-git-version-from-2022-08-25.patch b/patches/packages/routing/0008-oonf-olsrd2-change-to-git-version-from-2022-08-25.patch new file mode 100644 index 00000000000..29c04eb665c --- /dev/null +++ b/patches/packages/routing/0008-oonf-olsrd2-change-to-git-version-from-2022-08-25.patch @@ -0,0 +1,238 @@ +From: Patrick Grimm +Date: Fri, 13 Jan 2023 14:28:28 +0100 +Subject: oonf-olsrd2: change to git version from 2022-08-25 + +Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc +Description: +fb15d54d (HEAD -> master, origin/master, origin/HEAD) Merge pull request #23 from fhuberts/master +a8e81e99 Merge pull request #43 from jpo-github-work/no-dh-systemd +8cc65a10 Merge pull request #48 from jpo-github-work/fix_lan_import +c7d404f8 build lan_import +bbbd4f3d the package dh-systemd is not longer present in recent Ubuntu versions +1bd73550 Merge pull request #42 from jpo-github-work/master +1a5fa2a7 add missing extern to global symbol +a0750337 Merge pull request #40 from trofi/fix-gcc-10-build +5ea168ce fix build for gcc-10 (-fno-common default) +02f69178 Merge pull request #7 from aaaaalbert/rename-to-BUILDING.md-#4 +9dc46726 Merge pull request #26 from sumpfralle/patch-1 +ced3ace0 Fix schema name for logging in README +c6dd02a1 test_config_delta: fix the build on GCC 9 +8397c64e Merge pull request #19 in FKIEA/oonf-os from develop to master +1d227500 Merge pull request #18 in FKIEA/oonf-os from bugfix/MOTOR-65-oonf-does-not-compile-cleanly-on-current-lede to develop +f40be238 include unistd.h in oonf.h to keep modern GCC (e.g. in LEDE) from complaining about ssize_t +8f2408f7 Merge pull request #17 in FKIEA/oonf-os from bugfix/MOTOR-62-fix-segfault-in-layer2_import to develop +95fbcb35 Do avl_for_each_elements_with_key_safe() by hand until we had a closer look at the macro +3fcd8fc5 Merge pull request #16 in FKIEA/oonf-os from bugfix/MOTOR-61-fix-clock-conversion-to-from-string to develop +e9b08759 use scaling factor when dealing with fixed integer conversion calls +65dc25e8 Merge pull request #15 in FKIEA/oonf-os from bugfix/MOTOR-60-prevent-division-by-zero-in-dat-metric to develop +2f615dab Prevent division by zero through (malformed) RLQ value +eb59d287 Merge pull request #14 in FKIEA/oonf-os from bugfix/MOTOR-59-fix-nhdp-status-for-ip-level-interfaces to develop +8d424b24 Fix NHDP link status for interfaces without MAC addresses +26557e54 Merge pull request #13 in FKIEA/oonf-os from bugfix/MOTOR-54-add-telnet-command-to-manipulate-layer2-data to develop +eecc3333 Add missing telnet dependency to layer2-config +0e24b09f Merge pull request #12 in FKIEA/oonf-os from feature/MOTOR-57-allow-import-of-non-unicast-routes to develop +965c2f73 Allow "non-unicast" routes to be imported +710b353b Merge pull request #11 in FKIEA/oonf-os from feature/MOTOR-54-add-telnet-command-to-manipulate-layer2-data to develop +243e17e3 Allow setting l2config via telnet +40f24ab9 Partly working telnet code for l2config +1db358dc Merge pull request #10 in FKIEA/oonf-os from feature/MOTOR-54-add-telnet-command-to-manipulate-layer2-data to develop +c33d680e Add LID capability to oonf_layer2 and l2config subsystem +312d09d4 Merge pull request #9 in FKIEA/oonf-os from develop to master +1551b86d Automatic merge from master -> develop +c154c31b Merge pull request #8 in FKIEA/oonf-os from feature/MOTOR-52-ablehnen-von-konfigurationen-mit-unbekannten-werten to develop +bad48ebc Do not accept configuration with unknown sections/values if 'global.failfast' is true. Set 'global.failfast' to true by default +9996fe65 Merge pull request #7 in FKIEA/oonf-os from bugfix/MOTOR-51-vif-socket-is-blocking to develop +05682c0c Make VIF sockets non-blocking +9455e50f Automatic merge from master -> develop +d05cc410 Merge pull request #6 in FKIEA/oonf-os from develop to master +7416ba8d Merge pull request #5 in FKIEA/oonf-os from bugfix/MOTOR-50-olsr-compilation-fails-on-ubuntu-16.04 to develop +63345654 Reorder libraries for testcase creation to prevent Ubuntu 16.04 Bug (MOTOR-50) +3a7e5e8e Automatic merge from master -> develop +d592fbf7 Merge pull request #4 in FKIEA/oonf-os from develop to master +e489f97a Merge pull request #3 in FKIEA/oonf-os from feature/MOTOR-48-tracking-von-metadaten-in-layer2-database to develop +3c1984f8 Fix compilation issue with "no-debug" logging +52c6b569 Merge pull request #2 in FKIEA/oonf-os from feature/MOTOR-48-tracking-von-metadaten-in-layer2-database to develop +3765eb01 Cleanup ffdat metric to be able to import rx_throughput. +bdee26ba Improve combination of DAT speed and L2 throughput values +a1c3ea66 Allow ffdat metric to consider rx_throughput field +c8ec8301 Fix token validation +ad72038e Improve DAT-Metric by shifting hysteresis to the loss side and consider other layer2 parameters +9addfba4 Fix fixed integer arithmetics handling +f9ccd26b Track scaling factors of layer2 data elements. Handle different scaling for DLEP conversion. +603e48e8 Fix router_id for Netjson domain output +6aebcf99 Merge pull request #1 in FKIEA/oonf-os from develop to master +234e9109 Improve hello interval overwriting +7fc0f50b Add SNR to layer2 neighbor data +f9ebcf8e Fix bad 'is in list' test in stream socket processing +29a2a385 Set path prefix length in CMakeListsGlobal +a2ea9186 Replace VIF name pointer with array +e8f04530 Simplify test case creation +271ff097 Move 'enable test' to CMakeListsGlobal.cmake +0482db42 Fix no-debug/no-info compilation +38edcced Add more doxygen comments for layer2 import +becd33bd Merge branch 'feature/MOTOR-47-route-redistribution-for-dlep' of ssh://team.fkie.fraunhofer.de:7999/fkiea/oonf-os into feature/MOTOR-47-route-redistribution-for-dlep +1a709b5c Add missing comment for subsystem shutdown initiation, remove empty files +c7a68650 Fix the handling of neighbor IPs in dlep radio. +c255ead5 Add avl_for_each_elements_with_key_safe() macro and do some basic tests +5f835533 Don't filter for protocol for routes being removed (linux does not report protocol in this case) +83b19c54 Allow imported routed to be combined by l2import into the same l2 network. Allow multiple IP addresses being reported by DLEP +d7d69064 (origin/staging) Merge branch 'develop' into staging +5274ce6a Fix tarball generator +6dd188ed Use relative path for calling archive builder +988aac6e Move included cmake files into CMakeListsGlobal to allow inclusion in wrapper projects +2a072733 Cleanup build installation directories +fc1fbbed Move test include to include directory +4043202f Rename "subsystems" directory to "base" +2e3578ba Add "config query" command to remotecontrol plugin to query a configuration value including default +48c2cdcb Prevent theoretical buffer overlow to make Coverity more happy (Coverity #181104) +19583704 Fix possible Null reference in colored logging (Coverity #188445) +6fa04505 Fix GCC 8 warning about small buffer +356d3b9b Allow wrapped build directory around OONF directory +11be4696 Cleanup and simplify OONF directory strucure +f1a30ade Restructure import of FIB entries to go through the layer2 db allow export of layer2 IP entries to FIB allow transmission of layer2 IP entries over DLEP +32bf829c Remove debugging code accidently left in for LID preparation +f6b884b1 (origin/packet_socket_bug) Hotfix for closing UDP socket behavior mentioned in Github Issue 14 +e7e5b685 Add missing build target for test creation +88efd166 Cleanup build system for tests and add generic 'build_tests' target. +2e5803bd Add more linklayer data options and a better query function +2dac53d9 Restructure ffdat plugin as preparation for external metric calculation Fix compiler warning in routing code +8cb39863 Remove static modifier from olsrv2/nhdp logging sources. Otherwise they cannot be used by the other source files of the plugins. +3a2dd24e Fix return values of DLEP signal processing callbacks +b2e18c91 Fix handling of lid-length TLV in DLEP session ACK +2b7b3ef8 Add doxygen comments for link-id code +bc24cba0 Implement lid_length mechanism into DLEP +b12ef6ea Add basic link-id capability to DLEP +8cc2d03e Add a few example configurations to the repository +1e3fb288 Add support for Link-ID to layer2 database +28adaf5a Remove (done) TODO mark for outgoing TCP connection error handling +2bfbcff3 Improve error handling for failed outgoing TCP connections +1d1e8876 Add better debugging output to packet socket code +3b89103e Fix issues with DLEP udp_mode none and reconnect +d4d64875 Add function to calculate IPv6 address from MAC +bdc2c2e6 Fixes for doxygen comments +5e2a7b48 Fix variable used in layer2 generator loop +a38b6847 Fix DLEP handling of mandatory TLVs +50e4e1b8 Add netaddr constants for MAC48 prefixes for IPv4/6 multicast + +Signed-off-by: Patrick Grimm + +diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile +index f3d81fcfe61936635280afd997ec487ed0ffa2fc..fe00dd1bc7969016856d5c3a19241d7750366352 100644 +--- a/oonf-olsrd2/Makefile ++++ b/oonf-olsrd2/Makefile +@@ -1,16 +1,13 @@ + include $(TOPDIR)/rules.mk + + PKG_NAME:=oonf-olsrd2 +-PKG_VERSION:=v0.15.1 +-PKG_REV:=bffb88b040659b237c4c91b6b42dbbb47431750e +-PKG_RELEASE:=$(PKG_REV) ++PKG_RELEASE:=1 + +-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +-PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git + PKG_SOURCE_PROTO:=git +-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +-PKG_SOURCE_VERSION:=$(PKG_REV) +-PKG_MIRROR_HASH:=2e38140e804e7fc0138d0893416c4f19b1ca43bd9de066e8b028bd0d59ac9255 ++PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git ++PKG_SOURCE_DATE:=2022-08-25 ++PKG_SOURCE_VERSION:=fb15d54d6a7a087cb0c5ec37c49804f6ce432396 ++PKG_MIRROR_HASH:=e8b2e7890f7315694649bb26c22be09554cba3724bae5419ea047101a4f5d03d + + CMAKE_INSTALL:=1 + +@@ -40,8 +37,7 @@ CMAKE_OPTIONS+=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \ + -D UCI:Bool=true \ + -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \ + -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \ +- -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \ +- -D OONF_VERSION:String=$(PKG_VERSION) \ ++ -D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \ + -D INSTALL_LIB_DIR:Path=lib/oonf \ + -D INSTALL_INCLUDE_DIR:Path=include/oonf \ + -D INSTALL_CMAKE_DIR:Path=lib/oonf \ +diff --git a/oonf-olsrd2/patches/010-gcc10.patch b/oonf-olsrd2/patches/010-gcc10.patch +deleted file mode 100644 +index e0b141ac8a764e5e3920d155df102560b9fadf24..0000000000000000000000000000000000000000 +--- a/oonf-olsrd2/patches/010-gcc10.patch ++++ /dev/null +@@ -1,40 +0,0 @@ +---- a/src-plugins/generic/nl80211_listener/nl80211_internal.h +-+++ b/src-plugins/generic/nl80211_listener/nl80211_internal.h +-@@ -49,6 +49,6 @@ +- #include "core/oonf_logging.h" +- +- /* headers only for use inside the NL80211 subsystem */ +--enum oonf_log_source LOG_NL80211; +-+extern enum oonf_log_source LOG_NL80211; +- +- #endif /* NL80211_INTERNAL_H_ */ +---- a/src-plugins/nhdp/nhdp/nhdp_internal.h +-+++ b/src-plugins/nhdp/nhdp/nhdp_internal.h +-@@ -49,8 +49,8 @@ +- #include "core/oonf_logging.h" +- +- /* headers only for use inside the NHDP subsystem */ +--enum oonf_log_source LOG_NHDP; +--enum oonf_log_source LOG_NHDP_R; +--enum oonf_log_source LOG_NHDP_W; +-+extern enum oonf_log_source LOG_NHDP; +-+extern enum oonf_log_source LOG_NHDP_R; +-+extern enum oonf_log_source LOG_NHDP_W; +- +- #endif /* NHDP_INTERNAL_H_ */ +---- a/src-plugins/olsrv2/olsrv2/olsrv2_internal.h +-+++ b/src-plugins/olsrv2/olsrv2/olsrv2_internal.h +-@@ -50,9 +50,9 @@ +- #include "core/oonf_logging.h" +- +- /* headers only for use inside the OLSRv2 subsystem */ +--EXPORT enum oonf_log_source LOG_OLSRV2; +--EXPORT enum oonf_log_source LOG_OLSRV2_R; +--EXPORT enum oonf_log_source LOG_OLSRV2_ROUTING; +--EXPORT enum oonf_log_source LOG_OLSRV2_W; +-+EXPORT extern enum oonf_log_source LOG_OLSRV2; +-+EXPORT extern enum oonf_log_source LOG_OLSRV2_R; +-+EXPORT extern enum oonf_log_source LOG_OLSRV2_ROUTING; +-+EXPORT extern enum oonf_log_source LOG_OLSRV2_W; +- +- #endif /* OLSRV2_INTERNAL_H_ */ +diff --git a/oonf-olsrd2/patches/020-static.patch b/oonf-olsrd2/patches/020-static.patch +deleted file mode 100644 +index 87146bf1ae325a59440100b99f4726eb36857c47..0000000000000000000000000000000000000000 +--- a/oonf-olsrd2/patches/020-static.patch ++++ /dev/null +@@ -1,32 +0,0 @@ +---- a/src-plugins/nhdp/nhdp/nhdp.c +-+++ b/src-plugins/nhdp/nhdp/nhdp.c +-@@ -187,9 +187,9 @@ static struct oonf_rfc5444_protocol *_pr +- static struct netaddr _originator_v4, _originator_v6; +- +- /* logging sources for NHDP subsystem */ +--static enum oonf_log_source LOG_NHDP; +--static enum oonf_log_source LOG_NHDP_R; +--static enum oonf_log_source LOG_NHDP_W; +-+enum oonf_log_source LOG_NHDP; +-+enum oonf_log_source LOG_NHDP_R; +-+enum oonf_log_source LOG_NHDP_W; +- +- /** +- * Initialize additional logging sources for NHDP +---- a/src-plugins/olsrv2/olsrv2/olsrv2.c +-+++ b/src-plugins/olsrv2/olsrv2/olsrv2.c +-@@ -255,10 +255,10 @@ static uint64_t _overwrite_tc_interval; +- static uint64_t _overwrite_tc_validity; +- +- /* Additional logging sources */ +--static enum oonf_log_source LOG_OLSRV2; +--static enum oonf_log_source LOG_OLSRV2_R; +--static enum oonf_log_source LOG_OLSRV2_ROUTING; +--static enum oonf_log_source LOG_OLSRV2_W; +-+enum oonf_log_source LOG_OLSRV2; +-+enum oonf_log_source LOG_OLSRV2_R; +-+enum oonf_log_source LOG_OLSRV2_ROUTING; +-+enum oonf_log_source LOG_OLSRV2_W; +- +- /** +- * Initialize additional logging sources for NHDP diff --git a/patches/packages/routing/0009-oonf-olsrd2-add-git-version-for-compile-in.patch b/patches/packages/routing/0009-oonf-olsrd2-add-git-version-for-compile-in.patch new file mode 100644 index 00000000000..68e985a1e2d --- /dev/null +++ b/patches/packages/routing/0009-oonf-olsrd2-add-git-version-for-compile-in.patch @@ -0,0 +1,20 @@ +From: Patrick Grimm +Date: Sat, 14 Jan 2023 00:09:34 +0100 +Subject: oonf-olsrd2: add git version for compile in + +Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc + +Signed-off-by: Patrick Grimm + +diff --git a/oonf-olsrd2/Makefile b/oonf-olsrd2/Makefile +index fe00dd1bc7969016856d5c3a19241d7750366352..15e5731a1612ae35cdc1d842dc0087cc31d4b290 100644 +--- a/oonf-olsrd2/Makefile ++++ b/oonf-olsrd2/Makefile +@@ -37,6 +37,7 @@ CMAKE_OPTIONS+=-D CMAKE_BUILD_TYPE:String=$(BUILD_TYPE) \ + -D UCI:Bool=true \ + -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \ + -D OONF_STATIC_PLUGINS:String="class;clock;duplicate_set;layer2;packet_socket;rfc5444;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_routing;os_system;nhdp;olsrv2;ff_dat_metric;neighbor_probing;nl80211_listener;link_config;layer2info;systeminfo;cfg_uciloader;cfg_compact;nhdpinfo;olsrv2info;netjsoninfo;${CMAKE_OPTIONAL_PLUGINS}" \ ++ -D OONF_LIB_GIT:String=$(PKG_SOURCE_VERSION) \ + -D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \ + -D INSTALL_LIB_DIR:Path=lib/oonf \ + -D INSTALL_INCLUDE_DIR:Path=include/oonf \ diff --git a/patches/packages/routing/0010-oonf-olsrd2-a-usable-default-configuration.patch b/patches/packages/routing/0010-oonf-olsrd2-a-usable-default-configuration.patch new file mode 100644 index 00000000000..15e36d1dd51 --- /dev/null +++ b/patches/packages/routing/0010-oonf-olsrd2-a-usable-default-configuration.patch @@ -0,0 +1,52 @@ +From: Patrick Grimm +Date: Sat, 28 Jan 2023 11:28:00 +0100 +Subject: oonf-olsrd2: a usable default configuration + +Compile tested: mips_24kc, arm_cortex-a9_vfpv3-d16, i386_pentium4, x86_64, i386_pentium-mmx, mipsel_24kc + +Description: +- OONF_OLSRV2_LAN_IMPORT for integration off other routing protocol (OLSR1, BGP, ...) +- OONF_OLSRV2_ROUTE_MODIFIER for overwriting the link qualitty of a neighbor, called LinkQuality Multiplicator in OLSR1 +- OONF_GENERIC_REMOTECONTROL one of the goal of olsrv2 +- OONF_OLSRV2_MPR reduce the routing graph when the network gets bigger + +Signed-off-by: Patrick Grimm + +diff --git a/oonf-olsrd2/Config.in b/oonf-olsrd2/Config.in +index b0d7d7cb2767f7b12d089ccd44042e6788dcf9de..e4621e44e5a4ff55fbfe94ff7b4d5b9f27909034 100644 +--- a/oonf-olsrd2/Config.in ++++ b/oonf-olsrd2/Config.in +@@ -12,13 +12,13 @@ + bool "Lan_import plugin enabled" + help + The lan_import plugin can read routing tables and automatically export them as locally attached networks in olsrd2. +- default n ++ default y + + config OONF_OLSRV2_ROUTE_MODIFIER + bool "route_modifier plugin enabled" + help + The route_modifier plugin allows you to overwrite aspects of routes (like table/protocol) for certain destinations. +- default n ++ default y + + config OONF_GENERIC_DLEP_ROUTER + bool "dlep_router plugin enabled" +@@ -30,7 +30,7 @@ + bool "remotecontrol plugin enabled" + help + The remotecontrol plugin allows you to control configuration and logging over the telnet plugin. Be careful not to open this functionality over the network without securing it. +- default n ++ default y + + config OONF_GENERIC_HTTP + bool "http plugin enabled" +@@ -42,7 +42,7 @@ + bool "MPR plugin enabled" + help + The MPR plugin reduce the routing graph to limit the overhead of the OLSRv2 protocol +- default n ++ default y + + config OONF_OLSRV2_LAN + bool "New config option for Locally attached entries"