commits July 2016

commits@lists.open-mesh.org

1 participants
109 discussions

[alfred] master: alfred: vis: Fix parsing of iface_status (f34d03e)
by postmaster＠open-mesh.org 26 Jul '16

26 Jul '16

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit f34d03efa7e6a1f1f9f912a3bf15deb612434bc8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 5 20:46:59 2016 +0200 alfred: vis: Fix parsing of iface_status The content of batman_adv/iface_status ends with a newline. Thus register_interfaces has to make sure that it only compares the first line without the \n when comparing with the status string. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- f34d03efa7e6a1f1f9f912a3bf15deb612434bc8 vis/vis.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vis/vis.c b/vis/vis.c index 4d494bc..7eab781 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -257,6 +257,7 @@ static int register_interfaces(struct globals *globals) DIR *iface_base_dir; struct dirent *iface_dir; char *path_buff, *file_content; + char *content_newline; path_buff = malloc(PATH_BUFF_LEN); if (!path_buff) { @@ -295,6 +296,10 @@ static int register_interfaces(struct globals *globals) if (!file_content) continue; + content_newline = strstr(file_content, "\n"); + if (content_newline) + *content_newline = '\0'; + if (strcmp(file_content, "active") == 0) get_if_index(globals, iface_dir->d_name);

1 0

[linux-merge]linux integration; annotated tag, v4.7, created. v4.7
by postmaster＠open-mesh.org 24 Jul '16

24 Jul '16

The annotated tag, v4.7 has been created at 5563368c573d2a245d14737b9ff32dcdee4126dc (tag) tagging 523d939ef98fd712632d93a5a2b588e477a7565e (commit) replaces v4.7-rc7 tagged by Linus Torvalds on Sun Jul 24 12:24:02 2016 -0700 - Shortlog ------------------------------------------------------------ Linux 4.7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJXlRXSAAoJEHm+PkMAQRiGG/gH/0Z8O4zWOsrwO+X1mRToRDBH joFOjAmCVe83T1VpF5LYNB+9+owL/dEDt6+ZIswnhH7AfQPjs4RqwS4PcuMbCDVO +mDm0PmfcKaYcQZrB2Z2OwIzRNnfCTVcsDPhIHwuIHk0m4z/xuGZonD8KoAj0+tO 3yJF6sbE1KubDVjOb+lmZZSP3cXA0pDXrNhkYhE4Tsr8fiihGjeXSNJ8t2zPLjxo W3MPqo0rzDvQsOwoF4TWHHagVaFSJlhLBBgqu33fI7uO3jtfQD2G8wG68JCND1j3 qbMoBfTLFV/yQmSIJUt0Wv1axaCcwnjpweEB35A/GEeZ0mNB1rDdoBeI1eKEQkc= =DGFC -----END PGP SIGNATURE----- Sven Eckelmann (7): batman-adv: Avoid nullptr dereference in bla after vlan_insert_tag batman-adv: Avoid nullptr dereference in dat after vlan_insert_tag batman-adv: Fix orig_node_vlan leak on orig_node_release batman-adv: Fix non-atomic bla_claim::backbone_gw access batman-adv: Fix reference leak in batadv_find_router batman-adv: Free last_bonding_candidate on release of orig_node batman-adv: Fix speedy join in gateway client mode ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Allow to disable debugfs support (4f47cce)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4f47ccec30c21401c1e2c7349f8bac2787eaf67a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 16 09:31:20 2016 +0200 batman-adv: Allow to disable debugfs support The files provided by batman-adv via debugfs are currently converted to netlink. Tools which are not yet converted to use the netlink interface may still rely on the old debugfs files. But systems which already upgraded their tools can save some space by disabling this feature. The default configuration of batman-adv on amd64 can reduce the size of the module by around 11% when this feature is disabled. $ size net/batman-adv/batman-adv.ko* text data bss dec hex filename 150507 10395 4160 165062 284c6 net/batman-adv/batman-adv.ko.y 137106 7099 2112 146317 23b8d net/batman-adv/batman-adv.ko.n Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4f47ccec30c21401c1e2c7349f8bac2787eaf67a Makefile | 3 +++ README.external | 1 + compat.h | 5 +++++ gen-compat-autoconf.sh | 1 + net/batman-adv/Kconfig | 15 +++++++++++++-- net/batman-adv/Makefile | 4 ++-- net/batman-adv/bat_algo.c | 2 ++ net/batman-adv/bat_iv_ogm.c | 12 ++++++++++++ net/batman-adv/bat_v.c | 12 ++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 4 ++++ net/batman-adv/debugfs.h | 2 +- net/batman-adv/distributed-arp-table.c | 2 ++ net/batman-adv/gateway_client.c | 2 ++ net/batman-adv/icmp_socket.h | 18 +++++++++++++++++- net/batman-adv/main.c | 2 ++ net/batman-adv/multicast.c | 2 ++ net/batman-adv/network-coding.c | 2 ++ net/batman-adv/originator.c | 4 ++++ net/batman-adv/translation-table.c | 4 ++++ net/batman-adv/types.h | 6 ++++++ 20 files changed, 97 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 725c70b..d42bb56 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,8 @@ # # read README.external for more information about the configuration +# batman-adv DebugFS entries: +export CONFIG_BATMAN_ADV_DEBUGFS=y # B.A.T.M.A.N. debugging: export CONFIG_BATMAN_ADV_DEBUG=n # B.A.T.M.A.N. bridge loop avoidance: @@ -66,6 +68,7 @@ BUILD_FLAGS := \ REVISION=$(REVISION) \ CONFIG_BATMAN_ADV=m \ CONFIG_BATMAN_ADV_DEBUG=$(CONFIG_BATMAN_ADV_DEBUG) \ + CONFIG_BATMAN_ADV_DEBUGFS=$(CONFIG_BATMAN_ADV_DEBUGFS) \ CONFIG_BATMAN_ADV_BLA=$(CONFIG_BATMAN_ADV_BLA) \ CONFIG_BATMAN_ADV_DAT=$(CONFIG_BATMAN_ADV_DAT) \ CONFIG_BATMAN_ADV_NC=$(CONFIG_BATMAN_ADV_NC) \ diff --git a/README.external b/README.external index 8393c27..ec04364 100644 --- a/README.external +++ b/README.external @@ -35,6 +35,7 @@ option can be set to to y (enabled), n (disabled) or m (build as module). Available options and their possible values are (default marked with an "*") + * CONFIG_BATMAN_ADV_DEBUGFS=[y*|n] (B.A.T.M.A.N. debugfs entries) * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) * CONFIG_BATMAN_ADV_DAT=[y*|n] (B.A.T.M.A.N. Distributed ARP Table) diff --git a/compat.h b/compat.h index fc78948..d987577 100644 --- a/compat.h +++ b/compat.h @@ -27,6 +27,11 @@ #include "compat-autoconf.h" +/* test for dependency CONFIG_BATMAN_ADV_DEBUG -> CONFIG_BATMAN_ADV_DEBUGFS */ +#if defined(CONFIG_BATMAN_ADV_DEBUG) && !defined(CONFIG_BATMAN_ADV_DEBUGFS) +#error CONFIG_BATMAN_ADV_DEBUG=y requires CONFIG_BATMAN_ADV_DEBUGFS=y +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) #include <linux/netdevice.h> diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 396357a..cf36e55 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -36,6 +36,7 @@ gen_config() { } # write config variables +gen_config 'CONFIG_BATMAN_ADV_DEBUGFS' ${CONFIG_BATMAN_ADV_DEBUGFS:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" gen_config 'CONFIG_BATMAN_ADV_DAT' ${CONFIG_BATMAN_ADV_DAT:="y"} >> "${TMP}" diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 833bb14..f20742c 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -73,10 +73,21 @@ config BATMAN_ADV_MCAST reduce the air overhead while improving the reliability of multicast messages. -config BATMAN_ADV_DEBUG - bool "B.A.T.M.A.N. debugging" +config BATMAN_ADV_DEBUGFS + bool "batman-adv debugfs entries" depends on BATMAN_ADV depends on DEBUG_FS + default y + help + Enable this to export routing related debug tables via debugfs. + The information for each soft-interface and used hard-interface can be + found under batman_adv/ + + If unsure, say Y. + +config BATMAN_ADV_DEBUG + bool "B.A.T.M.A.N. debugging" + depends on BATMAN_ADV_DEBUGFS help This is an option for use by developers; most people should say N here. This enables compilation of support for diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index a83fc6c..f724d3c 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -24,14 +24,14 @@ batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_elp.o batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v_ogm.o batman-adv-y += bitarray.o batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o -batman-adv-$(CONFIG_DEBUG_FS) += debugfs.o +batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += debugfs.o batman-adv-$(CONFIG_BATMAN_ADV_DAT) += distributed-arp-table.o batman-adv-y += fragmentation.o batman-adv-y += gateway_client.o batman-adv-y += gateway_common.o batman-adv-y += hard-interface.o batman-adv-y += hash.o -batman-adv-y += icmp_socket.o +batman-adv-$(CONFIG_BATMAN_ADV_DEBUGFS) += icmp_socket.o batman-adv-$(CONFIG_BATMAN_ADV_DEBUG) += log.o batman-adv-y += main.o batman-adv-$(CONFIG_BATMAN_ADV_MCAST) += multicast.o diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c index f2cc50d..623d043 100644 --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -101,6 +101,7 @@ int batadv_algo_select(struct batadv_priv *bat_priv, char *name) return 0; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) { struct batadv_algo_ops *bat_algo_ops; @@ -113,6 +114,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) return 0; } +#endif static int batadv_param_set_ra(const char *val, const struct kernel_param *kp) { diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 3c7900d..e2d18d0 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1855,6 +1855,7 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, return NET_RX_SUCCESS; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_iv_ogm_orig_print_neigh - print neighbors for the originator table * @orig_node: the orig_node for which the neighbors are printed @@ -1952,6 +1953,7 @@ next: if (batman_count == 0) seq_puts(seq, "No batman nodes in range ...\n"); } +#endif /** * batadv_iv_ogm_neigh_get_tq_avg - Get the TQ average for a neighbour on a @@ -2182,6 +2184,7 @@ batadv_iv_ogm_orig_dump(struct sk_buff *msg, struct netlink_callback *cb, cb->args[2] = sub; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_iv_hardif_neigh_print - print a single hop neighbour node * @seq: neighbour table seq_file struct @@ -2232,6 +2235,7 @@ static void batadv_iv_neigh_print(struct batadv_priv *bat_priv, if (batman_count == 0) seq_puts(seq, "No batman nodes in range ...\n"); } +#endif /** * batadv_iv_ogm_neigh_diff - calculate tq difference of two neighbors @@ -2618,6 +2622,7 @@ out: return ret; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /* fails if orig_node has no router */ static int batadv_iv_gw_write_buffer_text(struct batadv_priv *bat_priv, struct seq_file *seq, @@ -2681,6 +2686,7 @@ static void batadv_iv_gw_print(struct batadv_priv *bat_priv, if (gw_count == 0) seq_puts(seq, "No gateways in range ...\n"); } +#endif /** * batadv_iv_gw_dump_entry - Dump a gateway into a message @@ -2798,11 +2804,15 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .neigh = { .cmp = batadv_iv_ogm_neigh_cmp, .is_similar_or_better = batadv_iv_ogm_neigh_is_sob, +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_iv_neigh_print, +#endif .dump = batadv_iv_ogm_neigh_dump, }, .orig = { +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_iv_ogm_orig_print, +#endif .dump = batadv_iv_ogm_orig_dump, .free = batadv_iv_ogm_orig_free, .add_if = batadv_iv_ogm_orig_add_if, @@ -2811,7 +2821,9 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .gw = { .get_best_gw_node = batadv_iv_gw_get_best_gw_node, .is_eligible = batadv_iv_gw_is_eligible, +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_iv_gw_print, +#endif .dump = batadv_iv_gw_dump, }, }; diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 9e872dc..e79f6f0 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -129,6 +129,7 @@ batadv_v_hardif_neigh_init(struct batadv_hardif_neigh_node *hardif_neigh) batadv_v_elp_throughput_metric_update); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_v_orig_print_neigh - print neighbors for the originator table * @orig_node: the orig_node for which the neighbors are printed @@ -212,6 +213,7 @@ static void batadv_v_neigh_print(struct batadv_priv *bat_priv, if (batman_count == 0) seq_puts(seq, "No batman nodes in range ...\n"); } +#endif /** * batadv_v_neigh_dump_neigh - Dump a neighbour into a message @@ -345,6 +347,7 @@ batadv_v_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb, cb->args[1] = idx; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_v_orig_print - print the originator table * @bat_priv: the bat priv with all the soft interface information @@ -411,6 +414,7 @@ next: if (batman_count == 0) seq_puts(seq, "No batman nodes in range ...\n"); } +#endif /** * batadv_v_orig_dump_subentry - Dump an originator subentry into a @@ -827,6 +831,7 @@ out: return ret; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /* fails if orig_node has no router */ static int batadv_v_gw_write_buffer_text(struct batadv_priv *bat_priv, struct seq_file *seq, @@ -896,6 +901,7 @@ static void batadv_v_gw_print(struct batadv_priv *bat_priv, if (gw_count == 0) seq_puts(seq, "No gateways in range ...\n"); } +#endif /** * batadv_v_gw_dump_entry - Dump a gateway into a message @@ -1034,11 +1040,15 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .hardif_init = batadv_v_hardif_neigh_init, .cmp = batadv_v_neigh_cmp, .is_similar_or_better = batadv_v_neigh_is_sob, +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_v_neigh_print, +#endif .dump = batadv_v_neigh_dump, }, .orig = { +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_v_orig_print, +#endif .dump = batadv_v_orig_dump, }, .gw = { @@ -1046,7 +1056,9 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { .show_sel_class = batadv_v_show_sel_class, .get_best_gw_node = batadv_v_gw_get_best_gw_node, .is_eligible = batadv_v_gw_is_eligible, +#ifdef CONFIG_BATMAN_ADV_DEBUGFS .print = batadv_v_gw_print, +#endif .dump = batadv_v_gw_dump, }, }; diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 1db3c12..e7f690b 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1996,6 +1996,7 @@ out: return ret; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_bla_claim_table_seq_print_text - print the claim table in a seq file * @seq: seq file to print on @@ -2056,6 +2057,7 @@ out: batadv_hardif_put(primary_if); return 0; } +#endif /** * batadv_bla_claim_dump_entry - dump one entry of the claim table @@ -2219,6 +2221,7 @@ out: return ret; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_bla_backbone_table_seq_print_text - print the backbone table in a seq * file @@ -2282,6 +2285,7 @@ out: batadv_hardif_put(primary_if); return 0; } +#endif /** * batadv_bla_backbone_dump_entry - dump one entry of the backbone table diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 1ab4e2e..c68ff3d 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -26,7 +26,7 @@ struct net_device; #define BATADV_DEBUGFS_SUBDIR "batman_adv" -#if IS_ENABLED(CONFIG_DEBUG_FS) +#if IS_ENABLED(CONFIG_BATMAN_ADV_DEBUGFS) void batadv_debugfs_init(void); void batadv_debugfs_destroy(void); diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 059bc23..e257efd 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -795,6 +795,7 @@ void batadv_dat_free(struct batadv_priv *bat_priv) batadv_dat_hash_free(bat_priv); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_dat_cache_seq_print_text - print the local DAT hash table * @seq: seq file to print on @@ -846,6 +847,7 @@ out: batadv_hardif_put(primary_if); return 0; } +#endif /** * batadv_arp_get_type - parse an ARP packet and gets the type diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 4b51b1c..de055d6 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -482,6 +482,7 @@ void batadv_gw_node_free(struct batadv_priv *bat_priv) spin_unlock_bh(&bat_priv->gw.list_lock); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; @@ -509,6 +510,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) return 0; } +#endif /** * batadv_gw_dump - Dump gateways into a message diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 618d5de..e44a7da 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -26,9 +26,25 @@ struct batadv_icmp_header; #define BATADV_ICMP_SOCKET "socket" -void batadv_socket_init(void); int batadv_socket_setup(struct batadv_priv *bat_priv); + +#ifdef CONFIG_BATMAN_ADV_DEBUGFS + +void batadv_socket_init(void); void batadv_socket_receive_packet(struct batadv_icmp_header *icmph, size_t icmp_len); +#else + +static inline void batadv_socket_init(void) +{ +} + +static inline void +batadv_socket_receive_packet(struct batadv_icmp_header *icmph, size_t icmp_len) +{ +} + +#endif + #endif /* _NET_BATMAN_ADV_ICMP_SOCKET_H_ */ diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index ef07e5b..2c017ab 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -282,6 +282,7 @@ bool batadv_is_my_mac(struct batadv_priv *bat_priv, const u8 *addr) return is_my_mac; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_seq_print_text_primary_if_get - called from debugfs table printing * function that requires the primary interface @@ -317,6 +318,7 @@ batadv_seq_print_text_primary_if_get(struct seq_file *seq) out: return primary_if; } +#endif /** * batadv_max_header_len - calculate maximum encapsulation overhead for a diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 894df60..13661f4 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -1134,6 +1134,7 @@ void batadv_mcast_init(struct batadv_priv *bat_priv) BATADV_TVLV_HANDLER_OGM_CIFNOTFND); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_mcast_flags_print_header - print own mcast flags to debugfs table * @bat_priv: the bat priv with all the soft interface information @@ -1234,6 +1235,7 @@ int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset) return 0; } +#endif /** * batadv_mcast_free - free the multicast optimizations structures diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 165cd27..e3baf69 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -1881,6 +1881,7 @@ void batadv_nc_mesh_free(struct batadv_priv *bat_priv) batadv_hash_destroy(bat_priv->nc.decoding_hash); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_nc_nodes_seq_print_text - print the nc node information * @seq: seq file to print on @@ -1980,3 +1981,4 @@ int batadv_nc_init_debugfs(struct batadv_priv *bat_priv) out: return -ENOMEM; } +#endif diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 0b7d57a..5f3bfc4 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -693,6 +693,7 @@ batadv_neigh_node_get_or_create(struct batadv_orig_node *orig_node, return batadv_neigh_node_create(orig_node, hard_iface, neigh_addr); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_hardif_neigh_seq_print_text - print the single hop neighbour list * @seq: neighbour table seq_file struct @@ -726,6 +727,7 @@ int batadv_hardif_neigh_seq_print_text(struct seq_file *seq, void *offset) bat_priv->algo_ops->neigh.print(bat_priv, seq); return 0; } +#endif /** * batadv_hardif_neigh_dump - Dump to netlink the neighbor infos for a specific @@ -1339,6 +1341,7 @@ void batadv_purge_orig_ref(struct batadv_priv *bat_priv) _batadv_purge_orig(bat_priv); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; @@ -1412,6 +1415,7 @@ out: batadv_hardif_put(hard_iface); return 0; } +#endif /** * batadv_orig_dump - Dump to netlink the originator infos for a specific diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index d94e298..7f66309 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1047,6 +1047,7 @@ container_register: kfree(tt_data); } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) { struct net_device *net_dev = (struct net_device *)seq->private; @@ -1114,6 +1115,7 @@ out: batadv_hardif_put(primary_if); return 0; } +#endif /** * batadv_tt_local_dump_entry - Dump one TT local entry into a message @@ -1796,6 +1798,7 @@ batadv_transtable_best_orig(struct batadv_priv *bat_priv, return best_entry; } +#ifdef CONFIG_BATMAN_ADV_DEBUGFS /** * batadv_tt_global_print_entry - print all orig nodes who announce the address * for this global entry @@ -1919,6 +1922,7 @@ out: batadv_hardif_put(primary_if); return 0; } +#endif /** * batadv_tt_global_dump_subentry - Dump all TT local entries into a message diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b5f01a3..b3dd1a3 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1431,7 +1431,9 @@ struct batadv_algo_neigh_ops { struct batadv_hard_iface *if_outgoing1, struct batadv_neigh_node *neigh2, struct batadv_hard_iface *if_outgoing2); +#ifdef CONFIG_BATMAN_ADV_DEBUGFS void (*print)(struct batadv_priv *priv, struct seq_file *seq); +#endif void (*dump)(struct sk_buff *msg, struct netlink_callback *cb, struct batadv_priv *priv, struct batadv_hard_iface *hard_iface); @@ -1453,8 +1455,10 @@ struct batadv_algo_orig_ops { int (*add_if)(struct batadv_orig_node *orig_node, int max_if_num); int (*del_if)(struct batadv_orig_node *orig_node, int max_if_num, int del_if_num); +#ifdef CONFIG_BATMAN_ADV_DEBUGFS void (*print)(struct batadv_priv *priv, struct seq_file *seq, struct batadv_hard_iface *hard_iface); +#endif void (*dump)(struct sk_buff *msg, struct netlink_callback *cb, struct batadv_priv *priv, struct batadv_hard_iface *hard_iface); @@ -1480,7 +1484,9 @@ struct batadv_algo_gw_ops { bool (*is_eligible)(struct batadv_priv *bat_priv, struct batadv_orig_node *curr_gw_orig, struct batadv_orig_node *orig_node); +#ifdef CONFIG_BATMAN_ADV_DEBUGFS void (*print)(struct batadv_priv *bat_priv, struct seq_file *seq); +#endif void (*dump)(struct sk_buff *msg, struct netlink_callback *cb, struct batadv_priv *priv); };

1 0

[batctl] master: batctl: Use debugfs fallback when netlink not supported (5401c71)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 5401c71adfad66113026e5cc549f2595b5329225 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 19 22:09:52 2016 +0200 batctl: Use debugfs fallback when netlink not supported The batman-adv release v2016.2 already has the batadv netlink family . Thus the fallback to debugfs not only has to be triggered when the the netlink family doesn't exist but also when the cmd returns a -EOPNOTSUPP. This still has the problem that the header is generated via a different command then the actual table entries. Falling back to debugfs would cause a second header entry for the table. The header print functionality is therefore refactored to only gather the data for the header and print the actual header either with the first received entry or when the CMD finished without any result. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5401c71adfad66113026e5cc549f2595b5329225 functions.h | 1 - netlink.c | 150 ++++++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 101 insertions(+), 50 deletions(-) diff --git a/functions.h b/functions.h index 1f311ca..e24dea0 100644 --- a/functions.h +++ b/functions.h @@ -61,7 +61,6 @@ enum { SKIP_HEADER = 0x100, UNICAST_ONLY = 0x200, MULTICAST_ONLY = 0x400, - PARSE_ONLY = 0x800, }; #endif diff --git a/netlink.c b/netlink.c index 423fc9b..e8e94b2 100644 --- a/netlink.c +++ b/netlink.c @@ -54,6 +54,9 @@ struct print_opts { int read_opt; float orig_timeout; float watch_interval; + nl_recvmsg_msg_cb_t callback; + char *remaining_header; + const char *static_header; uint8_t nl_cmd; }; @@ -139,7 +142,7 @@ static int print_error(struct sockaddr_nl *nla __unused, fprintf(stderr, "Error received: %s\n", strerror(-nlerr->error)); - last_err = -nlerr->error; + last_err = nlerr->error; return NL_STOP; } @@ -182,6 +185,7 @@ static int info_callback(struct nl_msg *msg, void *arg) uint8_t ttvn = 0; uint16_t bla_group_id = 0; const char *algo_name; + const char *extra_header; int ret; if (!genlmsg_valid_hdr(nlh, 0)) { @@ -230,54 +234,64 @@ static int info_callback(struct nl_msg *msg, void *arg) if (attrs[BATADV_ATTR_BLA_CRC]) bla_group_id = nla_get_u16(attrs[BATADV_ATTR_BLA_CRC]); - if (!(opts->read_opt & PARSE_ONLY)) { - switch (opts->nl_cmd) { - case BATADV_CMD_GET_TRANSTABLE_LOCAL: - ret = asprintf(&extra_info, ", TTVN: %u", ttvn); - if (ret < 0) - extra_info = NULL; - break; - case BATADV_CMD_GET_BLA_BACKBONE: - case BATADV_CMD_GET_BLA_CLAIM: - ret = asprintf(&extra_info, ", group id: 0x%04x", - bla_group_id); - if (ret < 0) - extra_info = NULL; - break; - default: - extra_info = strdup(""); - break; - } - - printf("[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%02x:%02x:%02x:%02x:%02x:%02x (%s/%02x:%02x:%02x:%02x:%02x:%02x %s)%s]\n", + switch (opts->nl_cmd) { + case BATADV_CMD_GET_TRANSTABLE_LOCAL: + ret = asprintf(&extra_info, ", TTVN: %u", ttvn); + if (ret < 0) + extra_info = NULL; + break; + case BATADV_CMD_GET_BLA_BACKBONE: + case BATADV_CMD_GET_BLA_CLAIM: + ret = asprintf(&extra_info, ", group id: 0x%04x", + bla_group_id); + if (ret < 0) + extra_info = NULL; + break; + default: + extra_info = strdup(""); + break; + } + + if (opts->static_header) + extra_header = opts->static_header; + else + extra_header = ""; + + ret = asprintf(&opts->remaining_header, + "[B.A.T.M.A.N. adv %s, MainIF/MAC: %s/%02x:%02x:%02x:%02x:%02x:%02x (%s/%02x:%02x:%02x:%02x:%02x:%02x %s)%s]\n%s", version, primary_if, primary_mac[0], primary_mac[1], primary_mac[2], primary_mac[3], primary_mac[4], primary_mac[5], mesh_name, mesh_mac[0], mesh_mac[1], mesh_mac[2], mesh_mac[3], mesh_mac[4], mesh_mac[5], - algo_name, extra_info); + algo_name, extra_info, extra_header); + if (ret < 0) + opts->remaining_header = NULL; - if (extra_info) - free(extra_info); - } + if (extra_info) + free(extra_info); } else { - if (!(opts->read_opt & PARSE_ONLY)) - printf("BATMAN mesh %s disabled\n", mesh_name); + ret = asprintf(&opts->remaining_header, + "BATMAN mesh %s disabled\n", mesh_name); + if (ret < 0) + opts->remaining_header = NULL; } return NL_STOP; } -static void netlink_print_info(int ifindex, uint8_t nl_cmd, int read_opt) +static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) { struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; int family; struct print_opts opts = { - .read_opt = read_opt, + .read_opt = 0, .nl_cmd = nl_cmd, + .remaining_header = NULL, + .static_header = header, }; sock = nl_socket_alloc(); @@ -285,7 +299,7 @@ static void netlink_print_info(int ifindex, uint8_t nl_cmd, int read_opt) family = genl_ctrl_resolve(sock, BATADV_NL_NAME); if (family < 0) - return; + return NULL; msg = nlmsg_alloc(); genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, 0, @@ -304,6 +318,27 @@ static void netlink_print_info(int ifindex, uint8_t nl_cmd, int read_opt) nl_recvmsgs(sock, cb); nl_socket_free(sock); + + return opts.remaining_header; +} + +static void netlink_print_remaining_header(struct print_opts *opts) +{ + if (!opts->remaining_header) + return; + + fputs(opts->remaining_header, stdout); + free(opts->remaining_header); + opts->remaining_header = NULL; +} + +static int netlink_print_common_cb(struct nl_msg *msg, void *arg) +{ + struct print_opts *opts = arg; + + netlink_print_remaining_header(opts); + + return opts->callback(msg, arg); } static const int routing_algos_mandatory[] = { @@ -352,6 +387,9 @@ int netlink_print_routing_algos(void) struct nl_msg *msg; struct nl_cb *cb; int family; + struct print_opts opts = { + .callback = routing_algos_callback, + }; sock = nl_socket_alloc(); genl_connect(sock); @@ -368,19 +406,21 @@ int netlink_print_routing_algos(void) nlmsg_free(msg); + opts.remaining_header = strdup("Available routing algorithms:\n"); + cb = nl_cb_alloc(NL_CB_DEFAULT); - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, routing_algos_callback, - NULL); + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, netlink_print_common_cb, + &opts); nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, stop_callback, NULL); nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); - printf("Available routing algorithms:\n"); - nl_recvmsgs(sock, cb); - nl_socket_free(sock); - return 0; + if (!last_err) + netlink_print_remaining_header(&opts); + + return last_err; } static const int originators_mandatory[] = { @@ -1040,7 +1080,9 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, struct print_opts opts = { .read_opt = read_opt, .orig_timeout = orig_timeout, - .watch_interval = watch_interval + .watch_interval = watch_interval, + .remaining_header = NULL, + .callback = callback, }; int hardifindex = 0; struct nl_sock *sock; @@ -1074,7 +1116,7 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, bat_hosts_init(read_opt); cb = nl_cb_alloc(NL_CB_DEFAULT); - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, &opts); + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, netlink_print_common_cb, &opts); nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, stop_callback, NULL); nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); @@ -1083,11 +1125,10 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, /* clear screen, set cursor back to 0,0 */ printf("\033[2J\033[0;0f"); - if (!(read_opt & SKIP_HEADER)) { - netlink_print_info(ifindex, nl_cmd, 0); - if (header) - printf("%s", header); - } + if (!(read_opt & SKIP_HEADER)) + opts.remaining_header = netlink_get_info(ifindex, + nl_cmd, + header); msg = nlmsg_alloc(); genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, @@ -1104,6 +1145,11 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, last_err = 0; nl_recvmsgs(sock, cb); + + /* the header should still be printed when no entry was received */ + if (!last_err) + netlink_print_remaining_header(&opts); + if (!last_err && read_opt & (CONT_READ|CLR_CONT_READ)) usleep(1000000 * watch_interval); @@ -1120,7 +1166,8 @@ int netlink_print_originators(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) { - char *header; + char *header = NULL; + char *info_header; int ifindex; ifindex = if_nametoindex(mesh_iface); @@ -1129,10 +1176,12 @@ int netlink_print_originators(char *mesh_iface, char *orig_iface, return -ENODEV; } - netlink_print_info(ifindex, BATADV_CMD_GET_ORIGINATORS, PARSE_ONLY); + /* only parse routing algorithm name */ + info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); if (strlen(algo_name_buf) == 0) - return -EINVAL; + return -EOPNOTSUPP; if (!strcmp("BATMAN_IV", algo_name_buf)) header = " Originator last-seen (#/255) Nexthop [outgoingIF]\n"; @@ -1184,7 +1233,8 @@ int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opts, int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) -{ char *header; +{ char *header = NULL; + char *info_header; int ifindex; ifindex = if_nametoindex(mesh_iface); @@ -1193,10 +1243,12 @@ int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, return -ENODEV; } - netlink_print_info(ifindex, BATADV_CMD_GET_ORIGINATORS, PARSE_ONLY); + /* only parse routing algorithm name */ + info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); if (strlen(algo_name_buf) == 0) - return -EINVAL; + return -EOPNOTSUPP; if (!strcmp("BATMAN_IV", algo_name_buf)) header = " Router ( TQ) Next Hop [outgoingIf] Bandwidth\n";

1 0

[batctl] master: batctl: Document a network namespaces example. (30c2e89)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 30c2e89d6510d9d09f66e35beaa71302eef5358e Author: Andrew Lunn <andrew(a)lunn.ch> Date: Mon Jul 18 12:12:07 2016 +0200 batctl: Document a network namespaces example. Add example of has BATMAN can be used with network name spaces in the README. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 30c2e89d6510d9d09f66e35beaa71302eef5358e README | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/README b/README index 6df669a..ce049d4 100644 --- a/README +++ b/README @@ -555,3 +555,60 @@ where: - IPv4 is the IP address of a client in the mesh network - MAC is the MAC address associated to that IP - last-seen is the amount of time since last refresh of this entry + +batctl and network name spaces +============================== + +The batman-adv kernel module is netns aware. Mesh instances can be +created in name spaces, and interfaces in that name space added to the +mesh. The mesh interface cannot be moved between name spaces, as is +typical for virtual interfaces. + +The following example creates two network namespaces, and uses veth +pairs to connect them together into a mesh of three nodes. + +EMU1="ip netns exec emu1" +EMU2="ip netns exec emu2" + +ip netns add emu1 +ip netns add emu2 + +ip link add emu1-veth1 type veth peer name emu2-veth1 +ip link set emu1-veth1 netns emu1 +ip link set emu2-veth1 netns emu2 + +$EMU1 ip link set emu1-veth1 name veth1 +$EMU2 ip link set emu2-veth1 name veth1 + +$EMU1 ip link set veth1 up +$EMU2 ip link set veth1 up + +ip link add emu1-veth2 type veth peer name veth2 +ip link set emu1-veth2 netns emu1 +$EMU1 ip link set emu1-veth2 name veth2 + +$EMU1 ip link set veth2 up +ip link set veth2 up + +$EMU1 batctl if add veth1 +$EMU1 batctl if add veth2 +$EMU1 ip link set bat0 up + +$EMU2 batctl if add veth1 +$EMU2 ip link set bat0 up + +batctl if add veth2 +ip link set bat0 up + +alfred and batadv-vis can also be used with name spaces. In this +example, only netns has been used, so there are no filesystem name +spaces. Hence the unix domain socket used by alfred needs to be given +a unique name per instance. + +($EMU1 alfred -m -i bat0 -u /var/run/emu1-alfred.soc) & +($EMU2 alfred -m -i bat0 -u /var/run/emu2-alfred.soc) & +alfred -m -i bat0 & + +($EMU1 batadv-vis -s -u /var/run/emu1-alfred.soc) & +($EMU2 batadv-vis -s -u /var/run/emu2-alfred.soc) & +batadv-vis -s &

1 0

[batctl] master: batctl: Translate mac addresses via netlink (c2eb7a6)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit c2eb7a6cc5310c49e4d6996c80ef9341510f1552 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jul 18 12:12:06 2016 +0200 batctl: Translate mac addresses via netlink The debugfs entries are only available on the main network namespace. All other network namespaces have to fall back to netlink to read the global translation table. batctl has therefore try to access the translation table via netlink and try to fall back to the debugfs table in case the batman-adv module doesn't support BATADV_CMD_GET_TRANSTABLE_GLOBAL. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- c2eb7a6cc5310c49e4d6996c80ef9341510f1552 functions.c | 6 +- netlink.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.h | 5 ++ 3 files changed, 195 insertions(+), 1 deletion(-) diff --git a/functions.c b/functions.c index f994ced..d236d64 100644 --- a/functions.c +++ b/functions.c @@ -463,6 +463,7 @@ struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr in_mac; static struct ether_addr out_mac; struct ether_addr *mac_result; + int ret; /* input mac has to be copied because it could be in the shared * ether_aton buffer @@ -471,7 +472,10 @@ struct ether_addr *translate_mac(const char *mesh_iface, memcpy(&out_mac, mac, sizeof(out_mac)); mac_result = &out_mac; - translate_mac_debugfs(mesh_iface, &in_mac, mac_result); + ret = translate_mac_netlink(mesh_iface, &in_mac, mac_result); + + if (ret == -EOPNOTSUPP) + translate_mac_debugfs(mesh_iface, &in_mac, mac_result); return mac_result; } diff --git a/netlink.c b/netlink.c index 43b680e..423fc9b 100644 --- a/netlink.c +++ b/netlink.c @@ -22,6 +22,7 @@ #include "netlink.h" #include "main.h" +#include <stdbool.h> #include <stdio.h> #include <string.h> #include <unistd.h> @@ -43,6 +44,12 @@ #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#ifndef container_of +#define container_of(ptr, type, member) __extension__ ({ \ + const __typeof__(((type *)0)->member) *__pmember = (ptr); \ + (type *)((char *)__pmember - offsetof(type, member)); }) +#endif + struct print_opts { int read_opt; float orig_timeout; @@ -50,6 +57,10 @@ struct print_opts { uint8_t nl_cmd; }; +struct nlquery_opts { + int err; +}; + struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_VERSION] = { .type = NLA_STRING }, [BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING }, @@ -1222,3 +1233,177 @@ int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, int read_opts BATADV_CMD_GET_BLA_BACKBONE, bla_backbone_callback); } + +static int nlquery_error_cb(struct sockaddr_nl *nla __unused, + struct nlmsgerr *nlerr, void *arg) +{ + struct nlquery_opts *query_opts = arg; + + query_opts->err = nlerr->error; + + return NL_STOP; +} + +static int nlquery_stop_cb(struct nl_msg *msg, void *arg) +{ + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct nlquery_opts *query_opts = arg; + int *error = nlmsg_data(nlh); + + if (*error) + query_opts->err = *error; + + return NL_STOP; +} + +static int netlink_query_common(const char *mesh_iface, uint8_t nl_cmd, + nl_recvmsg_msg_cb_t callback, + struct nlquery_opts *query_opts) +{ + struct nl_sock *sock; + struct nl_msg *msg; + struct nl_cb *cb; + int ifindex; + int family; + int ret; + + query_opts->err = 0; + + sock = nl_socket_alloc(); + if (!sock) + return -ENOMEM; + + ret = genl_connect(sock); + if (ret < 0) { + query_opts->err = ret; + goto err_free_sock; + } + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); + if (family < 0) { + query_opts->err = -EOPNOTSUPP; + goto err_free_sock; + } + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + query_opts->err = -ENODEV; + goto err_free_sock; + } + + cb = nl_cb_alloc(NL_CB_DEFAULT); + if (!cb) { + query_opts->err = -ENOMEM; + goto err_free_sock; + } + + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, query_opts); + nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, nlquery_stop_cb, query_opts); + nl_cb_err(cb, NL_CB_CUSTOM, nlquery_error_cb, query_opts); + + msg = nlmsg_alloc(); + if (!msg) { + query_opts->err = -ENOMEM; + goto err_free_cb; + } + + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP, + nl_cmd, 1); + + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nl_send_auto_complete(sock, msg); + nlmsg_free(msg); + + nl_recvmsgs(sock, cb); + +err_free_cb: + nl_cb_put(cb); +err_free_sock: + nl_socket_free(sock); + + return query_opts->err; +} + +static const int translate_mac_netlink_mandatory[] = { + BATADV_ATTR_TT_ADDRESS, + BATADV_ATTR_ORIG_ADDRESS, +}; + +struct translate_mac_netlink_opts { + struct ether_addr mac; + bool found; + struct nlquery_opts query_opts; +}; + +static int translate_mac_netlink_cb(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct nlquery_opts *query_opts = arg; + struct translate_mac_netlink_opts *opts; + struct genlmsghdr *ghdr; + uint8_t *addr; + uint8_t *orig; + + opts = container_of(query_opts, struct translate_mac_netlink_opts, + query_opts); + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_TRANSTABLE_GLOBAL) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + return NL_OK; + } + + if (missing_mandatory_attrs(attrs, translate_mac_netlink_mandatory, + ARRAY_SIZE(translate_mac_netlink_mandatory))) + return NL_OK; + + addr = nla_data(attrs[BATADV_ATTR_TT_ADDRESS]); + orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); + + if (!attrs[BATADV_ATTR_FLAG_BEST]) + return NL_OK; + + if (memcmp(&opts->mac, addr, ETH_ALEN) != 0) + return NL_OK; + + memcpy(&opts->mac, orig, ETH_ALEN); + opts->found = true; + opts->query_opts.err = 0; + + return NL_STOP; +} + +int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, + struct ether_addr *mac_out) +{ + struct translate_mac_netlink_opts opts = { + .found = false, + .query_opts = { + .err = 0, + }, + }; + int ret; + + memcpy(&opts.mac, mac, ETH_ALEN); + + ret = netlink_query_common(mesh_iface, + BATADV_CMD_GET_TRANSTABLE_GLOBAL, + translate_mac_netlink_cb, &opts.query_opts); + if (ret < 0) + return ret; + + if (!opts.found) + return -ENOENT; + + memcpy(mac_out, &opts.mac, ETH_ALEN); + + return 0; +} diff --git a/netlink.h b/netlink.h index 5ff7ace..b2084fb 100644 --- a/netlink.h +++ b/netlink.h @@ -25,6 +25,8 @@ #include <netlink/genl/genl.h> #include <netlink/genl/ctrl.h> +struct ether_addr; + int netlink_print_routing_algos(void); int netlink_print_originators(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); @@ -43,6 +45,9 @@ int netlink_print_bla_claim(char *mesh_iface, char *orig_iface, int read_opt, int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); +int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, + struct ether_addr *mac_out); + extern struct nla_policy batadv_netlink_policy[]; #endif /* _BATCTL_NETLINK_H */

1 0

[batctl] master: batctl: Split translate_mac from debugfs backend (c8434de)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit c8434de2fb25f46a486f93bddc676e236c135dec Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jul 18 12:12:05 2016 +0200 batctl: Split translate_mac from debugfs backend The debugfs tables cannot be used by the batctl in network namespaces. These have to use netlink. Thus the translate_mac should be less tightly linked to the debugfs tables to implement optional netlink support. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- c8434de2fb25f46a486f93bddc676e236c135dec functions.c | 46 +++++++++++++++++++++++++++++++++++----------- functions.h | 3 ++- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/functions.c b/functions.c index 5b76062..f994ced 100644 --- a/functions.c +++ b/functions.c @@ -26,6 +26,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -371,7 +372,9 @@ out: return res; } -struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) +static int translate_mac_debugfs(const char *mesh_iface, + const struct ether_addr *mac, + struct ether_addr *mac_out) { enum { tg_start, @@ -381,26 +384,23 @@ struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) } pos; char full_path[MAX_PATH+1]; char *debugfs_mnt; - static struct ether_addr in_mac; - struct ether_addr *mac_result, *mac_tmp; + struct ether_addr *mac_tmp; FILE *f = NULL; size_t len = 0; char *line = NULL; char *input, *saveptr, *token; int line_invalid; - - memcpy(&in_mac, mac, sizeof(in_mac)); - mac_result = &in_mac; + bool found = false; debugfs_mnt = debugfs_mount(NULL); if (!debugfs_mnt) - goto out; + return -EOPNOTSUPP; debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_TRANSTABLE_GLOBAL, mesh_iface, full_path, sizeof(full_path)); f = fopen(full_path, "r"); if (!f) - goto out; + return -EOPNOTSUPP; while (getline(&line, &len, f) != -1) { line_invalid = 0; @@ -419,8 +419,8 @@ struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) break; case tg_mac: mac_tmp = ether_aton(token); - if (!mac_tmp || memcmp(mac_tmp, &in_mac, - sizeof(in_mac)) != 0) + if (!mac_tmp || memcmp(mac_tmp, mac, + ETH_ALEN) != 0) line_invalid = 1; else pos = tg_via; @@ -434,7 +434,8 @@ struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) if (!mac_tmp) { line_invalid = 1; } else { - mac_result = mac_tmp; + memcpy(mac_out, mac_tmp, ETH_ALEN); + found = true; goto out; } break; @@ -449,6 +450,29 @@ out: if (f) fclose(f); free(line); + + if (found) + return 0; + else + return -ENOENT; +} + +struct ether_addr *translate_mac(const char *mesh_iface, + const struct ether_addr *mac) +{ + struct ether_addr in_mac; + static struct ether_addr out_mac; + struct ether_addr *mac_result; + + /* input mac has to be copied because it could be in the shared + * ether_aton buffer + */ + memcpy(&in_mac, mac, sizeof(in_mac)); + memcpy(&out_mac, mac, sizeof(out_mac)); + mac_result = &out_mac; + + translate_mac_debugfs(mesh_iface, &in_mac, mac_result); + return mac_result; } diff --git a/functions.h b/functions.h index 2d29d52..1f311ca 100644 --- a/functions.h +++ b/functions.h @@ -40,7 +40,8 @@ int read_file(const char *dir, const char *path, int read_opt, float orig_timeout, float watch_interval, size_t header_lines); int write_file(const char *dir, const char *fname, const char *arg1, const char *arg2); -struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); +struct ether_addr *translate_mac(const char *mesh_iface, + const struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc); int vlan_get_link(const char *ifname, char **parent);

1 0

[batctl] master: batctl: Import alfred version of debugfs.* (23c3c6d)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 23c3c6dcab2101adc8dbde9e865ecbdf672b719d Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jul 18 12:12:04 2016 +0200 batctl: Import alfred version of debugfs.* The alfred version of debugfs.c and debugfs.h contains several cleanups regarding error message output, removal of unused declarations and usage of const buffers. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 23c3c6dcab2101adc8dbde9e865ecbdf672b719d debugfs.c | 17 ++++++++++------- debugfs.h | 4 +--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debugfs.c b/debugfs.c index 3c58195..fc39322 100644 --- a/debugfs.c +++ b/debugfs.c @@ -33,6 +33,9 @@ static int debugfs_premounted; static char debugfs_mountpoint[MAX_PATH+1]; +static const char *debugfs_find_mountpoint(void); +static int debugfs_valid_mountpoint(const char *debugfs); + static const char *debugfs_known_mountpoints[] = { "/sys/kernel/debug/", "/debug/", @@ -40,7 +43,8 @@ static const char *debugfs_known_mountpoints[] = { }; /* construct a full path to a debugfs element */ -int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) +int debugfs_make_path(const char *fmt, const char *mesh_iface, char *buffer, + int size) { if (strlen(debugfs_mountpoint) == 0) { buffer[0] = '\0'; @@ -53,14 +57,14 @@ int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size) static int debugfs_found; /* find the path to the mounted debugfs */ -const char *debugfs_find_mountpoint(void) +static const char *debugfs_find_mountpoint(void) { const char **ptr; char type[100]; FILE *fp; if (debugfs_found) - return (const char *) debugfs_mountpoint; + return (const char *)debugfs_mountpoint; ptr = debugfs_known_mountpoints; while (*ptr) { @@ -68,7 +72,7 @@ const char *debugfs_find_mountpoint(void) debugfs_found = 1; strncpy(debugfs_mountpoint, *ptr, sizeof(debugfs_mountpoint)); - debugfs_mountpoint[sizeof(debugfs_mountpoint) - 1] = '\0'; + debugfs_mountpoint[sizeof(debugfs_mountpoint) - 1] = 0; return debugfs_mountpoint; } ptr++; @@ -77,8 +81,7 @@ const char *debugfs_find_mountpoint(void) /* give up and parse /proc/mounts */ fp = fopen("/proc/mounts", "r"); if (fp == NULL) { - fprintf(stderr, "Error - can't open /proc/mounts for read: %s\n", - strerror(errno)); + perror("Error - can't open /proc/mounts for read"); return NULL; } @@ -101,7 +104,7 @@ const char *debugfs_find_mountpoint(void) /* verify that a mountpoint is actually a debugfs instance */ -int debugfs_valid_mountpoint(const char *debugfs) +static int debugfs_valid_mountpoint(const char *debugfs) { struct statfs st_fs; diff --git a/debugfs.h b/debugfs.h index e608902..b4dc6bb 100644 --- a/debugfs.h +++ b/debugfs.h @@ -30,11 +30,9 @@ # define STR(x) _STR(x) #endif -extern const char *debugfs_find_mountpoint(void); -extern int debugfs_valid_mountpoint(const char *debugfs); extern int debugfs_valid_entry(const char *path); extern char *debugfs_mount(const char *mountpoint); -extern int debugfs_make_path(const char *fmt, char *mesh_iface, +extern int debugfs_make_path(const char *fmt, const char *mesh_iface, char *buffer, int size); #endif /* __DEBUGFS_H__ */

1 0

[batctl] master: batctl: add netlink dump support for B.A.T.M.A.N. V gateways (02775f1)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 02775f1ad23055dcaad0e64d07c0233e94b2ccc2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Jul 18 12:12:03 2016 +0200 batctl: add netlink dump support for B.A.T.M.A.N. V gateways Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 02775f1ad23055dcaad0e64d07c0233e94b2ccc2 netlink.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/netlink.c b/netlink.c index 1e406a9..43b680e 100644 --- a/netlink.c +++ b/netlink.c @@ -794,7 +794,6 @@ static int translocal_callback(struct nl_msg *msg, void *arg) static const int gateways_mandatory[] = { BATADV_ATTR_ORIG_ADDRESS, - BATADV_ATTR_TQ, BATADV_ATTR_ROUTER, BATADV_ATTR_HARD_IFNAME, BATADV_ATTR_BANDWIDTH_DOWN, @@ -811,6 +810,7 @@ static int gateways_callback(struct nl_msg *msg, void *arg) const char *primary_if; uint32_t bandwidth_down; uint32_t bandwidth_up; + uint32_t throughput; uint8_t *router; uint8_t *orig; char c = ' '; @@ -842,7 +842,6 @@ static int gateways_callback(struct nl_msg *msg, void *arg) c = '*'; orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); - tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); router = nla_data(attrs[BATADV_ATTR_ROUTER]); primary_if = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); bandwidth_down = nla_get_u32(attrs[BATADV_ATTR_BANDWIDTH_DOWN]); @@ -858,7 +857,13 @@ static int gateways_callback(struct nl_msg *msg, void *arg) else printf("%17s ", bat_host->name); - printf("(%3i) ", tq); + if (attrs[BATADV_ATTR_THROUGHPUT]) { + throughput = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); + printf("(%9u.%1u) ", throughput / 10, throughput % 10); + } else if (attrs[BATADV_ATTR_TQ]) { + tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); + printf("(%3i) ", tq); + } bat_host = bat_hosts_find_by_mac((char *)router); if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) @@ -1168,10 +1173,31 @@ int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opts, int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) -{ +{ char *header; + int ifindex; + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + fprintf(stderr, "Interface %s is unknown\n", mesh_iface); + return -ENODEV; + } + + netlink_print_info(ifindex, BATADV_CMD_GET_ORIGINATORS, PARSE_ONLY); + + if (strlen(algo_name_buf) == 0) + return -EINVAL; + + if (!strcmp("BATMAN_IV", algo_name_buf)) + header = " Router ( TQ) Next Hop [outgoingIf] Bandwidth\n"; + if (!strcmp("BATMAN_V", algo_name_buf)) + header = " Router ( throughput) Next Hop [outgoingIf] Bandwidth\n"; + + if (!header) + return -EINVAL; + return netlink_print_common(mesh_iface, orig_iface, read_opts, orig_timeout, watch_interval, - " Router TQ Next Hop outgoingIf Bandwidth\n", + header, BATADV_CMD_GET_GATEWAYS, gateways_callback); }

1 0

[batctl] master: batctl: add netlink dump function for backbone tables (39c1441)
by postmaster＠open-mesh.org 22 Jul '16

22 Jul '16

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 39c144142e364986d3a2f1ce3ba61a2a138122c0 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Jul 18 12:12:02 2016 +0200 batctl: add netlink dump function for backbone tables Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 39c144142e364986d3a2f1ce3ba61a2a138122c0 debug.c | 1 + netlink.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.h | 2 ++ 3 files changed, 82 insertions(+) diff --git a/debug.c b/debug.c index 46f03da..ddabbfb 100644 --- a/debug.c +++ b/debug.c @@ -79,6 +79,7 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .opt_short = "bbt", .debugfs_name = "bla_backbone_table", .header_lines = 2, + .netlink_fn = netlink_print_bla_backbone, }, { .opt_long = "dat_cache", diff --git a/netlink.c b/netlink.c index b87964a..1e406a9 100644 --- a/netlink.c +++ b/netlink.c @@ -226,6 +226,7 @@ static int info_callback(struct nl_msg *msg, void *arg) if (ret < 0) extra_info = NULL; break; + case BATADV_CMD_GET_BLA_BACKBONE: case BATADV_CMD_GET_BLA_CLAIM: ret = asprintf(&extra_info, ", group id: 0x%04x", bla_group_id); @@ -947,6 +948,74 @@ static int bla_claim_callback(struct nl_msg *msg, void *arg) return NL_OK; } +static const int bla_backbone_mandatory[] = { + BATADV_ATTR_BLA_VID, + BATADV_ATTR_BLA_BACKBONE, + BATADV_ATTR_BLA_CRC, + BATADV_ATTR_LAST_SEEN_MSECS, +}; + +static int bla_backbone_callback(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + int last_seen_msecs, last_seen_secs; + struct print_opts *opts = arg; + struct bat_host *bat_host; + struct genlmsghdr *ghdr; + uint16_t backbone_crc; + uint8_t *backbone; + uint16_t vid; + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_BLA_BACKBONE) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + if (missing_mandatory_attrs(attrs, bla_backbone_mandatory, + ARRAY_SIZE(bla_backbone_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + /* don't show own backbones */ + if (attrs[BATADV_ATTR_BLA_OWN]) + return NL_OK; + + vid = nla_get_u16(attrs[BATADV_ATTR_BLA_VID]); + backbone = nla_data(attrs[BATADV_ATTR_BLA_BACKBONE]); + backbone_crc = nla_get_u16(attrs[BATADV_ATTR_BLA_CRC]); + + last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + bat_host = bat_hosts_find_by_mac((char *)backbone); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + backbone[0], backbone[1], backbone[2], + backbone[3], backbone[4], backbone[5]); + else + printf("%17s ", bat_host->name); + + printf("on %5d %4i.%03is (0x%04x)\n", + BATADV_PRINT_VID(vid), last_seen_secs, last_seen_msecs, + backbone_crc); + + return NL_OK; +} + static int netlink_print_common(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval, const char *header, @@ -1117,3 +1186,13 @@ int netlink_print_bla_claim(char *mesh_iface, char *orig_iface, int read_opts, BATADV_CMD_GET_BLA_CLAIM, bla_claim_callback); } + +int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, int read_opts, + float orig_timeout, float watch_interval) +{ + return netlink_print_common(mesh_iface, orig_iface, read_opts, + orig_timeout, watch_interval, + "Originator VID last seen (CRC )\n", + BATADV_CMD_GET_BLA_BACKBONE, + bla_backbone_callback); +} diff --git a/netlink.h b/netlink.h index 69f0958..5ff7ace 100644 --- a/netlink.h +++ b/netlink.h @@ -40,6 +40,8 @@ int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); int netlink_print_bla_claim(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); +int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, int read_opt, + float orig_timeout, float watch_interval); extern struct nla_policy batadv_netlink_policy[];

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2016