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.] batman-adv 0.2 released
by Marek Lindner 15 Nov '09

15 Nov '09

The B.A.T.M.A.N. team is pleased to announce the availability of the second batman-adv release which brings major improvements, new features, changes along the way and a series of bugfixes. As the kernel module always depends on the kernel it was compiled against it does not make sense to provide binaries. However, you will find binaries for batctl at the usual location: http://downloads.open-mesh.net/batman/stable/binaries/ as well as signed source tarballs for the module and batctl: http://downloads.open-mesh.net/batman/stable/sources/ Important changes ----------------- With this release we believe that the kernel module is fully capable to replace a routing daemon feature wise as well stability wise. Therefore the batman-adv user space daemon (which was marked deprecated since the last release) as well as the vis-adv daemon have been removed from our repositories as they are no longer supported. We urge all remaining users to consider a migration towards the the kernel module. Thanks ------ Special thanks go to: * Sven Eckelmann who continuously provides us with patches and advice whenever problems show up * Andrew Lunn & Yang Su for their analysis of the routing protocol which helped us to identify temporary routing loops in the code * Linus Luessing & Freifunk Luebeck for the rigorous testing & bug reporting of all (im)possible race conditions they encountered * Jacob Marble who tried to find a new home for our extravagant mailing list requirements and gave birth to the batctl idea Thanks to all people sending in patches (in no particular order): - Andrea Ghittino <a.mailevent(a)gmail.com> - Sven Eckelmann <sven.eckelmann(a)gmx.de> - Andrew Lunn <andrew.lunn(a)ascom.ch> - Yang Su <Yang.Su(a)ascom.ch> - Linus Luessing <linus.luessing(a)web.de> - Antoine van Gelder <antoine(a)7degrees.co.za> (JSON patch was ported) batman-adv ---------- The module has undergone some major changes to better fit into the event based nature of the kernel. We removed a number of timers (e.g the new interface detection) which also greatly reduces the risk of race conditions. Also new is the packet queue that allowed implementing the aggregation (already known from the user space implementation) as well as transmission retry (ARQ) for payload broadcasts because we noticed most broadcasts vanish in transit. This feature merits some extra attention as it is the first in which the routing module influences the payload traffic directly to enhance the mesh experience. We also spent quite some energy to fix bugs in the routing algorithm that triggered temporary routing loops, squashed a TTL code bug and removed the ghost entries from the originator table. The whole code received linux coding style adjustments, refactoring & cleanups. Furthermore all kernel version compatibility code has been unified in compat.h. The internal vis server received another output format (JSON) plus secondary interface export functionality in the dot draw format. Numerous small bugs were fixed such as using the random ethernet generator from the kernel for better randomness, exporting the version via /sys/module/batman_adv/version, fixing alignment issues, race conditions and deadlocks. batctl ------ Although this is the first release of batctl it carries the same release version as the kernel module (for the sake of simplicity). It is based on the work of Andreas Langer who created the battools which were never officially released. Since then it has been extended to the point that it serves as configuration utility, monitoring and debugging application. It allows to modify the module parameters, reading the logfiles & tables, decapsulate embedded packets on the fly, traceroute to & ping mac addresses, generate sequence number graphs and more. Check the README to get an impression: http://www.open-mesh.net/browser/trunk/batctl/README?rev=1466 road ahead ---------- The batman-adv development lying ahead can be separated into 2 big chunks: The linux kernel integration already started and we began working on batman's move into the linux land (more information can be found on www.open-mesh.net) - expect follow up news in the coming weeks. In the meantime a large number of ideas are flying around how to further improve the B.A.T.M.A.N. algorithm to increase its convergence speed, reduce traffic overhead and much more. A first idea collection will be published soon. Happy routing, The B.A.T.M.A.N. team

5 9

[B.A.T.M.A.N.] A peer-reviewed assessment of OLSR, BATMAN and Babel
by Juliusz Chroboczek 09 Nov '09

09 Nov '09

I've just come upon an interesting paper that experimentally compares the performance of OLSR, BATMAN and Babel. Real-world Performance of Current Proactive Multi-hop Mesh Protocols. M. Abolhasan, B. Hagelstein, J. C.-P. Wang. http://ro.uow.edu.au/cgi/viewcontent.cgi?article=1747&context=infopapers Short summary: see Table II on the last page. A few comments on the paper: 1. Section II (the informal description of the protocols) doesn't make much sense. Ignore it. 2. They evaluated original OLSR, not OLSR-ETX as used by our friends in Vienna and Berlin. 3. The results in Figure 3 would appear to imply that there's a bug in Babel -- it loses a packet every time it switches routes. I think I understand why. 4. They ran the routing daemons with the default parameters. This means that BATMAN ran with an OGM interval of 1 second, while Babel used a Hello interval of 4 seconds. It would have been interesting to see the results with similar parameters. 5. They didn't measure the amount of routing protocol traffic. Juliusz

6 9

Re: [B.A.T.M.A.N.] [Babel-users] A peer-reviewed assessment of OLSR, BATMAN and Babel
by Chun-Ping Wang 09 Nov '09

09 Nov '09

Hi all, Many thanks for all your feedbacks. It will definately help us to improve our work. However, I think there is quite a bit of confusions at very beginning. So I would like to make some clarifications for this paper. As it has been mentioned earlier, this paper was to study all the protocols in their default setting. In term of "default setting" for OLSR, we used original config file shipped in olsr v0.5.5. As far as I know, this config file is based on the LQ mode of OLSR (i.e. olsrd.conf.default.lq ). So, correct me if I am wrong, we have been using OLSR with ETX to begin with. We only modified the HELLO and TC interval to improve static node performance. The results shown in our paper is actually the performance of OLSR with ETX. You may also aware the protocols that we used are already out-dated. This is because this work was done back in 2008. We are more than happy to undergo another study with more recent protocols. Regards, Jerry ________________________________________ From: Henning Rogge [hrogge(a)googlemail.com] Sent: Monday, November 09, 2009 8:07 PM To: Mehran Abolhasan Cc: Juliusz Chroboczek; babel-users(a)lists.alioth.debian.org; olsr-users(a)lists.olsr.org; b.a.t.m.a.n(a)lists.open-mesh.net; Brett Hagelstein; justin.lipman(a)gmail.com; Brett Hegelstein; Chun-Ping Wang Subject: Re: [Babel-users] A peer-reviewed assessment of OLSR, BATMAN and Babel On Mon, Nov 9, 2009 at 05:46, Dr. Mehran Abolhasan <mehrana(a)uow.edu.au> wrote: > Hi All, > > Many Thanks for all your comments. Just a couple of point of clarification. > > 1. The aim of this paper was to study all the protocols in their default > settings. We did not > switch off ETX with olsr (note we used the olsr version from olsr.org). In > fact the link quality metric was left to 2 by default. We are well aware > that ETX provide more stable routes than hop count. The problem is that the "RFC" mode of olsr.org is not well tested, the MPR algorithm is broken in 0.5.6 and RFC conform OLSR networks do not work in practice for non-trivial networks. I'm surprised that you got results this good. > 2. In terms of looking at performance using different parameters, we will be > doing this in our future studies. > Also, note that the conference papers were limited to 4 pages only. If you plan to start your tests, feel free to contact the olsr mailing lists for some suggestions for parameters. ;) > 3. In terms of overheads, given that this was a small scale indoor test-bed, > we believed the amount of overhead introduced into the network is not > signficant enough to adversely affect the network. So we did not look into > overheads for this paper, however we would do this for larger test-beds. > > 4. We previously ran OLSR using various different outdoor and indoor > test-beds and at the time we were doing the experimentations BATMAN and > BABEL were more stable. Noone surprised (without ETX). Henning Rogge -- "Wo kämen wir hin, wenn alle sagten, wo kämem wir hin, und niemand ginge, um einmal zu schauen, wohin man käme, wenn man ginge." (Kurt Marti)

2 1

[B.A.T.M.A.N.] batman (user space) development is stopped?
by wu xiaofei 09 Nov '09

09 Nov '09

Hello, The development of batman (user space batman daemon) is stopped, right?

2 1

[B.A.T.M.A.N.] [PATCH] [batctl] Remove unreachable code in tcpdump
by Sven Eckelmann 07 Nov '09

07 Nov '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/tcpdump.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index b96984b..abf20b1 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -547,8 +547,6 @@ int tcpdump(int argc, char **argv) } - ret = EXIT_SUCCESS; - out: list_for_each_entry_safe(dump_if, dump_if_tmp, &dump_if_list, list) { if (dump_if->raw_sock) -- 1.6.5.2

1 0

[B.A.T.M.A.N.] [PATCH] [batctl] Correct printf format string conversation
by Sven Eckelmann 07 Nov '09

07 Nov '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/ping.c | 12 ++++++------ batctl/tcpdump.c | 44 ++++++++++++++++++++++---------------------- batctl/traceroute.c | 10 +++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/batctl/ping.c b/batctl/ping.c index f6b11af..8020643 100644 --- a/batctl/ping.c +++ b/batctl/ping.c @@ -148,7 +148,7 @@ int ping(int argc, char **argv) icmp_packet_out.ttl = 50; icmp_packet_out.seqno = 0; - printf("PING %s (%s) %zi(%zi) bytes of data\n", dst_string, mac_string, + printf("PING %s (%s) %zu(%zu) bytes of data\n", dst_string, mac_string, sizeof(icmp_packet_out), sizeof(icmp_packet_out) + 28); while (!is_aborted) { @@ -196,7 +196,7 @@ int ping(int argc, char **argv) } if ((size_t)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(icmp_packet_in), read_len); goto sleep; } @@ -204,7 +204,7 @@ int ping(int argc, char **argv) switch (icmp_packet_in.msg_type) { case ECHO_REPLY: time_delta = end_timer(); - printf("%zd bytes from %s icmp_seq=%u ttl=%d time=%.2f ms\n", + printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms\n", read_len, dst_string, ntohs(icmp_packet_in.seqno), icmp_packet_in.ttl, time_delta); @@ -216,10 +216,10 @@ int ping(int argc, char **argv) packets_in++; break; case DESTINATION_UNREACHABLE: - printf("From %s: Destination Host Unreachable (icmp_seq %u)\n", dst_string, ntohs(icmp_packet_in.seqno)); + printf("From %s: Destination Host Unreachable (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case TTL_EXCEEDED: - printf("From %s: Time to live exceeded (icmp_seq %u)\n", dst_string, ntohs(icmp_packet_in.seqno)); + printf("From %s: Time to live exceeded (icmp_seq %hu)\n", dst_string, ntohs(icmp_packet_in.seqno)); break; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", @@ -243,7 +243,7 @@ sleep: packets_loss = ((packets_out - packets_in) * 100) / packets_out; printf("--- %s ping statistics ---\n", dst_string); - printf("%d packets transmitted, %d received, %d%% packet loss\n", + printf("%u packets transmitted, %u received, %u%% packet loss\n", packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); diff --git a/batctl/tcpdump.c b/batctl/tcpdump.c index e121472..b96984b 100644 --- a/batctl/tcpdump.c +++ b/batctl/tcpdump.c @@ -45,7 +45,7 @@ #define LEN_CHECK(buff_len, check_len, desc) \ if ((size_t)(buff_len) < (check_len)) { \ - printf("Warning - dropping received %s packet as it is smaller than expected (%zd): %zd\n", \ + printf("Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ desc, (check_len), (size_t)(buff_len)); \ return; \ } @@ -127,7 +127,7 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print switch (icmphdr->type) { case ICMP_ECHOREPLY: - printf("%s: ICMP echo reply, id %u, seq %u, length %zd\n", + printf("%s: ICMP echo reply, id %hu, seq %hu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); @@ -142,12 +142,12 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print tmp_udphdr = (struct udphdr *)(((char *)tmp_iphdr) + (tmp_iphdr->ihl * 4)); printf("%s: ICMP ", inet_ntoa(*(struct in_addr *)&iphdr->daddr)); - printf("%s udp port %u unreachable, length %zd\n", + printf("%s udp port %hu unreachable, length %zu\n", inet_ntoa(*(struct in_addr *)&tmp_iphdr->daddr), ntohs(tmp_udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4)); break; default: - printf("%s: ICMP unreachable %u, length %zd\n", + printf("%s: ICMP unreachable %hhu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->code, (size_t)buff_len - (iphdr->ihl * 4)); break; @@ -155,18 +155,18 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print break; case ICMP_ECHO: - printf("%s: ICMP echo request, id %u, seq %u, length %zd\n", + printf("%s: ICMP echo request, id %hu, seq %hu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(icmphdr->un.echo.id), ntohs(icmphdr->un.echo.sequence), (size_t)buff_len - (iphdr->ihl * 4)); break; case ICMP_TIME_EXCEEDED: - printf("%s: ICMP time exceeded in-transit, length %zd\n", + printf("%s: ICMP time exceeded in-transit, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), (size_t)buff_len - (iphdr->ihl * 4)); break; default: - printf("%s: ICMP type %u, length %zd\n", + printf("%s: ICMP type %hhu, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), icmphdr->type, (size_t)buff_len - (iphdr->ihl * 4)); break; @@ -178,7 +178,7 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print tcphdr = (struct tcphdr *)(packet_buff + (iphdr->ihl * 4)); printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(tcphdr->source)); - printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zd\n", + printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(tcphdr->dest), (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), @@ -194,18 +194,18 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print switch (ntohs(udphdr->dest)) { case 67: LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr), (size_t) 44, "DHCP"); - printf("%s.67: BOOTP/DHCP, Request from %s, length %zd\n", + printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + sizeof(struct udphdr) + 28)), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; case 68: - printf("%s.68: BOOTP/DHCP, Reply, length %zd\n", + printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; default: - printf("%s.%i: UDP, length %zd\n", + printf("%s.%i: UDP, length %zu\n", inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(udphdr->dest), (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; @@ -236,7 +236,7 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); - printf("OGM via neigh %s, seqno %d, tq %3d, ttl %2d, v %d, flags [%c%c], length %zd\n", + printf("OGM via neigh %s, seqno %d, tq %3d, ttl %2d, v %d, flags [%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, batman_packet->version, @@ -264,25 +264,25 @@ static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int r switch (icmp_packet->msg_type) { case ECHO_REPLY: - printf("%s: ICMP echo reply, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case ECHO_REQUEST: - printf("%s: ICMP echo request, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; case TTL_EXCEEDED: - printf("%s: ICMP time exceeded in-transit, id %u, seq %u, ttl %2d, v %d, length %zd\n", + printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", name, icmp_packet->uid, ntohs(icmp_packet->seqno), icmp_packet->ttl, icmp_packet->version, (size_t)buff_len - sizeof(struct ether_header)); break; default: - printf("%s: ICMP type %u, length %zd\n", + printf("%s: ICMP type %hhu, length %zu\n", name, icmp_packet->msg_type, (size_t)buff_len - sizeof(struct ether_header)); break; } @@ -305,7 +305,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("%s: UCAST, ttl %u, ", + printf("%s: UCAST, ttl %hu, ", get_name_by_macaddr((struct ether_addr *)unicast_packet->dest, read_opt), unicast_packet->ttl); @@ -321,7 +321,7 @@ static void dump_batman_ucast(unsigned char *packet_buff, ssize_t buff_len, int buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct unicast_packet), 1); break; default: - printf(" unknown payload ether type: %u\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); break; } } @@ -343,7 +343,7 @@ static void dump_batman_bcast(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt)); - printf("BCAST, orig %s, seqno %u, ", + printf("BCAST, orig %s, seqno %hu, ", get_name_by_macaddr((struct ether_addr *)bcast_packet->orig, read_opt), ntohs(bcast_packet->seqno)); @@ -359,7 +359,7 @@ static void dump_batman_bcast(unsigned char *packet_buff, ssize_t buff_len, int buff_len - (2 * sizeof(struct ether_header)) - sizeof(struct bcast_packet), 1); break; default: - printf(" unknown payload ether type: %u\n", ntohs(ether_header->ether_type)); + printf(" unknown payload ether type: %hu\n", ntohs(ether_header->ether_type)); break; } } @@ -492,7 +492,7 @@ int tcpdump(int argc, char **argv) } if ((size_t)read_len < sizeof(struct ether_header)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(struct ether_header), read_len); continue; } @@ -538,7 +538,7 @@ int tcpdump(int argc, char **argv) break; default: - printf("Warning - packet contains unknown ether type: %u\n", ether_type); + printf("Warning - packet contains unknown ether type: %hu\n", ether_type); break; } diff --git a/batctl/traceroute.c b/batctl/traceroute.c index f69586e..f05c306 100644 --- a/batctl/traceroute.c +++ b/batctl/traceroute.c @@ -114,7 +114,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, %zd byte packets\n", + printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); for (icmp_packet_out.ttl = 1; !dst_reached && icmp_packet_out.ttl < TTL_MAX; icmp_packet_out.ttl++) { @@ -139,7 +139,7 @@ int traceroute(int argc, char **argv) if (res <= 0) { if (i == 0) - printf("%2u: ", icmp_packet_out.ttl); + printf("%2hu: ", icmp_packet_out.ttl); printf(" * "); fflush(stdout); @@ -154,7 +154,7 @@ int traceroute(int argc, char **argv) } if ((size_t)read_len < sizeof(icmp_packet_in)) { - printf("Warning - dropping received packet as it is smaller than expected (%zd): %zd\n", + printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(icmp_packet_in), read_len); continue; } @@ -176,10 +176,10 @@ int traceroute(int argc, char **argv) bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.orig); if (!bat_host) - printf("%2u: %s %.3f ms", + printf("%2hu: %s %.3f ms", icmp_packet_out.ttl, return_mac, time_delta); else - printf("%2u: %s (%s) %.3f ms", + printf("%2hu: %s (%s) %.3f ms", icmp_packet_out.ttl, bat_host->name, return_mac, time_delta); if (icmp_packet_in.msg_type == ECHO_REPLY) -- 1.6.5.2

1 0

[B.A.T.M.A.N.] [PATCH] [batctl] Prevent division by zero when no packets were send
by Sven Eckelmann 07 Nov '09

07 Nov '09

We will try to print a statistic even when we receive a sigterm or sigint before we send any data or started to count the send data. This means that the we try to calculate the data loss by dividing through zero as it is the number of send packets. This is not possible and we must check for that corner case. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batctl/ping.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/batctl/ping.c b/batctl/ping.c index 684a84d..ca1fbf0 100644 --- a/batctl/ping.c +++ b/batctl/ping.c @@ -72,7 +72,7 @@ int ping(int argc, char **argv) fd_set read_socket; int ret = EXIT_FAILURE, ping_fd = 0, res, optchar, found_args = 1; int loop_count = -1, loop_interval = 1, timeout = 1; - unsigned int seq_counter = 0, packets_out = 0, packets_in = 0; + unsigned int seq_counter = 0, packets_out = 0, packets_in = 0, packets_loss; char *dst_string, *mac_string; double time_delta; float min = 0.0, max = 0.0, avg = 0.0; @@ -237,9 +237,14 @@ sleep: } + if (packets_out == 0) + packets_loss = 0; + else + packets_loss = ((packets_out - packets_in) * 100) / packets_out; + printf("--- %s ping statistics ---\n", dst_string); printf("%d packets transmitted, %d received, %d%% packet loss\n", - packets_out, packets_in, (((packets_out - packets_in) * 100) / packets_out)); + packets_out, packets_in, packets_loss); printf("rtt min/avg/max/mdev = %.3f/%.3f/%.3f/%.3f ms\n", min, (packets_in ? (avg / packets_in) : 0.000), max, (max - min)); -- 1.6.5.2

1 0

[B.A.T.M.A.N.] [PATCH] Remove unknown escape string \{
by Sven Eckelmann 07 Nov '09

07 Nov '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/proc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv-kernelland/proc.c b/batman-adv-kernelland/proc.c index 792a006..aac3df7 100644 --- a/batman-adv-kernelland/proc.c +++ b/batman-adv-kernelland/proc.c @@ -541,7 +541,7 @@ static int proc_vis_read(struct seq_file *seq, void *offset) if (current_format == DOT_DRAW) { addr_to_string(tmp_addr_str, info->packet.vis_orig); - seq_printf(seq, "\tsubgraph \"cluster_%s\" \{\n", tmp_addr_str); + seq_printf(seq, "\tsubgraph \"cluster_%s\" {\n", tmp_addr_str); while (if_entries != NULL) { addr_to_string(tmp_addr_str, if_entries->addr); -- 1.6.5.2

1 0

[B.A.T.M.A.N.] [PATCH] Mark local symbols as static
by Sven Eckelmann 07 Nov '09

07 Nov '09

Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> --- batman-adv-kernelland/aggregation.c | 2 +- batman-adv-kernelland/hard-interface.c | 6 +++--- batman-adv-kernelland/proc.c | 2 +- batman-adv-kernelland/routing.c | 4 ++-- batman-adv-kernelland/soft-interface.c | 2 +- batman-adv-kernelland/translation-table.c | 2 +- batman-adv-kernelland/vis.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/batman-adv-kernelland/aggregation.c b/batman-adv-kernelland/aggregation.c index 5a31e94..9c6e681 100644 --- a/batman-adv-kernelland/aggregation.c +++ b/batman-adv-kernelland/aggregation.c @@ -88,7 +88,7 @@ static bool can_aggregate_with(struct batman_packet *new_batman_packet, } /* create a new aggregated packet and add this packet to it */ -void new_aggregated_packet(unsigned char *packet_buff, +static void new_aggregated_packet(unsigned char *packet_buff, int packet_len, unsigned long send_time, bool direct_link, diff --git a/batman-adv-kernelland/hard-interface.c b/batman-adv-kernelland/hard-interface.c index e0d0342..8d8dff5 100644 --- a/batman-adv-kernelland/hard-interface.c +++ b/batman-adv-kernelland/hard-interface.c @@ -72,7 +72,7 @@ int hardif_min_mtu(void) return min_mtu; } -void check_known_mac_addr(uint8_t *addr) +static void check_known_mac_addr(uint8_t *addr) { struct batman_if *batman_if; char mac_string[ETH_STR_LEN]; @@ -105,7 +105,7 @@ void update_min_mtu(void) } /* checks if the interface is up. (returns 1 if it is) */ -int hardif_is_interface_up(char *dev) +static int hardif_is_interface_up(char *dev) { struct net_device *net_dev; @@ -176,7 +176,7 @@ void hardif_deactivate_interface(struct batman_if *batman_if) } /* (re)activate given interface. */ -void hardif_activate_interface(struct batman_if *batman_if) +static void hardif_activate_interface(struct batman_if *batman_if) { struct sockaddr_ll bind_addr; int retval; diff --git a/batman-adv-kernelland/proc.c b/batman-adv-kernelland/proc.c index b3eb69d..792a006 100644 --- a/batman-adv-kernelland/proc.c +++ b/batman-adv-kernelland/proc.c @@ -30,7 +30,7 @@ #include "vis.h" #include "compat.h" -uint8_t vis_format = DOT_DRAW; +static uint8_t vis_format = DOT_DRAW; static struct proc_dir_entry *proc_batman_dir, *proc_interface_file; static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file; diff --git a/batman-adv-kernelland/routing.c b/batman-adv-kernelland/routing.c index 220dbf7..b33cef9 100644 --- a/batman-adv-kernelland/routing.c +++ b/batman-adv-kernelland/routing.c @@ -46,7 +46,7 @@ static DECLARE_DELAYED_WORK(purge_orig_wq, purge_orig); static atomic_t data_ready_cond; atomic_t exit_cond; -void start_purge_timer(void) +static void start_purge_timer(void) { queue_delayed_work(bat_event_workqueue, &purge_orig_wq, 1 * HZ); } @@ -618,7 +618,7 @@ void purge_orig(struct work_struct *work) start_purge_timer(); } -int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) +static int receive_raw_packet(struct socket *raw_sock, unsigned char *packet_buff, int packet_buff_len) { struct kvec iov; struct msghdr msg; diff --git a/batman-adv-kernelland/soft-interface.c b/batman-adv-kernelland/soft-interface.c index 18e5e8f..d543f50 100644 --- a/batman-adv-kernelland/soft-interface.c +++ b/batman-adv-kernelland/soft-interface.c @@ -68,7 +68,7 @@ int main_if_was_up(void) return (memcmp(mainIfAddr, mainIfAddr_default, ETH_ALEN) != 0 ? 1 : 0); } -int my_skb_push(struct sk_buff *skb, unsigned int len) +static int my_skb_push(struct sk_buff *skb, unsigned int len) { int result = 0; diff --git a/batman-adv-kernelland/translation-table.c b/batman-adv-kernelland/translation-table.c index 9936bc2..c2190e1 100644 --- a/batman-adv-kernelland/translation-table.c +++ b/batman-adv-kernelland/translation-table.c @@ -32,7 +32,7 @@ static struct hashtable_t *hna_global_hash; atomic_t hna_local_changed; DEFINE_SPINLOCK(hna_local_hash_lock); -DEFINE_SPINLOCK(hna_global_hash_lock); +static DEFINE_SPINLOCK(hna_global_hash_lock); static DECLARE_DELAYED_WORK(hna_local_purge_wq, hna_local_purge); diff --git a/batman-adv-kernelland/vis.c b/batman-adv-kernelland/vis.c index 22235ad..f6c9acb 100644 --- a/batman-adv-kernelland/vis.c +++ b/batman-adv-kernelland/vis.c @@ -369,7 +369,7 @@ static int generate_vis_packet(void) return 0; } -void purge_vis_packets(void) +static void purge_vis_packets(void) { struct hash_it_t *hashit = NULL; struct vis_info *info; -- 1.6.5.2

1 0

[B.A.T.M.A.N.] Any results from BattleMesh 2009?
by Gus Wirth 06 Nov '09

06 Nov '09

I see on the OpenWRT site that there was supposed to be a Wireless Battle Mesh a couple weeks ago. Does anyone have some results from the event? Gus

6 10

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