commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 1102e51addc682c9f116a8458dc44c6b278c5649 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 11:44:54 2009 +0000 remove dead code git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1465 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/bitarray.c b/bitarray.c index 32a16e2..3c67f5f 100644 --- a/bitarray.c +++ b/bitarray.c @@ -23,15 +23,6 @@ #include "bitarray.h" #include "log.h" -/* clear the bits */ -void bit_init(TYPE_OF_WORD *seq_bits) -{ - int i; - - for (i = 0; i < NUM_WORDS; i++) - seq_bits[i] = 0; -} - /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, @@ -55,24 +46,6 @@ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, } } -/* print the packet array, for debugging purposes */ -static char bit_string[130]; -char *bit_print(TYPE_OF_WORD *seq_bits) -{ - int i, j, k = 0, b = 0; - - for (i = 0; i < NUM_WORDS; i++) { - for (j = 0; j < WORD_BIT_SIZE; j++) { - bit_string[k++] = ((seq_bits[i]>>j)%2 ? '1' : '0'); - if (++b == TQ_LOCAL_WINDOW_SIZE) - bit_string[k++] = '|'; - } - bit_string[k++] = ' '; - } - bit_string[k++] = '\0'; - return bit_string; -} - /* turn corresponding bit on, so we can remember that we got the packet */ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) { -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit d31f6bce02d98f203cb3a21775b101409bb96623 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 13:21:17 2009 +0000 remove obsolete functions from bitarray.h (thanks Sven) git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1467 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/bitarray.h b/bitarray.h index 2f1f523..ec72dd7 100644 --- a/bitarray.h +++ b/bitarray.h @@ -24,9 +24,6 @@ #define TYPE_OF_WORD unsigned long #define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8) -/* clear the bits, ready for use */ -void bit_init(TYPE_OF_WORD *seq_bits); - /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, @@ -46,6 +43,3 @@ char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, /* count the hamming weight, how many good packets did we receive? */ int bit_packet_count(TYPE_OF_WORD *seq_bits); - -/* print the packet array, for debugging purposes */ -char *bit_print(TYPE_OF_WORD *seq_bits); -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 666c47db54d39b3e616059e9c04cda7ac9ba04ce Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 13:29:35 2009 +0000 fix memory leak when there is a problem adding an interface git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1468 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/hard-interface.c b/hard-interface.c index e0d0342..fdc5add 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -400,6 +400,8 @@ int hardif_add_interface(char *dev, int if_num) return 1; out: + if (batman_if->packet_buff) + kfree(batman_if->packet_buff); kfree(batman_if); kfree(dev); return -1; -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit f435210d154536d875e81b65739ff7bbdd1a60d3 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 11:23:28 2009 +0000 update version string to 0.2 git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1464 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/main.h b/main.h index 5d2e27c..85e50b7 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "0.2-beta" +#define SOURCE_VERSION "0.2" /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 1e94b41f4bc9d224d89a4bff2705e8f92db8ddb6 Author: marek <marek@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Wed Nov 4 23:12:34 2009 +0000 [batman-adv] avoid temporary routing loops git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1460 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/routing.c b/routing.c index c317998..a5a7c61 100644 --- a/routing.c +++ b/routing.c @@ -344,18 +344,28 @@ static void update_orig(struct orig_node *orig_node, struct ethhdr *ethhdr, stru tmp_hna_buff_len = (hna_buff_len > batman_packet->num_hna * ETH_ALEN ? batman_packet->num_hna * ETH_ALEN : hna_buff_len); - /** - * if we got have a better tq value via this neighbour or - * same tq value but the link is more symetric change the next hop - * router - */ - if ((orig_node->router != neigh_node) && ((!orig_node->router) || - (neigh_node->tq_avg > orig_node->router->tq_avg) || - ((neigh_node->tq_avg == orig_node->router->tq_avg) && - (neigh_node->orig_node->bcast_own_sum[if_incoming->if_num] > orig_node->router->orig_node->bcast_own_sum[if_incoming->if_num])))) - update_routes(orig_node, neigh_node, hna_buff, tmp_hna_buff_len); - else - update_routes(orig_node, orig_node->router, hna_buff, tmp_hna_buff_len); + /* if this neighbor already is our next hop there is nothing to change */ + if (orig_node->router == neigh_node) + goto update_hna; + + /* if this neighbor does not offer a better TQ we won't consider it */ + if ((orig_node->router) && + (orig_node->router->tq_avg > neigh_node->tq_avg)) + goto update_hna; + + /* if the TQ is the same and the link not more symetric we won't consider it either */ + if ((orig_node->router) && + ((neigh_node->tq_avg == orig_node->router->tq_avg) && + (orig_node->router->orig_node->bcast_own_sum[if_incoming->if_num] > + neigh_node->orig_node->bcast_own_sum[if_incoming->if_num]))) + goto update_hna; + + update_routes(orig_node, neigh_node, hna_buff, tmp_hna_buff_len); + return; + +update_hna: + update_routes(orig_node, orig_node->router, hna_buff, tmp_hna_buff_len); + return; } static char count_real_packets(struct ethhdr *ethhdr, struct batman_packet *batman_packet, struct batman_if *if_incoming) @@ -402,7 +412,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack /* Silently drop when the batman packet is actually not a correct packet. * - * This might happen if a packet is padded (e.g. Ethernet has a + * This might happen if a packet is padded (e.g. Ethernet has a * minimum frame length of 64 byte) and the aggregation interprets * it as an additional length. * @@ -491,6 +501,15 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack if (orig_node == NULL) return; + /* avoid temporary routing loops */ + if ((orig_node->router) && (orig_node->router->orig_node->router) && + (compare_orig(orig_node->router->addr, batman_packet->prev_sender)) && + !(compare_orig(batman_packet->orig, batman_packet->prev_sender)) && + (compare_orig(orig_node->router->addr, orig_node->router->orig_node->router->addr))) { + debug_log(LOG_TYPE_BATMAN, "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %s) \n", neigh_str); + return; + } + /* if sender is a direct neighbor the sender mac equals originator mac */ orig_neigh_node = (is_single_hop_neigh ? orig_node : get_orig_node(ethhdr->h_source)); if (orig_neigh_node == NULL) -- batman-adv

1 0

[git] batman-adv branch, master, updated. 087625b70d2114b02cc0edb97c7d8edd9d2a9b71
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

The following commit has been merged in the master branch: commit 2dc3eb129a68bb65af65eccb37a2bc0bfd1d6b52 Author: simon <simon@45894c77-fb22-0410-b583-ff6e7d5dbf6c> Date: Sat Nov 7 10:59:00 2009 +0000 update README and adjust year numbers in copyright notice git-svn-id: http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland@1462 45894c77-fb22-0410-b583-ff6e7d5dbf6c diff --git a/Makefile b/Makefile index d49514a..062149b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ # -# Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: +# # Marek Lindner, Simon Wunderlich +# # 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. diff --git a/Makefile.kbuild b/Makefile.kbuild index 4210267..6be1223 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -1,6 +1,8 @@ # -# Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: +# # Marek Lindner, Simon Wunderlich +# # 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. diff --git a/README b/README index 63465c2..d554a6c 100644 --- a/README +++ b/README @@ -1,11 +1,20 @@ -[state: 17-11-2008] +[state: 07-11-2009] BATMAN-ADV ---------- -The kernel implementation of batman-advanced. It does not depend on any network -driver, and can be used on wifi as well as ethernet, vpn, etc ... (anything -with ethernet-style layer 2). +Batman-advanced is a new approach to wireless networking which does no longer +operate on the IP basis. Unlike B.A.T.M.A.N, which exchanges information +using UDP packets and sets routing tables, batman-advanced operates on ISO/OSI +Layer 2 only and uses and routes (or better: bridges) Ethernet Frames. It +emulates a virtual network switch of all nodes participating. Therefore all +nodes appear to be link local, thus all higher operating protocols won't be +affected by any changes within the network. You can run almost any protocol +above B.A.T.M.A.N. Advanced, prominent examples are: IPv4, IPv6, DHCP, IPX. + +This is batman-advanced implemented as Linux kernel driver. It does not depend +on any network (other) driver, and can be used on wifi as well as ethernet, +vpn, etc ... (anything with ethernet-style layer 2). It compiles against and should work with Linux 2.6.20 - 2.6.31. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@ -53,18 +62,54 @@ as VIS-server: # echo "server" > /proc/net/batman-adv/vis +Each node is either configured as "server" or as "client" (default: +"client"). Clients send their topology data to the server next to them, +and server synchronize with other servers. If there is no server +configured (default) within the mesh, no topology information will be +transmitted. With these "synchronizing servers", there can be 1 or +more vis servers sharing the same (or at least very similar) data. + When configured as server, you can get a topology snapshot of your mesh: # cat /proc/net/batman-adv/vis -This output can be processed with graphviz-tools like dot. +This output format is a graphviz formatted text file which can be +processed with graphviz-tools like dot. The labels are similar/compatible to the ETX metric, 1.0 means perfect connection (100%), 2.0 means 50%, 3.0 means 33% and so on. +Alternatively, a JSON output format is available. The format can be set +using by writing either "dot_draw" or "json" into the vis_format file. +"dot_draw" is selected by default. + +echo "json" > /proc/net/batman-adv/vis_format + +In very mobile scenarios, you might want to adjust the originator +interval to a lower value. This will make the mesh more responsive to +topology changes, but will also increase the overhead. Please make sure +that all nodes in your mesh use the same interval. The default value +is 1000 ms (1 second). + +# echo 1000 > /proc/net/batman-adv/orig_interval + To deactivate batman, do: # echo "" > /proc/net/batman-adv/interfaces +BATCTL +------ + +B.A.T.M.A.N. advanced operates on layer 2 and thus all hosts partici- +pating in the virtual switch are completely transparent for all proto- +cols above layer 2. Therefore the common diagnosis tools do not work as +expected. To overcome these problems batctl was created. At the moment +the batctl contains ping, traceroute, tcpdump and interfaces to the +kernel module settings. + +For more information, please see the manpage (man batctl). + +batctl is available on http://www.open-mesh.net/ + CONTACT ------- diff --git a/aggregation.c b/aggregation.c index 9b88b14..5a31e94 100644 --- a/aggregation.c +++ b/aggregation.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/aggregation.h b/aggregation.h index a0500b2..6da8df9 100644 --- a/aggregation.h +++ b/aggregation.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/bitarray.c b/bitarray.c index e4c4087..32a16e2 100644 --- a/bitarray.c +++ b/bitarray.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2006-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich, Marek Lindner + * * 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. diff --git a/bitarray.h b/bitarray.h index 9f1b36f..2f1f523 100644 --- a/bitarray.h +++ b/bitarray.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2006-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich, Marek Lindner + * * 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. diff --git a/compat.h b/compat.h index cd3e71f..f4e0a45 100644 --- a/compat.h +++ b/compat.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/device.c b/device.c index c5fc6fe..45bc1f8 100644 --- a/device.c +++ b/device.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * 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. diff --git a/device.h b/device.h index 5e53531..46c0f44 100644 --- a/device.h +++ b/device.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * 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. diff --git a/hard-interface.c b/hard-interface.c index 960e86c..e0d0342 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/hard-interface.h b/hard-interface.h index 29d010b..742358c 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/hash.c b/hash.c index 576464d..61cb4a2 100644 --- a/hash.c +++ b/hash.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2006-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich, Marek Lindner + * * 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. diff --git a/hash.h b/hash.h index c27687e..bb60f08 100644 --- a/hash.h +++ b/hash.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2006-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich, Marek Lindner + * * 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. diff --git a/log.c b/log.c index 939bf0d..ae8370b 100644 --- a/log.c +++ b/log.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/log.h b/log.h index 685f539..780e3ab 100644 --- a/log.h +++ b/log.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/main.c b/main.c index 4e70c95..bb89bfc 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/main.h b/main.h index 9493f96..5d2e27c 100644 --- a/main.h +++ b/main.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/packet.h b/packet.h index 021bcec..5627ca3 100644 --- a/packet.h +++ b/packet.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/proc.c b/proc.c index 7677de0..b3eb69d 100644 --- a/proc.c +++ b/proc.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/proc.h b/proc.h index 23c4fe4..ebce50d 100644 --- a/proc.h +++ b/proc.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/ring_buffer.c b/ring_buffer.c index dee6fba..751c899 100644 --- a/ring_buffer.c +++ b/ring_buffer.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * 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. diff --git a/ring_buffer.h b/ring_buffer.h index 246f354..6839ba9 100644 --- a/ring_buffer.h +++ b/ring_buffer.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * 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. diff --git a/routing.c b/routing.c index a5a7c61..220dbf7 100644 --- a/routing.c +++ b/routing.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/routing.h b/routing.h index 97db3f2..0123ea8 100644 --- a/routing.h +++ b/routing.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/send.c b/send.c index 01396b4..d724798 100644 --- a/send.c +++ b/send.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/send.h b/send.h index ca7f3f0..59d5009 100644 --- a/send.h +++ b/send.h @@ -1,6 +1,8 @@ /* * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/soft-interface.c b/soft-interface.c index fa5289e..18e5e8f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/soft-interface.h b/soft-interface.h index 32ed968..515e276 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * 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. diff --git a/translation-table.c b/translation-table.c index 8d7ea6d..9936bc2 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/translation-table.h b/translation-table.h index 660fcd8..f7da811 100644 --- a/translation-table.h +++ b/translation-table.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/types.h b/types.h index 0c31b4d..3a0ef0c 100644 --- a/types.h +++ b/types.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2007-2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Marek Lindner, Simon Wunderlich + * * 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. diff --git a/vis.c b/vis.c index 8c16ad4..22235ad 100644 --- a/vis.c +++ b/vis.c @@ -1,6 +1,8 @@ /* - * Copyright (C) 2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich + * * 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. diff --git a/vis.h b/vis.h index 6d5ddcf..276faba 100644 --- a/vis.h +++ b/vis.h @@ -1,6 +1,8 @@ /* - * Copyright (C) 2008 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2009 B.A.T.M.A.N. contributors: + * * Simon Wunderlich, Marek Lindner + * * 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. -- batman-adv

1 0

r1466 - trunk/batctl
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

Author: simon Date: 2009-11-07 12:50:34 +0000 (Sat, 07 Nov 2009) New Revision: 1466 Modified: trunk/batctl/README Log: update the batctl README Modified: trunk/batctl/README =================================================================== --- trunk/batctl/README 2009-11-07 11:44:54 UTC (rev 1465) +++ trunk/batctl/README 2009-11-07 12:50:34 UTC (rev 1466) @@ -1,92 +1,351 @@ +############################################################################## +# batctl - B.A.T.M.A.N. advanced control and management tool # +############################################################################## -############################################################ -# batctl - B.A.T.M.A.N. advanced control and managing tool # -############################################################ - Introduction ============ -Why do I need batctl ? B.A.T.M.A.N. advanced operates on layer 2 and thus all hosts participating in the virtual switch are completely transparent for all protocols above layer 2. Therefore the common diagnosis tools do not work as expected. To overcome these problems batctl was created. At the moment batctl contains ping, traceroute, tcpdump and interfaces to the kernel module settings. +Why do I need batctl ? B.A.T.M.A.N. advanced operates on layer 2 and thus all +hosts participating in the virtual switch are completely transparent for all +protocols above layer 2. Therefore the common diagnosis tools do not work as +expected. To overcome these problems batctl was created. At the moment batctl +contains ping, traceroute, tcpdump and interfaces to the kernel module +settings. How does it work ? ================== -batctl uses the /dev/batman-adv device provided by the B.A.T.M.A.N. advanced kernel module to inject custom icmp packets into the data flow. That's why ping and traceroute work almost like their IP based counterparts. Tcpdump was designed because B.A.T.M.A.N. advanced encapsulates all traffic within batman packets, so that the normal tcpdump would not recognize the packets. +batctl uses the /dev/batman-adv device provided by the B.A.T.M.A.N. advanced +kernel module to inject custom icmp packets into the data flow. That's why +ping and traceroute work almost like their IP based counterparts. Tcpdump was +designed because B.A.T.M.A.N. advanced encapsulates all traffic within batman +packets, so that the normal tcpdump would not recognize the packets. - The bat-hosts file +The bat-hosts file ================== -This file is simliar to the /etc/hosts file. You can write one MAC address and one host name per line. 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. ;) +This file is simliar to the /etc/hosts file. You can write one MAC address and +one host name per line. 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. ;) batctl ping ============ -batctl ping [options] [mac address|host name] +Sends a Layer 2 batman-adv ping to check round trip time and connectivity -The following options are supported: +Usage: batctl ping [options] mac|bat-host +options: + -c ping packet count + -h print this help + -i interval in seconds + -t timeout in seconds -- c (count) - stop after n pings (default is infinite) +Example: -- i (interval) - interval to wait between 2 pings (default is 1 second) +$ batctl ping fe:fe:00:00:09:01 +PING fe:fe:00:00:09:01 (fe:fe:00:00:09:01) 19(47) bytes of data +19 bytes from fe:fe:00:00:09:01 icmp_seq=1 ttl=43 time=8.74 ms +19 bytes from fe:fe:00:00:09:01 icmp_seq=2 ttl=43 time=7.48 ms +19 bytes from fe:fe:00:00:09:01 icmp_seq=3 ttl=43 time=8.23 ms +^C--- fe:fe:00:00:09:01 ping statistics --- +3 packets transmitted, 3 received, 0% packet loss +rtt min/avg/max/mdev = 7.476/8.151/8.743/1.267 ms -- t (timeout interval) - timeout interval in seconds (default is 1 second) - - batctl traceroute ================== -batctl traceroute [mac address|host name] +Traceroute sends 3 packets to each hop, awaits the answers and prints out the +response times. -Traceroute sends 3 packets to each hop, awaits the answers and prints out the response times. +Usage: batctl traceroute [options] mac|bat-host +Example: +$ batctl traceroute fe:fe:00:00:09:01 +traceroute to fe:fe:00:00:09:01 (fe:fe:00:00:09:01), 50 hops max, 19 byte packets + 1: fe:fe:00:00:02:01 4.932 ms 2.338 ms 1.333 ms + 2: fe:fe:00:00:03:01 6.860 ms 1.579 ms 1.260 ms + 3: fe:fe:00:00:04:01 2.342 ms 1.547 ms 1.655 ms + 4: fe:fe:00:00:05:01 2.906 ms 2.211 ms 2.253 ms + 5: fe:fe:00:00:06:01 3.577 ms 2.687 ms 3.088 ms + 6: fe:fe:00:00:07:01 4.217 ms 5.741 ms 3.551 ms + 7: fe:fe:00:00:08:01 5.017 ms 5.547 ms 4.294 ms + 8: fe:fe:00:00:09:01 5.730 ms 4.970 ms 6.437 ms + + + batctl tcpdump =============== -batctl tcpdump [options] [interface] +tcpdump layer 2 traffic on the given interface -The following options are supported: +Usage: batctl tcpdump [options] interface [interface] +options: + -h print this help + -n don't convert addresses to bat-host names + -p dump specific packet type + 1 - batman ogm packets + 2 - batman icmp packets + 4 - batman unicast packets + 8 - batman broadcast packets + 16 - batman vis packets + 32 - non batman packets + 33 - batman ogm & non batman packets --a (all packets) - switch tcpdump behaviour to work as the "normal" tcpdump and filter for non-batman advanced packets +Example output for tcpdump: --d (dump packets) - print packet data in hex +$ batctl tcpdump mesh0 +01:51:42.401188 BAT kansas: OGM via neigh kansas, seqno 6718, tq 255, ttl 50, v 9, flags [..I], length 28 +01:51:42.489735 BAT kansas: OGM via neigh wyoming, seqno 6718, tq 245, ttl 49, v 9, flags [.D.], length 28 +01:51:42.510330 BAT wyoming: OGM via neigh wyoming, seqno 6721, tq 255, ttl 50, v 9, flags [..I], length 28 +01:51:42.601092 BAT wyoming: OGM via neigh kansas, seqno 6721, tq 245, ttl 49, v 9, flags [.D.], length 28 +01:51:43.361076 BAT kansas > wyoming: ICMP echo request, id 0, seq 1, ttl 1, v 9, length 19 +01:51:43.365347 BAT wyoming > kansas: ICMP echo reply, id 0, seq 1, ttl 50, v 9, length 19 +01:51:43.372224 BAT kansas > wyoming: ICMP echo request, id 0, seq 2, ttl 1, v 9, length 19 +01:51:43.376506 BAT wyoming > kansas: ICMP echo reply, id 0, seq 2, ttl 50, v 9, length 19 +01:51:43.381250 BAT kansas: OGM via neigh kansas, seqno 6719, tq 255, ttl 50, v 9, flags [..I], length 28 +01:51:43.386281 BAT kansas > wyoming: ICMP echo request, id 0, seq 3, ttl 1, v 9, length 19 +01:51:43.387910 BAT wyoming > kansas: ICMP echo reply, id 0, seq 3, ttl 50, v 9, length 19 +01:51:43.479503 BAT kansas: OGM via neigh wyoming, seqno 6719, tq 245, ttl 49, v 9, flags [.D.], length 28 +01:51:43.509899 BAT wyoming: OGM via neigh wyoming, seqno 6722, tq 255, ttl 50, v 9, flags [..I], length 28 +01:51:43.600999 BAT wyoming: OGM via neigh kansas, seqno 6722, tq 245, ttl 49, v 9, flags [.D.], length 28 +01:51:44.381064 BAT kansas: OGM via neigh kansas, seqno 6720, tq 255, ttl 50, v 9, flags [..I], length 28 --p (packet type) - specify to filter for certain batman packets (1 = batman packets, 2 = icmp packets, 3 = unicast packets, 4 = broadcast packets) +batctl bisect +============= --v (verbose) - prints more information about each packet +Analyzes the logfiles to build a small internal database of all sent sequence +numbers and routing table changes. This database can be used to search for +routing loops (default action), to trace OGMs of a host (use "-t" to +specify the mac address or bat-host name) throughout the network or to +display routing tables of the nodes (use "-r" to specify the mac address or +bat-host name). You can name a specific sequence number or a range using the +"-s" option to limit the output's range. Furthermore you can filter the +output by specifying an originator (use "-o" to specify the mac address or +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: + -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 + -r print routing tables of given mac address or bat-host + -s seqno range to limit the output + -t trace seqnos of given mac address or bat-host -B.A.T.M.A.N. advanced encapsulates all traffic within batman packets. In total it uses 4 different packet types: +Examples: -batman packets - these transport the B.A.T.M.A.N. originator messages to build the mesh network +$ batctl bisect log/* -l uml3 +Analyzing routing tables of originator: uml3 [all sequence numbers] -batman icmp packets - lightweight implementation of the ICMP protocol (needed for ping and traceroute) +Checking host: uml3 +Path towards uml7 (seqno 9 via neigh uml5): -> uml5 -> uml6 +Path towards uml7 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 +Path towards uml6 (seqno 4 via neigh uml4): -> uml4 +Path towards uml8 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 +Path towards uml8 (seqno 203 via neigh uml4): -> uml4 -> uml6 -> uml7 +Path towards uml8 (seqno 391 via neigh uml2): -> uml2 -> uml3 -> uml2 aborted due to loop! +Path towards uml8 (seqno 396 via neigh uml4): -> uml4 -> uml6 -> uml7 +Path towards uml9 (seqno 10 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml9. +Path towards uml9 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml9. +Path towards uml9 (seqno 11 via neigh uml4): -> uml4 -> uml6 -> uml7 -> uml8 -> uml9. +Path towards uml9 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. +Path towards uml9 (seqno 21 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. +Path towards uml9 (seqno 22 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. -batman unicast packets - unicast data is bound as payload in these packets +$ ./batctl bisect -t uml3 log/* +Sequence number flow of originator: uml3 [all sequence numbers] +[...] ++=> uml3 (seqno 19) +|- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] +| |- uml3 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] +| \- uml1 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] +| |- uml3 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] +| \- uml2 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] +|- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] +| |- uml6 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] +| | |- uml5 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] +| | |- uml7 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] +| | | |- uml8 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] +| | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | |- uml6 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] +| | | |- uml9 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] +| | | \- uml5 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] +| | \- uml4 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] +| |- uml7 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] +| \- uml4 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] +\- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + |- uml3 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml6 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml2 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + \- uml5 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] ++=> uml3 (seqno 20) +|- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] +| |- uml3 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] +| |- uml1 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] +| \- uml4 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] +|- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] +| |- uml3 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] +| |- uml6 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] +| | |- uml8 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] +| | |- uml5 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] +| | |- uml7 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] +| | | |- uml8 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] +| | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] +| | | \- uml6 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] +| | \- uml4 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] +| \- uml4 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] +|- uml1 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] +| \- uml2 [tq: 49, ttl: 48, neigh: uml1, prev_sender: uml3] +\- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + |- uml3 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml6 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml2 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + \- uml5 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] +[...] -batman broadcast packets - broadcast data is bound as payload in these packets +batctl originators +================== +Check the Originators table -The tcpdump output looks like: +Usage: batctl originators|o -34 05:47:22 6e:2b:79:45:c8:1a -> ff:ff:ff:ff:ff:ff BAT 6e:2b:79:45:c8:1a 6e:2b:79:45:c8:1a (seqno 401, tq 255, TTL 50, V 1, UD 0, DL 0) +Example: -60 -> packet size in bytes -17:56:57 -> time when this packet was seen -6e:2b:79:45:c8:1a -> sender mac address -ff:ff:ff:ff:ff:ff -> recipient mac address -BAT -> packet type (batman packet) -6e:2b:79:45:c8:1a -> batman packet originator -6e:2b:79:45:c8:1a -> batman old originator -seqno 401 -tq 255 -ttl 50 -V 1 -> batman version -UD 0 -> [1|0] unidirectional -DL 0 -> [1|0] directlink +$ batctl originators + Originator (#/255) Nexthop [outgoingIF]: Potential nexthops ... [B.A.T.M.A.N. adv 0.2-beta r1457, MainIF/MAC: eth0/fe:fe:00:00:01:01] +fe:fe:00:00:05:01 (223) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 96) fe:fe:00:00:02:01 (223) +fe:fe:00:00:04:01 (233) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 (100) fe:fe:00:00:02:01 (233) +fe:fe:00:00:02:01 (254) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (254) fe:fe:00:00:03:01 (100) +fe:fe:00:00:07:01 (203) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (203) fe:fe:00:00:03:01 ( 88) +fe:fe:00:00:08:01 (196) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 0) fe:fe:00:00:02:01 (196) +fe:fe:00:00:03:01 (244) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 (104) fe:fe:00:00:02:01 (244) +fe:fe:00:00:09:01 (184) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (184) fe:fe:00:00:03:01 ( 72) +fe:fe:00:00:06:01 (214) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 76) fe:fe:00:00:02:01 (214) +batctl interface +================ + +display or modify the interface settings + +Usage: batctl interface|if [none|interface] + +Example: + +$ batctl interface +[ active] eth0 fe:fe:00:00:01:01 + +batctl interval +=============== + +display or modify the originator interval in ms + +Usage: batctl interval|it [orig_interval] + +Example: + +$ batctl interval +1000 + +batctl log +========== + +read the log produced by the kernel module + +Usage: batctl log|l + +Example: + +$ batctl log +r) +[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:01:01 via prev OG: fe:fe:00:00:01:01 seqno 670, tq 245, TTL 49, V 8, IDF 1) +[ 400] Drop packet: originator packet from myself (via neighbour) +[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:02:01 via prev OG: fe:fe:00:00:02:01 seqno 545, tq 255, TTL 50, V 8, IDF 0) +[ 400] updating last_seqno: old 544, new 545 +[ 400] bidirectional: orig = fe:fe:00:00:02:01 neigh = fe:fe:00:00:02:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 255 +[ 400] update_originator(): Searching and updating originator entry of received packet +[ 400] Updating existing last-hop neighbour of originator +[...] + +batctl loglevel +=============== + +display or modify the log level + +Usage: batctl |ll [level] + +Example: +$ batctl loglevel +[x] critical (0) +[x] warnings (1) +[x] notices (2) +[x] batman (4) +[x] routes (8) + +batctl aggregation +================== + +display or modify the packet aggregation setting + +Usage: batctl aggregation|ag [0|1] + +batctl translocal +================= + +display the local translation table + +Usage: batctl translocal|tl + +Example: + +$ batctl translocal +Locally retrieved addresses (from bat0) announced via HNA: + * d6:e0:fd:d9:00:00 + +batctl transglobal +================== + +display the global translation table + +Usage: batctl transglobal|tg + +Example: + +Globally announced HNAs received via the mesh (translation table): + * 16:aa:c4:a2:00:00 via fe:fe:00:00:09:01 + * 5a:32:f9:df:00:00 via fe:fe:00:00:03:01 + * 32:ae:5a:00:00:00 via fe:fe:00:00:04:01 + * 86:88:80:29:00:00 via fe:fe:00:00:08:01 + * 9e:d8:72:f2:00:00 via fe:fe:00:00:02:01 + * 76:84:68:49:00:00 via fe:fe:00:00:05:01 + * 86:4b:b2:d2:00:00 via fe:fe:00:00:07:01 + * ca:a1:5b:e5:00:00 via fe:fe:00:00:06:01 + +batctl visformat +================ + +display or modify the vis output format + +Usage: batctl visformat|vf [format] + +Example: + +$ batctl visformat +[x] dot_draw +[ ] json + + +

1 0

r1465 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

Author: simon Date: 2009-11-07 11:44:54 +0000 (Sat, 07 Nov 2009) New Revision: 1465 Modified: trunk/batman-adv-kernelland/bitarray.c Log: remove dead code Modified: trunk/batman-adv-kernelland/bitarray.c =================================================================== --- trunk/batman-adv-kernelland/bitarray.c 2009-11-07 11:23:28 UTC (rev 1464) +++ trunk/batman-adv-kernelland/bitarray.c 2009-11-07 11:44:54 UTC (rev 1465) @@ -23,15 +23,6 @@ #include "bitarray.h" #include "log.h" -/* clear the bits */ -void bit_init(TYPE_OF_WORD *seq_bits) -{ - int i; - - for (i = 0; i < NUM_WORDS; i++) - seq_bits[i] = 0; -} - /* returns true if the corresponding bit in the given seq_bits indicates true * and curr_seqno is within range of last_seqno */ uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, @@ -55,24 +46,6 @@ } } -/* print the packet array, for debugging purposes */ -static char bit_string[130]; -char *bit_print(TYPE_OF_WORD *seq_bits) -{ - int i, j, k = 0, b = 0; - - for (i = 0; i < NUM_WORDS; i++) { - for (j = 0; j < WORD_BIT_SIZE; j++) { - bit_string[k++] = ((seq_bits[i]>>j)%2 ? '1' : '0'); - if (++b == TQ_LOCAL_WINDOW_SIZE) - bit_string[k++] = '|'; - } - bit_string[k++] = ' '; - } - bit_string[k++] = '\0'; - return bit_string; -} - /* turn corresponding bit on, so we can remember that we got the packet */ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n) {

1 0

r1464 - in trunk: batctl batman-adv-kernelland
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

Author: simon Date: 2009-11-07 11:23:28 +0000 (Sat, 07 Nov 2009) New Revision: 1464 Modified: trunk/batctl/main.h trunk/batman-adv-kernelland/main.h Log: update version string to 0.2 Modified: trunk/batctl/main.h =================================================================== --- trunk/batctl/main.h 2009-11-07 11:20:40 UTC (rev 1463) +++ trunk/batctl/main.h 2009-11-07 11:23:28 UTC (rev 1464) @@ -21,7 +21,7 @@ -#define SOURCE_VERSION "0.2-beta" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ +#define SOURCE_VERSION "0.2" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ #define BAT_DEVICE "/dev/batman-adv" #define PROC_ROOT_PATH "/proc/net/batman-adv/" Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2009-11-07 11:20:40 UTC (rev 1463) +++ trunk/batman-adv-kernelland/main.h 2009-11-07 11:23:28 UTC (rev 1464) @@ -26,7 +26,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "0.2-beta" +#define SOURCE_VERSION "0.2" /* B.A.T.M.A.N. parameters */

1 0

r1463 - trunk/batctl
by postmaster＠open-mesh.net 07 Nov '09

07 Nov '09

Author: simon Date: 2009-11-07 11:20:40 +0000 (Sat, 07 Nov 2009) New Revision: 1463 Modified: trunk/batctl/bat-hosts.c trunk/batctl/bat-hosts.h trunk/batctl/bisect.c trunk/batctl/bisect.h trunk/batctl/functions.c trunk/batctl/functions.h trunk/batctl/main.c trunk/batctl/main.h trunk/batctl/ping.c trunk/batctl/ping.h trunk/batctl/proc.c trunk/batctl/proc.h trunk/batctl/tcpdump.c trunk/batctl/tcpdump.h trunk/batctl/traceroute.c trunk/batctl/traceroute.h Log: update batctl copyright line formatting (all years were already correct) Modified: trunk/batctl/bat-hosts.c =================================================================== --- trunk/batctl/bat-hosts.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/bat-hosts.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/bat-hosts.h =================================================================== --- trunk/batctl/bat-hosts.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/bat-hosts.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/bisect.c =================================================================== --- trunk/batctl/bisect.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/bisect.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/bisect.h =================================================================== --- trunk/batctl/bisect.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/bisect.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/functions.c =================================================================== --- trunk/batctl/functions.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/functions.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/functions.h =================================================================== --- trunk/batctl/functions.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/functions.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/main.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/main.h =================================================================== --- trunk/batctl/main.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/main.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/ping.c =================================================================== --- trunk/batctl/ping.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/ping.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/ping.h =================================================================== --- trunk/batctl/ping.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/ping.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/proc.c =================================================================== --- trunk/batctl/proc.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/proc.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/proc.h =================================================================== --- trunk/batctl/proc.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/proc.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/tcpdump.c =================================================================== --- trunk/batctl/tcpdump.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/tcpdump.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * * Andreas Langer <a.langer(a)q-dsl.de> * * This program is free software; you can redistribute it and/or Modified: trunk/batctl/tcpdump.h =================================================================== --- trunk/batctl/tcpdump.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/tcpdump.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/traceroute.c =================================================================== --- trunk/batctl/traceroute.c 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/traceroute.c 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,7 +1,8 @@ -/* Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: - * Andreas Langer <a.langer(a)q-dsl.de> - * Marek Lindner <lindner_marek(a)yahoo.de> +/* + * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: * + * Andreas Langer <a.langer(a)q-dsl.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. Modified: trunk/batctl/traceroute.h =================================================================== --- trunk/batctl/traceroute.h 2009-11-07 10:59:00 UTC (rev 1462) +++ trunk/batctl/traceroute.h 2009-11-07 11:20:40 UTC (rev 1463) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * * Marek Lindner <lindner_marek(a)yahoo.de> * * This program is free software; you can redistribute it and/or

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009