B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] Clarification of version number in batctl/main.h
by Sven Eckelmann 23 Jun '09

23 Jun '09

Hi, I just wanted to ask how to interpret the current version number of batctl. Does it mean that the current version in svn is before or after a possible 0.2-beta release? Is it important for me because debian differentiates between before and after something. For example 0.2~beta would mean that there is a beta version before the 0.2 release. So I wanted to know if should call a svn snapshot of the current batctl 0.2~beta~svn1317 (svn1317 snapshot before a possible 0.2~beta release) or 0.2~beta+svn1317 (svn1317 snapshot after the beta phase has started - no beta version will ever be made available or has been released already). It seems that the 0.2~beta~svn1317 is the more "correct" version as it has less extra rules than 0.2~beta+svn1317. For example there must not be an extra rule for events like the release of 0.3.1 of batman when Simon changed the version string to 0.3.1 in 1177 which was before the release of 0.3.1 and thus shouldn't be called 0.3.1+svn1177. Can this be interpreted the same way for all other on open-mesh.net published hosted projects? So if I would create a snapshot version of batman it would have the version number 0.4~beta~svn1309? Regards, Sven

2 1

[B.A.T.M.A.N.] HTTP transfers greater than 1000 bytes fail
by Jacob Marble 22 Jun '09

22 Jun '09

Two Linux boxes, each plugged in via Ethernet to a BATMAN node (two nodes). The nodes talk batman-advanced to each other via WiFi. The Linux boxes can ping each other all day long. Both Linux boxes have Apache running. Downloading a file via HTTP works only if the file is smaller than or equal to exactly 1,145 bytes. TFTP file transfers are halting, but they get through (4 megabytes took a couple of minutes). This happens with both r1176 and r1298 on OpenWrt.

3 12

[B.A.T.M.A.N.] [PATCH] [batctl] Use length modifier for size_t types in printf
by Sven Eckelmann 22 Jun '09

22 Jun '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/ping.c | 10 +++++----- batctl/traceroute.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/batctl/ping.c b/batctl/ping.c index b56867b..f051fe9 100644 --- a/batctl/ping.c +++ b/batctl/ping.c @@ -147,7 +147,7 @@ int ping(int argc, char **argv) icmp_packet_out.ttl = 50; icmp_packet_out.seqno = 0; - printf("PING %s (%s) %i(%i) bytes of data\n", dst_string, mac_string, + printf("PING %s (%s) %zi(%zi) bytes of data\n", dst_string, mac_string, sizeof(icmp_packet_out), sizeof(icmp_packet_out) + 28); while (!is_aborted) { @@ -194,8 +194,8 @@ int ping(int argc, char **argv) goto sleep; } - if ((unsigned int)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%d): %d\n", + if ((size_t)read_len < sizeof(icmp_packet_in)) { + printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", sizeof(icmp_packet_in), read_len); goto sleep; } @@ -204,7 +204,7 @@ int ping(int argc, char **argv) case ECHO_REPLY: gettimeofday(&end, (struct timezone*)0); time_delta = time_diff(&start, &end); - printf("%d bytes from %s icmp_seq=%u ttl=%d time=%.2f ms\n", + printf("%zd bytes from %s icmp_seq=%u ttl=%d time=%.2f ms\n", read_len, dst_string, ntohs(icmp_packet_in.seqno), icmp_packet_in.ttl, time_delta); @@ -227,7 +227,7 @@ int ping(int argc, char **argv) printf("Please make sure to compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %d received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); break; } diff --git a/batctl/traceroute.c b/batctl/traceroute.c index 2d16ff4..cdc2b8c 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -108,7 +108,7 @@ int traceroute(int argc, char **argv) icmp_packet_out.msg_type = ECHO_REQUEST; icmp_packet_out.seqno = 0; - printf("traceroute to %s (%s), %d hops max, %d byte packets\n", + printf("traceroute to %s (%s), %d hops max, %zd byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); for (icmp_packet_out.ttl = 0; !dst_reached && icmp_packet_out.ttl < TTL_MAX; icmp_packet_out.ttl++) { @@ -143,8 +143,8 @@ int traceroute(int argc, char **argv) continue; } - if ((unsigned int)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%d): %d\n", + if ((size_t)read_len < sizeof(icmp_packet_in)) { + printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", sizeof(icmp_packet_in), read_len); continue; } @@ -182,7 +182,7 @@ int traceroute(int argc, char **argv) printf("Please make sure to compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %d received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); break; } } -- 1.6.3.1

1 0

[B.A.T.M.A.N.] [PATCH] [batctl] Expand ~ in paths to host files
by Sven Eckelmann 20 Jun '09

20 Jun '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/bat-hosts.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/batctl/bat-hosts.c b/batctl/bat-hosts.c index 95d105f..e997ad0 100644 --- a/batctl/bat-hosts.c +++ b/batctl/bat-hosts.c @@ -67,7 +67,6 @@ static void parse_hosts_file(struct hashtable_t *hash, const char path[]) struct hashtable_t *swaphash; name[0] = mac_str[0] = '\0'; - fd = fopen(path, "r"); if (fd == NULL) return; @@ -129,6 +128,9 @@ static void parse_hosts_file(struct hashtable_t *hash, const char path[]) void bat_hosts_init(void) { unsigned int i; +#define CONF_DIR_LEN 256 + char confdir[CONF_DIR_LEN]; + char *homedir; host_hash = hash_new(64, compare_mac, choose_mac); @@ -137,8 +139,21 @@ void bat_hosts_init(void) return; } - for (i = 0; i < sizeof(bat_hosts_path) / sizeof(char *); i++) - parse_hosts_file(host_hash, bat_hosts_path[i]); + homedir = getenv("HOME"); + + for (i = 0; i < sizeof(bat_hosts_path) / sizeof(char *); i++) { + strcpy(confdir, ""); + if (strlen(bat_hosts_path[i]) >= 2 + && bat_hosts_path[i][0] == '~' && bat_hosts_path[i][1] == '/') { + strncpy(confdir, homedir, CONF_DIR_LEN); + confdir[CONF_DIR_LEN - 1] = '\0'; + strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir)); + } else { + strncpy(confdir, bat_hosts_path[i], CONF_DIR_LEN); + confdir[CONF_DIR_LEN - 1] = '\0'; + } + parse_hosts_file(host_hash, confdir); + } } struct bat_host *bat_hosts_find_by_name(char *name) -- 1.6.3.1

1 0

[B.A.T.M.A.N.] [PATCH] [batctl] Remove references to old tool names
by Sven Eckelmann 20 Jun '09

20 Jun '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/man/batctl.8 | 6 +++--- batctl/ping.c | 8 ++++---- batctl/tcpdump.c | 4 ++-- batctl/traceroute.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/batctl/man/batctl.8 b/batctl/man/batctl.8 index 4cd206b..1222af9 100644 --- a/batctl/man/batctl.8 +++ b/batctl/man/batctl.8 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH BATTOOL 8 "Sep 17, 2007" +.TH BATCTL 8 "Sep 17, 2007" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -77,7 +77,7 @@ timeout interval in seconds (default is 1 second) Traceroute sends 3 packets to each hop, awaits the answers and prints out the response times. .TP -.RI \fBbatctl\ batdump\fP\ [\fIoptions\fP]\ [\fIinterface\fP] +.RI \fBbatctl\ tcpdump\fP\ [\fIoptions\fP]\ [\fIinterface\fP] The following options are supported: .RSs .IPs "-a (all packets)" @@ -104,7 +104,7 @@ prints more information about each packet .br .SH FILES .IPs bat-hosts -This file is simliar to the /etc/hosts file. You can write one MAC address and one host name per line. The battool will analyze the file to find the matching MAC address to your provided host name. Host names are much easier to remember than MAC addresses. ;) +This file is simliar to the /etc/hosts file. You can write one MAC address and one host name per line. The batctl will analyze the file to find the matching MAC address to your provided host name. Host names are much easier to remember than MAC addresses. ;) .SH SEE ALSO \fIbatmand-adv\fP (8) .SH AUTHOR diff --git a/batctl/ping.c b/batctl/ping.c index b273133..8f4eee8 100644 --- a/batctl/ping.c +++ b/batctl/ping.c @@ -46,8 +46,8 @@ uint8_t Stop = 0; void batping_usage() { - printf("Battool module batping\n"); - printf("Usage: battool batping|bp [options] mac|name\n"); + printf("batctl module ping\n"); + printf("Usage: batctl ping|bp [options] mac|name\n"); printf("\t-c count\n"); printf("\t-h help\n"); printf("\t-i interval in seconds\n"); @@ -197,7 +197,7 @@ int ping(int argc, char **argv) /* remove new procmask from current procmask */ sigprocmask( SIG_UNBLOCK,&sigmask_new, &sigmask_old ); - printf("batping %s\n", mac_string ); + printf("ping %s\n", mac_string ); while( !Stop && loop_count != 0 ) { if( loop_count > 0 ) loop_count--; @@ -263,7 +263,7 @@ int ping(int argc, char **argv) } if( timeout.tv_sec > 0 ) sleep( loop_interval?loop_interval:1 ); } - printf("--- %s batping statistic ---\n",mac_string ); + printf("--- %s ping statistic ---\n",mac_string ); printf("%d packets transmitted, %d received, %d%c packet loss\n", trans, recv, ( (trans - recv) * 100 / trans ),'%'); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", min < 0.0 ? 0.000 : min, avg_count?(avg / avg_count):0.000 ,max, max - ( min < 0.0 ? 0.0:min) ); ret = EXIT_SUCCESS; diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index 5b100a5..e58aa30 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -50,8 +50,8 @@ uint8_t print_names = 1; struct list_head_first dump_if_list; void batdump_usage() { - printf("Battool module batdump\n"); - printf("Usage: battool batdump|bd [option] interface\n"); + printf("batctl module tcpdump\n"); + printf("Usage: batctl tcpdump|bd [option] interface\n"); printf("\t-p packet type\n\t\t1=batman packets\n\t\t2=icmp packets\n\t\t3=unicast packets\n\t\t4=broadcast packets\n"); printf("\t-a all packet types\n"); printf("\t-d packet dump in hex\n"); diff --git a/batctl/traceroute.c b/batctl/traceroute.c index 2018cab..67484a9 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -40,8 +40,8 @@ void batroute_usage() { - printf("Battool module batroute\n"); - printf("Usage: battool batroute|br mac|name\n"); + printf("batctl module traceroute\n"); + printf("Usage: batctl traceroute|br mac|name\n"); printf("\t-h help\n"); return; } -- 1.6.3.1

1 0

[B.A.T.M.A.N.] opkg doesn't rmmod
by Jacob Marble 19 Jun '09

19 Jun '09

Using OpenWrt SVN and batman-advanced SVN (yay!). When I "opkg remove kmod-batman-adv-kernelland", the kernel module stays loaded, so when I "opkg install kmod-batman-adv-[newer version]" the old module stays loaded. A simple rmmod gets rid of the old module. There is a script in the openwrt SVN called postinst that inserts the module after install. Very convenient. A similar script could be added, called prerm, that would remove the module before removing the ipk. There are several ways to rmmod; "rmmod -f batman-adv" might be best for removing the package. When I create the file in my build_dir, make just deletes it, so I leave this up to someone else (Marek?). Jake -- Jacob Marble 435 760 4321 jacobmarble(a)gmail.com

2 2

[B.A.T.M.A.N.] batman advanced in openwrt
by Jacob Marble 19 Jun '09

19 Jun '09

Hello all- I am attempting to use batman-adv in openwrt 8.09.1 on three Ubiquiti NanoStation2. This is just a test environment. For now, my goal is to have: node 1: eth0 -> 10.0.0.1/24 ath0 -> bat0 -> 10.0.1.1/24 node 2: eth0 -> 10.0.0.2/24 ath0 -> bat0 -> 10.0.1.2/24 node 3: eth0 -> 10.0.0.3/24 ath0 -> bat0 -> 10.0.1.3/24 So far, I have an adhoc network on ath0, and I have installed batmand-adv, battool, and kmod-batman-advanced. Do I need badmand-adv? Is this the old userspace batman-adv implementation? - "lsmod" shows that a module batman-adv is loaded, and the directory /proc/net/batman-adv/ looks right. - "cat /proc/net/batman-adv/interfaces" shows nothing. - "ifconfig" does *not* list an interface called bat0. - "cat ath0 > /proc/net/batman-adv/interfaces" doesn't complain. - "cat /proc/net/batman-adv/interfaces" *still* shows nothing. I have no bat0 interface. Rebooting doesn't help. At first, I only installed kmod-batman-advanced. When that didn't work, I installed batmand-adv and battool. Still nothing. Any ideas? TIA, Jake

3 20

[B.A.T.M.A.N.] mail server reconfiguration
by Marek Lindner 18 Jun '09

18 Jun '09

Hi folks, I just finished reconfiguring our mail system to further reduce our SPAM traffic. At the same time the list address changed to b.a.t.m.a.n(a)lists.open-mesh.net but the old address is still valid for a while and will be mapped to the new one automatically. My previous mail was a test for the system and can be ignored. If someone experiences problems please contact me directly. Regards, Marek

1 0

[B.A.T.M.A.N.] bat0 looses IPv6 capabilities when inserting tinc-interface (BATMAN-Adv)
by Linus Lüssing 13 Jun '09

13 Jun '09

I'm having a tinc-tunnel with the interface named 3micc over the internet here which is in "switch-mode" (so every tunneled package has a complete ethernet-frame which makes batman-adv able to use this interface for OGMs). When I'm doing the steps in the following order, then everything works fine: 1) sudo modprobe batman-adv 2) sudo ifconfig bat0 up 3) su -c "echo 3micc > /proc/net/batman-adv/interfaces" But when I'm switching the steps 2) and 3), so first adding the interface and then putting bat0 up, then bat0 suddenly looses its IPv6 link-local addresse. /proc/sys/net/ipv6/conf/bat0 vanished (but ipv4/conf/bat0 is still there). When I'm trying to add an IPv6-address manually with "sudo ip -6 addr add fe80::2ff:e3ff:fe85:b9ca/64 dev bat0" then I get the response "RTNETLINK answers: No buffer space available". But dmesg shows no errors. This problem is reproducable, I've been doing a sudo modprobe -r batman-adv a couple of times and repeating the steps stated above. I'm running batman-adv-modules-2.6.26-2-486 version 0.1-7+2.6.26-15 on Debian unstable with the same kernel-version. Cheers, Linus

1 0

[B.A.T.M.A.N.] batman 0.3.2 released
by Marek Lindner 13 Jun '09

13 Jun '09

Hi folks, the B.A.T.M.A.N. team is releasing the second bugfix and maintenance release of the 0.3 batman daemon which also contains smaller enhancements in various areas. It's mostly an update to batman 0.3 and does not contain major routing protocol changes. We offer precompiled packages http://downloads.open-mesh.net/batman/stable/binaries/ as well as signed source tarballs: http://downloads.open-mesh.net/batman/stable/sources/ In the past many new users experienced difficulties using batman to connect to the internet as it was necessary to enable NAT on the tunnel manually. With this release we address this issue. The batman daemon will try to locate the iptables binary to setup the masquerading automatically. This behaviour can be disabled using the "--disable-client-nat" option. If the outgoing packets are not masqueraded (the iptables binary wasn't found / the automatism disabled) batman will switch to the "half tunnel" mode which operates without masquerading. This mode requires the gateway to have a routing entry for each client that accesses the internet (e.g. non-batman clients may be announced via HNA). The whole HNA code has been rewritten and now supports multiple nodes announcing the same network segment. You may have one non-batman network but several entry points to it. All border nodes can announce the same network. Receiving batman nodes choose their entry point based on the best TQ value available. The packet aggregation that exists since batman 0.3 has been enabled by default. Thanks to Benjamin Henrions persistence the hop penalty was modified to make use of multi radio interfaces to maximize throughput. Nathan Wharton and Sven Eckelmann debugged alignment issues on Avila boards. Sven also improved the kernel routing communication and contributed many more patches. Antoine van Gelder developed an extension for the vis server that allows the vis server to export its data in the JSON format if it was started using the "-j" parameter. In the coming months we want to focus on improving the protocol. Therefore we will start the batman 0.4 branch soon. Happy routing, The B.A.T.M.A.N. team

2 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N