Commit Graph

1504 Commits

Author SHA1 Message Date
Simon Wunderlich ad79a0f065
Merge pull request #584 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2020.1
2020-07-07 09:20:00 +02:00
Sven Eckelmann 4c05fe97d9 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>
2020-07-06 20:08:55 +02:00
Sven Eckelmann 822b55ff7d 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>
2020-07-06 20:04:33 +02:00
Alexander Couzens 3f8571194c nodogsplash: update to 4.0.3
Fix a traversal path attack.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2020-05-06 13:24:58 +02:00
Simon Wunderlich 9b42e24a54
Merge pull request #563 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2020.1
2020-04-27 10:25:41 +02:00
Sven Eckelmann 5dd2f44a5b 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>
2020-04-24 21:06:04 +02:00
Sven Eckelmann 8b25c90ed6 batctl: Merge bugfixes from 2020.1
* Return EXIT_FAILURE when throughputmeter failed

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2020-04-24 20:46:29 +02:00
Sven Eckelmann 094e9b0f94 batctl: Fix upstream reference in backported patch
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2020-04-24 20:46:00 +02:00
zorun 20b98f094e
Merge pull request #560 from fblaese/babeld
[19.07] babeld: Update to version 1.9.2
2020-04-22 14:32:50 +02:00
Fabian Bläse bd25cae2c4 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>
2020-04-22 14:08:05 +02:00
Moritz Warning 9f21b212ef
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
2020-04-02 20:54:16 +02:00
Yuxiang Zhu dc81e506ca
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
2020-03-28 21:55:55 +01:00
Toke Høiland-Jørgensen 6e51cca4ea
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>
2020-03-28 21:53:54 +01:00
Josef Schlehofer 3a800853d6
bird2: Update to version 2.0.6
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-03-28 21:53:49 +01:00
Toke Høiland-Jørgensen 38f2ed9466
bird2: Bump to v2.0.5
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2020-03-28 21:53:33 +01:00
Simon Wunderlich b8fd8c8b9f
Merge pull request #554 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2020.0
2020-03-10 17:08:52 +01:00
Sven Eckelmann 18a724e154 batman-adv: Merge bugfixes from 2020.0
* Don't schedule OGM for disabled interface

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2020-03-06 20:51:17 +01:00
Pedro hates github.com efa6e5445a luci-app-bmx6: bugfix querying bmx6-info (p2)
see 51b370e1ce and #550
2020-02-26 15:21:25 +01:00
pedrolab f1b0476edc 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 b92f82ad1f)
2020-02-21 12:55:11 +01:00
Josef Schlehofer 839ea37939 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>
2020-01-27 23:58:39 +01:00
Simon Wunderlich c82ce8d095
Merge pull request #536 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2019.5
2019-12-14 16:59:11 +01:00
Sven Eckelmann 242185e386 batman-adv: Merge bugfixes from 2019.5
* fix DAT candidate selection on little endian systems

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-12-13 22:16:19 +01:00
Simon Wunderlich 8d5ee29f08
Merge pull request #519 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2019.4
2019-10-26 10:30:30 +02:00
Sven Eckelmann a2f2a13386 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>
2019-10-25 22:25:10 +02:00
zorun 931f947dd6
Merge pull request #505 from zorun/babeld-1.9-openwrt-19.07
[openwrt-19.07] babeld: Update to 1.9.1 and assorted fixes
2019-08-26 21:06:38 +02:00
Baptiste Jonglez 56878ac500 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>
2019-08-26 20:54:56 +02:00
Baptiste Jonglez e53bb5eed6 babeld: Update description in Makefile and fix license path
Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
2019-08-26 19:31:54 +02:00
Adrian Schmutzler 774b7c60d7 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>
2019-08-26 19:31:50 +02:00
Adrian Schmutzler 953cd03492 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>
2019-08-26 19:31:46 +02:00
Adrian Schmutzler e0787e950d 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>
2019-08-26 19:31:43 +02:00
Baptiste Jonglez e0b319cb9f 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 bab933d4ca ("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>
2019-08-26 19:29:08 +02:00
Simon Wunderlich 66c20292c6
Merge pull request #498 from ecsv/batadv-for-19.07
batman-adv: Readd Linux 4.19.x compat patches
2019-08-04 13:33:29 +02:00
Sven Eckelmann b04d24313d 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: a93e68447a ("alfred: Merge bugfixes from 2019.3")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-08-04 08:16:01 +02:00
Simon Wunderlich 784ae0e42d
Merge pull request #496 from ecsv/batadv-for-19.07
openwrt-19.07: batman-adv: Merge bugfixes from 2019.3
2019-08-02 09:53:13 +02:00
Sven Eckelmann 9d559fdae9 batman-adv: Merge bugfixes from 2019.3
* Fix netlink dumping of all mcast_flags buckets

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-08-01 19:47:11 +02:00
Sven Eckelmann d65d6f1ea3 batctl: Merge bugfixes from 2019.3
* Prefer netlink hardif status retrieval over sysfs

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-08-01 19:47:11 +02:00
Sven Eckelmann 6ea9e9b093 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>
2019-08-01 19:47:11 +02:00
Sven Eckelmann a93e68447a 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>
2019-08-01 19:47:11 +02:00
Rob White 830440d25a 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>
2019-07-30 16:21:40 +02:00
Toke Høiland-Jørgensen bef6617141 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 37f8c509e0)
2019-06-26 19:28:58 +02:00
Josef Schlehofer 18ec6d717b bird1: update to version 1.6.6
Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
(cherry picked from commit 6141d5d182)
2019-06-26 19:24:56 +02:00
Simon Wunderlich e8799fb2ad
Merge pull request #478 from ecsv/batadv-for-19.07
batman-adv: Add support for B.A.T.M.A.N. V hardif settings
2019-06-16 11:27:08 +02:00
Sven Eckelmann e87a25f408 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: f5205d7d24 ("batman-adv: upgrade package to latest release 2014.2.0")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-06-16 09:29:42 +02:00
Sven Eckelmann 67875e2069 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>
2019-06-15 09:53:55 +02:00
Sven Eckelmann eeea3e980e 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>
2019-06-15 09:18:51 +02:00
Simon Wunderlich 35b886649b
Merge pull request #475 from ecsv/batadv-2019.2
batman-adv: Fix duplicated OGMs on NETDEV_UP
2019-06-02 22:41:20 +02:00
Sven Eckelmann e26096ae1d 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: 549909f89d ("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>
2019-06-02 14:08:16 +02:00
elektra42 bf475d6493
Merge pull request #472 from yogo1212/batmand_whitespace
batmand: whitespace
2019-05-27 09:04:38 +02:00
Leon M. George fdc37cac29 batmand: match loop format 2019-05-25 08:42:53 +02:00
Leon M. George c514a2a49c batmand: fix whitespace 2019-05-25 08:42:42 +02:00