batctl: update to version 2021.1
* add various commands to print generic netlink replies as JSON * coding style cleanups and refactoring Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
5d09821ed7
commit
511211431b
|
@ -3,12 +3,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=batctl
|
PKG_NAME:=batctl
|
||||||
PKG_VERSION:=2021.0
|
PKG_VERSION:=2021.1
|
||||||
PKG_RELEASE:=$(AUTORELEASE)
|
PKG_RELEASE:=$(AUTORELEASE)
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION)
|
||||||
PKG_HASH:=9cec8bf1952f885192749a9dc0318a54633b717aaf05c438d504efd83f5201e4
|
PKG_HASH:=44b28cebb46b8ba1bc170bedeef67f69d89503806c429ff8cb113cc01966e176
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
|
||||||
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
|
PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
|
||||||
|
@ -95,27 +95,37 @@ config-n := \
|
||||||
backbonetable \
|
backbonetable \
|
||||||
bisect_iv \
|
bisect_iv \
|
||||||
bonding \
|
bonding \
|
||||||
|
bla_backbone_json \
|
||||||
|
bla_claim_json \
|
||||||
bridge_loop_avoidance \
|
bridge_loop_avoidance \
|
||||||
claimtable \
|
claimtable \
|
||||||
dat_cache \
|
dat_cache \
|
||||||
|
dat_cache_json \
|
||||||
distributed_arp_table \
|
distributed_arp_table \
|
||||||
elp_interval \
|
elp_interval \
|
||||||
event \
|
event \
|
||||||
fragmentation \
|
fragmentation \
|
||||||
gateways \
|
gateways \
|
||||||
|
gateways_json \
|
||||||
gw_mode \
|
gw_mode \
|
||||||
|
hardif_json \
|
||||||
|
hardifs_json \
|
||||||
hop_penalty \
|
hop_penalty \
|
||||||
interface \
|
interface \
|
||||||
isolation_mark \
|
isolation_mark \
|
||||||
loglevel \
|
loglevel \
|
||||||
mcast_flags \
|
mcast_flags \
|
||||||
|
mcast_flags_json \
|
||||||
|
mesh_json \
|
||||||
multicast_fanout \
|
multicast_fanout \
|
||||||
multicast_forceflood \
|
multicast_forceflood \
|
||||||
multicast_mode \
|
multicast_mode \
|
||||||
neighbors \
|
neighbors \
|
||||||
|
neighbors_json \
|
||||||
network_coding \
|
network_coding \
|
||||||
orig_interval \
|
orig_interval \
|
||||||
originators \
|
originators \
|
||||||
|
originators_json \
|
||||||
ping \
|
ping \
|
||||||
routing_algo \
|
routing_algo \
|
||||||
statistics \
|
statistics \
|
||||||
|
@ -126,6 +136,9 @@ config-n := \
|
||||||
transglobal \
|
transglobal \
|
||||||
translate \
|
translate \
|
||||||
translocal \
|
translocal \
|
||||||
|
transtable_global_json \
|
||||||
|
transtable_local_json \
|
||||||
|
vlan_json \
|
||||||
|
|
||||||
config-settings := \
|
config-settings := \
|
||||||
aggregation \
|
aggregation \
|
||||||
|
@ -160,6 +173,21 @@ config-tables := \
|
||||||
transglobal \
|
transglobal \
|
||||||
translocal \
|
translocal \
|
||||||
|
|
||||||
|
config-json := \
|
||||||
|
bla_backbone_json \
|
||||||
|
bla_claim_json \
|
||||||
|
dat_cache_json \
|
||||||
|
gateways_json \
|
||||||
|
hardif_json \
|
||||||
|
hardifs_json \
|
||||||
|
mcast_flags_json \
|
||||||
|
mesh_json \
|
||||||
|
neighbors_json \
|
||||||
|
originators_json \
|
||||||
|
transtable_global_json \
|
||||||
|
transtable_local_json \
|
||||||
|
vlan_json \
|
||||||
|
|
||||||
config-tools := \
|
config-tools := \
|
||||||
event \
|
event \
|
||||||
ping \
|
ping \
|
||||||
|
@ -183,6 +211,7 @@ ifeq ($(BUILD_VARIANT),default)
|
||||||
config-y := \
|
config-y := \
|
||||||
$(config-settings) \
|
$(config-settings) \
|
||||||
$(config-tables) \
|
$(config-tables) \
|
||||||
|
$(config-json) \
|
||||||
$(config-tools) \
|
$(config-tools) \
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -192,6 +221,7 @@ ifeq ($(BUILD_VARIANT),full)
|
||||||
config-y := \
|
config-y := \
|
||||||
$(config-settings) \
|
$(config-settings) \
|
||||||
$(config-tables) \
|
$(config-tables) \
|
||||||
|
$(config-json) \
|
||||||
$(config-tools) \
|
$(config-tools) \
|
||||||
$(config-extratools) \
|
$(config-extratools) \
|
||||||
|
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
From: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Date: Thu, 28 Jan 2021 20:44:22 +0100
|
|
||||||
Subject: batctl: Fix build of routing_algo against musl
|
|
||||||
|
|
||||||
glibc is including the headers for the rtnetlink functionality. But musl
|
|
||||||
avoids this indirect include. The headers must therefore be included
|
|
||||||
explicitely.
|
|
||||||
|
|
||||||
Fixes: e0ccb9b575d9 ("batctl: Switch active routing algo list to netlink")
|
|
||||||
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
||||||
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/b0044a6b2f8a762387d9b7408b1fe528f21c4ad7
|
|
||||||
|
|
||||||
diff --git a/routing_algo.c b/routing_algo.c
|
|
||||||
index 27458ffdd9b91decbecbe6ec5da8ffd14c863a35..b5e3ebb8c5a4743cd2c42634d79f8a4c6a8210db 100644
|
|
||||||
--- a/routing_algo.c
|
|
||||||
+++ b/routing_algo.c
|
|
||||||
@@ -9,6 +9,8 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <getopt.h>
|
|
||||||
+#include <linux/if_link.h>
|
|
||||||
+#include <linux/rtnetlink.h>
|
|
||||||
#include <netinet/if_ether.h>
|
|
||||||
#include <netlink/netlink.h>
|
|
||||||
#include <netlink/genl/genl.h>
|
|
Loading…
Reference in New Issue