commits October 2012

commits@lists.open-mesh.org

1 participants
92 discussions

[batman-adv] master: batman-adv: Add function to calculate crc32c for the skb payload (a7fe307)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a7fe30736a46d203b74e9fb2df3fb4e1d94222bc Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Oct 17 21:10:39 2012 +0200 batman-adv: Add function to calculate crc32c for the skb payload Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a7fe30736a46d203b74e9fb2df3fb4e1d94222bc compat.h | 34 ++++++++++++++++++++++++++++++++++ main.c | 39 +++++++++++++++++++++++++++++++++++++++ main.h | 1 + 3 files changed, 74 insertions(+) diff --git a/compat.h b/compat.h index 0caf43b..83befd1 100644 --- a/compat.h +++ b/compat.h @@ -37,6 +37,9 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) +#define skb_walk_frags(skb, iter) \ + for (iter = skb_shinfo(skb)->frag_list; iter; iter = iter->next) + #define __compat__module_param_call(p1, p2, p3, p4, p5, p6, p7) \ __module_param_call(p1, p2, p3, p4, p5, p7) @@ -78,6 +81,17 @@ #endif /* < KERNEL_VERSION(2, 6, 35) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) + +#define kmap_atomic(p) kmap_atomic(p, KM_SKB_DATA_SOFTIRQ) + +#ifdef kunmap_atomic +#undef kunmap_atomic +#endif +#define kunmap_atomic(x, arg...) do { pagefault_enable(); } while (0) + +#endif /* < KERNEL_VERSION(2, 6, 37) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) @@ -146,6 +160,26 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #endif /* < KERNEL_VERSION(3, 0, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + +static inline struct page *skb_frag_page(const skb_frag_t *frag) +{ + return frag->page; +} + +static inline void *skb_frag_address(const skb_frag_t *frag) +{ + return page_address(skb_frag_page(frag)) + frag->page_offset; +} + +static inline unsigned int skb_frag_size(const skb_frag_t *frag) +{ + return frag->size; +} + +#endif /* < KERNEL_VERSION(3, 2, 0) */ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) static inline void eth_hw_addr_random(struct net_device *dev) diff --git a/main.c b/main.c index f54efe9..76d653a 100644 --- a/main.c +++ b/main.c @@ -17,6 +17,8 @@ * 02110-1301, USA */ +#include <linux/crc32c.h> +#include <linux/highmem.h> #include "main.h" #include "sysfs.h" #include "debugfs.h" @@ -433,6 +435,43 @@ int batadv_compat_seq_print_text(struct seq_file *seq, void *offset) return 0; } +/** + * batadv_skb_crc32 - calculate CRC32 of the whole packet and skip bytes in + * the header + * @skb: skb pointing to fragmented socket buffers + * @payload_ptr: Pointer to position inside the head buffer of the skb + * marking the start of the data to be CRC'ed + * + * payload_ptr must always point to an address in the skb head buffer and not to + * a fragment. + */ +__be32 batadv_skb_crc32(const struct sk_buff *skb, u8 *payload_ptr) +{ + u32 crc = 0; + struct sk_buff *iter; + size_t skip_len, read_len; + const skb_frag_t *f; + u8 *vaddr; + int i; + + skip_len = payload_ptr - skb->data; + read_len = skb_headlen(skb) - skip_len; + if (read_len) + crc = crc32c(crc, payload_ptr, read_len); + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + f = &skb_shinfo(skb)->frags[i]; + vaddr = kmap_atomic(skb_frag_page(f)); + crc = crc32c(crc, vaddr + f->page_offset, skb_frag_size(f)); + kunmap_atomic(vaddr); + } + + skb_walk_frags(skb, iter) + crc = crc32c(crc, iter->data, skb_headlen(iter)); + + return htonl(crc); +} + static int batadv_param_set_ra(const char *val, const struct kernel_param *kp) { struct batadv_algo_ops *bat_algo_ops; diff --git a/main.h b/main.h index 2dfcf8c..e147261 100644 --- a/main.h +++ b/main.h @@ -177,6 +177,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); int batadv_compat_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_skb_crc32(const struct sk_buff *skb, u8 *payload_ptr); /** * enum batadv_dbg_level - available log levels

1 0

[batctl] master: batctl: Add tool to translate mac/IPv4/bat_host to originator address (c8e4fd4)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit c8e4fd483118cda7c9e8575a5f2b12fd55b1f636 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 16 22:54:36 2012 +0200 batctl: Add tool to translate mac/IPv4/bat_host to originator address Users may want to get the originator which is responsible for a specific mac address. These addresses can be specified using IPv4 address, ethernet address or bat-host name. For example, the output can be used to get the TQ value from the originator table when only the client address is known and not the gateway address. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- c8e4fd483118cda7c9e8575a5f2b12fd55b1f636 Makefile | 2 +- README | 18 ++++++++++++ main.c | 6 ++++ man/batctl.8 | 5 ++++ translate.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ ping.h => translate.h | 2 +- 6 files changed, 109 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4379837..699a3ea 100755 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ export CONFIG_BATCTL_BISECT=n # batctl build BINARY_NAME = batctl -OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o hash.o vis.o debugfs.o ioctl.o list-batman.o +OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o hash.o vis.o debugfs.o ioctl.o list-batman.o translate.o OBJ_BISECT = bisect_iv.o MANPAGE = man/batctl.8 diff --git a/README b/README index b9c6b23..efdd3cb 100644 --- a/README +++ b/README @@ -75,6 +75,24 @@ $ batctl statistics dat_reply_tx: 1 dat_reply_rx: 0 +batctl translate +================ + +Translates a destination (hostname, IPv4, MAC, bat_host-name) to the originator +mac address responsible for it. + +Usage: batctl translate mac|bat-host|host-name|IPv4-address + +Example: + +$ batctl translate www.google.de +02:ca:fe:af:fe:01 +$ batctl translate 02:ca:fe:af:fe:01 +02:ca:fe:af:fe:01 +$ batctl translate 192.168.1.2 +02:ca:fe:af:fe:05 +$ batctl translate fe:fe:00:00:09:01 +02:ca:fe:af:fe:05 batctl ping ============ diff --git a/main.c b/main.c index d37a46c..e239b2a 100644 --- a/main.c +++ b/main.c @@ -33,6 +33,7 @@ #include "debug.h" #include "debugfs.h" #include "ping.h" +#include "translate.h" #include "traceroute.h" #include "tcpdump.h" #include "bisect_iv.h" @@ -87,6 +88,7 @@ void print_usage(void) printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + printf(" \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); #ifdef BATCTL_BISECT printf(" \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); #endif @@ -203,6 +205,10 @@ int main(int argc, char **argv) ret = ioctl_statistics_get(mesh_iface); + } else if ((strcmp(argv[1], "translate") == 0) || (strcmp(argv[1], "t") == 0)) { + + ret = translate(mesh_iface, argc - 1, argv + 1); + #ifdef BATCTL_BISECT } else if ((strcmp(argv[1], "bisect_iv") == 0)) { diff --git a/man/batctl.8 b/man/batctl.8 index feb1a17..3c8edce 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -200,6 +200,11 @@ List of debug tables: .RE .RE .br +.IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIPv4_address\fP" + +Translates a destination (hostname, IPv4, MAC, bat_host-name) to the originator +mac address responsible for it. +.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. diff --git a/translate.c b/translate.c new file mode 100644 index 0000000..2d6ede9 --- /dev/null +++ b/translate.c @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + * + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +#include <netinet/in.h> +#include <stdio.h> +#include <stdlib.h> + +#include "main.h" +#include "translate.h" +#include "functions.h" +#include "bat-hosts.h" + + +static void translate_usage(void) +{ + printf("Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); +} + +int translate(char *mesh_iface, int argc, char **argv) +{ + struct ether_addr *dst_mac = NULL; + struct bat_host *bat_host; + int ret = EXIT_FAILURE; + char *dst_string, *mac_string; + + if (argc <= 1) { + fprintf(stderr, "Error - destination not specified\n"); + translate_usage(); + return EXIT_FAILURE; + } + + dst_string = argv[1]; + bat_hosts_init(0); + bat_host = bat_hosts_find_by_name(dst_string); + + if (bat_host) + dst_mac = &bat_host->mac_addr; + + if (!dst_mac) { + dst_mac = resolve_mac(dst_string); + + if (!dst_mac) { + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + goto out; + } + } + + dst_mac = translate_mac(mesh_iface, dst_mac); + if (dst_mac) { + mac_string = ether_ntoa_long(dst_mac); + printf("%s\n", mac_string); + ret = EXIT_SUCCESS; + } else { + ret = EXIT_NOSUCCESS; + } + +out: + bat_hosts_free(); + return ret; +} diff --git a/ping.h b/translate.h similarity index 93% copy from ping.h copy to translate.h index e3f47fc..eb0ef65 100644 --- a/ping.h +++ b/translate.h @@ -21,4 +21,4 @@ -int ping(char *mesh_iface, int argc, char **argv); +int translate(char *mesh_iface, int argc, char **argv);

1 0

[batman-adv] master: Merge branch 'next' (b85918b)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b85918b46ed49cba9b1a663f713531c6fca92eaf Merge: 7e86840 4c1721b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Oct 18 01:56:37 2012 +0800 Merge branch 'next' >--------------------------------------------------------------- b85918b46ed49cba9b1a663f713531c6fca92eaf bridge_loop_avoidance.c | 24 +++++++++++++++--------- main.c | 1 + routing.c | 8 +++++++- types.h | 2 ++ 4 files changed, 25 insertions(+), 10 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (b85918b)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 2cebfac batman-adv: Fix broadcast packet CRC calculation 4c1721b batman-adv: Fix potential broadcast BLA-duplicate-check race condition b85918b Merge branch 'next'

1 0

[batman-adv] next: batman-adv: Fix potential broadcast BLA-duplicate-check race condition (4c1721b)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 4c1721b39c8a77c99e8f4de97b5d5d112006406c Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 14:53:05 2012 +0200 batman-adv: Fix potential broadcast BLA-duplicate-check race condition Threads in the bottom half of batadv_bla_check_bcast_duplist() might otherwise for instance overwrite variables which other threads might be using/reading at the same time in the top half, potentially leading to messing up the bcast_duplist, possibly resulting in false bridge loop avoidance duplicate check decisions. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 4c1721b39c8a77c99e8f4de97b5d5d112006406c bridge_loop_avoidance.c | 16 +++++++++++----- main.c | 1 + types.h | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index eebab20..9a4b24f 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1226,7 +1226,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, int bcast_packet_len) { - int i, length, curr; + int i, length, curr, ret = 0; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; @@ -1238,6 +1238,8 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, /* calculate the crc ... */ crc = crc16(0, content, length); + spin_lock_bh(&bat_priv->bla.bcast_duplist_lock); + for (i = 0; i < BATADV_DUPLIST_SIZE; i++) { curr = (bat_priv->bla.bcast_duplist_curr + i); curr %= BATADV_DUPLIST_SIZE; @@ -1259,9 +1261,11 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, /* this entry seems to match: same crc, not too old, * and from another gw. therefore return 1 to forbid it. */ - return 1; + ret = 1; + goto out; } - /* not found, add a new entry (overwrite the oldest entry) */ + /* not found, add a new entry (overwrite the oldest entry) + * and allow it, its the first occurence. */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; entry = &bat_priv->bla.bcast_duplist[curr]; @@ -1270,8 +1274,10 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, memcpy(entry->orig, bcast_packet->orig, ETH_ALEN); bat_priv->bla.bcast_duplist_curr = curr; - /* allow it, its the first occurence. */ - return 0; +out: + spin_unlock_bh(&bat_priv->bla.bcast_duplist_lock); + + return ret; } diff --git a/main.c b/main.c index b4aa470..f167b65 100644 --- a/main.c +++ b/main.c @@ -101,6 +101,7 @@ int batadv_mesh_init(struct net_device *soft_iface) spin_lock_init(&bat_priv->gw.list_lock); spin_lock_init(&bat_priv->vis.hash_lock); spin_lock_init(&bat_priv->vis.list_lock); + spin_lock_init(&bat_priv->bla.bcast_duplist_lock); INIT_HLIST_HEAD(&bat_priv->forw_bat_list); INIT_HLIST_HEAD(&bat_priv->forw_bcast_list); diff --git a/types.h b/types.h index 2ed82ca..ac1e07a 100644 --- a/types.h +++ b/types.h @@ -205,6 +205,8 @@ struct batadv_priv_bla { struct batadv_hashtable *backbone_hash; struct batadv_bcast_duplist_entry bcast_duplist[BATADV_DUPLIST_SIZE]; int bcast_duplist_curr; + /* protects bcast_duplist and bcast_duplist_curr */ + spinlock_t bcast_duplist_lock; struct batadv_bla_claim_dst claim_dest; struct delayed_work work; };

1 0

[batman-adv] next: batman-adv: Fix broadcast packet CRC calculation (2cebfac)
by postmaster＠open-mesh.org 17 Oct '12

17 Oct '12

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 2cebface808ba2df76e38a813b3d3f3e97497aff Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 14:53:04 2012 +0200 batman-adv: Fix broadcast packet CRC calculation So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped (60-80% packet loss). This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regression introduced by ("batman-adv: add broadcast duplicate check"). Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 2cebface808ba2df76e38a813b3d3f3e97497aff bridge_loop_avoidance.c | 8 ++++---- routing.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 0a9084a..eebab20 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1210,8 +1210,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1224,14 +1224,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, - int hdr_size) + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/routing.c b/routing.c index 939fc01..376b4cc 100644 --- a/routing.c +++ b/routing.c @@ -1124,8 +1124,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */

1 0

[batctl] master: batctl: Print compat version when querying the version (a88e6b7)
by postmaster＠open-mesh.org 16 Oct '12

16 Oct '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit a88e6b7b938ae201deba074e819b299ebb1c165f Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 16 15:31:34 2012 +0200 batctl: Print compat version when querying the version Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a88e6b7b938ae201deba074e819b299ebb1c165f main.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/main.c b/main.c index 647818d..d37a46c 100644 --- a/main.c +++ b/main.c @@ -31,6 +31,7 @@ #include "main.h" #include "sys.h" #include "debug.h" +#include "debugfs.h" #include "ping.h" #include "traceroute.h" #include "tcpdump.h" @@ -42,6 +43,7 @@ char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; +char module_compat_ver_file[] = "batman_adv/compat_version"; void print_usage(void) { @@ -90,6 +92,44 @@ void print_usage(void) #endif } +static void print_version(void) +{ + int ret; + char *debugfs_mnt; + + printf("batctl %s [", SOURCE_VERSION); + + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) { + printf("batman-adv: %s", line_ptr); + } else { + printf("module not loaded"); + goto out; + } + + free(line_ptr); + line_ptr = NULL; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) + goto out; + + ret = read_file(debugfs_mnt, module_compat_ver_file, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) + printf(", compat: %s", line_ptr); + +out: + free(line_ptr); + line_ptr = NULL; + printf("]\n"); +} + int main(int argc, char **argv) { int i, ret = EXIT_FAILURE; @@ -116,18 +156,7 @@ int main(int argc, char **argv) goto err; if (strcmp(argv[1], "-v") == 0) { - printf("batctl %s [batman-adv: ", SOURCE_VERSION); - - ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); - if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (ret == EXIT_SUCCESS) - printf("%s]\n", line_ptr); - else - printf("module not loaded]\n"); - - free(line_ptr); + print_version(); exit(EXIT_SUCCESS); }

1 0

[batctl] master: batctl: Allow to skip header in debug table output (9820b38)
by postmaster＠open-mesh.org 16 Oct '12

16 Oct '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 9820b386612b238928d2c27748c29abfe0bd158d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 14 22:20:54 2012 +0200 batctl: Allow to skip header in debug table output Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9820b386612b238928d2c27748c29abfe0bd158d debug.c | 18 +++++++++++++++--- debug.h | 1 + functions.c | 7 ++++++- functions.h | 3 ++- main.c | 2 +- man/batctl.8 | 3 +++ sys.c | 14 +++++++------- 7 files changed, 35 insertions(+), 13 deletions(-) diff --git a/debug.c b/debug.c index a230a12..260448b 100644 --- a/debug.c +++ b/debug.c @@ -38,36 +38,43 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .opt_long = "originators", .opt_short = "o", .debugfs_name = "originators", + .header_lines = 2, }, { .opt_long = "gateways", .opt_short = "gwl", .debugfs_name = "gateways", + .header_lines = 1, }, { .opt_long = "translocal", .opt_short = "tl", .debugfs_name = "transtable_local", + .header_lines = 1, }, { .opt_long = "transglobal", .opt_short = "tg", .debugfs_name = "transtable_global", + .header_lines = 2, }, { .opt_long = "claimtable", .opt_short = "cl", .debugfs_name = "bla_claim_table", + .header_lines = 2, }, { .opt_long = "backbonetable", .opt_short = "bbt", .debugfs_name = "bla_backbone_table", + .header_lines = 2, }, { .opt_long = "dat_cache", .opt_short = "dc", .debugfs_name = "dat_cache", + .header_lines = 2, }, }; @@ -78,6 +85,7 @@ void debug_table_usage(int debug_table) 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 -H don't show the header\n"); printf(" \t -w [interval] watch mode - refresh the table continuously\n"); if (debug_table == BATCTL_TABLE_ORIGINATORS) @@ -93,7 +101,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) float watch_interval = 1; opterr = 0; - while ((optchar = getopt(argc, argv, "hnw:t:")) != -1) { + while ((optchar = getopt(argc, argv, "hnw:t:H")) != -1) { switch (optchar) { case 'h': debug_table_usage(debug_table); @@ -126,6 +134,9 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) return EXIT_FAILURE; } break; + case 'H': + read_opt |= SKIP_HEADER; + break; case '?': if (optopt == 't') printf("Error - option '-t' needs a number as argument\n"); @@ -152,7 +163,8 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); return read_file(full_path, (char *)batctl_debug_tables[debug_table].debugfs_name, - read_opt, orig_timeout, watch_interval); + read_opt, orig_timeout, watch_interval, + batctl_debug_tables[debug_table].header_lines); } static void log_usage(void) @@ -190,6 +202,6 @@ int log_print(char *mesh_iface, int argc, char **argv) } debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); - res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0); + res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); return res; } diff --git a/debug.h b/debug.h index 5bd7f3e..3fa2830 100644 --- a/debug.h +++ b/debug.h @@ -40,6 +40,7 @@ struct debug_table_data { const char opt_long[OPT_LONG_MAX_LEN]; const char opt_short[OPT_SHORT_MAX_LEN]; const char debugfs_name[DEBUG_TABLE_PATH_MAX_LEN]; + size_t header_lines; }; extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; diff --git a/functions.c b/functions.c index a500444..57c2bba 100644 --- a/functions.c +++ b/functions.c @@ -162,7 +162,7 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path) } int read_file(char *dir, char *fname, int read_opt, - float orig_timeout, float watch_interval) + float orig_timeout, float watch_interval, size_t header_lines) { struct ether_addr *mac_addr; struct bat_host *bat_host; @@ -171,6 +171,7 @@ int read_file(char *dir, char *fname, int read_opt, char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; FILE *fp = NULL; + size_t line; if (read_opt & USE_BAT_HOSTS) bat_hosts_init(read_opt); @@ -180,6 +181,7 @@ int read_file(char *dir, char *fname, int read_opt, strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); open: + line = 0; fp = fopen(full_path, "r"); if (!fp) { @@ -195,6 +197,9 @@ open: read: while (getline(&line_ptr, &len, fp) != -1) { + if (line++ < header_lines && read_opt & SKIP_HEADER) + continue; + /* the buffer will be handled elsewhere */ if (read_opt & USE_READ_BUFF) break; diff --git a/functions.h b/functions.h index 0ec1d1a..6e427f4 100644 --- a/functions.h +++ b/functions.h @@ -35,7 +35,7 @@ char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int file_exists(const char *fpath); int read_file(char *dir, char *path, int read_opt, - float orig_timeout, float watch_interval); + float orig_timeout, float watch_interval, size_t header_lines); int write_file(char *dir, char *fname, char *arg1, char *arg2); struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc); @@ -52,4 +52,5 @@ enum { SILENCE_ERRORS = 0x20, NO_OLD_ORIGS = 0x40, COMPAT_FILTER = 0x80, + SKIP_HEADER = 0x100, }; diff --git a/main.c b/main.c index 01a435b..647818d 100644 --- a/main.c +++ b/main.c @@ -118,7 +118,7 @@ int main(int argc, char **argv) if (strcmp(argv[1], "-v") == 0) { printf("batctl %s [batman-adv: ", SOURCE_VERSION); - ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) line_ptr[strlen(line_ptr) - 1] = '\0'; diff --git a/man/batctl.8 b/man/batctl.8 index 804682e..feb1a17 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -168,6 +168,9 @@ All of the debug tables support the following options: .RS 10 \-n do not replace the MAC addresses with bat\-host names in the output .RE +.RS 10 +\-H do not show the header of the debug table +.RE .RS 7 The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen diff --git a/sys.c b/sys.c index 3d5e129..9591416 100644 --- a/sys.c +++ b/sys.c @@ -136,7 +136,7 @@ static int print_interfaces(char *mesh_iface) while ((iface_dir = readdir(iface_base_dir)) != NULL) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); - res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) continue; @@ -153,7 +153,7 @@ static int print_interfaces(char *mesh_iface) line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); - res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + res = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); if (res != EXIT_SUCCESS) { printf("<error reading status>\n"); continue; @@ -318,7 +318,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) goto out; } - res = read_file(path_buff, SYS_LOG_LEVEL, USE_READ_BUFF, 0, 0); + res = read_file(path_buff, SYS_LOG_LEVEL, USE_READ_BUFF, 0, 0, 0); if (res != EXIT_SUCCESS) goto out; @@ -382,7 +382,7 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) if (argc == 1) { res = read_file(path_buff, (char *)batctl_settings[setting].sysfs_name, - NO_FLAGS, 0, 0); + NO_FLAGS, 0, 0, 0); goto out; } @@ -445,7 +445,7 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); if (argc == 1) { - res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0); + res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); if (res != EXIT_SUCCESS) goto out; @@ -465,10 +465,10 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) switch (gw_mode) { case GW_MODE_CLIENT: - res = read_file(path_buff, SYS_GW_SEL, USE_READ_BUFF, 0, 0); + res = read_file(path_buff, SYS_GW_SEL, USE_READ_BUFF, 0, 0, 0); break; case GW_MODE_SERVER: - res = read_file(path_buff, SYS_GW_BW, USE_READ_BUFF, 0, 0); + res = read_file(path_buff, SYS_GW_BW, USE_READ_BUFF, 0, 0, 0); break; default: printf("off\n");

1 0

[batctl] master: batctl: Allow to use IPv4 addresses for ping/traceroute (cb75e01)
by postmaster＠open-mesh.org 16 Oct '12

16 Oct '12

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit cb75e019e74fc11f9547dadd51abbf3c9df2c5e7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 14 22:20:53 2012 +0200 batctl: Allow to use IPv4 addresses for ping/traceroute IPv4 addresses and hostnames are easier to remember than many MAC addresses. batctl can automatically resolve the MAC address of the target device when the IP is configured on top of the batman-adv device and the source and destination batman-adv interface are in the same IPv4 subnet. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- cb75e019e74fc11f9547dadd51abbf3c9df2c5e7 README | 4 +- functions.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions.h | 1 + man/batctl.8 | 18 ++++--- ping.c | 6 +-- traceroute.c | 6 +-- 6 files changed, 170 insertions(+), 14 deletions(-) diff --git a/README b/README index ad4fc44..b9c6b23 100644 --- a/README +++ b/README @@ -81,7 +81,7 @@ batctl ping Sends a Layer 2 batman-adv ping to check round trip time and connectivity -Usage: batctl ping [parameters] mac|bat-host +Usage: batctl ping [parameters] mac|bat-host|host-name|IPv4-address parameters: -c ping packet count -h print this help @@ -107,7 +107,7 @@ batctl traceroute Traceroute sends 3 packets to each hop, awaits the answers and prints out the response times. -Usage: batctl traceroute [parameters] mac|bat-host +Usage: batctl traceroute [parameters] mac|bat-host|host-name|IPv4-address Example: diff --git a/functions.c b/functions.c index 7875716..a500444 100644 --- a/functions.c +++ b/functions.c @@ -22,6 +22,9 @@ #define _GNU_SOURCE #include <netinet/ether.h> +#include <arpa/inet.h> +#include <sys/socket.h> +#include <netdb.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -402,3 +405,149 @@ out: free(line); return mac_result; } + +static uint32_t resolve_ipv4(const char *asc) +{ + int ret; + struct addrinfo hints; + struct addrinfo *res; + struct sockaddr_in *inet4; + uint32_t addr = 0; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_INET; + ret = getaddrinfo(asc, NULL, &hints, &res); + if (ret) + return 0; + + if (res) { + inet4 = (struct sockaddr_in *)res->ai_addr; + addr = inet4->sin_addr.s_addr; + } + + freeaddrinfo(res); + return addr; +} + +static void request_arp(uint32_t ipv4_addr) +{ + struct sockaddr_in inet4; + int sock; + char t = 0; + + memset(&inet4, 0, sizeof(inet4)); + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock < 0) + return; + + inet4.sin_family = AF_INET; + inet4.sin_port = htons(9); + inet4.sin_addr.s_addr = ipv4_addr; + sendto(sock, &t, sizeof(t), 0, (const struct sockaddr *)&inet4, + sizeof(inet4)); + close(sock); +} + +static struct ether_addr *resolve_mac_from_arp(uint32_t ipv4_addr) +{ + struct ether_addr mac_empty; + struct ether_addr *mac_result = NULL, *mac_tmp; + struct sockaddr_in inet4; + int ret; + FILE *f; + size_t len = 0; + char *line = NULL; + int skip_line = 1; + size_t column; + char *token, *input, *saveptr; + int line_invalid; + + memset(&mac_empty, 0, sizeof(mac_empty)); + + f = fopen("/proc/net/arp", "r"); + if (!f) + return NULL; + + while (getline(&line, &len, f) != -1) { + if (skip_line) { + skip_line = 0; + continue; + } + + line_invalid = 0; + column = 0; + input = line; + while ((token = strtok_r(input, " \t", &saveptr))) { + input = NULL; + + if (column == 0) { + ret = inet_pton(AF_INET, token, &inet4.sin_addr); + if (ret != 1) { + line_invalid = 1; + break; + } + } + + if (column == 3) { + mac_tmp = ether_aton(token); + if (!mac_tmp || memcmp(mac_tmp, &mac_empty, + sizeof(mac_empty)) == 0) { + line_invalid = 1; + break; + } + } + + column++; + } + + if (column < 4) + line_invalid = 1; + + if (line_invalid) + continue; + + if (ipv4_addr == inet4.sin_addr.s_addr) { + mac_result = mac_tmp; + break; + } + } + + free(line); + fclose(f); + return mac_result; +} + +static struct ether_addr *resolve_mac_from_ipv4(const char *asc) +{ + uint32_t ipv4_addr; + int retries = 5; + struct ether_addr *mac_result = NULL; + + ipv4_addr = resolve_ipv4(asc); + if (!ipv4_addr) + return NULL; + + while (retries-- && !mac_result) { + mac_result = resolve_mac_from_arp(ipv4_addr); + if (!mac_result) { + request_arp(ipv4_addr); + usleep(200000); + } + } + + return mac_result; +} + +struct ether_addr *resolve_mac(const char *asc) +{ + struct ether_addr *mac_result = NULL; + + mac_result = ether_aton(asc); + if (mac_result) + goto out; + + mac_result = resolve_mac_from_ipv4(asc); + +out: + return mac_result; +} diff --git a/functions.h b/functions.h index a59bb24..0ec1d1a 100644 --- a/functions.h +++ b/functions.h @@ -38,6 +38,7 @@ int read_file(char *dir, char *path, int read_opt, float orig_timeout, float watch_interval); int write_file(char *dir, char *fname, char *arg1, char *arg2); struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); +struct ether_addr *resolve_mac(const char *asc); extern char *line_ptr; diff --git a/man/batctl.8 b/man/batctl.8 index 369be20..804682e 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -212,19 +212,25 @@ tt - translation 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][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIPv4_address\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" +not a MAC address. It can also try to guess the MAC address using an IPv4 address or a hostname when +the IPv4 address was configured on top of the batman-adv interface of the destination device and both source and +destination devices are in the same IPv4 subnet. +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. With "\-T" you can disable the automatic translation of a client MAC address to the originator address which is responsible for this client. .br -.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIPv4_address\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. With "\-T" you can disable the automatic translation of a -client MAC address to the originator address which is responsible for this client. +was not a MAC address. It can also try to guess the MAC address using an IPv4 address or a hostname when +the IPv4 address was configured on top of the batman-adv interface of the destination device and both source and +destination devices are in the same IPv4 subnet. +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. With "\-T" you can disable the automatic translation +of a client MAC address to the originator address which is responsible for this client. .br .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 diff --git a/ping.c b/ping.c index 02132f4..51d18e8 100644 --- a/ping.c +++ b/ping.c @@ -44,7 +44,7 @@ char is_aborted = 0; void ping_usage(void) { - printf("Usage: batctl [options] ping [parameters] mac|bat-host \n"); + printf("Usage: batctl [options] ping [parameters] mac|bat-host|host_name|IPv4_address \n"); printf("parameters:\n"); printf(" \t -c ping packet count \n"); printf(" \t -h print this help\n"); @@ -137,10 +137,10 @@ int ping(char *mesh_iface, int argc, char **argv) dst_mac = &bat_host->mac_addr; if (!dst_mac) { - dst_mac = ether_aton(dst_string); + dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - the ping destination is not a mac address or bat-host name: %s\n", dst_string); + printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } } diff --git a/traceroute.c b/traceroute.c index 4e42419..ac2f1fa 100644 --- a/traceroute.c +++ b/traceroute.c @@ -43,7 +43,7 @@ void traceroute_usage(void) { - printf("Usage: batctl [options] traceroute [parameters] mac|bat-host \n"); + printf("Usage: batctl [options] traceroute [parameters] mac|bat-host|host_name|IPv4_address \n"); printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); @@ -99,10 +99,10 @@ int traceroute(char *mesh_iface, int argc, char **argv) dst_mac = &bat_host->mac_addr; if (!dst_mac) { - dst_mac = ether_aton(dst_string); + dst_mac = resolve_mac(dst_string); if (!dst_mac) { - printf("Error - the traceroute destination is not a mac address or bat-host name: %s\n", dst_string); + printf("Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); goto out; } }

1 0

[alfred] master: alfred: initial commit (23359bb)
by postmaster＠open-mesh.org 16 Oct '12

16 Oct '12

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 23359bbf72aa82ae7a2821757be018659224d907 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Tue Oct 16 19:39:13 2012 +0200 alfred: initial commit Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> >---------------------------------------------------------------

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2012