Commit Graph

1531 Commits

Author SHA1 Message Date
Simon Wunderlich 571b0b5672
Merge pull request #451 from ecsv/batadv-2019.0
batman-adv: finish config batctl usage & drop unused compat code
2019-03-07 16:56:37 +01:00
Sven Eckelmann 5882b6049d 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>
2019-02-22 22:49:56 +01:00
Sven Eckelmann 278e98cb86 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>
2019-02-22 22:49:56 +01:00
Sven Eckelmann 7d973599ef 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>
2019-02-22 22:46:21 +01:00
Sven Eckelmann ad27ee7f9a 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>
2019-02-22 20:40:11 +01:00
Sven Eckelmann fc37a1aa4d 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>
2019-02-22 20:38:35 +01:00
Sven Eckelmann df9d2719fa 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>
2019-02-22 20:37:54 +01:00
Sven Eckelmann ae9c14e8b0 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>
2019-02-22 20:35:39 +01:00
Sven Eckelmann 3f0a7c4880 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>
2019-02-22 20:24:40 +01:00
Sven Eckelmann 89bc1bc1a1 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>
2019-02-22 20:22:22 +01:00
Sven Eckelmann 502d1232f7 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>
2019-02-22 20:19:42 +01:00
Sven Eckelmann 203ee34d9c 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>
2019-02-22 20:04:35 +01:00
Simon Wunderlich 34e4913b57
Merge pull request #448 from SvenRoederer/patch-1
batctl: fix wrong binary-name for batctl-default
2019-02-22 19:30:34 +01:00
Axel Neumann 2d31531737
Merge pull request #450 from dangowrt/bmx7-2018122901
bmx7: update to git snapshot as of 2018-12-29: Use MbedTLS 2.8.0
2019-02-21 09:10:03 +01:00
Daniel Golle 25916fb99f 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>
2019-02-20 14:06:56 +01:00
Sven Roederer e29142379e
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>
2019-02-18 22:40:24 +01:00
Simon Wunderlich 6e8cf7689e
Merge pull request #446 from ecsv/batadv-2019.0
batman-adv 2019.0
2019-02-04 10:12:51 +01:00
Sven Eckelmann e6fc697d41 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>
2019-02-02 14:04:09 +01:00
Sven Eckelmann 5d3a71f342 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>
2019-02-02 14:04:09 +01:00
Sven Eckelmann 0ba9fa2ba7 alfred: upgrade package to latest release 2019.0
* (no changes)

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-02 14:04:09 +01:00
Moritz Warning 13a4dad69a
Merge pull request #445 from diizzyy/patch-1
nodogsplash: libmicrohttpd-no-ssl -> libmicrohttpd
2019-01-31 19:08:51 +01:00
Daniel Engberg be91e9d6dc
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>
2019-01-31 15:50:56 +01:00
Jo-Philipp Wich f796748997
Merge pull request #444 from dedeckeh/pr_nat46
nat46: drop from repo
2019-01-27 18:26:25 +01:00
Hans Dedecker bc431ae65f nat46: drop from repo
Move nat46 and 464xlat to OpenWrt base repo

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
2019-01-27 16:04:09 +01:00
Sven Eckelmann 498463cd59 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>
2019-01-27 15:31:37 +01:00
Sven Eckelmann 1299868252 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>
2019-01-27 15:07:57 +01:00
Pau 29d4160f4b
Merge pull request #437 from rogerpueyo/luci-app-bmx6-graph-sys-exec
luci-app-bmx6: Avoid race condition in bmx6json.lua get()
2019-01-11 09:52:46 +01:00
Moritz Warning f438333a6a
Merge pull request #438 from cotequeiroz/hnetd_openssl-1.1
hnetd: add compatiblity with openssl 1.1.x
2019-01-11 01:17:10 +01:00
p4u fce1287bd7 luci-app-bmx7: show mDNS menu if available
Signed-off-by: p4u <p4u@dabax.net>
2019-01-10 20:30:01 +01:00
Eneas U de Queiroz 2c9f89cc76 hnetd: add compatiblity with openssl 1.1.x
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-12-13 11:21:08 -02:00
Roger Pueyo Centelles 6c63383f0d 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>
2018-12-09 21:06:18 +01:00
Pau a7c447903c
Merge pull request #435 from rogerpueyo/bmx6-graph-tunnels
luci-app-bmx6: Fix corner case in bmx6-info?tunnels
2018-12-08 22:26:04 +01:00
Roger Pueyo Centelles 2cc3c50bed 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>
2018-12-08 22:20:42 +01:00
Pau 9bc518e8c8
Merge pull request #433 from rogerpueyo/bmx6-graph
luci-app-bmx6: Fix URL of network topology JSON file
2018-12-08 22:12:52 +01:00
Roger Pueyo Centelles b6815d5942 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>
2018-12-08 22:02:48 +01:00
p4u 940d621757 Merge branch 'p4u/luci-app-bmx7/refactory' 2018-12-07 19:15:16 +01:00
Pau 3264d15492
Merge pull request #431 from rogerpueyo/p4u/luci-app-bmx7/refactory
Fix bmx7-info indentation and "$info" call
2018-12-07 18:44:19 +01:00
Roger Pueyo Centelles 3e259f8ec5 luci-app-bmx7: fix bmx7-info script's "$info" call
This commit fixes a bug in bmx7-info script's "$info" call when no
interfaces are being used by BMX7, or when no links have been
established. In those cases, the generated JSON output struct contained
extra commas, which made it invalid.

Closes #430

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
2018-12-07 18:04:10 +01:00
Roger Pueyo Centelles a7d7f4baa8 luci-app-bmx7: fix bmx7-info script's indentation
Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
2018-12-07 17:47:22 +01:00
p4u 9345df949e luci-app-bmx7: update version, dependencies and maintainer
Signed-off-by: p4u <p4u@dabax.net>
2018-12-07 16:55:11 +01:00
Simon Wunderlich a31ebca77e
Merge pull request #429 from ecsv/batadv-2018.4
batctl: Fix parsing of optional debug table command parameters
2018-12-07 09:52:46 +01:00
p4u a1e102093f luci-app-bmx7: refactory, multiple fixes and add topology graph
Signed-off-by: p4u <p4u@dabax.net>
2018-12-06 12:17:49 +01:00
Sven Eckelmann db1869971d batctl: Fix parsing of optional debug table command parameters
The commands which should have no support for -t/-u/-m/-i were allowed to
accept these parameters but commands which should have accepted them were
denying them.

Fixes: 8936141bf0 ("batctl: upgrade package to latest release 2018.4")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-12-06 09:21:15 +01:00
Simon Wunderlich 3d97690ba3
Merge pull request #427 from ecsv/batadv-2018.4
batman-adv 2018.4
2018-11-15 10:12:33 +01:00
Sven Eckelmann 4167ad2c62 batman-adv: upgrade package to latest release 2018.4
* support latest kernels (3.16 - 4.20)
* coding style cleanups and refactoring
* improve tx performance by avoiding unnecessary locking
* add help messages regarding deprecation of debugfs files
* support for debug message tracepoints
* explicit ELP padding to allow TVLVs in the future
* bugs squashed:

  - fix skb_over_panic for merged fragments with small tailroom

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-11-14 21:50:38 +01:00
Sven Eckelmann 8936141bf0 batctl: upgrade package to latest release 2018.4
* coding style cleanups and refactoring
* correction of manpage spelling errors
* new subcommand "event" to receive netlink notifications
* infrastructure to disable commands during build time
* drop of the legacy vis subcommands

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-11-14 21:50:38 +01:00
Sven Eckelmann 3528a5df09 alfred: upgrade package to latest release 2018.4
* bugs squashed:

  - fixed detection of own IPv4 packets
  - use manual IPv4 ARP requests to retrieve MAC of neighbors

Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-11-14 21:50:38 +01:00
zorun 2681019264
Merge pull request #426 from robimarko/babeld-1.8.4
babeld: Update to version 1.8.4
2018-11-11 10:11:29 +01:00
Robert Marko 6151c44f22
babeld: Update to version 1.8.4
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.

Signed-off-by: Robert Marko <robimarko@gmail.com>
2018-11-11 00:34:59 +01:00
Sven Eckelmann 9bc898b8f4 batman-adv: Re-add kmod-lib-crc16 back to dependency line
The OpenWrt dependency builder cannot extract the crc16 dependency from
the KMOD_BATMAN_ADV_BLA dependencies. They have to be specified directly in
the OpenWrt Makefile's DEPENDS line to avoid error when BLA is enabled:

  Package kmod-batman-adv is missing dependencies for the following libraries:
  crc16.ko

Reported-by: Lech Perczak <lech.perczak@gmail.com>
Fixes: 0db66160aa ("batman-adv: Sync config options with kernel Kconfig")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
2018-10-22 12:34:32 +02:00