Commit Graph

1312 Commits

Author SHA1 Message Date
Josef Schlehofer 9fa2b249cc [OpenWrt 18.06] bird: Update to version 1.6.8 (security fix) (#539)
* bird: Bump to v1.6.7

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
(cherry-picked from commit 559619d9d9)

* bird: Update to version 1.6.8

Fixes CVE-2019-16159

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

Co-authored-by: Toke Høiland-Jørgensen <toke@toke.dk>
2020-01-01 17:33:24 +01:00
Simon Wunderlich b3125f0d4c
Merge pull request #537 from ecsv/batadv-for-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2019.5
2019-12-14 16:59:15 +01:00
Sven Eckelmann 0d22982f30 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:11:22 +01:00
Josef Schlehofer 3610d114f9 pimbd: update to current git HEAD (#534)
Allow compilation with gcc 7.3.0.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from commit c299f8bcea)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-12-08 15:38:03 +01:00
Simon Wunderlich c52779c05a
Merge pull request #520 from ecsv/batadv-for-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2019.4
2019-10-26 10:30:47 +02:00
Sven Eckelmann ee3264b6aa 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:41:19 +02:00
zorun 049cb8a4c4
Merge pull request #511 from adrianschmutzler/babeld1806
[18.06] babeld: Update to version 1.8.5
2019-09-04 00:34:51 +02:00
Adrian Schmutzler e80f582b2b babeld: Update to version 1.8.5
This updates babeld to the latest release from the
babeld-1.8-branch, which introduces mostly fixes:

22 July 2019: babeld-1.8.5

  * 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).

9 November 2018: babeld-1.8.4

  * Fixed a bug that discarded pipelined commands received on the local
    configuration interface.
  * Added the per-interface option rfc6126-compatible.

24 September 2018: babeld-1.8.3

  * Fixed a read-only two byte buffer overflow in the packet parser.
    This is a read-only overflow, and hence most probably not exploitable.
  * Fixed an issue with creating unreachable routes on recent kernels
    (4.16 and up).  Thanks to Christof Schulze.
  * Notice interface changes faster by listening to more netlink events.
    Thanks to Christof Schulze.
  * Fixed a local interface issue when an interface has no link-local
    address.  Thanks to Christof Schulze.

During the last months, "babeld-1.8.5" has shown superior stability
compared to earlier versions in my tests.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2019-09-03 11:47:43 +02:00
Rob White 6e50f8b998 nodogsplash: Backport Version 4.0.1. (#493)
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:20:15 +02:00
Rob White a55193512f nodogsplash: Backport of Version 4.0.0. (#486)
This version has numerous fixes and enhancements.
It is compatible with the previous v3.2.1 release and onwards.

Maintainer: Moritz Warning <moritzwarning@web.de>

Signed-off-by: Rob White <rob@blue-wave.net>
2019-07-25 13:32:53 +02:00
Jo-Philipp Wich bb156bf355
Merge pull request #455 from BKPepe/bird-openwrt18.06
[OpenWrt 18.06] bird: update to version 1.6.6
2019-06-26 19:24:35 +02:00
Simon Wunderlich 7589804a56
Merge pull request #474 from ecsv/batadv-for-18.06
openwrt-18.06: batman-adv: Fix duplicated OGMs on NETDEV_UP
2019-06-02 22:41:16 +02:00
Sven Eckelmann c07326c3ba 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:07:39 +02:00
Simon Wunderlich cad1fba86f
Merge pull request #469 from ecsv/batadv-for-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2019.2
2019-05-24 09:45:38 +02:00
Sven Eckelmann 145ba7f46a batman-adv: Merge bugfixes from 2019.2
* mcast: fix multicast tt/tvlv worker locking
* fix for leaked TVLV handler

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-05-23 19:53:52 +02:00
Sven Eckelmann 40b75193bc batman-adv: Reorder patches
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-05-23 19:08:04 +02:00
Simon Wunderlich e5fe4b63e8
Merge pull request #462 from ecsv/batadv-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2019.1
2019-03-29 13:33:01 +01:00
Sven Eckelmann ee2d981d00 batman-adv: Merge bugfixes from 2019.1
* fix uninit-value in batadv_interface_tx()
* Reduce claim hash refcnt only for removed entry
* Reduce tt_local hash refcnt only for removed entry
* Reduce tt_global hash refcnt only for removed entry

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-03-28 20:39:10 +01:00
Moritz Warning 4d7a182ef3 nodogsplash: fix invalid pointer bug when clock is turned back (#456)
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2019-03-14 18:31:33 +01:00
Josef Schlehofer d3f317b4ed
bird: update to version 1.6.6
Signed-off-by: Josef Schlehofer <josef.schlehofer@nic.cz>
2019-03-13 12:29:51 +01:00
Axel Neumann 2ad165c954
Merge pull request #452 from dangowrt/openwrt-18.06
bmx7: update to git snapshot as of 2018-12-29
2019-03-05 00:52:11 +01:00
Daniel Golle 71f9aae5e4 luci-app-bmx7: update to v0.1-alpha
consolidated commits from master branch:
 fce1287 luci-app-bmx7: show mDNS menu if available
 3e259f8 luci-app-bmx7: fix bmx7-info script's "$info" call
 a7d7f4b luci-app-bmx7: fix bmx7-info script's indentation
 9345df9 luci-app-bmx7: update version, dependencies and maintainer
 a1e1020 luci-app-bmx7: refactory, multiple fixes and add topology graph

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-02 22:34:57 +01:00
Daniel Golle 0e3d70176c bmx7: update to git snapshot as of 2018-12-29
consolidated commits from master branch:
 25916fb bmx7: update to git snapshot as of 2018-12-29
(dfe8097 bmx7: Avoid namespace collision with libubox.)
(43449bc treewide: Basic cleanup and alignment to package guidelines (#383))
 440ad46 bmx7: add config trigger

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-02 22:34:57 +01:00
Sven Eckelmann 42af8350c1 batman-adv: Refresh patches
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-11 11:24:47 +01:00
Simon Wunderlich ea345d16a6
Merge pull request #442 from ecsv/batadv-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2019.0
2019-01-16 10:00:25 +01:00
Sven Eckelmann 02313085ea batman-adv: Merge bugfixes from 2019.0
* Avoid WARN on net_device without parent in netns
* Force mac header to start of data on xmit

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-01-16 09:45:07 +01:00
Simon Wunderlich bc6e7f6903
Merge pull request #425 from ecsv/batadv-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2018.4
2018-11-08 11:38:58 +01:00
Sven Eckelmann c00a1bfbbf alfred: Merge bugfixes from 2018.4
* Fix detection of own packets for IPv4 mode
* Request MAC resolution for IPv4 address not in ARP cache

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-11-08 00:18:54 +01:00
Sven Eckelmann 7bf62cc8b5 batman-adv: Merge bugfixes from 2018.4
* Use explicit tvlv padding for ELP packets
* Expand merged fragment buffer for full packet

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-11-08 00:10:24 +01:00
Simon Wunderlich d1cf6d1949
Merge pull request #422 from ecsv/batadv-18.06
openwrt-18.06: batman-adv package fixes
2018-10-18 15:01:58 +02:00
Sven Eckelmann 121c92d669 batctl: Don't overwrite default PKG_BUILD_DIR
There is no benefit to overwrite the PKG_BUILD_DIR directory for batctl. As
seen with kmod-batman-adv, it actually can also break the build.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 95e56cf644 alfred: Add openwrt revision to internal version
OpenWrt is using a modified version of the software and these modifications
may introduce extra bugs (or behavior changes). It is also patched for
stable releases instead of switching to new releases. The revision should
therefore be added to the version number to make it easier understandable
which modified version the user may have installed.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 93cce266fe batctl: Add openwrt revision to internal version
OpenWrt is using a modified version of the software and these modifications
may introduce extra bugs (or behavior changes). It is also patched for
stable releases instead of switching to new releases. The revision should
therefore be added to the version number to make it easier understandable
which modified version the user may have installed.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 1a83b56d47 batman-adv: Add openwrt revision to internal version
OpenWrt is using a modified version of the software and these modifications
may introduce extra bugs (or behavior changes). It is also patched for
stable releases instead of switching to new releases. The revision should
therefore be added to the version number to make it easier understandable
which modified version the user may have installed.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 1ba424a4d0 batman-adv: Load module with AutoProbe
cfg80211 is loaded by kmodloader after the modules with a priority
(AutoLoad) are loaded. batman-adv should therefore also be loaded at that
time and must not load cfg80211 itself. The information in the ELF header
are enough for kmodloader to load these two modules in the correct order.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann b9656fb31e batman-adv: Fix search for cfg80211 module symbols
The Module.symvers with the exported symbols of all other kernel modules in
OpenWrt is usually placed in the main source directory of the package. But
the actual sources for batman-adv are found in net/batman-adv. OpenWrt must
therefore be informed to move it to this subdirectory or otherwise modpost
will fail to find the symbols

  WARNING: "cfg80211_get_station" [.../batman-adv-2018.1/net/batman-adv/batman-adv.ko] undefined!

The dependency will then be missing in the .modinfo depends= option and
thus it the kernel module loader will not correctly load the cfg80211.ko
during bootup.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 059d7266a9 batman-adv: Remove unused option "interfaces" in config
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann 3d5c2d06b6 batman-adv: Add DEBUG_LOG -> DEBUGFS dependency
The debug log is only available when the debugfs is also enabled. This
must be reflected in Kconfig to avoid incompatible selection of batman-adv
options.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 16:04:31 +02:00
Sven Eckelmann a9a4b04b98 batman-adv: Rebuild automatically on mac80211 changes
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-14 15:31:24 +02:00
Moritz Warning 8b760071d1 nodogsplash: fix download hash
The tagging of the release was wrong, as a result, the hash of the downloaded files is different from the usual download package.
The content has been verified to be the same.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
2018-09-28 15:32:43 +02:00
Moritz Warning ebc5874d9c
Merge pull request #417 from bluewavenet/openwrt-18.06
nodogsplash: Backport v3.2.1 to OpenWrt 18.06
2018-09-27 18:37:13 +02:00
Rob White f68a998fb2 nodogsplash: Backport v3.2.1 to OpenWrt 18.06
This release provides bugfixes and some minor enhancements:

  * reset upload/download counter when a client has been authenticated a second time [mwarning]
  * print sesssion duration as 0 in "ndsctl json" and "ndsctl clients" output when a session has not been started [mwarning]
  * rework html templater to speed up splash page generation [mwarning]
  * FAS documentation updates [bluewavenet]
  * Add CSS file and update splash and status html [bluewavenet]

Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-27 14:51:23 +01:00
Simon Wunderlich 2e21588922
Merge pull request #414 from ecsv/batadv-18.06
openwrt-18.06: batman-adv: Merge bugfixes from 2018.3
2018-09-17 10:55:06 +02:00
Moritz Warning 3785b5552f
Merge pull request #411 from bluewavenet/openwrt-18.06
nodogsplash: add missing config options
2018-09-15 12:14:59 +02:00
Sven Eckelmann ddef3900a4 batman-adv: Merge bugfixes from 2018.3
* Avoid probe ELP information leak
* Fix segfault when writing to throughput_override
* Fix segfault when writing to sysfs elp_interval
* fix backbone_gw refcount on queue_work() failure
* fix hardif_neigh refcount on queue_work() failure
* Prevent duplicated gateway_node entry
* Prevent duplicated nc_node entry
* Prevent duplicated softif_vlan entry
* Prevent duplicated global TT entry
* Prevent duplicated tvlv handler

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-09-15 11:19:36 +02:00
Rob White ed5d97c2ce nodogsplash: add missing config options
sessiontimeout (minutes) until client is forced out
checkinterval (seconds) interval at which nodogsplash checks client timeout status

Add real world useful values to timeout options.

Signed-off-by: Rob White rob@blue-wave.net
2018-09-15 10:02:54 +01:00
Moritz Warning b0e37f285f
Merge pull request #409 from wfleurant/backport-fix-luci-cjdns
backport: luci-app-cjdns: luci admin support for cjdns-v20.2 (#394)
2018-09-11 11:22:04 +02:00
William Fleurant 85775e956c
luci-app-cjdns: luci admin support for cjdns-v20.2 (#394)
* luci-app-cjdns: luci admin support for cjdns-v20.2

* adds layer 2 and 3 address display column
* fixes switch label pinger
* get version from addr string
* parse addr string for peerStats publicKey

Signed-off-by: William Fleurant <william@netblazr.com>

* luci-app-cjdns: bump release, update repo-url and license year

Signed-off-by: William Fleurant <william@netblazr.com>

* luci-app-cjdns: support views for 17.01 and 18.06
- fixed user/name column
- removed latency column
- combind peerstats functions
- fix css on overview page
- table displays with `cbi_update_table` with fallback
- columns ordered similar to peerStats.js output
- normalized XHR polling to mimic wireless.htm by jow@openwrt

Signed-off-by: William Fleurant <william@netblazr.com>

Signed-off-by: William Fleurant <william@netblazr.com>
2018-09-10 03:08:29 +00:00
Moritz Warning 59e815882d
Merge pull request #407 from bluewavenet/openwrt-18.06
nodogsplash: Backport v3.2.0 to Openwrt 18.06
2018-09-05 14:23:59 +02:00
Rob White 883dec4212 nodogsplash: Backport v3.2.0
Signed-off-by: Rob White <rob@blue-wave.net>
2018-09-04 17:15:48 +01:00