feed/routing.git
3 years agoMerge pull request #752 from ecsv/batadv-for-19.07
Simon Wunderlich [Fri, 19 Nov 2021 16:54:51 +0000 (17:54 +0100)]
Merge pull request #752 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2021.4

3 years agobatman-adv: Merge bugfixes from 2021.4 752/head
Sven Eckelmann [Fri, 19 Nov 2021 16:05:03 +0000 (17:05 +0100)]
batman-adv: Merge bugfixes from 2021.4

* fix error handling during interface initialization

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agobatman-adv: Refresh patches with quilt
Sven Eckelmann [Fri, 19 Nov 2021 16:12:00 +0000 (17:12 +0100)]
batman-adv: Refresh patches with quilt

The test builds are now requiring quilt refreshed patches instead of git
patches. Otherwise the build check will not even try to build something.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agoMerge pull request #718 from ecsv/batadv-for-19.07
Simon Wunderlich [Fri, 20 Aug 2021 20:46:55 +0000 (22:46 +0200)]
Merge pull request #718 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2021.2

3 years agobatman-adv: Merge bugfixes from 2021.2 718/head
Sven Eckelmann [Fri, 20 Aug 2021 09:54:22 +0000 (11:54 +0200)]
batman-adv: Merge bugfixes from 2021.2

* Avoid WARN_ON timing related checks

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agoMerge pull request #658 from ecsv/batadv-for-19.07
Simon Wunderlich [Tue, 18 May 2021 17:09:21 +0000 (19:09 +0200)]
Merge pull request #658 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2021.1

3 years agobatman-adv: Merge bugfixes from 2021.1 658/head
Sven Eckelmann [Fri, 14 May 2021 18:54:45 +0000 (20:54 +0200)]
batman-adv: Merge bugfixes from 2021.1

* initialize "struct batadv_tvlv_tt_vlan_data"->reserved field

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agobird2: Makefile polishing
Josef Schlehofer [Thu, 25 Mar 2021 11:26:41 +0000 (12:26 +0100)]
bird2: Makefile polishing

- Just small reodering of some rows to be more consistent with packages feed
- Fix deprecated SPDX License Identifier

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit b38a46acd54879cd56de433a5e86c2dcf4b8b151)

3 years agobird2: update to version 2.0.8
Josef Schlehofer [Thu, 25 Mar 2021 11:16:49 +0000 (12:16 +0100)]
bird2: update to version 2.0.8

- Removed patch as it is now included in upstream release
- Removed --with-linux-headers option
(Fixes: configure: WARNING: unrecognized options: --with-linux-headers)

Changelog:
https://bird.network.cz/pipermail/bird-users/2021-March/015281.html

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
3 years agoMerge pull request #644 from ecsv/batadv-for-19.07
Simon Wunderlich [Tue, 16 Feb 2021 07:45:44 +0000 (08:45 +0100)]
Merge pull request #644 from ecsv/batadv-for-19.07

openwrt-19.07: alfred: Fix state handling for startup and restart/reload of alfred

3 years agoalfred: Start up alfred without valid interfaces 644/head
Sven Eckelmann [Mon, 15 Feb 2021 20:17:53 +0000 (21:17 +0100)]
alfred: Start up alfred without valid interfaces

The alfred server always needs interfaces to operate on. But these
interfaces might not exist at the moment when the daemon process is
started. This situation stopped the startup process after the init scripts
waited for a longer period of polling the system state.

But alfred is able to deal with interfaces which disappeared at runtime but
existed at startup. To force a similar behavior for the alfred startup, the
parameter "--force" or "-f" is used. The extra polling code is therefore no
longer needed in the init scripts.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agoalfred: Fix procd process handling for disable state
Sven Eckelmann [Mon, 15 Feb 2021 20:03:57 +0000 (21:03 +0100)]
alfred: Fix procd process handling for disable state

Alfred can be stopped during a (re)start or reload when:

* disabled = 1
* batman-adv interface is missing
* MAC based EUI64 IPv6 link-local address not set

It is assumed that procd detects that the procd instance definition
disappeared and the currently running instance must be stopped. But all
these checks were triggering an "exit" which then stopped the alfred init
script and the wrapper from /lib/functions/procd.sh. And thus procd was
never informed about the instances which should be changed.

The correct handling is to return the result of the function instead of
directly killing the init scripts.

Fixes: 45db0e60d2ff ("alfred: use procd")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agoMerge pull request #636 from ecsv/batadv-for-19.07
Simon Wunderlich [Thu, 28 Jan 2021 21:26:11 +0000 (22:26 +0100)]
Merge pull request #636 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2021.0

3 years agobatman-adv: Merge bugfixes from 2021.0 636/head
Sven Eckelmann [Thu, 28 Jan 2021 20:39:59 +0000 (21:39 +0100)]
batman-adv: Merge bugfixes from 2021.0

* set .owner to THIS_MODULE
* Consider fragmentation for needed_headroom
* Reserve needed_*room for fragments
* Don't always reallocate the fragmentation skb head

Signed-off-by: Sven Eckelmann <sven@narfation.org>
3 years agobatctl: Merge bugfixes from 2021.0
Sven Eckelmann [Thu, 28 Jan 2021 20:34:50 +0000 (21:34 +0100)]
batctl: Merge bugfixes from 2021.0

* Don't stop when create_interface detected existing interface
* Fix retrieval of meshif ap_isolation

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoMerge pull request #620 from ecsv/batadv-for-19.07
Simon Wunderlich [Tue, 27 Oct 2020 14:03:08 +0000 (15:03 +0100)]
Merge pull request #620 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2020.4

4 years agobatctl: Merge bugfixes from 2020.4 620/head
Sven Eckelmann [Sat, 24 Oct 2020 19:40:40 +0000 (21:40 +0200)]
batctl: Merge bugfixes from 2020.4

* tcpdump: Fix endianness in ICMPv6 Echo Request/Reply parsing

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agobatman-adv: Merge bugfixes from 2020.4
Sven Eckelmann [Sat, 24 Oct 2020 19:40:40 +0000 (21:40 +0200)]
batman-adv: Merge bugfixes from 2020.4

* bla: fix type misuse for backbone_gw hash indexing
* mcast/TT: fix wrongly dropped or rerouted packets
* Add missing include for in_interrupt()
* mcast: fix duplicate mcast packets in BLA backbone from LAN
* mcast: fix duplicate mcast packets in BLA backbone from mesh
* mcast: fix duplicate mcast packets from BLA backbone to mesh

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoMerge pull request #603 from ecsv/batadv-for-19.07
Simon Wunderlich [Thu, 27 Aug 2020 08:27:20 +0000 (10:27 +0200)]
Merge pull request #603 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2020.3

4 years agobatman-adv: Merge bugfixes from 2020.3 588/head 603/head
Sven Eckelmann [Tue, 25 Aug 2020 18:36:05 +0000 (20:36 +0200)]
batman-adv: Merge bugfixes from 2020.3

* Avoid uninitialized chaddr when handling DHCP
* Fix own OGM check in aggregated OGMs
* bla: use netif_rx_ni when not in interrupt context

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoMerge pull request #601 from bluewavenet/openwrt-19.07
Moritz Warning [Tue, 25 Aug 2020 06:51:18 +0000 (08:51 +0200)]
Merge pull request #601 from bluewavenet/openwrt-19.07

openwrt-19.07: opennds: Backport v5.2.0

4 years agoopennds: Backport v5.2.0 601/head
Rob White [Mon, 24 Aug 2020 12:08:37 +0000 (13:08 +0100)]
opennds: Backport v5.2.0

Designed to replace the old NoDogsplash v4.0.3
NoDogSplash v4.0.3 still contains the FAS API but has numerous bugs,
some serious, but is no longer supported as the decision was made to
split into two projects - openNDS with FAS and NoDoGSplash optimised for
devices with minimal resources.

This version of openNDS is functionally the same as v6.0.0, but supports
libmicrohttpd (MHD) versions up to 0.9.70 that use the old MHD API.

There are many additions and bugfixes over NoDogSplash v4.0.3.
eg support for HTTPS remote FAS and support for upload/download quotas.

From the Changelog:
openNDS (5.2.0)

  * This version - for backport to Openwrt 19.07 - for compatibility with old MHD API
  * Fix - Failure of MHD with some operating systems eg Debian [bluewavenet]
  * Fix - potential buffer truncation in ndsctl
  * Set - use_outdated_mhd to 1 (enabled) as default [bluewavenet]
  * Set - maximum permissible version of MHD to 0.9.70 to ensure old MHD API is used [bluewavenet]

openNDS (5.1.0)

  * Add - Generic Linux - install opennds.service [bluewavenet]
  * Add - Documentation updates [bluewavenet]
  * Add - config file updates [bluewavenet]
  * Add - Install sitewide username/password splash support files [bluewavenet]
  * Add - quotas to binauth_sitewide [bluewavenet]
  * Add - Splash page updates [bluewavenet]
  * Add - Implement Rate Quotas [bluewavenet]
  * Fix - check if idle preauthenticated [bluewavenet]
  * Add - support for rate quotas [bluewavenet]
  * Fix - Correctly compare client counters and clean up debuglevel messages [bluewavenet]
  * Add - Implement upload/download quotas Update fas-aes-https to support quotas [bluewavenet]
  * Add - Rename demo-preauth scripts and install all scripts [bluewavenet]
  * Add - fas-aes-https layout update [bluewavenet]
  * Add - Set some defaults in fas-aes-https [bluewavenet]
  * Add - custom data string to ndsctl auth [bluewavenet]
  * Add - custom data string to fas-hid.php [bluewavenet]
  * Add - Send custom data field to BinAuth via auth_client method [bluewavenet]
  * Fix - missing token value in auth_client [bluewavenet]
  * Add - upload/download quota and rate configuration values [bluewavenet]
  * Add - Send client token to binauth [bluewavenet]
  * Add - Rename upload_limit and download_limit to upload_rate and download_rate [bluewavenet]
  * Fix - Pass correct session end time to binauth [bluewavenet]
  * Add - some debuglevel 3 messages [bluewavenet]
  * Add - description of the favicon and page footer images [bluewavenet]
  * Add - Authmon collect authentication parameters from fas-aes-https [bluewavenet]
  * Add - sessionlength to ndsctl auth [bluewavenet]
  * Fix - Page fault when ndsctl auth is called and client not found [bluewavenet]
  * Add - Enable BinAuth / fas_secure_enabled level 3 compatibility [bluewavenet]
  * Fix - Correctly set BinAuth session_end [bluewavenet]
  * Add - Updates to Templated Splash pages [bluewavenet]
  * Add - Community Testing files [bluewavenet]
  * Fix - BinAuth error passing client session times [bluewavenet]
  * Fix - PHP notice - undefined constant [bluewavenet]
  * Fix - OpenWrt CONFLICTS variable in Makefile [bluewavenet]

openNDS (5.0.1)

  * Fix - Path Traversal Attack vulnerability allowed by libmicrohttpd's built in unescape functionality [bluewavenet] [lynxis]

openNDS (5.0.0)

  * Import - from NoDogSplash 4.5.0 allowing development without compromising NoDogSplash optimisation for minimum resource utilisation [bluewavenet]
  * Rename - from NoDogSplash to openNDS [bluewavenet]
  * Create - openNDS avatar and splash image [bluewavenet]
  * Move - wait_for_interface to opennds C code ensuring consistent start at boot time for all hardware, OpenWrt and Debian [bluewavenet]
  * Add - Enable https protocol for remote FAS [bluewavenet]
  * Add - trusted devices list to ndsctl json output [bluewavenet]
  * Add - option unescape_callback_enabled [bluewavenet]
  * Add - get_client_token library utility [bluewavenet]
  * Add - utf-8 to PreAuth header [bluewavenet]
  * Add - PreAuth Support for hashed id (hid) if sent by NDS [bluewavenet]
  * Add - library script shebang warning for systems not running Busybox [bluewavenet]
  * Add - htmlentityencode function, encode gatewayname in templated splash page [bluewavenet]
  * Add - htmlentity encode gatewayname on login page (PreAuth) [bluewavenet]
  * Add - Simple customisation of log file location for PreAuth and BinAuth [bluewavenet]
  * Add - option use_outdated_mhd [bluewavenet]
  * Add - url-encode and htmlentity-encode gatewayname on startup [bluewavenet]
  * Add - Allow special characters in username (PreAuth) [bluewavenet]
  * Add - Documentation updates [bluewavenet]
  * Add - Various style and cosmetic updates  [bluewavenet]
  * Fix - Change library script shebang to bash in Debian [bluewavenet]
  * Fix - Remove unnecessary characters causing script execution failure in Debian [bluewavenet]
  * Fix - Add missing NULL parameter in MHD_OPTION_UNESCAPE_CALLBACK [skra72] [bluewavenet]
  * Fix - Script failures running on Openwrt 19.07.0 [bluewavenet]
  * Fix - Preauth, status=authenticated [bluewavenet]
  * Fix - Prevent ndsctl from running if called from a Binauth script. [bluewavenet]
  * Fix - Minor changes in Library scripts for better portability [bluewavenet]
  * Fix - Prevent php notices on pedantic php servers [bluewavenet]
  * Fix - broken remote image retrieval (PreAuth) [bluewavenet]
  * Fix - Allow use of "#" in gatewayname [bluewavenet]

Tested on mips_24kc, mipsel_24kc, arm_cortex-a7_neon-vfpv4 and x86_64 platforms.

Signed-off-by: Rob White <rob@blue-wave.net>
4 years agobatctl: Enable build of mcast_flags subcommand
Sven Eckelmann [Tue, 21 Jul 2020 20:29:33 +0000 (22:29 +0200)]
batctl: Enable build of mcast_flags subcommand

The mcast_flags subcommand allows to query the mcast_flags of the current
device and of the seen originators. It should be enabled for the default
and full variants. But the configuration string wasn't correctly included
in the list when the variants were prepared and thus disabled in all
variants.

Reported-by: Linus Lüssing <linus.luessing@c0d3.blue>
Fixes: 129986825219 ("batctl: Provide different variants")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoMerge pull request #584 from ecsv/batadv-for-19.07
Simon Wunderlich [Tue, 7 Jul 2020 07:20:00 +0000 (09:20 +0200)]
Merge pull request #584 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2020.1

4 years agobatman-adv: Merge bugfixes from 2020.2 584/head
Sven Eckelmann [Mon, 6 Jul 2020 18:04:33 +0000 (20:04 +0200)]
batman-adv: Merge bugfixes from 2020.2

* Revert "disable ethtool link speed detection when auto negotiation off"

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agobatctl: Merge bugfixes from 2020.2
Sven Eckelmann [Mon, 6 Jul 2020 18:04:33 +0000 (20:04 +0200)]
batctl: Merge bugfixes from 2020.2

* fix endianness when reading radiotap header
* Only remove batadv interface on hardif reduction

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agonodogsplash: update to 4.0.3
Alexander Couzens [Wed, 6 May 2020 03:04:11 +0000 (05:04 +0200)]
nodogsplash: update to 4.0.3

Fix a traversal path attack.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
4 years agoMerge pull request #563 from ecsv/batadv-for-19.07
Simon Wunderlich [Mon, 27 Apr 2020 08:25:41 +0000 (10:25 +0200)]
Merge pull request #563 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2020.1

4 years agobatman-adv: Merge bugfixes from 2020.1 563/head
Sven Eckelmann [Fri, 24 Apr 2020 18:52:25 +0000 (20:52 +0200)]
batman-adv: Merge bugfixes from 2020.1

* fix batadv_nc_random_weight_tq
* Fix refcnt leak in batadv_show_throughput_override
* Fix refcnt leak in batadv_store_throughput_override
* Fix refcnt leak in batadv_v_ogm_process

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agobatctl: Merge bugfixes from 2020.1
Sven Eckelmann [Fri, 24 Apr 2020 18:46:29 +0000 (20:46 +0200)]
batctl: Merge bugfixes from 2020.1

* Return EXIT_FAILURE when throughputmeter failed

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agobatctl: Fix upstream reference in backported patch
Sven Eckelmann [Fri, 24 Apr 2020 18:46:00 +0000 (20:46 +0200)]
batctl: Fix upstream reference in backported patch

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoMerge pull request #560 from fblaese/babeld
zorun [Wed, 22 Apr 2020 12:32:50 +0000 (14:32 +0200)]
Merge pull request #560 from fblaese/babeld

[19.07] babeld: Update to version 1.9.2

4 years agobabeld: Update to version 1.9.2 560/head
Fabian Bläse [Wed, 22 Apr 2020 10:52:41 +0000 (12:52 +0200)]
babeld: Update to version 1.9.2

21 April 2020: babeld-1.9.2

  * Fixed two issues that could cause IPv4 routes to be represented
    incorrectly, with a range of confusing symptoms.  Thanks to
    Fabian Bläse.
  * Fixed incorrect parsing of TLVs with an unknown Address Encoding.
    Thanks to Théophile Bastian.
  * Fixed access to mis-aligned data structure.  Thanks to Antonin Décimo.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
4 years agoMerge pull request #558 from BKPepe/bird2-19.07-bump
Moritz Warning [Thu, 2 Apr 2020 18:54:16 +0000 (20:54 +0200)]
Merge pull request #558 from BKPepe/bird2-19.07-bump

[19.07] bird2: backport from master update to version 2.0.7 + fix restart&reload

4 years agobird2: fix service restart and reload (#546) 558/head
Yuxiang Zhu [Sat, 8 Feb 2020 21:47:13 +0000 (05:47 +0800)]
bird2: fix service restart and reload (#546)

`/etc/init.d/bird restart` or `/etc/init.d/bird reload` has no effects.

This PR fixes this issue by:

- running the service in the foreground to meet the requirements of procd
- sending SIGHUP signal to reload the service

4 years agobird2: Update to v2.0.7 (#516)
Toke Høiland-Jørgensen [Sat, 21 Dec 2019 22:18:36 +0000 (23:18 +0100)]
bird2: Update to v2.0.7 (#516)

Bump release to upstream v2.0.7

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
4 years agobird2: Update to version 2.0.6
Josef Schlehofer [Sun, 29 Sep 2019 18:35:35 +0000 (20:35 +0200)]
bird2: Update to version 2.0.6

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
4 years agobird2: Bump to v2.0.5
Toke Høiland-Jørgensen [Mon, 19 Aug 2019 10:34:05 +0000 (12:34 +0200)]
bird2: Bump to v2.0.5

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
4 years agoMerge pull request #554 from ecsv/batadv-for-19.07
Simon Wunderlich [Tue, 10 Mar 2020 16:08:52 +0000 (17:08 +0100)]
Merge pull request #554 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2020.0

4 years agobatman-adv: Merge bugfixes from 2020.0 554/head
Sven Eckelmann [Fri, 6 Mar 2020 19:51:17 +0000 (20:51 +0100)]
batman-adv: Merge bugfixes from 2020.0

* Don't schedule OGM for disabled interface

Signed-off-by: Sven Eckelmann <sven@narfation.org>
4 years agoluci-app-bmx6: bugfix querying bmx6-info (p2)
Pedro hates github.com [Fri, 21 Feb 2020 23:47:36 +0000 (00:47 +0100)]
luci-app-bmx6: bugfix querying bmx6-info (p2)

see 51b370e1ce4e55e8ac333d57cc6709309eeffcdc and #550

4 years agoluci-app-bmx6: bugfix format to query bmx6-info
pedrolab [Fri, 21 Feb 2020 09:27:27 +0000 (10:27 +0100)]
luci-app-bmx6: bugfix format to query bmx6-info

- affected three tab luci templates (even with luci-compat installed)
- fixes #548
- as jow said in #548:
  - it might be that modern LuCI escapes it as %24 while old versions passed it
    on as-is
  - bmx6-info removes it anyway
    https://github.com/openwrt-routing/packages/blob/master/luci-app-bmx6/bmx6/www/cgi-bin/bmx6-info#L22
you can probably just remove it in all three tab templates

(cherry picked from commit b92f82ad1f8bb572395fc1b843d409fafb3fc0d3)

4 years agoquagga: update to version 1.1.1 (#541)
Josef Schlehofer [Sun, 26 Jan 2020 22:13:23 +0000 (23:13 +0100)]
quagga: update to version 1.1.1 (#541)

Makefile changes:
- Use HTTPS everywhere
- Reorder some things to have it in sync with other packages
- Fixed SPDX License Identifier
- Added PKG_LICENSE_FILES
- For checksum use SHA256

Refreshed patches

Fixes CVEs:
- CVE-2017-5495
- CVE-2017-16227

Fixes security issues:
- Quagga-2018-0543: attr_endp used for NOTIFY data
https://gogs.quagga.net/Quagga/quagga/src/master/doc/security/Quagga-2018-0543.txt
- Quagga-2018-1114: bgpd double free
https://gogs.quagga.net/Quagga/quagga/src/master/doc/security/Quagga-2018-1114.txt
- Quagga-2018-1550: debug overrun in notify lookup tables
https://gogs.quagga.net/Quagga/quagga/src/master/doc/security/Quagga-2018-1550.txt
- Quagga-2018-1975: BGP capability inf. loop
https://gogs.quagga.net/Quagga/quagga/src/master/doc/security/Quagga-2018-1975.txt

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
4 years agoMerge pull request #536 from ecsv/batadv-for-19.07
Simon Wunderlich [Sat, 14 Dec 2019 15:59:11 +0000 (16:59 +0100)]
Merge pull request #536 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2019.5

4 years agobatman-adv: Merge bugfixes from 2019.5 536/head
Sven Eckelmann [Fri, 13 Dec 2019 21:13:55 +0000 (22:13 +0100)]
batman-adv: Merge bugfixes from 2019.5

* fix DAT candidate selection on little endian systems

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #519 from ecsv/batadv-for-19.07
Simon Wunderlich [Sat, 26 Oct 2019 08:30:30 +0000 (10:30 +0200)]
Merge pull request #519 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2019.4

5 years agobatman-adv: Merge bugfixes from 2019.4 519/head
Sven Eckelmann [Fri, 25 Oct 2019 20:25:10 +0000 (22:25 +0200)]
batman-adv: Merge bugfixes from 2019.4

* fix uninit-value in batadv_netlink_get_ifindex()
* Only read OGM tvlv_len after buffer len check
* Only read OGM2 tvlv_len after buffer len check
* Avoid free/alloc race when handling OGM2 buffer
* Avoid free/alloc race when handling OGM buffer
* Introduce own OGM2 buffer mutex
* Avoid OGM workqueue synchronous cancel deadlock

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #505 from zorun/babeld-1.9-openwrt-19.07
zorun [Mon, 26 Aug 2019 19:06:38 +0000 (21:06 +0200)]
Merge pull request #505 from zorun/babeld-1.9-openwrt-19.07

[openwrt-19.07] babeld: Update to 1.9.1 and assorted fixes

5 years agobabeld: Update example configuration file 505/head
Baptiste Jonglez [Mon, 26 Aug 2019 16:25:32 +0000 (18:25 +0200)]
babeld: Update example configuration file

More example filters are provided, and new options such as "type" or
"pref_src" are given as example.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
5 years agobabeld: Update description in Makefile and fix license path
Baptiste Jonglez [Mon, 26 Aug 2019 16:12:50 +0000 (18:12 +0200)]
babeld: Update description in Makefile and fix license path

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
5 years agobabeld: Update to version 1.9.1
Adrian Schmutzler [Wed, 21 Aug 2019 14:09:18 +0000 (16:09 +0200)]
babeld: Update to version 1.9.1

20 August 2019: babeld-1.9.1

  * Fixed a crash that could happen when unicast and RTT estimation are
    both enabled on an interface.  Thanks to Dave Taht.
  * Fixed compilation under BSD.  Thanks to Dave Taht.

4 August 2019: babeld-1.9.0

  * Reworked buffering of unicast packets to use a per-neighbour buffer
    rather than a single buffer per interface.  This makes unicast as
    efficient as multicast, at the cost of slightly higher memory usage.
  * Added option "unicast" that allows sending most TLVs over unicast.
    This is necessary for the DTLS extension.
  * Implemented parsing of unicast Hellos.  This makes it possible to
    interoperate with neighbours that only speak unicast (e.g. over some
    kinds of tunnels that only do unicast).
  * Implemented sending of unscheduled unicast Hellos.  This makes the
    RTT extension work over unicast too.
  * Reworked the xroute data structures to use binary search and
    linear-time comparison.
  * Don't attempt to modify the rp_filter sysctl if it already has the
    desired value; this makes it possible to run babeld in an
    unpriviledged container.  Thanks to Christof Schulze.
  * Reinstated logging of late hellos.  Thanks to Dave Taht.
  * Don't send wildcard requests or Hellos to newish nodes.  This makes
    acquisition of new neighbours slower, but drastically reduces noise at
    startup.  Thanks to Teco Boot.
  * Remove an arbitrary limit on the number of interfaces.  Thanks to
    Christof Schulze.
  * Removed class E from martian filter.  Thanks to Dave Taht.
  * Added the ability to set the preferred source address in install filters.
    Thanks to Killian Lufau.
  * Fixed a number of read-only buffer overflows.  Thanks to Leo Stefanesco.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
5 years agobabeld: Improve Makefile formatting
Adrian Schmutzler [Wed, 21 Aug 2019 13:56:50 +0000 (15:56 +0200)]
babeld: Improve Makefile formatting

This applies some style improvements to make this ready for
migration to openwrt/packages.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
5 years agobabeld: Update to version 1.8.5
Adrian Schmutzler [Wed, 21 Aug 2019 13:45:50 +0000 (15:45 +0200)]
babeld: Update to version 1.8.5

Changes:

  * Fixed a bug that caused confustion between learned routes and
    imported routes (thanks to Fabian Bläse).
  * Fixed a bug that prevented install filters from being evaluated
    (thanks to Killian Lufau).

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
5 years agobabeld: Don't kill -9 on stop
Baptiste Jonglez [Mon, 26 Aug 2019 16:39:37 +0000 (18:39 +0200)]
babeld: Don't kill -9 on stop

Killing anything with -9 is a bad idea.  When killed this way, babeld
won't be able to properly disassociate from its neighbours, withdraw its
announced routes or remove routes from the kernel.

This got introduced in bab933d4cad8 ("babeld: Update to version 1.8.3 +
fix init") with an unrelated change.  The purpose of the change is unclear
because stopping and restarting babeld worked fine without this change.

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
5 years agoMerge pull request #498 from ecsv/batadv-for-19.07
Simon Wunderlich [Sun, 4 Aug 2019 11:33:29 +0000 (13:33 +0200)]
Merge pull request #498 from ecsv/batadv-for-19.07

batman-adv: Readd Linux 4.19.x compat patches

5 years agobatman-adv: Readd Linux 4.19.x compat patches 498/head
Sven Eckelmann [Sun, 4 Aug 2019 06:16:01 +0000 (08:16 +0200)]
batman-adv: Readd Linux 4.19.x compat patches

The patches were accidentally deleted while testing the batman-adv 2019.3
bugfixes with various OpenWrt versions. But OpenWrt 19.07 will be released
with a mac80211 package which still uses the Linux 4.19 API. And thus the
OpenWrt 19.07 openwrt-routing branch still has to retain these compat
patches.

Fixes: a93e68447a55 ("alfred: Merge bugfixes from 2019.3")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #496 from ecsv/batadv-for-19.07
Simon Wunderlich [Fri, 2 Aug 2019 07:53:13 +0000 (09:53 +0200)]
Merge pull request #496 from ecsv/batadv-for-19.07

openwrt-19.07: batman-adv: Merge bugfixes from 2019.3

5 years agobatman-adv: Merge bugfixes from 2019.3 496/head
Sven Eckelmann [Thu, 1 Aug 2019 17:24:32 +0000 (19:24 +0200)]
batman-adv: Merge bugfixes from 2019.3

* Fix netlink dumping of all mcast_flags buckets

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: Merge bugfixes from 2019.3
Sven Eckelmann [Thu, 1 Aug 2019 17:20:20 +0000 (19:20 +0200)]
batctl: Merge bugfixes from 2019.3

* Prefer netlink hardif status retrieval over sysfs

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: Upgrade hardif settings patches to upstream version
Sven Eckelmann [Thu, 1 Aug 2019 17:15:03 +0000 (19:15 +0200)]
batctl: Upgrade hardif settings patches to upstream version

The hardif patches were added to OpenWrt before they were accepted in the
upstream repository. This seemed necessary at that time because OpenWrt
19.07 was alreadu branched of (to be released soon).

But the upstream merged patches contain more cleanups. Having the actual
upstream version in OpenWrt make it easier to integrate potential bugfixes.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoalfred: Merge bugfixes from 2019.3
Sven Eckelmann [Thu, 1 Aug 2019 16:52:28 +0000 (18:52 +0200)]
alfred: Merge bugfixes from 2019.3

* vis: Use rtnl to query list of hardifs of meshif
* vis: Retrieve hardif status via generic netlink

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agonodogsplash: Backport Version 4.0.1. (#494)
Rob White [Tue, 30 Jul 2019 14:21:40 +0000 (15:21 +0100)]
nodogsplash: Backport Version 4.0.1. (#494)

This version has numerous fixes and enhancements.
It is compatible with the previous v3.2.1 release and onwards.

Important fixes in this version:
 * Fix coding error in fas-aes.php [bluewavenet]
 * Make debuglevel platform independent [mwarning]
 * Fix memory handling bug, issue nodogsplash/nodogsplash#341 [mwarning] [stevo01]
 * ndsctl_thread - ignore interupts when returning from epoll [lynxis]
 * auth.c - use correct types to prevent cast and comparement of uint and int [lynxis]
 * openwrt/init.d - prevent start of the daemon if configuration generation fails [lynxis]
 * Generate Error 403 Forbidden, if Gateway Port is accessed directly [bluewavenet]
 * Validate fasremoteip as a valid dotted format IPv4 address [bluewavenet] [mwarning]
 * Prevent client CPD "Too Many Redirects" error. [bluewavenet]

Maintainer: Moritz Warning <moritzwarning@web.de>

Signed-off-by: Rob White <rob@blue-wave.net>
5 years agobird2: Bump to v2.0.4
Toke Høiland-Jørgensen [Mon, 14 Jan 2019 08:47:10 +0000 (09:47 +0100)]
bird2: Bump to v2.0.4

Bird 2.0.4 was released on March 1st. Remove upstreamed patches.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
(cherry picked from commit 37f8c509e03de355a3d0f9b6d62837c43750f98b)

5 years agobird1: update to version 1.6.6
Josef Schlehofer [Wed, 13 Mar 2019 09:25:08 +0000 (10:25 +0100)]
bird1: update to version 1.6.6

Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
(cherry picked from commit 6141d5d182dbf961430b6970279fe21d7fb528e4)

5 years agoMerge pull request #478 from ecsv/batadv-for-19.07
Simon Wunderlich [Sun, 16 Jun 2019 09:27:08 +0000 (11:27 +0200)]
Merge pull request #478 from ecsv/batadv-for-19.07

batman-adv: Add support for B.A.T.M.A.N. V hardif settings

5 years agobatman-adv: Don't try to set unconfigured ap_isolation for vlan 478/head
Sven Eckelmann [Sun, 16 Jun 2019 07:27:08 +0000 (09:27 +0200)]
batman-adv: Don't try to set unconfigured ap_isolation for vlan

The ap_isolation setting only supports boolean values. So setting an empty
string as ap_isolation is not supported by batctl.

Fixes: f5205d7d2434 ("batman-adv: upgrade package to latest release 2014.2.0")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatman-adv: Add support for hardif settings
Sven Eckelmann [Sat, 15 Jun 2019 07:25:05 +0000 (09:25 +0200)]
batman-adv: Add support for hardif settings

B.A.T.M.A.N. V support additional settings which are hardif specific. The
batadv_hardif proto has to expose them to allow automatic configuration.
The default configuration would be:

  config interface 'bat0_hardif_eth0'
   option proto 'batadv_hardif'
   option master 'bat0'
   option ifname 'eth0'
   option mtu '1536'
   option 'elp_interval' 500
   # string like '1mbit' is accepted instead of kbit for override
   option 'throughput_override' '0'

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: Add support for hardif settings
Sven Eckelmann [Sat, 15 Jun 2019 07:18:51 +0000 (09:18 +0200)]
batctl: Add support for hardif settings

batctl currently supports settings which are either mesh interface or vlan
specific. But B.A.T.M.A.N. V introduced two additional settings which are
hard (slave) interface specific.

To support these, an additional command prefix called hardif is implemented
for some sysfs commands:

  $ batctl -m bat0 hardif eth0 ..

The usable commands with that are:

* elp_interval
* throughput_override

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #475 from ecsv/batadv-2019.2
Simon Wunderlich [Sun, 2 Jun 2019 20:41:20 +0000 (22:41 +0200)]
Merge pull request #475 from ecsv/batadv-2019.2

batman-adv: Fix duplicated OGMs on NETDEV_UP

5 years agobatman-adv: Fix duplicated OGMs on NETDEV_UP 475/head
Sven Eckelmann [Sun, 2 Jun 2019 09:46:25 +0000 (11:46 +0200)]
batman-adv: Fix duplicated OGMs on NETDEV_UP

The state of slave interfaces are handled differently depending on whether
the interface is up or not. All active interfaces (IFF_UP) will transmit
OGMs. But for B.A.T.M.A.N. IV, also non-active interfaces are scheduling
(low TTL) OGMs on active interfaces. The code which setups and schedules
the OGMs must therefore already be called when the interfaces gets added as
slave interface and the transmit function must then check whether it has to
send out the OGM or not on the specific slave interface.

But v2016.3 moved the setup code from the enable function to the activate
function. The latter is called either when the added slave was already up
when batadv_hardif_enable_interface processed the new interface or when a
NETDEV_UP event was received for this slave interfac. As result, each
NETDEV_UP would schedule a new OGM worker for the interface and thus OGMs
would be send a lot more than expected.

Fixes: 549909f89dd7 ("batman-adv: upgrade package to latest release 2016.3")
Reported-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #472 from yogo1212/batmand_whitespace
elektra42 [Mon, 27 May 2019 07:04:38 +0000 (09:04 +0200)]
Merge pull request #472 from yogo1212/batmand_whitespace

batmand: whitespace

5 years agobatmand: match loop format 472/head
Leon M. George [Fri, 24 May 2019 22:11:17 +0000 (00:11 +0200)]
batmand: match loop format

5 years agobatmand: fix whitespace
Leon M. George [Thu, 23 May 2019 23:17:41 +0000 (01:17 +0200)]
batmand: fix whitespace

5 years agoMerge pull request #471 from ecsv/batadv-2019.2
Simon Wunderlich [Fri, 24 May 2019 07:45:32 +0000 (09:45 +0200)]
Merge pull request #471 from ecsv/batadv-2019.2

batman-adv 2019.2

5 years agobatman-adv: upgrade package to latest release 2019.2 471/head
Sven Eckelmann [Thu, 23 May 2019 18:13:21 +0000 (20:13 +0200)]
batman-adv: upgrade package to latest release 2019.2

* support latest kernels (3.16 - 5.2)
* coding style cleanups and refactoring
* implement multicast-to-unicast support for multiple targets
* deprecate sysfs support and make it optional
* refresh DAT entry timeouts on incoming ARP Replies
* bugs squashed:

  - fix multicast tt/tvlv worker locking
  - drop roam tvlv handler when unregistering mesh interface

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: upgrade package to latest release 2019.2
Sven Eckelmann [Thu, 23 May 2019 18:12:31 +0000 (20:12 +0200)]
batctl: upgrade package to latest release 2019.2

* coding style cleanups and refactoring
* add multicast_fanout setting subcommand
* implement netlink based support for remaining sysfs-only features
* drop support for deprecated log command support
* remove non-netlink support for translating MAC addresses to originators

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoalfred: upgrade package to latest release 2019.2
Sven Eckelmann [Thu, 23 May 2019 18:11:42 +0000 (20:11 +0200)]
alfred: upgrade package to latest release 2019.2

* synchronization of batman-adv netlink header

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agonodogsplash: Release v3.3.2-1 (#468)
Rob White [Tue, 7 May 2019 20:38:40 +0000 (21:38 +0100)]
nodogsplash: Release v3.3.2-1 (#468)

Maintainer: Moritz Warning <moritzwarning@web.de>

Compiled and tested on snapshot SDK mips_24kc and arm_cortex-a5_neon-vfpv4/

  * Fix Issue introduced in v3.3.0 with the addition of Improvements towards usable IPv6 support, that caused CPD on client devices to fail with "Too Many Redirects" error. NDS now terminates gracefully with a console error if fasremoteip is set AND fasport=80  [bluewavenet]
  * Validate fasremoteip to ensure that if it is set, then it is a valid dotted format IPv4 address  [bluewavenet]
  * Numerous Documentation updates  [bluewavenet]
  * Fix to Known Issue on OpenWrt >18.x.x with v3.3.1. This was caused by misconfigured Makefile for libmicrohttpd; this has been fixed there [bluewavenet]

Signed-off-by: Rob White <rob@blue-wave.net>
5 years agoMerge pull request #467 from lynxis/remove-smcroute
Jo-Philipp Wich [Tue, 30 Apr 2019 21:52:53 +0000 (23:52 +0200)]
Merge pull request #467 from lynxis/remove-smcroute

smcroute: remove package as it's orphaned

5 years agosmcroute: remove package as it's orphaned 467/head
Alexander Couzens [Tue, 23 Apr 2019 09:59:23 +0000 (11:59 +0200)]
smcroute: remove package as it's orphaned

If someone like to become the maintainer, please re-submit this package
to the general openwrt package repository
https://github.com/openwrt/packages

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
5 years agoMerge pull request #459 from pmelange/olsrd_0.9.7
Bastian Bittorf [Mon, 1 Apr 2019 05:30:42 +0000 (07:30 +0200)]
Merge pull request #459 from pmelange/olsrd_0.9.7

[OLSRd] Bump OLSRd version to 0.9.7

5 years agoMerge pull request #461 from ecsv/batadv-2019.1
Simon Wunderlich [Fri, 29 Mar 2019 12:32:50 +0000 (13:32 +0100)]
Merge pull request #461 from ecsv/batadv-2019.1

batman-adv 2019.1

5 years agobatman-adv: upgrade package to latest release 2019.1 461/head
Sven Eckelmann [Sun, 17 Mar 2019 08:35:50 +0000 (09:35 +0100)]
batman-adv: upgrade package to latest release 2019.1

* support latest kernels (3.16 - 5.1)
* coding style cleanups and refactoring
* implement meshif, hardif and vlan config interface via netlink
* snoop DHCP ACKs to improve DAT cache efficiency
* bugs squashed:

  - avoid potential reference counter underflows and use-after free errors for
    several objects
  - fix GCC warning when B.A.T.M.A.N. V is build in but cfg80211 is not
    available
  - reject too small VLAN packets before they are processed further

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: upgrade package to latest release 2019.1
Sven Eckelmann [Sun, 17 Mar 2019 08:35:50 +0000 (09:35 +0100)]
batctl: upgrade package to latest release 2019.1

* coding style cleanups and refactoring
* introduce support for batadv meshif, hardif and vlan configuration via netlink
* replace multicast_mode with multicast_forceflood settings subcommand
* add hop_penalty setting subcommand

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoalfred: upgrade package to latest release 2019.1
Sven Eckelmann [Thu, 28 Mar 2019 18:40:20 +0000 (19:40 +0100)]
alfred: upgrade package to latest release 2019.1

* synchronization of batman-adv netlink header

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: Add package description per variant
Sven Eckelmann [Sun, 17 Mar 2019 08:32:33 +0000 (09:32 +0100)]
batctl: Add package description per variant

Fixes: 129986825219 ("batctl: Provide different variants")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agonodogsplash: Add missing install directories (#460)
Rob White [Mon, 25 Mar 2019 17:03:29 +0000 (17:03 +0000)]
nodogsplash: Add missing install directories (#460)

Add missing install directories in revised Makefile

Signed-off-by: Rob White rob@blue-wave.net
5 years agonodogsplash: Bump to v3.3.0-1 (#457)
Rob White [Mon, 25 Mar 2019 13:28:02 +0000 (13:28 +0000)]
nodogsplash: Bump to v3.3.0-1 (#457)

Signed-off-by: Rob White <rob@blue-wave.net>
5 years ago[OLSRd] Bump OLSRd version to 0.9.7 459/head
pmelange [Sat, 23 Mar 2019 13:16:40 +0000 (14:16 +0100)]
[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>
5 years agoMerge pull request #458 from adrianschmutzler/fixcommit
Simon Wunderlich [Wed, 20 Mar 2019 16:50:20 +0000 (17:50 +0100)]
Merge pull request #458 from adrianschmutzler/fixcommit

batman-adv: Fix uci commit target

5 years agobatman-adv: Fix uci commit target 458/head
Adrian Schmutzler [Tue, 19 Mar 2019 18:49:27 +0000 (19:49 +0100)]
batman-adv: Fix uci commit target

Although batman-adv config is cycled in config_foreach, changes
are made in the network config. Thus, this one has to be committed.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
5 years agonodogsplash: fix invalid pointer bug when clock is turned back (#456)
Moritz Warning [Thu, 14 Mar 2019 17:23:32 +0000 (18:23 +0100)]
nodogsplash: fix invalid pointer bug when clock is turned back (#456)

Signed-off-by: Moritz Warning <moritzwarning@web.de>
5 years agoMerge pull request #454 from dangowrt/master
Axel Neumann [Wed, 13 Mar 2019 21:44:14 +0000 (22:44 +0100)]
Merge pull request #454 from dangowrt/master

bmx7: update source to 2019030802

5 years agobmx7: update source to 2019030802 454/head
Daniel Golle [Fri, 8 Mar 2019 02:58:35 +0000 (03:58 +0100)]
bmx7: update source to 2019030802

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
5 years agoMerge pull request #453 from ecsv/batadv-2019.0
Simon Wunderlich [Thu, 7 Mar 2019 16:04:54 +0000 (17:04 +0100)]
Merge pull request #453 from ecsv/batadv-2019.0

batman-adv: Split batadv proto in meshif and hardif part

5 years agobatman-adv: Split batadv proto in meshif and hardif part 453/head
Sven Eckelmann [Sun, 24 Feb 2019 16:51:13 +0000 (17:51 +0100)]
batman-adv: Split batadv proto in meshif and hardif part

batman-adv allows to configure three different objects:

* batadv hardif

  - network interface used by batadv meshif to transport the batman-adv
    packets
  - its master interface is set to the batadv meshif

* batadv (meshif/softif)

  - virtual interface that emulates a normal 802.3 interface on top
  - encapsulates traffic and forwards it via the batadv hardifs

* batadv vlan

  - potential VLAN ID on top of batadv meshif
  - allows filtering of traffic from specific VIDs

While batadv vlan objects were already represented as an own proto
"batadv_vlan", the batadv meshif could never be fully configured using
/etc/config/network. Instead, parts of its configuration were stored in
/etc/config/batman_adv and some in the interfaces with the "batadv" proto.

To increase the confusion, the "batadv" proto wasn't used to define the
batadv meshif but to identify batadv (slave) hardifs. The batman-adv
meshifs were also never created directly but only when a hardif was
configured. The actual modification of the configuration settings was then
applied using a hotplug script hack. The batadv meshif network interface
could therefore only be created when an hardif was available and not
manipulated with ifup/ifdown. Also `/etc/init.d/network reload` didn't
modify the batadv meshif interface configuration correctly.

The "batadv" is now renamed to "batadv_hardif" and a new "batadv" proto is
used to configure the main (meshif) network interface with all its
configuration.

A simple network configuration with WiFi & ethernet interfaces and static
IP on top of bat0 would look like:

  # batadv meshif bat0
  config interface 'bat0'
   option proto 'batadv'
   option routing_algo 'BATMAN_IV'
   option aggregated_ogms 1
   option ap_isolation 0
   option bonding 0
   option fragmentation 1
   #option gw_bandwidth '10000/2000'
   option gw_mode 'off'
   #option gw_sel_class 20
   option log_level 0
   option orig_interval 1000
   option bridge_loop_avoidance 1
   option distributed_arp_table 1
   option multicast_mode 1
   option network_coding 0
   option hop_penalty 30
   option isolation_mark '0x00000000/0x00000000'

  # add *single* wifi-iface with network bat0_hardif_wlan as hardif to bat0
  config interface 'bat0_hardif_wlan'
   option mtu '1536'
   option proto 'batadv_hardif'
   option master 'bat0'
   # option ifname is filled out by the wifi-iface

  # add eth0 as hardif to bat0
  config interface 'bat0_hardif_eth0'
   option proto 'batadv_hardif'
   option master 'bat0'
   option ifname 'eth0'
   option mtu '1536'

  # configure IP on bat0
  config interface 'bat0_lan'
   option ifname 'bat0'
   option proto 'static'
   option ipaddr '192.168.1.1'
   option netmask '255.255.255.0'
   option ip6assign '60'

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #451 from ecsv/batadv-2019.0
Simon Wunderlich [Thu, 7 Mar 2019 15:56:37 +0000 (16:56 +0100)]
Merge pull request #451 from ecsv/batadv-2019.0

batman-adv: finish config batctl usage & drop unused compat code

5 years agobatman-adv: use batctl for configuration of hop_penalty 451/head
Sven Eckelmann [Fri, 22 Feb 2019 20:47:40 +0000 (21:47 +0100)]
batman-adv: use batctl for configuration of hop_penalty

hop_penalty is the last remaining setting which is directly writing to
sysfs instead of using a implementation (sysfs vs. netlink) abstraction
layer. batctl now provides a wrapper function that allows the script to
directly use it to take care of communicating with the driver.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatctl: Add support for hop_penalty settings command
Sven Eckelmann [Fri, 22 Feb 2019 21:31:44 +0000 (22:31 +0100)]
batctl: Add support for hop_penalty settings command

The batman-adv scripts are still using sysfs for setting the hop_penalty.
Since the sysfs is deprecated, the batctl interface should be used to make
it independent of implementation details (sysfs vs. netlink).

Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agobatman-adv: use batctl for configuration of gw_mode
Sven Eckelmann [Fri, 22 Feb 2019 20:47:40 +0000 (21:47 +0100)]
batman-adv: use batctl for configuration of gw_mode

The batctl tool should be used for modifying settings in the batman-adv
driver to keep the scripts consistent and allow to use the correct way of
communicating with the kernel (sysfs vs. netlink).

The gw_mode, gw_bandwidth and gw_sel_class options are all handled by
the same gw_mode command in batctl and thus have to be combined depending
on the "gw_mode" value.

Signed-off-by: Sven Eckelmann <sven@narfation.org>