Commit Graph

108 Commits

Author SHA1 Message Date
Nick Hainke e3f0d89220 olsrd: replace patch for storms with real patch
Fixes: bb5bbc6afd ("olsrd: import patch to prevent olsr storms")

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit cfd82729a9)
2022-06-23 14:04:47 +02:00
Nick Hainke 7c7d11e290 olsrd: set lqm via ipc
You can now give a lqm when adding an interface:
  ubus call olsrd add_interface '{"ifname":"wg_51821", "lqm":"0.5"}'

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit e3c6842923)
2022-03-26 19:00:40 +01:00
Nick Hainke 10d3ffd8b3 olsrd: fix setting default interface config
The IPC should apply the "InterfaceDefaults".

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 4afbe17480)
2022-02-13 18:32:20 +01:00
Nick Hainke c2e138d49f olsrd: add ubus ipc integration to olsrd
IPC integration of olsrd with OpenWrt. Allow dynamic adding and removing
of interfaces at run-time. We need to rename the avl-tree files, since
libubox also defines avl tree. Also add patch to allow meshing via
wireguard point-to-point links.

The ubus interface offers following functions:
  - add_inteface '{"ifname":"wg_51820"}'
  - del_inteface '{"ifname":"wg_51820"}'

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 0bffe620b4)
2022-01-17 09:41:46 +01:00
Nick Hainke c8b613e11c olsrd: fix meshing via wireguard tunnels
The procd script was not adding the wireguard interfaces. Add corner case
in the init script to allow meshing via wireguard.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 576967a2a3)
2022-01-08 22:55:55 +01:00
Perry Melange 1fcda9dfa8 olsrd: wait for wireless to initialize before starting
Wait for wireless to initialize (pending="false") to ensure
that any olsrd(6) configured interfaces and their associated
devices are up.  This provides the init script the ability
to properly add all interface sections to the generated
config file /tmp/etc/olsrd(6).conf

Signed-off-by: Perry Melange <isprotejesvalkata@gmail.com>
(cherry picked from commit 0bb6aa04f6)
2021-10-13 11:35:31 +02:00
Nick Hainke 8d93475e79 olsrd: add filtergw plugin
The plugin adds a possibility to filter out gateway HNAs. This can be
very handy e.g. for faulty nodes. A gateway can be taken out directly on
a central node and all traffic is then redirected. Also the underlying
smart gateways are adapted. Currently the link multiplier is often used
to control a faulty node, but it is not necessarily the best way to do
so.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit bdec65a6d9)
2021-08-14 14:45:44 +02:00
Nick Hainke 76a7bc7555 olsrd: update to 2021-06-21
- filtergw: add plugin allow to allow/block gateways
    (even smartgateway)

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit a302ee6265)
2021-08-14 14:45:44 +02:00
Nick Hainke 3912935ab1 olsrd: use SPDX
Use SPDX license headers to be machine readable.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 1326a6c252)
2021-08-14 14:45:44 +02:00
Nick Hainke e7e25b873b olsrd: rename general to procd
It was requested to name the section "procd".

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 87be9afac6)
2021-08-01 11:28:27 +02:00
Nick Hainke e93c57981d olsrd: make respawn_threshold configurable
Also make respawn_threshold configurable. Further, add default
values for:
- respawn_threshold 3600
- respawn_timeout 15
- respawn_retry 0

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 775d030a58)
2021-08-01 11:28:27 +02:00
Tobias Schwarz 0eb67d72d0 olsrd: improve respawn settings
This increases the amount of seconds to wait before a service restart
attempt from 5 to 15 seconds and allows unlimited retries. Olsrd
sometimes crashes together with a network interface and 5 seconds can
be too short to bring back up a crashed network interface, which is
required for olsrd to restart. It also adds the ability to configure
the wait time (respawn_timeout) and the number of retries
(respawn_retry).

Signed-off-by: Tobias Schwarz <info@tobias-schwarz.com>
(cherry picked from commit bc58bd99e8)
2021-08-01 11:28:27 +02:00
Martin Hübner c53a640e44 olsrd: add olsrd-neigh.sh
This script originates from Freifunk Berlin. It prints a list of
all meshing neighbors known to olsrd on the command line.

Added: Error-checking for IPv4/IPv6-Hosts.

Signed-off-by: Martin Hübner <martin.hubner@web.de>
(cherry picked from commit eff944874c)
2021-07-11 19:53:11 +02:00
Nick Hainke 911c0cb45a olsrd: fix olsrd starting before network
Should fix #691.

Sometimes the wifi interface is not ready before olsrd tries to access
it. This leads to warnings in the form of:

daemon.info olsrd: /etc/rc.d/S65olsrd: olsrd_write_interface()
	Warning: Interface 'wireless0' not found, skipped
daemon.notice procd: /etc/rc.d/S65olsrd: olsrd: /etc/rc.d/S65olsrd:
	olsrd_write_interface() Warning: Interface 'wireless0' not found,			skipped

We make use of the "wait_for" procd command that allows us to wait for
the network before starting olsrd.

Tested-by: Noki
Signed-off-by: Nick Hainke <vincent@systemli.org>
2021-07-07 14:56:57 +02:00
Nick Hainke ce4d4578c7 olsrd: reload if config changed via uci
Fixes:
https://github.com/openwrt/luci/issues/5139

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 64aa8866b7)
2021-06-23 16:31:27 +02:00
Nick Hainke 2baff33918 olsrd: switch to procd
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit dc0adf7dce)
2021-06-12 16:37:24 +02:00
Nick Hainke 13461119bc olsrd: only pud depends on libgps
As a workaround for the glibc-fix the dependency on libgps was moved
to olsrd. However, only pud is using this library.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 27ac56adc6)
2021-06-08 22:21:51 +02:00
Nick Hainke 96ba5d184a olsrd: update to 2021-06-07
- pud: fix openwrt glibc compilation

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 4f7791a1fd)
2021-06-08 22:21:51 +02:00
Nick Hainke f1f523117f olsrd: update olsrd to 2021-06-01
Update olsrd to new version.
Remove upstreamed patches:
- 010-musl.patch
- 011-bison.patch
- 012-gpsd.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 6dac4d296c)
2021-06-08 22:21:51 +02:00
Nick Hainke 435ae43565 olsrd: add me as maintainer
I am now the maintainer of olsrd. Add me also as maintainer in the
openwrt-routing feed.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit b455e1809a)
2021-06-08 22:21:51 +02:00
Nick Hainke 60874ceb56 olsrd: use $(AUTORELEASE)
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 8c7bcb7206)
2021-06-08 22:21:51 +02:00
Nick Hainke 6e72bcffa5 olsrd: adapt gpsdclient.c to new gpsd lib
As mentioned in gpsd.h:
"Move gps_data_t->status to gps_fix_t.status for better fix merging"

Commit:
29991d6ffe

Signed-off-by: Nick Hainke <vincent@systemli.org>
2020-10-03 22:38:02 +02:00
pmelange 5cc8e05885 olsrd: migrate to using bison 3.7.1
With the upgrade to bison 3.7.1 (openwrt commit 1cf842d) building
olsrd was failing.  Now, instead of the contents of header files
being directly inserted into the generated source files, they are
instead included with a #include directive.

The local.mk has, until now, done some magic with *-tmp files,
which is not longer necessary and even causes builds to fail.

src/cfgparser/oparse.c:265:10: fatal error: oparse.h-tmp: No such file or directory
 #include "oparse.h-tmp"

Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Perry Melange <isprotejesvalkata@gmail.com>
2020-08-27 18:01:39 +02:00
Rosen Penev 14668df74b
olsrd: fix compilation with musl 1.2.x
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-08-11 12:38:12 -07:00
Nick Hainke 2b6a4e1beb olsrd: bump to latest version
Fixes https://github.com/openwrt-routing/packages/issues/547

Signed-off-by: Nick Hainke <vincent@systemli.org>
2020-06-18 14:02:51 +02:00
Russell Senior c1a41b1740 olsrd: update to 0.9.8
Allows building against gpsd-3.19.

Signed-off-by: Russell Senior <russell@personaltelco.net>
2019-08-12 12:35:21 -07:00
pmelange 20b9ab3cea [OLSRd] Bump OLSRd version to 0.9.7
This patch bumps OLSRd from 0.9.6.2 to 0.9.7 (released 06-March-2019)

Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
2019-03-23 14:16:40 +01:00
Daniel Engberg 43449bcbbd treewide: Basic cleanup and alignment to package guidelines (#383)
This is a very basic cleanup, several packages needs more work
but this at least drops git for https and removes the use of
PKG_MD5SUM and some minor fixes.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2018-07-12 16:50:47 +02:00
Bastian Bittorf f33ccc725c
Merge pull request #300 from OLSR/master
olsrd: pud: does not depend on ncurses
2017-12-13 12:41:10 +01:00
Thomas Huehn 78049b46ac [olsr] Bump olsr version to 0.9.6.2
This patch bumps olsr version from 0.9.6.1 to 0.9.6.2
One major bugfix comes with the newer version, which is quite relevant
for our Freifunk mesh network: the feature LinkQualityMult was not
working in 0.9.6.1 and got fixed in the new version.

Tested on 92 productive mesh nodes running current LEDE trunk .

Signed-off-by: Thomas Huehn <thomas@net.t-labs.tu-berlin.de>
2017-10-13 20:18:51 +02:00
Ferry Huberts 15e50466fb olsrd: pud: does not depend on ncurses
BTW According to Matthias there is no ncurses package either way!

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2017-06-07 10:17:21 +01:00
Bastian Bittorf 2a5a5e1837 olsrd: find_most_recent_plugin_libary() fix sorting 2017-02-24 15:12:19 +01:00
Bastian Bittorf f15b8246fa olsrd: find_most_recent_plugin_libary() fix input with 'exact' filenames 2017-02-14 08:58:22 +01:00
Bastian Bittorf c91ced7279 olsrd: init-script: fix new plugin-lazymode
make sure that we do not select
'olsrd_dyn_gw_plain.so.0.4' if user wants
'olsrd_dyn_gw.so.0.5'
2017-02-13 16:25:56 +01:00
Bastian Bittorf 824f1a68e3 olsr: hotplug: fix a wrong grep (never successful) in olsrd_interface_already_in_config() 2017-02-12 20:41:04 +01:00
Bastian Bittorf 67939e59a2 olsr: fix minor complain from 'shellcheck' 2017-02-12 20:37:28 +01:00
Bastian Bittorf 22c05861e6 olsr: smartfw: fix a syntax error whwile checking for 'nowan'
introduced in 059b26c2 in 2011-nov-14 ("Manuel Munz freifunk@somakoma.de modified init
file of olsrd with improvements for 6and4 operation and also for setup of smartgw")
2017-02-12 20:23:25 +01:00
Bastian Bittorf 0e71dbfba6 olsr: init-script: minor style changes
1) echo -n -> printf
2) do not 'return 0' in functions where rc is 0 anyway
3) calc with $(( $var + $x )) -> $(( var + x ))
2017-02-12 20:19:16 +01:00
Bastian Bittorf f4bc87dc65 olsr: allow lazy-plugin-naming: e.g. olsrd_txtinfo (not olsrd_txtinfo.so.1.2)
overload init-skript's olsrd_write_loadplugin() with new function
find_most_recent_plugin_libary() - so now we can mix 'exact' and lazy
names. This change is backward compatible and now we have a better
migration strategy. This topic was hot again, after the latest updates
of a lot of plugins, resulting in non-working configs...
2017-02-12 14:36:20 +01:00
Ferry Huberts ede4989259 olsrd: update to v0.9.6.1
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2017-02-10 11:14:52 +01:00
Ferry Huberts 54e47597d7 olsrd: update to v0.9.6
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
2017-02-01 18:48:35 +01:00
Bastian Bittorf eca18c2d62 Merge pull request #256 from SvenRoederer/olsr_fix_empty-line
olsrd: Makefile - remove empty line
2017-01-16 14:07:09 +01:00
Sven Roederer 9627e2956b olsrd: Makefile - remove empty line
doesn't look like it intended

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
2017-01-16 01:43:23 +01:00
root 5994c4507d olsrd: init: updated (c)-year to 2017 2017-01-15 12:07:32 +00:00
Sven Roederer 3d41efe1b5 olsrd: remove deprecated 6and4 compatibility
It's announced since several years, that such setups (one
olsrd running IPv4 and IPv6) will no be supported anymore.

See 4b06c42f97
(olsrd: splitting IPv6/4 configuration and start scripts)

Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
2017-01-15 12:01:13 +00:00
Sven Roederer f801067455 olsrd: disale compiler-warning "missing-include-dirs"
remove this warning as it fails to build for the nmealib with missing
"staging_dir/target-mipsel_24kc_musl-1.1.15/include" from buildenv
2016-12-22 12:32:55 +01:00
Bastian Bittorf dcecd7007d olsrd: disable parallel build and swap a dependency order, should fix buildbot 2016-12-18 21:39:12 +01:00
Bastian Bittorf 3b14a1c5b6 olsrd: plugins: pud: fix missing dependency for libgps
Signed-off-by: Bastian Bittorf <bittorf@bluebottle.com>
2016-12-16 17:14:24 +01:00
FreifunkUFO 803575c023 olsrd: add netjson plugin
netjson plugin added
2016-12-07 14:29:04 +01:00
Sven Roederer 8a7364f257 olsrd: update (c)-header date 2016-03-18 08:51:39 +01:00