feed/routing.git
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 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>
5 years agobatman-adv: Drop cfg80211_get_station memset workaround
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>
5 years agobatman-adv: Drop compat-hack for __poll_t
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>
5 years agobatman-adv: Drop compat-hack for from_timer
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>
5 years agobatman-adv: Drop compat-hack for skb_put*
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>
5 years agobatman-adv: Drop compat-hack for nla_put_u64_64bit
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>
5 years agobatman-adv: Drop compat-hack for netif_trans_update
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>
5 years agobatman-adv: Drop redefinition of NL80211_STA_INFO_EXPECTED_THROUGHPUT
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>
5 years agobatman-adv: Drop unused compat-hacks.patch
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>
5 years agoMerge pull request #448 from SvenRoederer/patch-1
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

5 years agoMerge pull request #450 from dangowrt/bmx7-2018122901
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

5 years agobmx7: update to git snapshot as of 2018-12-29 450/head
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>
5 years agobatctl: fix wrong binary-name for batctl-default 448/head
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>
5 years agoMerge pull request #446 from ecsv/batadv-2019.0
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

5 years agobatman-adv: upgrade package to latest release 2019.0 446/head
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>
5 years agobatctl: upgrade package to latest release 2019.0
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>
5 years agoalfred: upgrade package to latest release 2019.0
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>
5 years agoMerge pull request #445 from diizzyy/patch-1
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

5 years agonodogsplash: libmicrohttpd-no-ssl -> libmicrohttpd 445/head
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>
5 years agoMerge pull request #444 from dedeckeh/pr_nat46
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

5 years agonat46: drop from repo 444/head
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>
5 years agobatman-adv: use batctl for configuration
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>
5 years agobatctl: Provide different variants
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>
5 years agoMerge pull request #437 from rogerpueyo/luci-app-bmx6-graph-sys-exec
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()

5 years agoMerge pull request #438 from cotequeiroz/hnetd_openssl-1.1
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

5 years agoluci-app-bmx7: show mDNS menu if available
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>
5 years agohnetd: add compatiblity with openssl 1.1.x 438/head
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>
5 years agoluci-app-bmx6: Avoid race condition in bmx6json.lua get() 437/head
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>
5 years agoMerge pull request #435 from rogerpueyo/bmx6-graph-tunnels
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

5 years agoluci-app-bmx6: Fix corner case in bmx6-info?tunnels 435/head
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>
5 years agoMerge pull request #433 from rogerpueyo/bmx6-graph
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

5 years agoluci-app-bmx6: Fix URL of network topology JSON file 433/head
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>
5 years agoMerge branch 'p4u/luci-app-bmx7/refactory'
p4u [Fri, 7 Dec 2018 18:15:16 +0000 (19:15 +0100)]
Merge branch 'p4u/luci-app-bmx7/refactory'

5 years agoMerge pull request #431 from rogerpueyo/p4u/luci-app-bmx7/refactory
Pau [Fri, 7 Dec 2018 17:44:19 +0000 (18:44 +0100)]
Merge pull request #431 from rogerpueyo/p4u/luci-app-bmx7/refactory

Fix bmx7-info indentation and "$info" call

5 years agoluci-app-bmx7: fix bmx7-info script's "$info" call 431/head
Roger Pueyo Centelles [Fri, 7 Dec 2018 17:04:10 +0000 (18:04 +0100)]
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>
5 years agoluci-app-bmx7: fix bmx7-info script's indentation
Roger Pueyo Centelles [Fri, 7 Dec 2018 16:47:22 +0000 (17:47 +0100)]
luci-app-bmx7: fix bmx7-info script's indentation

Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
5 years agoluci-app-bmx7: update version, dependencies and maintainer
p4u [Thu, 6 Dec 2018 11:25:51 +0000 (12:25 +0100)]
luci-app-bmx7: update version, dependencies and maintainer

Signed-off-by: p4u <p4u@dabax.net>
5 years agoMerge pull request #429 from ecsv/batadv-2018.4
Simon Wunderlich [Fri, 7 Dec 2018 08:52:46 +0000 (09:52 +0100)]
Merge pull request #429 from ecsv/batadv-2018.4

batctl: Fix parsing of optional debug table command parameters

5 years agoluci-app-bmx7: refactory, multiple fixes and add topology graph
p4u [Thu, 6 Dec 2018 11:17:49 +0000 (12:17 +0100)]
luci-app-bmx7: refactory, multiple fixes and add topology graph

Signed-off-by: p4u <p4u@dabax.net>
5 years agobatctl: Fix parsing of optional debug table command parameters 429/head
Sven Eckelmann [Thu, 6 Dec 2018 08:21:15 +0000 (09:21 +0100)]
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: 8936141bf038 ("batctl: upgrade package to latest release 2018.4")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
5 years agoMerge pull request #427 from ecsv/batadv-2018.4
Simon Wunderlich [Thu, 15 Nov 2018 09:12:33 +0000 (10:12 +0100)]
Merge pull request #427 from ecsv/batadv-2018.4

batman-adv 2018.4

5 years agobatman-adv: upgrade package to latest release 2018.4 427/head
Sven Eckelmann [Tue, 6 Nov 2018 09:49:18 +0000 (10:49 +0100)]
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>
5 years agobatctl: upgrade package to latest release 2018.4
Sven Eckelmann [Wed, 14 Nov 2018 20:49:25 +0000 (21:49 +0100)]
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>
5 years agoalfred: upgrade package to latest release 2018.4
Sven Eckelmann [Wed, 14 Nov 2018 20:50:02 +0000 (21:50 +0100)]
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>
5 years agoMerge pull request #426 from robimarko/babeld-1.8.4
zorun [Sun, 11 Nov 2018 09:11:29 +0000 (10:11 +0100)]
Merge pull request #426 from robimarko/babeld-1.8.4

babeld: Update to version 1.8.4

5 years agobabeld: Update to version 1.8.4 426/head
Robert Marko [Sat, 10 Nov 2018 23:34:59 +0000 (00:34 +0100)]
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>
6 years agobatman-adv: Re-add kmod-lib-crc16 back to dependency line
Sven Eckelmann [Mon, 22 Oct 2018 10:24:10 +0000 (12:24 +0200)]
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: 0db66160aaab ("batman-adv: Sync config options with kernel Kconfig")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agoMerge pull request #421 from ecsv/batadv-2018.3
Simon Wunderlich [Thu, 18 Oct 2018 13:01:53 +0000 (15:01 +0200)]
Merge pull request #421 from ecsv/batadv-2018.3

batman-adv: Cleanup of configuration options

6 years agobatman-adv: Remove unused dependency kmod-crypto-crc32c 421/head
Sven Eckelmann [Sun, 14 Oct 2018 15:37:29 +0000 (17:37 +0200)]
batman-adv: Remove unused dependency kmod-crypto-crc32c

The translation table code from batman-adv is only using the function
crc32c which is part of kmod-lib-crc32c. The kmod-crypto-crc32c is then
only used by kmod-lib-crc32c but not batman-adv.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatman-adv: Use the kernel style Kconfig symbols
Sven Eckelmann [Sun, 14 Oct 2018 14:40:43 +0000 (16:40 +0200)]
batman-adv: Use the kernel style Kconfig symbols

Kernel modules like ath9k and ath10k are using the same Kconfig option
symbols as used in the kernel. This makes it easier to share them between
these two projects. A similar approach should be used for the batman-adv
module.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatman-adv: Sync config options with kernel Kconfig
Sven Eckelmann [Sun, 14 Oct 2018 14:24:20 +0000 (16:24 +0200)]
batman-adv: Sync config options with kernel Kconfig

The kernel already provides all available kernel options for batman-adv and
even includes more verbose descriptions of each option. Importing this
Kconfig (with minor adjustments) file as Config.in allows to share most
information between kernel and OpenWrt.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatman-adv: Disable MCAST during compilation
Sven Eckelmann [Sun, 14 Oct 2018 14:58:01 +0000 (16:58 +0200)]
batman-adv: Disable MCAST during compilation

The multicast optimization compile option is disabled by default in the
Kconfig of batman-adv. The out-of-tree module should keep this setting in
sync and thus has to also disable the build of multicast optimization by
default.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatman-adv: Order Kconfig config symbols like kernel
Sven Eckelmann [Sun, 14 Oct 2018 14:50:23 +0000 (16:50 +0200)]
batman-adv: Order Kconfig config symbols like kernel

The options in the kernel Kconfig have a different order than the one in
the OptionWrt Config.in. This makes it unnecessary hard to compare these
two files.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatman-adv: Add DEBUG_LOG -> DEBUGFS dependency
Sven Eckelmann [Sun, 14 Oct 2018 14:01:46 +0000 (16:01 +0200)]
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>
6 years agoMerge pull request #420 from ecsv/batadv-2018.3
Simon Wunderlich [Thu, 11 Oct 2018 08:34:05 +0000 (10:34 +0200)]
Merge pull request #420 from ecsv/batadv-2018.3

batman-adv package fixes

6 years agobatctl: Don't overwrite default PKG_BUILD_DIR 420/head
Sven Eckelmann [Sun, 7 Oct 2018 14:11:48 +0000 (16:11 +0200)]
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>
6 years agoalfred: Add openwrt revision to internal version
Sven Eckelmann [Sun, 7 Oct 2018 09:10:05 +0000 (11:10 +0200)]
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>
6 years agobatctl: Add openwrt revision to internal version
Sven Eckelmann [Sun, 7 Oct 2018 09:10:05 +0000 (11:10 +0200)]
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>
6 years agobatman-adv: Add openwrt revision to internal version
Sven Eckelmann [Sun, 7 Oct 2018 09:10:05 +0000 (11:10 +0200)]
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>
6 years agobatman-adv: Fix search for cfg80211 module symbols
Sven Eckelmann [Sun, 7 Oct 2018 11:20:30 +0000 (13:20 +0200)]
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.3/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>
6 years agobatman-adv: Rebuild automatically on mac80211 changes
Sven Eckelmann [Sun, 7 Oct 2018 08:42:12 +0000 (10:42 +0200)]
batman-adv: Rebuild automatically on mac80211 changes

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agoMerge pull request #415 from unquietwiki/patch-1
Moritz Warning [Wed, 3 Oct 2018 17:53:13 +0000 (19:53 +0200)]
Merge pull request #415 from unquietwiki/patch-1

babeld: update to 1.8.3

6 years agobabeld: Update to version 1.8.3 + fix init 415/head
Michael Adams [Thu, 27 Sep 2018 02:14:45 +0000 (19:14 -0700)]
babeld: Update to version 1.8.3 + fix init

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.

Also, the init script was edited to kill babeld on stop; restart works properly now, as well.

Signed-off-by: Michael Adams <unquietwiki@gmail.com>
6 years agoMerge pull request #419 from mwarning/nds_link_fix
Moritz Warning [Fri, 28 Sep 2018 13:31:14 +0000 (15:31 +0200)]
Merge pull request #419 from mwarning/nds_link_fix

nodogsplash: fix download link

6 years agonodogsplash: fix download hash 419/head
Moritz Warning [Fri, 28 Sep 2018 13:17:02 +0000 (15:17 +0200)]
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>
6 years agonodogsplash: Version 3.2.1 release (#416)
Rob White [Thu, 27 Sep 2018 12:59:33 +0000 (13:59 +0100)]
nodogsplash: Version 3.2.1 release (#416)

nodogsplash: Release 3.2.1

Signed-off-by: Rob White <rob@blue-wave.net>
6 years agoMerge pull request #412 from ecsv/batadv-2018.3
Simon Wunderlich [Mon, 17 Sep 2018 08:46:21 +0000 (10:46 +0200)]
Merge pull request #412 from ecsv/batadv-2018.3

batman-adv 2018.3

6 years agobatman-adv: upgrade package to latest release 2018.3 412/head
Sven Eckelmann [Sat, 15 Sep 2018 08:20:02 +0000 (10:20 +0200)]
batman-adv: upgrade package to latest release 2018.3

* support latest kernels (3.16 - 4.19)
* coding style cleanups and refactoring
* enable the DAT by default for the in-tree Linux module
* bugs squashed:

  - fix segfault when writing to sysfs files under batman_adv/ with
    CONFIG_BATMAN_ADV_DEBUG enabled
  - avoid information leakage in probe ELP packets
  - adjust reference counters when queue_work fails
  - prevent duplicated entries in various lists

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatctl: upgrade package to latest release 2018.3
Sven Eckelmann [Sat, 15 Sep 2018 08:18:20 +0000 (10:18 +0200)]
batctl: upgrade package to latest release 2018.3

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agoalfred: upgrade package to latest release 2018.3
Sven Eckelmann [Sat, 15 Sep 2018 08:18:10 +0000 (10:18 +0200)]
alfred: upgrade package to latest release 2018.3

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agoMerge pull request #410 from bluewavenet/nodogsplash-3.2.0
Moritz Warning [Thu, 13 Sep 2018 14:39:42 +0000 (16:39 +0200)]
Merge pull request #410 from bluewavenet/nodogsplash-3.2.0

nodogsplash: add missing config options

6 years agonodogsplash: add missing config options 410/head
Rob White [Thu, 13 Sep 2018 14:05:26 +0000 (15:05 +0100)]
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>
6 years agoMerge pull request #406 from bluewavenet/nodogsplash-3.2.0
Moritz Warning [Mon, 3 Sep 2018 10:17:37 +0000 (12:17 +0200)]
Merge pull request #406 from bluewavenet/nodogsplash-3.2.0

nodogsplash: Release 3.2.0

6 years agoluci-app-cjdns: luci admin support for cjdns-v20.2 (#394)
William Fleurant [Mon, 3 Sep 2018 00:50:34 +0000 (00:50 +0000)]
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>
6 years agonodogsplash: Release 3.2.0 406/head
Rob White [Sun, 2 Sep 2018 21:30:22 +0000 (22:30 +0100)]
nodogsplash: Release 3.2.0

Signed-off-by: Rob White <rob@blue-wave.net>
6 years agoMerge pull request #405 from bluewavenet/nodogsplash-3.1.0
Moritz Warning [Tue, 28 Aug 2018 08:47:37 +0000 (10:47 +0200)]
Merge pull request #405 from bluewavenet/nodogsplash-3.1.0

nodogsplash: Release 3.1.0

6 years agonodogsplash: Release 3.1.0 405/head
Rob White [Sun, 26 Aug 2018 21:57:12 +0000 (22:57 +0100)]
nodogsplash: Release 3.1.0

Signed-off-by: Rob White <rob@blue-wave.net>
6 years agoMerge pull request #404 from mwarning/nodogsplash
Moritz Warning [Fri, 17 Aug 2018 17:25:52 +0000 (19:25 +0200)]
Merge pull request #404 from mwarning/nodogsplash

nodogsplash: fix minor things

6 years agonodogsplash: fix minor package issues 404/head
Moritz Warning [Fri, 17 Aug 2018 09:38:57 +0000 (11:38 +0200)]
nodogsplash: fix minor package issues

- package now conflicts with nodogsplash2
- properly close heredoc block
- quiet uci when removing previous firewall hook

Signed-off-by: Moritz Warning <moritzwarning@web.de>
6 years agoMerge pull request #402 from crza/fix-ndppd
Moritz Warning [Thu, 16 Aug 2018 14:39:09 +0000 (16:39 +0200)]
Merge pull request #402 from crza/fix-ndppd

ndppd: fix compile error with musl

6 years agoMerge pull request #400 from cotequeiroz/bmx7_list.h
Moritz Warning [Thu, 16 Aug 2018 14:36:52 +0000 (16:36 +0200)]
Merge pull request #400 from cotequeiroz/bmx7_list.h

bmx7: avoid list.h namespace collision

6 years agobmx7: Avoid namespace collision with libubox. 400/head
Eneas U de Queiroz [Thu, 16 Aug 2018 14:04:21 +0000 (11:04 -0300)]
bmx7: Avoid namespace collision with libubox.

Applied Daniel Golle's patch from
https://github.com/bmx-routing/bmx7/pull/35 to "rename some list stuff
to avoid namespace collision with libubox."

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
6 years agoMerge pull request #401 from mwarning/nodogsplash2
Moritz Warning [Thu, 16 Aug 2018 13:51:26 +0000 (15:51 +0200)]
Merge pull request #401 from mwarning/nodogsplash2

nodogsplash2: update to 3.0 and merge packages

6 years agonodogsplash2: remove package 401/head
Moritz Warning [Thu, 16 Aug 2018 13:05:44 +0000 (15:05 +0200)]
nodogsplash2: remove package

Nodogplash 3.0.0 was released and makes the nodogsplash2 package unnecessary.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
6 years agonodogsplash: update to release 3.0.0
Moritz Warning [Thu, 16 Aug 2018 13:03:12 +0000 (15:03 +0200)]
nodogsplash: update to release 3.0.0

Signed-off-by: Moritz Warning <moritzwarning@web.de>
6 years agondppd: fix compile error with musl 402/head
Martin Strobel [Sun, 12 Aug 2018 16:03:38 +0000 (18:03 +0200)]
ndppd: fix compile error with musl

Error:
src/logger.cc: In static member function 'static std::string ndppd::logger::err()':
src/logger.cc:86:22: error: could not convert 'strerror_r((*__errno_location()), ((char*)(& buf)), sizeof (buf))'
                            from 'int' to 'std::string {aka std::basic_string<char>}'
    return strerror_r(errno, buf, sizeof(buf));

Added and modified some patches from
https://github.com/DanielAdolfsson/ndppd/compare/eb81b8f2d6d4d33545570402b049a73880b9ad01...navossoc:master
(See https://github.com/DanielAdolfsson/ndppd/issues/40 for details)

Compile-tested: octeon + mpc85xx openwrt master, musl + uclibc++
                octeon openwrt master, glibc + libstdc++

Run-tested: octeon openwrt master, musl + uclibc++

Signed-off-by: Martin Strobel <arctus@crza.de>
6 years agoMerge pull request #399 from mwarning/nodogsplash2_fix
Jo-Philipp Wich [Tue, 31 Jul 2018 16:33:58 +0000 (18:33 +0200)]
Merge pull request #399 from mwarning/nodogsplash2_fix

nodogsplash2: remove reference to dead code

6 years agonodogsplash2: remove reference to dead code 399/head
Moritz Warning [Tue, 31 Jul 2018 16:30:08 +0000 (18:30 +0200)]
nodogsplash2: remove reference to dead code

Signed-off-by: Moritz Warning <moritzwarning@web.de>
6 years agoMerge pull request #395 from mwarning/nodogsplash2
Moritz Warning [Mon, 23 Jul 2018 22:13:15 +0000 (00:13 +0200)]
Merge pull request #395 from mwarning/nodogsplash2

nodogsplash2: cleanup

6 years agonodogsplash2: init script cleanup and refactoring 395/head
Moritz Warning [Wed, 2 May 2018 19:35:39 +0000 (21:35 +0200)]
nodogsplash2: init script cleanup and refactoring

- refactor firewall restart hook
- remove dead code
- shorten existing code

Signed-off-by: Moritz Warning <moritzwarning@web.de>
6 years agoMerge pull request #397 from adrianschmutzler/fixalfred
Moritz Warning [Sat, 21 Jul 2018 15:15:02 +0000 (17:15 +0200)]
Merge pull request #397 from adrianschmutzler/fixalfred

alfred: Fix alfred.init

6 years agoalfred: Fix alfred.init 397/head
Adrian Schmutzler [Sat, 21 Jul 2018 13:57:51 +0000 (15:57 +0200)]
alfred: Fix alfred.init

The commit 45db0e6 introduced curly brackets which are not correct
syntax and thus broke the script.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
6 years agoMerge pull request #390 from aparcar/alfred_procd
Moritz Warning [Fri, 20 Jul 2018 12:22:52 +0000 (14:22 +0200)]
Merge pull request #390 from aparcar/alfred_procd

alfred: use procd fix #388

6 years agoalfred: use procd 390/head
Paul Spooren [Wed, 13 Jun 2018 15:08:51 +0000 (00:08 +0900)]
alfred: use procd

Signed-off-by: Paul Spooren <mail@aparcar.org>
6 years agoMerge pull request #396 from ecsv/batadv-2018.2
Simon Wunderlich [Wed, 18 Jul 2018 12:07:46 +0000 (05:07 -0700)]
Merge pull request #396 from ecsv/batadv-2018.2

batman-adv 2018.2

6 years agobatman-adv: upgrade package to latest release 2018.2 396/head
Sven Eckelmann [Tue, 17 Jul 2018 18:44:29 +0000 (20:44 +0200)]
batman-adv: upgrade package to latest release 2018.2

* support latest kernels (3.16 - 4.18)
* dropped support for kernels < 3.16 (note the removed build directory)
* coding style cleanups and refactoring
* avoid old nodes disabling multicast optimizations completely
* disable ethtool based B.A.T.M.A.N. V speed detection for virtual interfaces
* enable B.A.T.M.A.N. V compilation by default
* disable debugfs support by default
* bugs squashed:

  - fix TT sync flags for intermediate TT responses
  - avoid race in TT TVLV allocator helper
  - prevent TT request storms by not sending inconsistent TT TVLVs
  - fix best gw refcnt after netlink dump
  - adjust debugfs paths for interfaces after a namechange
  - fix single entry TT non-sync flag storage
  - fix multicast TT issues with bogus ROAM flags
  - work around insufficient memory initialization in cfg80211's station info

Signed-off-by: Sven Eckelmann <sven@narfation.org>
6 years agobatctl: upgrade package to latest release 2018.2
Sven Eckelmann [Tue, 17 Jul 2018 18:43:25 +0000 (20:43 +0200)]
batctl: upgrade package to latest release 2018.2

* (no changes)

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