commits November 2011

commits@lists.open-mesh.org

1 participants
69 discussions

batman-adv; branch, next, updated. v2011.3.1-29-gf886288
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit d552aa875ca8ad00fab1bb5bce7a028c6bb1288e Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 20:40:39 2011 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/CHANGELOG b/CHANGELOG index 36477d6..992bb8a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +batman-adv 2011.4.0: + +* support latest kernels (2.6.29 - 3.2) +* starting of code refactoring to support multiple protocol versions +* added support for AP-isolation to prevent non-mesh WIFI clients to talk to + each other over the mesh +* some bugs (memory leaks in the translation table, wrong initialization of + ethernet addresses of translation table entries, ...) squashed + + -- Sun, 13 Nov 2011 20:40:05 +0100 + batman-adv 2011.3.1: * don't send all packets to selected gateway as broadcast -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.3.1-29-gf886288
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit f88628875f6c34d3bbb78d3e72f021290e722ca6 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 20:41:47 2011 +0100 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 7bbcea1..c50cc0a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 21-08-2011] +[state: 13-11-2011] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.29 - 3.1. Supporting +against and should work with Linux 2.6.29 - 3.2. 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. :-) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.3.1-27-g53fc756
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit 53fc756bed824b7a31f4be750d732f2228ed3c3f Merge: 072038eda720ca79b1b080922297ee1b16702428 32d1ad673cf104d05368129884c4ff3bcb2c7941 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 14 03:36:16 2011 +0800 Merge branch 'maint' into next Conflicts: main.h -- batman-adv

1 0

batctl; branch, next, updated. v2011.3.0-15-g1c27cc6
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit 1c27cc68e3b40943e75326f81c498fe32a14aa3b Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 14 00:20:36 2011 +0800 batctl: update the tcpdump section in the README Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/README b/README index fc0a85e..97524da 100644 --- a/README +++ b/README @@ -84,21 +84,26 @@ traceroute to fe:fe:00:00:09:01 (fe:fe:00:00:09:01), 50 hops max, 19 byte packet batctl tcpdump =============== -tcpdump layer 2 traffic on the given interface +tcpdump layer 2 and/or layer 3 traffic on the given interface 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 - batman fragmented packets - 64 - non batman packets - 65 - batman ogm & non batman packets + -x dump all packet types except specified +packet types: + 1 - batman ogm packets + 2 - batman icmp packets + 4 - batman unicast packets + 8 - batman broadcast packets + 16 - batman vis packets + 32 - batman fragmented packets + 64 - batman tt / roaming packets + 128 - non batman packets + 129 - batman ogm & non batman packets + +tcpdump supports standard interfaces as well as raw wifi interfaces running in monitor mode. Example output for tcpdump: -- batctl

1 0

batctl; branch, next, updated. v2011.3.0-14-gdbb5934
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit dbb5934f13cbe3ab90416cb735620ec8b86e85c4 Author: Antonio Quartull <ordex(a)autistici.org> Date: Sun Nov 13 16:58:17 2011 +0100 batctl: update tt sections in the README translocal and transglobal section updated in the README file Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/README b/README index 442f8b6..fc0a85e 100644 --- a/README +++ b/README @@ -313,7 +313,21 @@ Example: $ batctl translocal Locally retrieved addresses (from bat0) announced via TT: - * d6:e0:fd:d9:00:00 + * d6:e0:fd:d9:00:00 [RPNXW] + +In particular, RPNXW are flags which have the following meanings: + +- R/Roaming: this client moved to another node but it is still kept for + consistency purposes up to the next OGM sending. +- P/noPurge: this client represents the local soft interface and has to never be + deleted. +- N/New: this client has recently been added but it has to not be advertised up + to the next OGM sending (for consistency purposes). +- X/delete: this client has to be removed for some reason, but it is still kept + for consistency purposes up to the next OGM sending. +- W/Wireless: this client is connected to the node through a Wireless device. + +If any of the flags is not enabled, a '.' will substitute its symbol. batctl transglobal ================== @@ -324,15 +338,26 @@ Usage: batctl transglobal|tg Example: -Globally announced TT entries 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 +Globally announced TT entries received via the mesh bat0 + Client (TTVN) Originator (Curr TTVN) Flags + * 16:aa:c4:a2:00:00 ( 12) via fe:fe:00:00:09:01 ( 50) [RXW] + +where: +- TTVN: is the translation-table-version-number which introduced this + client +- Curr TTVN: is the translation-table-version-number currently advertised by + the originator serving this client (different clients + advertised by the same originator have the same Curr TTVN) +- Flags that mean: + - R/Roaming: this client moved to another node but it is still kept for + consistency purposes up to the next OGM received from its + originator + - X/delete: this client has to be removed for some reason, but it is + still kept for consistency purposes. + - W/Wireless: this client is connected to the node through a Wireless + device. + +If any of the flags is not enabled, a '.' will substitute its symbol. batctl vis_mode ================= -- batctl

1 0

batctl; branch, next, updated. v2011.3.0-13-g631d566
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit 631d566dab8c0e1b9fc8baa8f12b69ee90da50a3 Author: Antonio Quartull <ordex(a)autistici.org> Date: Sun Nov 13 12:50:26 2011 +0100 batctl: correct batctl ll output Since batctl has moved to a human-readable loglevel format, the 'batctl ll' output should be coherent to this change. This patch corrects it by substituting the numbers with the human-readable strings. Signed-off-by: Antonio Quartull <ordex(a)autistici.org> diff --git a/sys.c b/sys.c index bddaaa3..e510bee 100644 --- a/sys.c +++ b/sys.c @@ -237,14 +237,15 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = strtol(line_ptr, (char **) NULL, 10); - printf("[%c] %s (%d)\n", (!log_level) ? 'x' : ' ', - "all debug output disabled", 0); - printf("[%c] %s (%d)\n", (log_level & 1) ? 'x' : ' ', - "messages related to routing / flooding / broadcasting", 1); - printf("[%c] %s (%d)\n", (log_level & 2) ? 'x' : ' ', - "messages related to route added / changed / deleted", 2); - printf("[%c] %s (%d)\n", (log_level & 4) ? 'x' : ' ', - "messages related to translation table operations", 4); + printf("[%c] %s (%s)\n", (!log_level) ? 'x' : ' ', + "all debug output disabled", "none"); + printf("[%c] %s (%s)\n", (log_level & 1) ? 'x' : ' ', + "messages related to routing / flooding / broadcasting", + "batman"); + printf("[%c] %s (%s)\n", (log_level & 2) ? 'x' : ' ', + "messages related to route added / changed / deleted", "routes"); + printf("[%c] %s (%s)\n", (log_level & 4) ? 'x' : ' ', + "messages related to translation table operations", "tt"); out: if (errno == ENOENT) -- batctl

1 0

batman-adv; branch, next, updated. v2011.3.0-27-gfc9b874
by postmaster＠open-mesh.org 13 Nov '11

13 Nov '11

The following commit has been merged in the next branch: commit fc9b87410ff9df27f2421a32172b5acb890daac9 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 19:37:14 2011 +0100 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/CHANGELOG b/CHANGELOG index d405be8..b6e8c3e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +batman-adv 2011.4.0: + +* support latest kernels (2.6.29 - 3.2) +* starting of code refactoring to support multiple protocol versions +* added support for AP-isolation to prevent non-mesh WIFI clients to talk to + each other over the mesh +* many bugs (memory leaks in the translation table, wrong initialization of + ethernet addresses of translation table entries, wrong number of table + response entries, unicast packets to GW sent as broadcast ...) squashed + + -- Sun, 13 Nov 2011 19:28:28 +0100 + batman-adv 2011.3.0: * support latest kernels (2.6.29 - 3.1) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.3.0-26-g072038e
by postmaster＠open-mesh.org 09 Nov '11

09 Nov '11

The following commit has been merged in the next branch: commit 072038eda720ca79b1b080922297ee1b16702428 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Aug 30 13:32:33 2011 +0200 batman-adv: readme update (mention ap isolation and new log level) Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/README b/README index 1e000ee..7bbcea1 100644 --- a/README +++ b/README @@ -218,15 +218,16 @@ abled during run time. Following log_levels are defined: 0 - All debug output disabled 1 - Enable messages related to routing / flooding / broadcasting -2 - Enable route or tt entry added / changed / deleted -3 - Enable all messages +2 - Enable messages related to route added / changed / deleted +4 - Enable messages related to translation table operations +7 - Enable all messages The debug output can be changed at runtime using the file /sys/class/net/bat0/mesh/log_level. e.g. # echo 2 > /sys/class/net/bat0/mesh/log_level -will enable debug messages for when routes or TTs change. +will enable debug messages for when routes change. BATCTL -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.3.0-44-gc103efd
by postmaster＠open-mesh.org 08 Nov '11

08 Nov '11

The following commit has been merged in the master branch: commit c103efd9af4ca23f75d77ff10fb7af5a95ece3c3 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Mon Nov 7 13:57:48 2011 +0100 batman-adv: use unregister_netdevice() when softif_create fails When entering softif_create(), the rtnl lock has already been acquired by store_mesh_iface(). (store_mesh_iface() -> hardif_enable_interface() -> softif_create) In case of an error, we should therefore call unregister_netdevice() instead of unregister_netdev(). unregister_netdev() tries to acquire the rtnl lock itself and deadlocks in this situation. unregister_netdevice() assumes that the rtnl lock is already been held. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/soft-interface.c b/soft-interface.c index 45297c8..987c75a 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -874,7 +874,7 @@ unreg_debugfs: unreg_sysfs: sysfs_del_meshif(soft_iface); unreg_soft_iface: - unregister_netdev(soft_iface); + unregister_netdevice(soft_iface); return NULL; free_soft_iface: -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.3.0-43-gc2e935f
by postmaster＠open-mesh.org 08 Nov '11

08 Nov '11

The following commit has been merged in the master branch: commit c2e935f5da562f008f77bb12995ebc10705cb15a Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Wed Nov 2 20:26:45 2011 +0100 batman-adv: check return value for hash_add() if hash_add() fails, we should remove the structure to avoid memory leaks. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Acked-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index f6bbd64..cc87acf 100644 --- a/translation-table.c +++ b/translation-table.c @@ -190,6 +190,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, struct bat_priv *bat_priv = netdev_priv(soft_iface); struct tt_local_entry *tt_local_entry = NULL; struct tt_global_entry *tt_global_entry = NULL; + int hash_added; tt_local_entry = tt_local_hash_find(bat_priv, addr); @@ -217,6 +218,16 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (compare_eth(addr, soft_iface->dev_addr)) tt_local_entry->common.flags |= TT_CLIENT_NOPURGE; + hash_added = hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, + &tt_local_entry->common, + &tt_local_entry->common.hash_entry); + + if (unlikely(hash_added != 0)) { + /* remove the reference for the hash */ + tt_local_entry_free_ref(tt_local_entry); + goto out; + } + tt_local_event(bat_priv, addr, tt_local_entry->common.flags); /* The local entry has to be marked as NEW to avoid to send it in @@ -224,9 +235,6 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, * (consistency check) */ tt_local_entry->common.flags |= TT_CLIENT_NEW; - hash_add(bat_priv->tt_local_hash, compare_tt, choose_orig, - &tt_local_entry->common, &tt_local_entry->common.hash_entry); - /* remove address from global hash if present */ tt_global_entry = tt_global_hash_find(bat_priv, addr); @@ -499,6 +507,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, struct tt_global_entry *tt_global_entry; struct orig_node *orig_node_tmp; int ret = 0; + int hash_added; tt_global_entry = tt_global_hash_find(bat_priv, tt_addr); @@ -518,9 +527,15 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, tt_global_entry->ttvn = ttvn; tt_global_entry->roam_at = 0; - hash_add(bat_priv->tt_global_hash, compare_tt, - choose_orig, &tt_global_entry->common, - &tt_global_entry->common.hash_entry); + hash_added = hash_add(bat_priv->tt_global_hash, compare_tt, + choose_orig, &tt_global_entry->common, + &tt_global_entry->common.hash_entry); + + if (unlikely(hash_added != 0)) { + /* remove the reference for the hash */ + tt_global_entry_free_ref(tt_global_entry); + goto out_remove; + } atomic_inc(&orig_node->tt_size); } else { if (tt_global_entry->orig_node != orig_node) { @@ -543,6 +558,7 @@ int tt_global_add(struct bat_priv *bat_priv, struct orig_node *orig_node, "Creating new global tt entry: %pM (via %pM)\n", tt_global_entry->common.addr, orig_node->orig); +out_remove: /* remove address from local hash if present */ tt_local_remove(bat_priv, tt_global_entry->common.addr, "global tt received", roaming); -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2011