commits June 2012

commits@lists.open-mesh.org

1 participants
236 discussions

linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been created at c9641e9563f778dd4adce8a20a4a4c2f51acad52 (tag) tagging 22ebcf672c09eba9ca69c75755055c11ac3a40bd (commit) replaces v3.5-rc4 tagged by Antonio Quartulli on Sat Jun 30 16:50:34 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: - The last batch of patches aimed to clean the batman-adv namespace - a couple of style fixes - a fix for the ethtool support - a fix to prevent sending unicast packets with an uninitialised header field -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAk/vEywACgkQpGgxIkP9cwcLvwCdHaKwFD3WKY7Jz+Buol8njZJ7 OxsAmwRSjBFXGEpWfkdEnQMkg+qOkn8x =SK3Y -----END PGP SIGNATURE----- Al Viro (5): batman-adv: get rid of pointless cast in memcpy() batman-adv: trivial endianness annotations batman-adv: keep batman_ogm_packet ->seqno net-endian all along batman-adv: don't bother flipping ->tt_data batman-adv: don't bother flipping ->tt_crc Antonio Quartulli (9): batman-adv: fix skb->data assignment batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t batman-adv: use DBG_ALL in log_level sysfs definition batman-adv: fix skb->data assignment batman-adv: fix race condition in TT full-table replacement batman-adv: fix condition in AP isolation batman-adv: fix global TT entry deletion batman-adv: clear ADD+DEL (and viceversa) events in the same orig-interval batman-adv: beautify tt_global_add() argument list David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Marek Lindner (7): batman-adv: avoid characters requiring shell escapes in protocol names batman-adv: ignore trailing CR when comparing protocol names batman-adv: return added entries instead of number of possibly added entries batman-adv: turn tt commit code into routing protocol agnostic API batman-adv: only store changed gw_bandwidth values batman-adv: only drop packets of known wifi clients batman-adv: fix counter summary length Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support Matthias Schiffer (2): batman-adv: fix visualization output without neighbors on the primary interface batman-adv: fix locking in hash_add() Sven Eckelmann (74): batman-adv: update internal version number batman-adv: Initialize lockdep class keys for hashes batman-adv: Return error codes instead of -1 on failures batman-adv: Prefix bat_algo non-static functions with batadv_ batman-adv: Prefix bat_debugfs non-static functions with batadv_ batman-adv: Prefix bat_sysfs non-static functions with batadv_ batman-adv: Prefix bitarray non-static functions with batadv_ batman-adv: Prefix bridge_loop_avoidance non-static functions with batadv_ batman-adv: Prefix gateway-client non-static functions with batadv_ batman-adv: Prefix gateway-common non-static functions with batadv_ batman-adv: Prefix hard-interface non-static functions with batadv_ batman-adv: Prefix hash non-static functions with batadv_ batman-adv: Prefix icmp-socket non-static functions with batadv_ batman-adv: Prefix originator non-static functions with batadv_ batman-adv: Prefix ring_buffer non-static functions with batadv_ batman-adv: Prefix routing non-static functions with batadv_ batman-adv: Prefix send non-static functions with batadv_ batman-adv: Prefix soft-interface non-static functions with batadv_ batman-adv: Prefix translation-table non-static functions with batadv_ batman-adv: Prefix unicast non-static functions with batadv_ batman-adv: Prefix vis non-static functions with batadv_ batman-adv: Prefix main non-static functions with batadv_ batman-adv: Reformat multiline comments to consistent style batman-adv: Prefix bat_debugfs local static functions with batadv_ batman-adv: Prefix bitarray static inline functions with batadv_ batman-adv: Prefix hard-interface static inline functions with batadv_ batman-adv: Prefix hash static inline functions with batadv_ batman-adv: Prefix originator static inline functions with batadv_ batman-adv: Prefix unicast static inline functions with batadv_ batman-adv: Prefix main static inline functions with batadv_ batman-adv: Prefix bat_iv_ogm local static functions with batadv_ batman-adv: Prefix bat_sysfs local static functions with batadv_ batman-adv: Prefix bridge_loop_avoidance local static functions with batadv_ batman-adv: Prefix gateway_client local static functions with batadv_ batman-adv: Prefix gateway_common local static functions with batadv_ batman-adv: Prefix hard-interface local static functions with batadv_ batman-adv: Prefix hash local static functions with batadv_ batman-adv: Prefix icmp_socket local static functions with batadv_ batman-adv: Prefix originator local static functions with batadv_ batman-adv: Prefix routing local static functions with batadv_ batman-adv: Prefix send local static functions with batadv_ batman-adv: Prefix soft-interface local static functions with batadv_ batman-adv: Prefix translation-table local static functions with batadv_ batman-adv: Prefix unicast local static functions with batadv_ batman-adv: Prefix vis local static functions with batadv_ batman-adv: Prefix main local static functions with batadv_ batman-adv: Prefix remaining function like macros with batadv_ batman-adv: Directly print to seq_file in vis batman-adv: Prefix local defines with BATADV_ batman-adv: Prefix debugfs defines with BATADV_ batman-adv: Prefix sysfs defines with BATADV_ batman-adv: Prefix bridge_loop_avoidance defines with BATADV_ batman-adv: Prefix gateway defines with BATADV_ batman-adv: Prefix icmp_socket defines with BATADV_ batman-adv: Prefix packet defines with BATADV_ batman-adv: Prefix types defines with BATADV_ batman-adv: Prefix unicast defines with BATADV_ batman-adv: Prefix vis defines with BATADV_ batman-adv: Prefix main defines with BATADV_ batman-adv: Prefix gateway enum with BATADV_ batman-adv: Prefix hard-interface enum with BATADV_ batman-adv: Prefix types enum with BATADV_ batman-adv: Prefix packet enum with BATADV_ batman-adv: Prefix main enum with BATADV_ batman-adv: Prefix local debugfs structs with batadv_ batman-adv: Prefix hash struct and typedef with batadv_ batman-adv: Prefix local sysfs struct with batadv_ batman-adv: Prefix packet structs with batadv_ batman-adv: Prefix types structs with batadv_ batman-adv: Transform BATADV_LOG_BUFF(idx) into function batman-adv: Remove bat_ prefix from bat_{debugfs, sysfs}.{c, h} batman-adv: Remove space before semicolon batman-adv: Fix alignment after opened parentheses batman-adv: Don't leak information through uninitialized packet fields ----------------------------------------------------------------------- -- linux integration

10 years, 11 months

linux integration; branch, merge/master, updated. v3.5-rc1-1471-g6bd389c

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 6bd389c269b2f0a2e723b6bf6d10621ae413de03 Merge: 07746107415dab8f1bf89ccc21484e62e0fe2969 4aae8042b3df7ac9a74177f799cb26186623e2e7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sat Jun 30 14:34:37 2012 +0200 Merge remote-tracking branch 'origin/standalone/next' into merge/master diff --combined net/batman-adv/soft-interface.c index b7c655c,9e4bb61..9e4bb61 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -214,6 -214,7 +214,7 @@@ static int batadv_interface_tx(struct s /* batman packet type: broadcast */ bcast_packet->header.packet_type = BATADV_BCAST; + bcast_packet->reserved = 0; /* hw address of first interface is the orig mac because only * this mac is known throughout the mesh diff --combined net/batman-adv/translation-table.c index 245cc9a,a438f4b..a438f4b --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -2052,6 -2052,7 +2052,7 @@@ static void batadv_send_roam_adv(struc roam_adv_packet->header.packet_type = BATADV_ROAM_ADV; roam_adv_packet->header.version = BATADV_COMPAT_VERSION; roam_adv_packet->header.ttl = BATADV_TTL; + roam_adv_packet->reserved = 0; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; diff --combined net/batman-adv/vis.c index f09cc9a,2a2ea06..2a2ea06 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -589,6 -589,7 +589,7 @@@ static int batadv_generate_vis_packet(s packet->header.ttl = BATADV_TTL; packet->seqno = htonl(ntohl(packet->seqno) + 1); packet->entries = 0; + packet->reserved = 0; skb_trim(info->skb_packet, sizeof(*packet)); if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) { @@@ -890,6 -891,7 +891,7 @@@ int batadv_vis_init(struct batadv_priv packet->header.packet_type = BATADV_VIS; packet->header.ttl = BATADV_TTL; packet->seqno = 0; + packet->reserved = 0; packet->entries = 0; INIT_LIST_HEAD(&bat_priv->vis_send_list); -- linux integration

10 years, 11 months

batctl; branch, master, updated. v2012.2.0-25-gb7b9484

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit b7b948479ca2c12ad4f038c974ee20294005ddf1 Merge: 40cc39306c445e6d513b44949f1ee2ace21894d7 74e9b222da4641ee337c62727c58a18aea8754cf Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 30 14:25:27 2012 +0200 Merge branch 'next' diff --combined ping.c index 9f64a8f,b6199c6..ce8f457 --- a/ping.c +++ b/ping.c @@@ -44,8 -44,8 +44,8 @@@ char is_aborted = 0 void ping_usage(void) { - printf("Usage: batctl ping [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] ping [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -c ping packet count \n"); printf(" \t -h print this help\n"); printf(" \t -i interval in seconds\n"); @@@ -174,6 -174,8 +174,8 @@@ int ping(char *mesh_iface, int argc, ch icmp_packet_out.rr_cur = 1; memset(&icmp_packet_out.rr, 0, BATADV_RR_LEN * ETH_ALEN); memset(last_rr, 0, BATADV_RR_LEN * ETH_ALEN); + } else { + ((struct batadv_icmp_packet *)&icmp_packet_out)->reserved = 0; } printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, diff --combined traceroute.c index c1aaad8,aae9fa7..75ff2b3 --- a/traceroute.c +++ b/traceroute.c @@@ -43,8 -43,8 +43,8 @@@ void traceroute_usage(void) { - printf("Usage: batctl traceroute [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] traceroute [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); } @@@ -125,6 -125,7 +125,7 @@@ int traceroute(char *mesh_iface, int ar icmp_packet_out.header.packet_type = BATADV_ICMP; icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; + icmp_packet_out.reserved = 0; printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); -- batctl

10 years, 11 months

batctl; branch, next, updated. v2012.2.0-17-g74e9b22

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 74e9b222da4641ee337c62727c58a18aea8754cf Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 28 11:56:53 2012 +0200 batctl: Don't leak information through uninitialized packet fields The reserved fields in batman-adv packets are not set to a constant value. The content of these memory regions is leaked unintentionally to the network. This regression was introduced in ee319368e5d6385458345731e519640889c177c4 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/ping.c b/ping.c index 85b4137..b6199c6 100644 --- a/ping.c +++ b/ping.c @@ -174,6 +174,8 @@ int ping(char *mesh_iface, int argc, char **argv) icmp_packet_out.rr_cur = 1; memset(&icmp_packet_out.rr, 0, BATADV_RR_LEN * ETH_ALEN); memset(last_rr, 0, BATADV_RR_LEN * ETH_ALEN); + } else { + ((struct batadv_icmp_packet *)&icmp_packet_out)->reserved = 0; } printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, diff --git a/traceroute.c b/traceroute.c index 31f77b0..aae9fa7 100644 --- a/traceroute.c +++ b/traceroute.c @@ -125,6 +125,7 @@ int traceroute(char *mesh_iface, int argc, char **argv) icmp_packet_out.header.packet_type = BATADV_ICMP; icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; + icmp_packet_out.reserved = 0; printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); -- batctl

10 years, 11 months

batman-adv; branch, master, updated. v2012.2.0-141-g5deb69f

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 5deb69f60f388055982a1da6dce876049f86841d Merge: 620f45d57203dcc722534b034157fec55df2a606 4aae8042b3df7ac9a74177f799cb26186623e2e7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 30 14:21:44 2012 +0200 Merge branch 'next' diff --combined soft-interface.c index c77473e,9e4bb61..96736ea --- a/soft-interface.c +++ b/soft-interface.c @@@ -93,14 -93,7 +93,14 @@@ static int batadv_interface_release(str static struct net_device_stats *batadv_interface_stats(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); - return &bat_priv->stats; + struct net_device_stats *stats = &bat_priv->stats; + + stats->tx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_TX); + stats->tx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_TX_BYTES); + stats->tx_dropped = batadv_sum_counter(bat_priv, BATADV_CNT_TX_DROPPED); + stats->rx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_RX); + stats->rx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_RX_BYTES); + return stats; } static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) @@@ -221,6 -214,7 +221,7 @@@ static int batadv_interface_tx(struct s /* batman packet type: broadcast */ bcast_packet->header.packet_type = BATADV_BCAST; + bcast_packet->reserved = 0; /* hw address of first interface is the orig mac because only * this mac is known throughout the mesh @@@ -252,14 -246,14 +253,14 @@@ goto dropped_freed; } - bat_priv->stats.tx_packets++; - bat_priv->stats.tx_bytes += data_len; + batadv_inc_counter(bat_priv, BATADV_CNT_TX); + batadv_add_counter(bat_priv, BATADV_CNT_TX_BYTES, data_len); goto end; dropped: kfree_skb(skb); dropped_freed: - bat_priv->stats.tx_dropped++; + batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED); end: if (primary_if) batadv_hardif_free_ref(primary_if); @@@ -310,9 -304,8 +311,9 @@@ void batadv_interface_rx(struct net_dev /* skb->ip_summed = CHECKSUM_UNNECESSARY; */ - bat_priv->stats.rx_packets++; - bat_priv->stats.rx_bytes += skb->len + ETH_HLEN; + batadv_inc_counter(bat_priv, BATADV_CNT_RX); + batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, + skb->len + ETH_HLEN); soft_iface->last_rx = jiffies; @@@ -382,22 -375,15 +383,22 @@@ struct net_device *batadv_softif_create if (!soft_iface) goto out; + bat_priv = netdev_priv(soft_iface); + + /* batadv_interface_stats() needs to be available as soon as + * register_netdevice() has been called + */ + bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); + if (!bat_priv->bat_counters) + goto free_soft_iface; + ret = register_netdevice(soft_iface); if (ret < 0) { pr_err("Unable to register the batman interface '%s': %i\n", name, ret); - goto free_soft_iface; + goto free_bat_counters; } - bat_priv = netdev_priv(soft_iface); - atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); atomic_set(&bat_priv->bridge_loop_avoidance, 0); @@@ -427,13 -413,17 +428,13 @@@ bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; - bat_priv->bat_counters = __alloc_percpu(cnt_len, __alignof__(uint64_t)); - if (!bat_priv->bat_counters) - goto unreg_soft_iface; - ret = batadv_algo_select(bat_priv, batadv_routing_algo); if (ret < 0) - goto free_bat_counters; + goto unreg_soft_iface; ret = batadv_sysfs_add_meshif(soft_iface); if (ret < 0) - goto free_bat_counters; + goto unreg_soft_iface; ret = batadv_debugfs_add_meshif(soft_iface); if (ret < 0) @@@ -449,13 -439,12 +450,13 @@@ unreg_debugfs batadv_debugfs_del_meshif(soft_iface); unreg_sysfs: batadv_sysfs_del_meshif(soft_iface); -free_bat_counters: - free_percpu(bat_priv->bat_counters); unreg_soft_iface: + free_percpu(bat_priv->bat_counters); unregister_netdevice(soft_iface); return NULL; +free_bat_counters: + free_percpu(bat_priv->bat_counters); free_soft_iface: free_netdev(soft_iface); out: @@@ -525,11 -514,6 +526,11 @@@ static u32 batadv_get_link(struct net_d static const struct { const char name[ETH_GSTRING_LEN]; } batadv_counters_strings[] = { + { "tx" }, + { "tx_bytes" }, + { "tx_dropped" }, + { "rx" }, + { "rx_bytes" }, { "forward" }, { "forward_bytes" }, { "mgmt_tx" }, -- batman-adv

10 years, 11 months

batman-adv; branch, next, updated. v2012.2.0-132-g4aae804

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 4aae8042b3df7ac9a74177f799cb26186623e2e7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 28 11:56:52 2012 +0200 batman-adv: Don't leak information through uninitialized packet fields The reserved fields in batman-adv packets are not set to a constant value. The content of these memory regions is leaked unintentionally to the network. This regression was introduced in c7fb529996cbc47bc8243d6860dac716ae70af82 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index b7c655c..9e4bb61 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -214,6 +214,7 @@ static int batadv_interface_tx(struct sk_buff *skb, /* batman packet type: broadcast */ bcast_packet->header.packet_type = BATADV_BCAST; + bcast_packet->reserved = 0; /* hw address of first interface is the orig mac because only * this mac is known throughout the mesh diff --git a/translation-table.c b/translation-table.c index 245cc9a..a438f4b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2052,6 +2052,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, roam_adv_packet->header.packet_type = BATADV_ROAM_ADV; roam_adv_packet->header.version = BATADV_COMPAT_VERSION; roam_adv_packet->header.ttl = BATADV_TTL; + roam_adv_packet->reserved = 0; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; diff --git a/vis.c b/vis.c index f09cc9a..2a2ea06 100644 --- a/vis.c +++ b/vis.c @@ -589,6 +589,7 @@ static int batadv_generate_vis_packet(struct batadv_priv *bat_priv) packet->header.ttl = BATADV_TTL; packet->seqno = htonl(ntohl(packet->seqno) + 1); packet->entries = 0; + packet->reserved = 0; skb_trim(info->skb_packet, sizeof(*packet)); if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) { @@ -890,6 +891,7 @@ int batadv_vis_init(struct batadv_priv *bat_priv) packet->header.packet_type = BATADV_VIS; packet->header.ttl = BATADV_TTL; packet->seqno = 0; + packet->reserved = 0; packet->entries = 0; INIT_LIST_HEAD(&bat_priv->vis_send_list); -- batman-adv

10 years, 11 months

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.5-rc2-1080-g42d0b04

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been deleted was 3eb40f57e6e7045db48a84761799d372bf172b1a ----------------------------------------------------------------------- tag batman-adv-for-davem Included changes: - another batch of patches meant to clean batman-adv namespace - deletion of an obsolete intermediate buffer used in the visualization code to print the output - TT code cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAk/r/yQACgkQpGgxIkP9cwefRwCgmLPvqF1y720Bs33vIxIExcY1 tZAAn24dNaVX7niTIF35FS/FuSsswW/J =6YOn -----END PGP SIGNATURE----- 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 batman-adv: Prefix main defines with BATADV_ ----------------------------------------------------------------------- -- linux integration

10 years, 11 months

linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been created at 3eb40f57e6e7045db48a84761799d372bf172b1a (tag) tagging 42d0b044b7c9e5821f1bf3e2b4ea7861417c11c2 (commit) replaces v3.5-rc2 tagged by Antonio Quartulli on Thu Jun 28 08:47:36 2012 +0200 - Shortlog ------------------------------------------------------------ Included changes: - another batch of patches meant to clean batman-adv namespace - deletion of an obsolete intermediate buffer used in the visualization code to print the output - TT code cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAk/r/yQACgkQpGgxIkP9cwefRwCgmLPvqF1y720Bs33vIxIExcY1 tZAAn24dNaVX7niTIF35FS/FuSsswW/J =6YOn -----END PGP SIGNATURE----- Al Viro (5): batman-adv: get rid of pointless cast in memcpy() batman-adv: trivial endianness annotations batman-adv: keep batman_ogm_packet ->seqno net-endian all along batman-adv: don't bother flipping ->tt_data batman-adv: don't bother flipping ->tt_crc Antonio Quartulli (9): batman-adv: fix skb->data assignment batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_t batman-adv: use DBG_ALL in log_level sysfs definition batman-adv: fix skb->data assignment batman-adv: fix race condition in TT full-table replacement batman-adv: fix condition in AP isolation batman-adv: fix global TT entry deletion batman-adv: clear ADD+DEL (and viceversa) events in the same orig-interval batman-adv: beautify tt_global_add() argument list David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Marek Lindner (6): batman-adv: avoid characters requiring shell escapes in protocol names batman-adv: ignore trailing CR when comparing protocol names batman-adv: return added entries instead of number of possibly added entries batman-adv: turn tt commit code into routing protocol agnostic API batman-adv: only store changed gw_bandwidth values batman-adv: only drop packets of known wifi clients Martin Hundebøll (1): batman-adv: Add get_ethtool_stats() support Matthias Schiffer (2): batman-adv: fix visualization output without neighbors on the primary interface batman-adv: fix locking in hash_add() Sven Eckelmann (59): batman-adv: update internal version number batman-adv: Initialize lockdep class keys for hashes batman-adv: Return error codes instead of -1 on failures batman-adv: Prefix bat_algo non-static functions with batadv_ batman-adv: Prefix bat_debugfs non-static functions with batadv_ batman-adv: Prefix bat_sysfs non-static functions with batadv_ batman-adv: Prefix bitarray non-static functions with batadv_ batman-adv: Prefix bridge_loop_avoidance non-static functions with batadv_ batman-adv: Prefix gateway-client non-static functions with batadv_ batman-adv: Prefix gateway-common non-static functions with batadv_ batman-adv: Prefix hard-interface non-static functions with batadv_ batman-adv: Prefix hash non-static functions with batadv_ batman-adv: Prefix icmp-socket non-static functions with batadv_ batman-adv: Prefix originator non-static functions with batadv_ batman-adv: Prefix ring_buffer non-static functions with batadv_ batman-adv: Prefix routing non-static functions with batadv_ batman-adv: Prefix send non-static functions with batadv_ batman-adv: Prefix soft-interface non-static functions with batadv_ batman-adv: Prefix translation-table non-static functions with batadv_ batman-adv: Prefix unicast non-static functions with batadv_ batman-adv: Prefix vis non-static functions with batadv_ batman-adv: Prefix main non-static functions with batadv_ batman-adv: Reformat multiline comments to consistent style batman-adv: Prefix bat_debugfs local static functions with batadv_ batman-adv: Prefix bitarray static inline functions with batadv_ batman-adv: Prefix hard-interface static inline functions with batadv_ batman-adv: Prefix hash static inline functions with batadv_ batman-adv: Prefix originator static inline functions with batadv_ batman-adv: Prefix unicast static inline functions with batadv_ batman-adv: Prefix main static inline functions with batadv_ batman-adv: Prefix bat_iv_ogm local static functions with batadv_ batman-adv: Prefix bat_sysfs local static functions with batadv_ batman-adv: Prefix bridge_loop_avoidance local static functions with batadv_ batman-adv: Prefix gateway_client local static functions with batadv_ batman-adv: Prefix gateway_common local static functions with batadv_ batman-adv: Prefix hard-interface local static functions with batadv_ batman-adv: Prefix hash local static functions with batadv_ batman-adv: Prefix icmp_socket local static functions with batadv_ batman-adv: Prefix originator local static functions with batadv_ batman-adv: Prefix routing local static functions with batadv_ batman-adv: Prefix send local static functions with batadv_ batman-adv: Prefix soft-interface local static functions with batadv_ batman-adv: Prefix translation-table local static functions with batadv_ batman-adv: Prefix unicast local static functions with batadv_ batman-adv: Prefix vis local static functions with batadv_ batman-adv: Prefix main local static functions with batadv_ batman-adv: Prefix remaining function like macros with batadv_ batman-adv: Directly print to seq_file in vis batman-adv: Prefix local defines with BATADV_ batman-adv: Prefix debugfs defines with BATADV_ batman-adv: Prefix sysfs defines with BATADV_ batman-adv: Prefix bridge_loop_avoidance defines with BATADV_ batman-adv: Prefix gateway defines with BATADV_ batman-adv: Prefix icmp_socket defines with BATADV_ batman-adv: Prefix packet defines with BATADV_ batman-adv: Prefix types defines with BATADV_ batman-adv: Prefix unicast defines with BATADV_ batman-adv: Prefix vis defines with BATADV_ batman-adv: Prefix main defines with BATADV_ ----------------------------------------------------------------------- -- linux integration

10 years, 11 months

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.5-rc2-920-ga513088

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been deleted was 1a5bd8f3a510e7d177bb5690c2a5eb8e9130965d ----------------------------------------------------------------------- tag batman-adv-for-davem Included changes: - yet another batch of 'namespace cleaning' patches -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAk/oCnEACgkQpGgxIkP9cwemxACgnCRoebBm9FXzoUfn3hI4YFTu Hg0AnA6nbPZLQ8uDqdjz45ix1G2T0FnY =+NOX -----END PGP SIGNATURE----- a513088d022c8f59cebe17c567797c220563b517 batman-adv: Prefix translation-table local static functions with batadv_ ----------------------------------------------------------------------- -- linux integration

10 years, 11 months

batctl; branch, master, updated. v2012.2.0-23-g40cc393

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 40cc39306c445e6d513b44949f1ee2ace21894d7 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Jun 23 13:42:24 2012 +0200 batctl: beef up man page Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/README b/README index b06aacf..a2b0266 100644 --- a/README +++ b/README @@ -81,8 +81,8 @@ batctl ping Sends a Layer 2 batman-adv ping to check round trip time and connectivity -Usage: batctl ping [options] mac|bat-host -options: +Usage: batctl ping [parameters] mac|bat-host +parameters: -c ping packet count -h print this help -i interval in seconds @@ -106,7 +106,7 @@ batctl traceroute Traceroute sends 3 packets to each hop, awaits the answers and prints out the response times. -Usage: batctl traceroute [options] mac|bat-host +Usage: batctl traceroute [parameters] mac|bat-host Example: @@ -128,8 +128,8 @@ batctl tcpdump tcpdump layer 2 and/or layer 3 traffic on the given interface -Usage: batctl tcpdump [options] interface [interface] -options: +Usage: batctl tcpdump [parameters] interface [interface] +parameters: -c compat filter - only display packets matching own compat version (14) -h print this help -n don't convert addresses to bat-host names @@ -182,8 +182,8 @@ bat-host name) to only see data connected to this originator. If "-n" was given batctl will not replace the mac addresses with bat-host names in the output. -Usage: batctl bisect [options] <file1> <file2> .. <fileN> -options: +Usage: batctl bisect [parameters] <file1> <file2> .. <fileN> +parameters: -h print this help -l run a loop detection of given mac address or bat-host (default) -n don't convert addresses to bat-host names @@ -292,7 +292,7 @@ batctl interface display or modify the interface settings -Usage: batctl interface|if [add|del iface(s)] +Usage: batctl interface|if [add|del iface(s)] Example: @@ -304,7 +304,7 @@ batctl interval display or modify the originator interval in ms -Usage: batctl interval|it [orig_interval] +Usage: batctl orig_interval|it [interval] Example: @@ -335,7 +335,7 @@ batctl loglevel display or modify the log level -Usage: batctl loglevel|ll [level] +Usage: batctl loglevel|ll [level] Example: $ batctl loglevel @@ -415,7 +415,7 @@ batctl vis_mode display or modify the status of the VIS server -Usage: batctl vis_mode|vm [mode] +Usage: batctl vis_mode|vm [mode] Example: diff --git a/bisect.c b/bisect.c index b505b1a..8bc9c65 100644 --- a/bisect.c +++ b/bisect.c @@ -37,8 +37,8 @@ static struct bat_node *curr_bat_node = NULL; static void bisect_usage(void) { - printf("Usage: batctl bisect [options] <file1> <file2> .. <fileN>\n"); - printf("options:\n"); + printf("Usage: batctl bisect [parameters] <file1> <file2> .. <fileN>\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -l run a loop detection of given mac address or bat-host (default)\n"); printf(" \t -n don't convert addresses to bat-host names\n"); diff --git a/debug.c b/debug.c index 8aa36c2..9b5146f 100644 --- a/debug.c +++ b/debug.c @@ -68,9 +68,9 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { void debug_table_usage(int debug_table) { - printf("Usage: batctl [options] %s|%s\n", + printf("Usage: batctl [options] %s|%s [parameters]\n", batctl_debug_tables[debug_table].opt_long, batctl_debug_tables[debug_table].opt_short); - printf("options:\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't replace mac addresses with bat-host names\n"); printf(" \t -w [interval] watch mode - refresh the table continuously\n"); @@ -152,8 +152,8 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) static void log_usage(void) { - printf("Usage: batctl [options] log \n"); - printf("options:\n"); + printf("Usage: batctl [options] log [parameters]\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't replace mac addresses with bat-host names\n"); } diff --git a/main.c b/main.c index ae0b3d2..1086f8e 100644 --- a/main.c +++ b/main.c @@ -47,10 +47,10 @@ void print_usage(void) { int i, opt_indent; - printf("Usage: batctl [options] command|debug table \n"); + printf("Usage: batctl [options] command|debug table [parameters]\n"); printf("options:\n"); printf(" \t-m mesh interface (default 'bat0')\n"); - printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the specific help)\n"); + printf(" \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); printf(" \t-v print version\n"); printf("\n"); diff --git a/man/batctl.8 b/man/batctl.8 index af30b67..1a11508 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -23,30 +23,23 @@ .SH NAME batctl \- B.A.T.M.A.N. advanced control and management tool .SH SYNOPSIS -.B batctl -.I [\fIbatctl\-options\fP]\ \fIcommand\fP\ [\fIcommand\-options\fP] +.B batctl [\fIoptions\fP]\ \fIcommand\fP|\fIdebug\ table\fP\ [\fIparameters\fP] .br .SH DESCRIPTION -batctl offers a convenient way to configure the batman\-adv kernel -module as well as displaying debug information such as originator -tables, translation tables and the debug log. In combination with a -bat\-hosts file batctl allows the use of host names instead of MAC -addresses. +batctl offers a convenient way to configure the batman\-adv kernel module as well as displaying debug information +such as originator tables, translation tables and the debug log. In combination with a bat\-hosts file batctl allows +the use of host names instead of MAC addresses. .PP -B.A.T.M.A.N. advanced operates on layer 2. Thus all hosts -participating in the virtual switched network are transparently -connected together for all protocols above layer 2. Therefore the -common diagnosis tools do not work as expected. To overcome these -problems batctl contains the commands \fBping\fP, \fBtraceroute\fP, -\fBtcpdump\fP which provide similar functionality to the normal -\fBping\fP(1), \fBtraceroute\fP(1), \fBtcpdump\fP(1) commands, but -modified to layer 2 behaviour or using the B.A.T.M.A.N. advanced -protocol. +B.A.T.M.A.N. advanced operates on layer 2. Thus all hosts participating in the virtual switched network are transparently +connected together for all protocols above layer 2. Therefore the common diagnosis tools do not work as expected. To +overcome these problems batctl contains the commands \fBping\fP, \fBtraceroute\fP, \fBtcpdump\fP which provide similar +functionality to the normal \fBping\fP(1), \fBtraceroute\fP(1), \fBtcpdump\fP(1) commands, but modified to layer 2 +behaviour or using the B.A.T.M.A.N. advanced protocol. .PP .PP .SH OPTIONS .TP -.I \fBbatctl\-options: +.I \fBoptions: \-m specify mesh interface (default 'bat0') .br \-h print general batctl help @@ -55,23 +48,58 @@ protocol. .br .TP .I \fBcommands: -.IP "\fBinterface\fP|\fBif\fP [\fBadd\fP|\fBdel iface(s)\fP]" -If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to add or delete. +.IP "\fBinterface\fP|\fBif\fP [\fBadd\fP|\fBdel iface(s)\fP]" +If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. +In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to +add or delete. Multiple interfaces can be specified. +.br +.IP "\fBorig_interval\fP|\fBit\fP [\fBinterval\fP]" +If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the +originator interval. The interval is in units of milliseconds. +.br +.IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or +disable ap isolation. +.br +.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable +or disable the bridge loop avoidance. Bridge loop avoidance support has to be enabled when compiling the module otherwise +this option won't be available. .br -.IP "\fBoriginators\fP|\fBo\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP][\fB\-t\fP]" -Once started batctl will display the list of announced originators in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. The "\-t" option filters all originators that have not been seen for the specified amount of seconds (with optional decimal places) from the output. +.IP "\fBvis_mode|vm\fP [\fBclient|server\fP]\fP" +If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode. +.br +.IP "\fBaggregation\fP|\fBag\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current aggregation setting is displayed. Otherwise the parameter is used to enable or disable +OGM packet aggregation. .br -.IP "\fBinterval\fP|\fBit\fP [\fBorig_interval\fP]" -If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. +.IP "\fBbonding\fP|\fBb\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable +the bonding mode. .br -.IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" -If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. +.IP "\fBfragmentation\fP|\fBf\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or +disable fragmentation. .br -.IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" -batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. +.IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" +If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log +level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. +Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to +translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all +messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging +output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br -.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" -If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. +.IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" +batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not +replace the MAC addresses with bat\-host names in the output. +.br +.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" +If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The +second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if +'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about +this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv +module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload +rate and the module will assume an upload of download / 5. .RS 17 default: 2000 \-> gateway class 20 .RE @@ -86,7 +114,8 @@ examples: 5000 \-> gateway class 49 5mbit/1mbit .RE .RS 7 -If the node is a gateway client the parameter will decide which criterias to consider when the batman-adv module has to choose between different internet connections announced by the aforementioned servers. +If the node is a gateway client the parameter will decide which criterias to consider when the batman-adv module has to choose +between different internet connections announced by the aforementioned servers. .RE .RS 17 default: 20 \-> late switch (TQ 20) @@ -108,63 +137,62 @@ chooses the gateway with the best link quality but switches to another gateway a .RE XX \-> late switch connection .RS 7 -chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found which is at least XX TQ better than the currently selected gateway (XX has to be a number between 3 and 256). +chooses the gateway with the best link quality but switches to another gateway as soon as a better one is found which is at +least XX TQ better than the currently selected gateway (XX has to be a number between 3 and 256). .RE .RE .br -.IP "\fBgateways|gwl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Once started batctl will display the list of announced gateways in the network. Use the "\-w" option to let batctl refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places). If "\-n" was given batctl will not replace the mac addresses with bat\-host names in the output. -.br -.IP "\fBtranslocal\fP|\fBtl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the local translation table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBtransglobal\fP|\fBtg\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the global translation table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBclaimtable\fP|\fBcl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the bridge loop avoidance claim table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBbackbonetable\fP|\fBbbl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the bridge loop avoidance backbone table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. -.br -.IP "\fBvis_mode|vm\fP [\fBmode\fP]\fP" -If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode. -.br -.IP "\fBvis_data|vd dot\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in graphviz \fBdot\fP(1) format. If -"\-\-numbers" or "\-n" is given batctl will not replace the MAC -addresses with bat-host names in the output. With "\-\-no-TT" or -"\-T" the TT entries are not displayed, so the pure mesh topology can -be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around -primary and secondary addresses from the same device. -.br -.IP "\fBvis_data|vd json\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" -Display the visualisation data in JSON format. If "\-\-numbers" or -"\-n" is given batctl will not replace the MAC addresses with bat-host -names in the output. With "\-\-no-TT" or "\-T" the TT entries are -not displayed, so the pure mesh topology can be seen. With -"\-\-no-2nd" or "\-2" a dot cluster is not formed around primary and -secondary addresses from the same device. -.br -.IP "\fBaggregation\fP|\fBag\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current aggregation setting is displayed. Otherwise the parameter is used to enable or disable packet aggregation. +.IP "\fBvis_data|vd dot\fP [\fB\-n\fP|\fB\-\-numbers\fP][\fB\-T\fP|\fB\-\-no-TT\fP][\fB\-2\fP|\fB\-\-no-2nd\fP]" +Display the visualisation data in graphviz \fBdot\fP(1) format. If "\-\-numbers" or "\-n" is given batctl will not replace +the MAC addresses with bat-host names in the output. With "\-\-no-TT" or "\-T" the TT entries are not displayed, so the pure +mesh topology can be seen. With "\-\-no-2nd" or "\-2" a dot cluster is not formed around primary and secondary addresses +from the same device. .br -.IP "\fBbonding\fP|\fBb\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode. -.br -.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable or disable the bridge loop avoidance. -.br -.IP "\fBfragmentation\fP|\fBf\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. -.br -.IP "\fBap_isolation\fP|\fBap\fP [\fB1\fP|\fB0\fP]" -If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or disable ap isolation. +.PP +.I \fBdebug tables: +.IP +The batman-adv kernel module comes with a variety of debug tables containing various information about the state of the mesh +seen by each individual node. These tables are exported via debugfs and easily accessible via batctl. You will need debugfs +support compiled into your kernel and preferrably have mounted the debugfs to a well-known mountpoint. If debugfs is not +mounted batctl will attempt to do this step for you. + +All of the debug tables support the following options: +.RS 10 +\-w refresh the list every second or add a number to let it refresh at a custom interval in seconds (with optional decimal places) +.RE +.RS 10 +\-n do not replace the MAC addresses with bat\-host names in the output +.RE + +.RS 7 +The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen +for the specified amount of seconds (with optional decimal places). + +List of debug tables: +.RS 10 +\- originators|o +.RE +.RS 10 +\- gateways|gwl +.RE +.RS 10 +\- translocal|tl +.RE +.RS 10 +\- transglobal|tg +.RE +.RS 10 +\- claimtable|cl (compile time option) +.RE +.RS 10 +\- backbonetable|bbt (compile time option) +.RE +.RE .br .IP "\fBstatistics\fP|\fBs\fP" -Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have -been compiled into the kernel module. For example, if the distributed arp table (short: dat) wasn't selected -as an option at compile time its counters won't be shown. +Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have been compiled +into the kernel module. For example, if the distributed arp table (short: dat) wasn't selected as an option at compile time +its counters won't be shown. .br Each module subsystem has its own counters which are indicated by their prefixes: .RS 15 @@ -180,24 +208,19 @@ dat - distributed arp table counters All counters without a prefix concern payload (pure user data) traffic. .RE .br -.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" -Layer 2 ping of a MAC address or bat\-host name. batctl will try to -find the bat\-host name if the given parameter was not a MAC -address. The "\-c" option tells batctl how man pings should be sent -before the program exits. Without the "\-c" option batctl will continue -pinging without end. Use CTRL + C to stop it. With "\-i" and "\-t" -you can set the default interval between pings and the timeout time -for replies, both in seconds. When run with "\-R", the route taken by -the ping messages will be recorded. +.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +Layer 2 ping of a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was +not a MAC address. The "\-c" option tells batctl how man pings should be sent before the program exits. Without the "\-c" +option batctl will continue pinging without end. Use CTRL + C to stop it. With "\-i" and "\-t" you can set the default +interval between pings and the timeout time for replies, both in seconds. When run with "\-R", the route taken by the ping +messages will be recorded. .br -.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" -Layer 2 traceroute to a MAC address or bat\-host name. batctl will try -to find the bat\-host name if the given parameter was not a MAC -address. batctl will send 3 packets to each host and display the -response time. If "\-n" is given batctl will not replace the MAC -addresses with bat\-host names in the output. +.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +Layer 2 traceroute to a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter +was not a MAC address. batctl will send 3 packets to each host and display the response time. If "\-n" is given batctl will +not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-c\fP][\fB\-n\fP][\fB\-p filter\fP][\fB\-x filter\fP] \fBinterface ...\fP" +.IP "\fBtcpdump\fP|\fBtd\fP [\fB\-c\fP][\fB\-n\fP][\fB\-p filter\fP][\fB\-x filter\fP] \fBinterface ...\fP" batctl will display all packets that are seen on the given interface(s). A variety of options to filter the output are available: To only print packets that match the compatibility number of batctl specify the "\-c" (compat filter) option. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. To filter @@ -231,27 +254,21 @@ except specified). The following packet types are available: Example: batctl td <interface> -p 129 \-> only display batman ogm packets and non batman packets .RE .br -.IP "\fBbisect\fP [\fB\-l MAC\fP][\fB\-t MAC\fP][\fB\-r MAC\fP][\fB\-s min\fP [\fB\- max\fP]][\fB\-o MAC\fP][\fB\-n\fP] \fBlogfile1\fP [\fBlogfile2\fP ... \fBlogfileN\fP]" -Analyses the logfiles to build a small internal database of all sent -sequence numbers and routing table changes. This database can then be -analyzed in a number of different ways. With "\-l" the database can be -used to search for routing loops. Use "\-t" to trace OGMs of a host -throughout the network. Use "\-r" to display routing tables of the -nodes. The option "\-s" can be used to limit the output to a range of -sequence numbers, between min and max, or to one specific sequence -number, min. Furthermore using "\-o" you can filter the output to a -specified originator. If "\-n" is given batctl will not replace the -MAC addresses with bat\-host names in the output. +.IP "\fBbisect\fP [\fB\-l MAC\fP][\fB\-t MAC\fP][\fB\-r MAC\fP][\fB\-s min\fP [\fB\- max\fP]][\fB\-o MAC\fP][\fB\-n\fP] \fBlogfile1\fP [\fBlogfile2\fP ... \fBlogfileN\fP]" +Analyses the logfiles to build a small internal database of all sent sequence numbers and routing table changes. This +database can then be analyzed in a number of different ways. With "\-l" the database can be used to search for routing +loops. Use "\-t" to trace OGMs of a host throughout the network. Use "\-r" to display routing tables of the nodes. The +option "\-s" can be used to limit the output to a range of sequence numbers, between min and max, or to one specific +sequence number, min. Furthermore using "\-o" you can filter the output to a specified originator. If "\-n" is given +batctl will not replace the MAC addresses with bat\-host names in the output. .br .SH FILES .TP .I "\fBbat-hosts\fP" -This file is similar to the /etc/hosts file. You can write one MAC -address and one host name per line. batctl will search for bat-hosts -in /etc, your home directory and the current directory. The found data -is used to match MAC address to your provided host name or replace MAC -addresses in debug output and logs. Host names are much easier to -remember than MAC addresses. +This file is similar to the /etc/hosts file. You can write one MAC address and one host name per line. batctl will search +for bat-hosts in /etc, your home directory and the current directory. The found data is used to match MAC address to your +provided host name or replace MAC addresses in debug output and logs. Host names are much easier to remember than MAC +addresses. .SH SEE ALSO .BR ping (1), .BR traceroute (1), @@ -259,9 +276,7 @@ remember than MAC addresses. .BR dmesg (1), .BR dot (1) .SH AUTHOR -batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek -Lindner <lindner_marek(a)yahoo.de>. +batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek Lindner <lindner_marek(a)yahoo.de>. .PP -This manual page was written by Simon Wunderlich -<siwu(a)hrz.tu-chemnitz.de>, Marek Lindner <lindner_marek(a)yahoo.de> and +This manual page was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>, Marek Lindner <lindner_marek(a)yahoo.de> and Andrew Lunn <andrew(a)lunn.ch> diff --git a/ping.c b/ping.c index 85b4137..9f64a8f 100644 --- a/ping.c +++ b/ping.c @@ -44,8 +44,8 @@ char is_aborted = 0; void ping_usage(void) { - printf("Usage: batctl ping [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] ping [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -c ping packet count \n"); printf(" \t -h print this help\n"); printf(" \t -i interval in seconds\n"); diff --git a/sys.c b/sys.c index 6a1071a..5b728a8 100644 --- a/sys.c +++ b/sys.c @@ -97,8 +97,8 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { static void interface_usage(void) { - printf("Usage: batctl interface [options] [add|del iface(s)] \n"); - printf("options:\n"); + printf("Usage: batctl [options] interface [parameters] [add|del iface(s)]\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); } @@ -237,8 +237,8 @@ err: static void log_level_usage(void) { - printf("Usage: batctl [options] loglevel [level[ level[ level]]...]\n"); - printf("options:\n"); + printf("Usage: batctl [options] loglevel [parameters] [level[ level[ level]]...]\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf("levels:\n"); printf(" \t none Debug logging is disabled\n"); @@ -324,7 +324,7 @@ out: static void settings_usage(int setting) { - printf("Usage: batctl [options] %s|%s", + printf("Usage: batctl [options] %s|%s [parameters]", (char *)batctl_settings[setting].opt_long, (char *)batctl_settings[setting].opt_short); if (batctl_settings[setting].params == sysfs_param_enable) @@ -334,7 +334,7 @@ static void settings_usage(int setting) else printf("\n"); - printf("options:\n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); } diff --git a/tcpdump.c b/tcpdump.c index 489132f..beac2ac 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -59,8 +59,8 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read static void tcpdump_usage(void) { - printf("Usage: batctl tcpdump [options] interface [interface]\n"); - printf("options:\n"); + printf("Usage: batctl tcpdump [parameters] interface [interface]\n"); + printf("parameters:\n"); printf(" \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); diff --git a/traceroute.c b/traceroute.c index 31f77b0..c1aaad8 100644 --- a/traceroute.c +++ b/traceroute.c @@ -43,8 +43,8 @@ void traceroute_usage(void) { - printf("Usage: batctl traceroute [options] mac|bat-host \n"); - printf("options:\n"); + printf("Usage: batctl [options] traceroute [parameters] mac|bat-host \n"); + printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); } -- batctl

10 years, 11 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2012