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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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
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>
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>
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>
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>
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>
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>
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
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>
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
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>
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>
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>
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>
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>
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)
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)
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
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>
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>
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>
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
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>
elektra42 [Mon, 27 May 2019 07:04:38 +0000 (09:04 +0200)]
Merge pull request #472 from yogo1212/batmand_whitespace
batmand: whitespace
Leon M. George [Fri, 24 May 2019 22:11:17 +0000 (00:11 +0200)]
batmand: match loop format
Leon M. George [Thu, 23 May 2019 23:17:41 +0000 (01:17 +0200)]
batmand: fix whitespace
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
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>
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>
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>
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>
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
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>
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
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
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>
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>
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>
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>
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
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>
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>
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
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>
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>
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
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>
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
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>
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
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>
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>
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>
Sven Eckelmann [Fri, 22 Feb 2019 19:40:11 +0000 (20:40 +0100)]
batman-adv: Drop cfg80211_get_station memset workaround
The actual memset fix for cfg80211_get_station's sinfo is already part of
the mac80211 package and doesn't have to be shipped anymore with
batman-adv.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop compat-hack for __poll_t
__poll_t is already defined by the mac80211's backports and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop compat-hack for from_timer
from_timer is already defined by the mac80211's backports and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop compat-hack for skb_put*
skb_put* is already defined by the mac80211's backports and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop compat-hack for nla_put_u64_64bit
nla_put_u64_64bit is already defined by the mac80211's backports and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop compat-hack for netif_trans_update
netif_trans_update is already defined by the mac80211's backports and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:19:42 +0000 (20:19 +0100)]
batman-adv: Drop redefinition of NL80211_STA_INFO_EXPECTED_THROUGHPUT
NL80211_STA_INFO_EXPECTED_THROUGHPUT is defined by the mac80211 package and
doesn't have to be redefined in the compat-hacks.h.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Fri, 22 Feb 2019 19:04:35 +0000 (20:04 +0100)]
batman-adv: Drop unused compat-hacks.patch
The linux/build_bug.h is already provided by mac80211's backports. It is
not needed anymore to adjust the includes to use the older linux/bug.h
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Simon Wunderlich [Fri, 22 Feb 2019 18:30:34 +0000 (19:30 +0100)]
Merge pull request #448 from SvenRoederer/patch-1
batctl: fix wrong binary-name for batctl-default
Axel Neumann [Thu, 21 Feb 2019 08:10:03 +0000 (09:10 +0100)]
Merge pull request #450 from dangowrt/bmx7-
2018122901
bmx7: update to git snapshot as of 2018-12-29: Use MbedTLS 2.8.0
Daniel Golle [Wed, 20 Feb 2019 13:05:41 +0000 (14:05 +0100)]
bmx7: update to git snapshot as of 2018-12-29
* fixes mbedTLS string constant deprecation build breakage
* obsoletes local patch
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Sven Roederer [Mon, 18 Feb 2019 21:40:24 +0000 (22:40 +0100)]
batctl: fix wrong binary-name for batctl-default
* correct binary for batctl-default to /usr/libexec/batctl-default
* while at it fix description of batctl-full
Signed-off-by: Sven Roederer <freifunk@it-solutions.geroedel.de>
Simon Wunderlich [Mon, 4 Feb 2019 09:12:51 +0000 (10:12 +0100)]
Merge pull request #446 from ecsv/batadv-2019.0
batman-adv 2019.0
Sven Eckelmann [Sun, 27 Jan 2019 15:28:23 +0000 (16:28 +0100)]
batman-adv: upgrade package to latest release 2019.0
* support latest kernels (3.16 - 5.0)
* coding style cleanups and refactoring
* allow to enable debug tracing without full batman-adv debugfs support
* enable inconsistency reporting for most netlink dump commands
* bugs squashed:
- avoid unnecessary kernel warning (panic) during detection of interface loops
- work around incorrect ethernet header offset in transmit code path
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Sun, 27 Jan 2019 15:28:23 +0000 (16:28 +0100)]
batctl: upgrade package to latest release 2019.0
* coding style cleanups and refactoring
* add gateway selection manpage section for B.A.T.M.A.N. V
* bugs squashed:
- re-integrate support for translation table unicast/multicast filter
- avoid incorrect warning about disabled mesh interface when debugfs
support is not enabled in batman-adv
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Sun, 27 Jan 2019 15:28:23 +0000 (16:28 +0100)]
alfred: upgrade package to latest release 2019.0
* (no changes)
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Moritz Warning [Thu, 31 Jan 2019 18:08:51 +0000 (19:08 +0100)]
Merge pull request #445 from diizzyy/patch-1
nodogsplash: libmicrohttpd-no-ssl -> libmicrohttpd
Daniel Engberg [Thu, 31 Jan 2019 14:50:56 +0000 (15:50 +0100)]
nodogsplash: libmicrohttpd-no-ssl -> libmicrohttpd
Due to rearrangements of the libmicrohttpd the non
ssl variant is now called libmicrohttpd.
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Jo-Philipp Wich [Sun, 27 Jan 2019 17:26:25 +0000 (18:26 +0100)]
Merge pull request #444 from dedeckeh/pr_nat46
nat46: drop from repo
Hans Dedecker [Sun, 27 Jan 2019 15:00:28 +0000 (16:00 +0100)]
nat46: drop from repo
Move nat46 and 464xlat to OpenWrt base repo
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Sven Eckelmann [Sun, 6 Jan 2019 12:24:21 +0000 (13:24 +0100)]
batman-adv: use batctl for configuration
The batctl binary is currently optional for batman-adv installations. But
new configuration settings will only be exposed via generic netlink. The
batctl tool will therefore be required to modify them.
batctl must therefore no longer depend on batman-adv but batman-adv must
depend on batctl. Some already implemented settings are already moved to
batctl.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Sven Eckelmann [Sun, 6 Jan 2019 12:23:42 +0000 (13:23 +0100)]
batctl: Provide different variants
The batctl binary is currently optional for batman-adv installations. But
new configuration settings will only be exposed via generic netlink. The
batctl tool will therefore be required to modify them.
To also fit batctl in some of the smaller devices, a new variant
batctl-tiny is build which only provides the settings subcommands. The
batctl-default variant is equal to the old batctl package and batctl-full
also provides the commands which were disabled until now.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Pau [Fri, 11 Jan 2019 08:52:46 +0000 (09:52 +0100)]
Merge pull request #437 from rogerpueyo/luci-app-bmx6-graph-sys-exec
luci-app-bmx6: Avoid race condition in bmx6json.lua get()
Moritz Warning [Fri, 11 Jan 2019 00:17:10 +0000 (01:17 +0100)]
Merge pull request #438 from cotequeiroz/hnetd_openssl-1.1
hnetd: add compatiblity with openssl 1.1.x
p4u [Thu, 10 Jan 2019 19:30:01 +0000 (20:30 +0100)]
luci-app-bmx7: show mDNS menu if available
Signed-off-by: p4u <p4u@dabax.net>
Eneas U de Queiroz [Thu, 13 Dec 2018 02:25:16 +0000 (00:25 -0200)]
hnetd: add compatiblity with openssl 1.1.x
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Roger Pueyo Centelles [Sun, 9 Dec 2018 19:55:05 +0000 (20:55 +0100)]
luci-app-bmx6: Avoid race condition in bmx6json.lua get()
The network topology of a BMX6 mesh can be obtained by asking all the nodes
about their links via the bmx6-info script. The wget() function in the
bmx6json.lua file is part of the process, but it often returns nil, even if
the remote data can actually be fetched, in what seems to be a race condition.
By calling the sys.exec("") function empty, the race condition disappears.
Dirty fix to https://github.com/openwrt-routing/packages/issues/436.
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Pau [Sat, 8 Dec 2018 21:26:04 +0000 (22:26 +0100)]
Merge pull request #435 from rogerpueyo/bmx6-graph-tunnels
luci-app-bmx6: Fix corner case in bmx6-info?tunnels
Roger Pueyo Centelles [Sat, 8 Dec 2018 21:20:42 +0000 (22:20 +0100)]
luci-app-bmx6: Fix corner case in bmx6-info?tunnels
The bmx6-info script will return null when no tunnels are known to BMX6.
However, the "Graph" and the "Tunnels" pages expect a JSON structure with an
array of tunnels. In case no tunnels are known to BMX6, bmx6-info now returns
'{ "tunnels" : [] }'.
Fixes #434
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Pau [Sat, 8 Dec 2018 21:12:52 +0000 (22:12 +0100)]
Merge pull request #433 from rogerpueyo/bmx6-graph
luci-app-bmx6: Fix URL of network topology JSON file
Roger Pueyo Centelles [Sat, 8 Dec 2018 21:02:48 +0000 (22:02 +0100)]
luci-app-bmx6: Fix URL of network topology JSON file
The JavaScript code of the network graph tried to fetch the topology from
%HOST/cgi-bin/luci/status/bmx6/topology, but the topology entry is now located
at admin->network->BMX6 (i.e., %HOST/cgi-bin/luci/admin/network/BMX6/topology).
Fixes #432
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
p4u [Fri, 7 Dec 2018 18:15:16 +0000 (19:15 +0100)]
Merge branch 'p4u/luci-app-bmx7/refactory'