commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

linux integration; annotated tag, v3.3-rc3, created. v3.3-rc3
by postmaster＠open-mesh.org 09 Feb '12

09 Feb '12

The annotated tag, v3.3-rc3 has been created at 72cdd65517c6463e5578040976c166b33bcfc14a (tag) tagging d65b4e98d7ea3038b767b70fe8be959b2913f16d (commit) replaces v3.3-rc2 tagged by Linus Torvalds on Wed Feb 8 19:22:14 2012 -0800 - Shortlog ------------------------------------------------------------ Linux 3.3-rc3 .. the number of the half-beast? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPMzv8AAoJEHm+PkMAQRiGgeYIAJxxGCxSMLRIiPaGRmQbWifs eE3z6AUWitGfYvhmYdWVz+C/aa4pPCVWr3bAFxUQhu+ESmiFIiqiefvlTRf5f84e pcoJFobkFfhtK4gLvUr75WxXDFq/1HhKqW1OLzIW4gQsnhMdjGJ3lLK6ZoRYH8h4 cGoN3DRII9mVLFcB2sgbeRvbQBA/O4n0aOQ2ryZkCcPQQMIKhR/rUEEV2pe/ovHE rumQgI3PVey816P4e5YnOvrEAllFZlaZ/F0ClJgNdfeQCVTZx9KNRbiNxHi6fcC5 6Zgg7e5EvQTAy7QqQZ0hmS4k4CFmnswX3Nm+ZabRNqBdLSjPEDD9hk1o1dodYCg= =BBLC -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2012.0.0-52-g052332f
by postmaster＠open-mesh.org 09 Feb '12

09 Feb '12

The following commit has been merged in the master branch: commit 052332fb1a2d694fdc10bb0ebef495bbcb6fb06d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Feb 9 16:10:12 2012 +0800 batman-adv: compat layer also needs ifdefs for bridge loop avoidance Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/compat.c b/compat.c index 73a2d8b..35ad397 100644 --- a/compat.c +++ b/compat.c @@ -55,6 +55,7 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu) kfree(tt_local_entry); } +#ifdef CONFIG_BATMAN_ADV_BLA void free_rcu_backbone_gw(struct rcu_head *rcu) { struct backbone_gw *backbone_gw; @@ -62,5 +63,6 @@ void free_rcu_backbone_gw(struct rcu_head *rcu) backbone_gw = container_of(rcu, struct backbone_gw, rcu); kfree(backbone_gw); } +#endif #endif /* < KERNEL_VERSION(3, 0, 0) */ -- batman-adv

1 0

batctl; branch, master, updated. v2012.0.0-10-g7dd21c8
by postmaster＠open-mesh.org 09 Feb '12

09 Feb '12

The following commit has been merged in the master branch: commit 7dd21c88f6c1484ce0cbf52dca7b9fc86c2c9bb0 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Tue Feb 7 20:05:25 2012 +0100 batctl: add bridge loop avoidance code and remove softif_neigh stuff Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/debug.c b/debug.c index 6a553ff..155f499 100644 --- a/debug.c +++ b/debug.c @@ -61,13 +61,13 @@ void trans_global_usage(void) printf(" \t -w [interval] watch mode - refresh the global translation table continuously\n"); } -void softif_neigh_usage(void) +void bla_claim_table_usage(void) { - printf("Usage: batctl [options] softif_neigh \n"); + printf("Usage: batctl [options] claimtable \n"); printf("options:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -w [interval] watch mode - refresh the soft-interface neighbor table continuously\n"); + printf(" \t -w [interval] watch mode - refresh the bridge loop avoidance claim table continuously\n"); } void gateways_usage(void) diff --git a/debug.h b/debug.h index 939f281..50d0e24 100644 --- a/debug.h +++ b/debug.h @@ -24,7 +24,7 @@ #define DEBUG_ORIGINATORS "originators" #define DEBUG_TRANSTABLE_LOCAL "transtable_local" #define DEBUG_TRANSTABLE_GLOBAL "transtable_global" -#define DEBUG_SOFTIF_NEIGH "softif_neigh" +#define DEBUG_BLA_CLAIM_TABLE "bla_claim_table" #define DEBUG_GATEWAYS "gateways" #define DEBUG_VIS_DATA "vis_data" #define DEBUG_LOG "log" @@ -32,7 +32,7 @@ void originators_usage(void); void trans_local_usage(void); void trans_global_usage(void); -void softif_neigh_usage(void); +void bla_claim_table_usage(void); void gateways_usage(void); int handle_debug_table(char *mesh_iface, int argc, char **argv, char *file_path, void table_usage(void)); diff --git a/main.c b/main.c index 0dfdb8e..86e2078 100644 --- a/main.c +++ b/main.c @@ -45,27 +45,28 @@ char module_ver_path[] = "/sys/module/batman_adv/version"; void print_usage(void) { printf("Usage: batctl [options] commands \n"); printf("commands:\n"); - printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); - printf(" \toriginators|o \tdisplay the originator table\n"); - printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); - printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); - printf(" \tlog|l \tread the log produced by the kernel module\n"); - printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - printf(" \tgateways|gwl \tdisplay the gateway server list\n"); - printf(" \ttranslocal|tl \tdisplay the local translation table\n"); - printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tsoftif_neigh|sn \tdisplay the soft-interface neighbor table\n"); - printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); - printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); - printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n"); - printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); - printf(" \tap_isolation|ap [0|1] \tdisplay or modify the ap isolation mode setting\n"); + printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + printf(" \toriginators|o \tdisplay the originator table\n"); + printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); + printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); + printf(" \tlog|l \tread the log produced by the kernel module\n"); + printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + printf(" \tgateways|gwl \tdisplay the gateway server list\n"); + printf(" \ttranslocal|tl \tdisplay the local translation table\n"); + printf(" \ttransglobal|tg \tdisplay the global translation table\n"); + printf(" \tclaimtable|cl \tdisplay the bridge loop avoidance claim table\n"); + printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); + printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); + printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n"); + printf(" \tbridge_loop_avoidance|bl [0|1] \tdisplay or modify the bridge loop avoidance setting\n"); + printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); + printf(" \tap_isolation|ap [0|1] \tdisplay or modify the ap isolation mode setting\n"); printf("\n"); - printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \tbisect <file1> .. <fileN>\tanalyze given log files for routing stability\n"); + printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); + printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); + printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + printf(" \tbisect <file1> .. <fileN>\tanalyze given log files for routing stability\n"); printf("options:\n"); printf(" \t-m mesh interface (default 'bat0')\n"); printf(" \t-h print this help (or 'batctl <command> -h' for the command specific help)\n"); @@ -151,10 +152,10 @@ int main(int argc, char **argv) ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, DEBUG_TRANSTABLE_GLOBAL, trans_global_usage); - } else if ((strcmp(argv[1], "softif_neigh") == 0) || (strcmp(argv[1], "sn") == 0)) { + } else if ((strcmp(argv[1], "claimtable") == 0) || (strcmp(argv[1], "cl") == 0)) { ret = handle_debug_table(mesh_iface, argc - 1, argv + 1, - DEBUG_SOFTIF_NEIGH, softif_neigh_usage); + DEBUG_BLA_CLAIM_TABLE, bla_claim_table_usage); } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { @@ -197,6 +198,11 @@ int main(int argc, char **argv) ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, SYS_BONDING, bonding_usage, sysfs_param_enable); + } else if ((strcmp(argv[1], "bridge_loop_avoidance") == 0) || (strcmp(argv[1], "bl") == 0)) { + + ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, + SYS_BRIDGE_LOOP_AVOIDANCE, bridge_loop_avoidance_usage, sysfs_param_enable); + } else if ((strcmp(argv[1], "fragmentation") == 0) || (strcmp(argv[1], "f") == 0)) { ret = handle_sys_setting(mesh_iface, argc - 1, argv + 1, diff --git a/man/batctl.8 b/man/batctl.8 index 0cf0a7b..f45a070 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -121,8 +121,8 @@ Display the local translation table. batctl will refresh the list every second i .IP "\fBtransglobal\fP|\fBtg\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" Display the global translation table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. .br -.IP "\fBsoftif_neigh\fP|\fBsn\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" -Display the soft\-interface neighbor table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. +.IP "\fBclaimtable\fP|\fBcl\fP [\fB\-w\fP [\fI\interval\fP]][\fB\-n\fP]" +Display the bridge loop avoidance claim table. batctl will refresh the list every second if the "\-w" option was given or add a number to let it refresh at a custom interval in seconds (with optional decimal places). Use "\-n" to let batctl not replace the MAC addresses with bat\-host names in the output. .br .IP "\fBvis_mode|vm\fP [\fBmode\fP]\fP" If no parameter is given the current vis mode is displayed otherwise the parameter is used to set the vis mode. @@ -149,6 +149,9 @@ If no parameter is given the current aggregation setting is displayed. Otherwise .IP "\fBbonding\fP|\fBb\fP [\fB1\fP|\fB0\fP]" If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode. .br +.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB1\fP|\fB0\fP]" +If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable or disable the bridge loop avoidance. +.br .IP "\fBfragmentation\fP|\fBf\fP [\fB1\fP|\fB0\fP]" If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation. .br diff --git a/sys.c b/sys.c index 0263ae7..6cf4714 100644 --- a/sys.c +++ b/sys.c @@ -183,6 +183,7 @@ static void log_level_usage(void) printf(" \t batman Messages related to routing / flooding / broadcasting\n"); printf(" \t routes Messages related to route added / changed / deleted\n"); printf(" \t tt Messages related to translation table operations\n"); + printf(" \t bla Messages related to bridge loop avoidance\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -221,6 +222,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= (1 << 1); else if (strcmp(argv[i], "tt") == 0) log_level |= (1 << 2); + else if (strcmp(argv[i], "bla") == 0) + log_level |= (1 << 4); else { log_level_usage(); goto out; @@ -248,6 +251,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to route added / changed / deleted", "routes"); printf("[%c] %s (%s)\n", (log_level & 4) ? 'x' : ' ', "messages related to translation table operations", "tt"); + printf("[%c] %s (%s)\n", (log_level & 8) ? 'x' : ' ', + "messages related to bridge loop avoidance", "bla"); out: if (errno == ENOENT) @@ -271,6 +276,13 @@ void bonding_usage(void) printf(" \t -h print this help\n"); } +void bridge_loop_avoidance_usage(void) +{ + printf("Usage: batctl [options] bridge_loop_avoidance [0|1]\n"); + printf("options:\n"); + printf(" \t -h print this help\n"); +} + void gw_mode_usage(void) { printf("Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); diff --git a/sys.h b/sys.h index 5dafe85..46a1159 100644 --- a/sys.h +++ b/sys.h @@ -25,6 +25,7 @@ #define SYS_LOG "log" #define SYS_AGGR "aggregated_ogms" #define SYS_BONDING "bonding" +#define SYS_BRIDGE_LOOP_AVOIDANCE "bridge_loop_avoidance" #define SYS_GW_MODE "gw_mode" #define SYS_GW_SEL "gw_sel_class" #define SYS_GW_BW "gw_bandwidth" @@ -47,6 +48,7 @@ extern const char *sysfs_param_server[]; void aggregation_usage(void); void bonding_usage(void); +void bridge_loop_avoidance_usage(void); void fragmentation_usage(void); void ap_isolation_usage(void); void gw_mode_usage(void); -- batctl

1 0

batman-adv; branch, master, updated. v2012.0.0-51-g4e60e72
by postmaster＠open-mesh.org 09 Feb '12

09 Feb '12

The following commit has been merged in the master branch: commit 4e60e72b1f6db4391b3fc041b586a761d5b1f1aa Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Tue Feb 7 20:34:25 2012 +0100 batman-adv: only bloat with bla-structures if activated We don't have to bloat the batman internal structures if bla is not configured. This patch adds a few ifdefs to do this. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/types.h b/types.h index 7f7f610..a5b1a63 100644 --- a/types.h +++ b/types.h @@ -140,11 +140,13 @@ struct neigh_node { spinlock_t tq_lock; /* protects: tq_recv, tq_index */ }; +#ifdef CONFIG_BATMAN_ADV_BLA struct bcast_duplist_entry { uint8_t orig[ETH_ALEN]; uint16_t crc; unsigned long entrytime; }; +#endif struct bat_priv { atomic_t mesh_state; @@ -186,14 +188,18 @@ struct bat_priv { struct hashtable_t *orig_hash; struct hashtable_t *tt_local_hash; struct hashtable_t *tt_global_hash; +#ifdef CONFIG_BATMAN_ADV_BLA struct hashtable_t *claim_hash; struct hashtable_t *backbone_hash; +#endif struct list_head tt_req_list; /* list of pending tt_requests */ struct list_head tt_roam_list; struct hashtable_t *vis_hash; +#ifdef CONFIG_BATMAN_ADV_BLA struct bcast_duplist_entry bcast_duplist[DUPLIST_SIZE]; int bcast_duplist_curr; struct bla_claim_dst claim_dest; +#endif spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects */ spinlock_t tt_changes_list_lock; /* protects tt_changes */ @@ -261,6 +267,7 @@ struct tt_orig_list_entry { struct hlist_node list; }; +#ifdef CONFIG_BATMAN_ADV_BLA struct backbone_gw { uint8_t orig[ETH_ALEN]; short vid; /* used VLAN ID */ @@ -282,6 +289,7 @@ struct claim { atomic_t refcount; struct hlist_node hash_entry; }; +#endif struct tt_change_node { struct list_head list; -- batman-adv

1 0

batctl; branch, master, updated. v2012.0.0-9-g7d3967f
by postmaster＠open-mesh.org 07 Feb '12

07 Feb '12

The following commit has been merged in the master branch: commit 7d3967fa4457d61df3742807d8b8dd676bc3f399 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:19 2012 +0100 batman-adv: add basic bridge loop avoidance code This second version of the bridge loop avoidance for batman-adv avoids loops between the mesh and a backbone (usually a LAN). By connecting multiple batman-adv mesh nodes to the same ethernet segment a loop can be created when the soft-interface is bridged into that ethernet segment. A simple visualization of the loop involving the most common case - a LAN as ethernet segment: node1 <-- LAN --> node2 | | wifi <-- mesh --> wifi Packets from the LAN (e.g. ARP broadcasts) will circle forever from node1 or node2 over the mesh back into the LAN. With this patch, batman recognizes backbone gateways, nodes which are part of the mesh and backbone/LAN at the same time. Each backbone gateway "claims" clients from within the mesh to handle them exclusively. By restricting that only responsible backbone gateways may handle their claimed clients traffic, loops are effectively avoided. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/packet.h b/packet.h index 45e75ed..caa12fe 100644 --- a/packet.h +++ b/packet.h @@ -90,6 +90,22 @@ enum tt_client_flags { TT_CLIENT_PENDING = 1 << 10 }; +/* claim frame types for the bridge loop avoidance */ +enum bla_claimframe { + CLAIM_TYPE_ADD = 0x00, + CLAIM_TYPE_DEL = 0x01, + CLAIM_TYPE_ANNOUNCE = 0x02, + CLAIM_TYPE_REQUEST = 0x03 +}; + +/* the destination hardware field in the ARP frame is used to + * transport the claim type and the group id */ +struct bla_claim_dst { + uint8_t magic[3]; /* FF:43:05 */ + uint8_t type; /* bla_claimframe */ + uint16_t group; /* group id */ +} __packed; + struct batman_header { uint8_t packet_type; uint8_t version; /* batman version field */ -- batctl

1 0

batman-adv; branch, master, updated. v2012.0.0-50-gbefb4bc
by postmaster＠open-mesh.org 07 Feb '12

07 Feb '12

The following commit has been merged in the master branch: commit befb4bc0396b784304c706f3c8929e1525afec96 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 6 23:11:53 2012 +0100 batman-adv: Remove declaration of only locally used functions The blaII code removed references to two functions outside of the own source file. route_unicast_packet can be marked as static since 9c11509d3bbf914060be1bcb4448ea69d571fcb9 and tt_global_del since 7c5289cb52a5cecaeeddc719cd52b50bb17263dd Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/routing.c b/routing.c index 4a0e265..7b7fcbe 100644 --- a/routing.c +++ b/routing.c @@ -31,6 +31,9 @@ #include "unicast.h" #include "bridge_loop_avoidance.h" +static int route_unicast_packet(struct sk_buff *skb, + struct hard_iface *recv_if); + void slide_own_bcast_window(struct hard_iface *hard_iface) { struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); @@ -806,7 +809,7 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) return 0; } -int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) +static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) { struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct orig_node *orig_node = NULL; diff --git a/routing.h b/routing.h index 92ac100..3d729cb 100644 --- a/routing.h +++ b/routing.h @@ -25,7 +25,6 @@ void slide_own_bcast_window(struct hard_iface *hard_iface); void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node); -int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); diff --git a/translation-table.c b/translation-table.c index 295d4b3..9a07882 100644 --- a/translation-table.c +++ b/translation-table.c @@ -816,9 +816,10 @@ static void tt_global_del_roaming(struct bat_priv *bat_priv, -void tt_global_del(struct bat_priv *bat_priv, - struct orig_node *orig_node, const unsigned char *addr, - const char *message, bool roaming) +static void tt_global_del(struct bat_priv *bat_priv, + struct orig_node *orig_node, + const unsigned char *addr, + const char *message, bool roaming) { struct tt_global_entry *tt_global_entry = NULL; struct tt_local_entry *tt_local_entry = NULL; -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-49-g9fd6b06
by postmaster＠open-mesh.org 06 Feb '12

06 Feb '12

The following commit has been merged in the master branch: commit 9fd6b0615b5499b270d39a92b8790e206cf75833 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:27 2012 +0100 batman-adv: add bridge loop avoidance compile option The define CONFIG_BATMAN_ADV_BLA switches the bridge loop avoidance on - skip it, and the bridge loop avoidance is not compiled in. This is useful if binary size should be saved or the feature is not needed. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/Makefile b/Makefile index 776cca4..08f8c39 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ # changing the CONFIG_* line to 'y' enables the related feature # B.A.T.M.A.N. debugging: export CONFIG_BATMAN_ADV_DEBUG=n +# B.A.T.M.A.N. bridge loop avoidance: +export CONFIG_BATMAN_ADV_BLA=y PWD:=$(shell pwd) KERNELPATH ?= /lib/modules/$(shell uname -r)/build diff --git a/Makefile.kbuild b/Makefile.kbuild index 94b67fd..6d5c194 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -23,7 +23,7 @@ batman-adv-y += bat_debugfs.o batman-adv-y += bat_iv_ogm.o batman-adv-y += bat_sysfs.o batman-adv-y += bitarray.o -batman-adv-y += bridge_loop_avoidance.o +batman-adv-$(CONFIG_BATMAN_ADV_BLA) += bridge_loop_avoidance.o batman-adv-y += gateway_client.o batman-adv-y += gateway_common.o batman-adv-y += hard-interface.o diff --git a/README.external b/README.external index 98b6e22..1eff0f9 100644 --- a/README.external +++ b/README.external @@ -36,6 +36,7 @@ module). Available options and their possible values are (default marked with an "*") * CONFIG_BATMAN_ADV_DEBUG=[y|n*] (B.A.T.M.A.N. debugging) + * CONFIG_BATMAN_ADV_BLA=[y*|n] (B.A.T.M.A.N. bridge loop avoidance) e.g., debugging can be enabled by diff --git a/bat_debugfs.c b/bat_debugfs.c index 0e35177..916380c 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -245,12 +245,13 @@ static int transtable_global_open(struct inode *inode, struct file *file) return single_open(file, tt_global_seq_print_text, net_dev); } +#ifdef CONFIG_BATMAN_ADV_BLA static int bla_claim_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; return single_open(file, bla_claim_table_seq_print_text, net_dev); } - +#endif static int transtable_local_open(struct inode *inode, struct file *file) { @@ -285,7 +286,9 @@ static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open); static BAT_DEBUGINFO(originators, S_IRUGO, originators_open); static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open); +#ifdef CONFIG_BATMAN_ADV_BLA static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open); +#endif static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open); static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open); @@ -293,7 +296,9 @@ static struct bat_debuginfo *mesh_debuginfos[] = { &bat_debuginfo_originators, &bat_debuginfo_gateways, &bat_debuginfo_transtable_global, +#ifdef CONFIG_BATMAN_ADV_BLA &bat_debuginfo_bla_claim_table, +#endif &bat_debuginfo_transtable_local, &bat_debuginfo_vis_data, NULL, diff --git a/bat_sysfs.c b/bat_sysfs.c index 2305cad..3adb183 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -386,7 +386,9 @@ static ssize_t store_gw_bwidth(struct kobject *kobj, struct attribute *attr, BAT_ATTR_BOOL(aggregated_ogms, S_IRUGO | S_IWUSR, NULL); BAT_ATTR_BOOL(bonding, S_IRUGO | S_IWUSR, NULL); +#ifdef CONFIG_BATMAN_ADV_BLA BAT_ATTR_BOOL(bridge_loop_avoidance, S_IRUGO | S_IWUSR, NULL); +#endif BAT_ATTR_BOOL(fragmentation, S_IRUGO | S_IWUSR, update_min_mtu); BAT_ATTR_BOOL(ap_isolation, S_IRUGO | S_IWUSR, NULL); static BAT_ATTR(vis_mode, S_IRUGO | S_IWUSR, show_vis_mode, store_vis_mode); @@ -405,7 +407,9 @@ BAT_ATTR_UINT(log_level, S_IRUGO | S_IWUSR, 0, 15, NULL); static struct bat_attribute *mesh_attrs[] = { &bat_attr_aggregated_ogms, &bat_attr_bonding, +#ifdef CONFIG_BATMAN_ADV_BLA &bat_attr_bridge_loop_avoidance, +#endif &bat_attr_fragmentation, &bat_attr_ap_isolation, &bat_attr_vis_mode, diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 9468c24..24d7f16 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -22,6 +22,7 @@ #ifndef _NET_BATMAN_ADV_BLA_H_ #define _NET_BATMAN_ADV_BLA_H_ +#ifdef CONFIG_BATMAN_ADV_BLA int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); int bla_is_backbone_gw(struct sk_buff *skb, @@ -37,5 +38,18 @@ int bla_init(struct bat_priv *bat_priv); void bla_free(struct bat_priv *bat_priv); #define BLA_CRC_INIT 0 +#else /* ifdef CONFIG_BATMAN_ADV_BLA */ + +#define bla_rx(...) (0) +#define bla_tx(...) (0) +#define bla_is_backbone_gw(...) (0) +#define bla_claim_table_seq_print_text (0) +#define bla_is_backbone_gw_orig(...) (0) +#define bla_check_bcast_duplist(...) (0) +#define bla_update_orig_address(...) {} +#define bla_init(...) (1) +#define bla_free(...) {} + +#endif /* ifdef CONFIG_BATMAN_ADV_BLA */ #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 1a020c1..7cf621b 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -37,6 +37,7 @@ gen_config() { # write config variables gen_config 'CONFIG_BATMAN_ADV_DEBUG' ${CONFIG_BATMAN_ADV_DEBUG:="n"} >> "${TMP}" +gen_config 'CONFIG_BATMAN_ADV_BLA' ${CONFIG_BATMAN_ADV_BLA:="y"} >> "${TMP}" # only regenerate compat-autoconf.h when config was changed diff "${TMP}" "${TARGET}" > /dev/null 2>&1 || cp "${TMP}" "${TARGET}" -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-48-g2313d1b
by postmaster＠open-mesh.org 06 Feb '12

06 Feb '12

The following commit has been merged in the master branch: commit 2313d1b5a8f757c17790425a738732a2d45e29e0 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:26 2012 +0100 batman-adv: form groups in the bridge loop avoidance backbone gateways may be part of the same LAN, but participate in different meshes. With this patch, backbone gateways form groups by applying the groupid of another backbone gateway if it is higher. After forming the group, they only accept messages from backbone gateways of the same group. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 4c4b897..99b0a8f 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -33,7 +33,6 @@ #include <net/arp.h> #include <linux/if_vlan.h> -static const uint8_t claim_dest[6] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00}; static const uint8_t announce_mac[4] = {0x43, 0x05, 0x43, 0x05}; static void bla_periodic_work(struct work_struct *work); @@ -268,7 +267,8 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, if (!primary_if) return; - memcpy(&local_claim_dest, claim_dest, sizeof(local_claim_dest)); + memcpy(&local_claim_dest, &bat_priv->claim_dest, + sizeof(local_claim_dest)); local_claim_dest.type = claimtype; soft_iface = primary_if->soft_iface; @@ -284,7 +284,8 @@ static void bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, /* Ethernet SRC/HW SRC: originator mac */ primary_if->net_dev->dev_addr, /* HW DST: FF:43:05:XX:00:00 - * with XX = claim type */ + * with XX = claim type + * and YY:YY = group id */ (uint8_t *)&local_claim_dest); if (!skb) @@ -746,6 +747,84 @@ static int handle_claim(struct bat_priv *bat_priv, return 1; } +/** + * + * @bat_priv: the bat priv with all the soft interface information + * @hw_src: the Hardware source in the ARP Header + * @hw_dst: the Hardware destination in the ARP Header + * @ethhdr: pointer to the Ethernet header of the claim frame + * + * checks if it is a claim packet and if its on the same group. + * This function also applies the group ID of the sender + * if it is in the same mesh. + * + * returns: + * 2 - if it is a claim packet and on the same group + * 1 - if is a claim packet from another group + * 0 - if it is not a claim packet + */ +static int check_claim_group(struct bat_priv *bat_priv, + struct hard_iface *primary_if, + uint8_t *hw_src, uint8_t *hw_dst, + struct ethhdr *ethhdr) +{ + uint8_t *backbone_addr; + struct orig_node *orig_node; + struct bla_claim_dst *bla_dst, *bla_dst_own; + + bla_dst = (struct bla_claim_dst *) hw_dst; + bla_dst_own = &bat_priv->claim_dest; + + /* check if it is a claim packet in general */ + if (memcmp(bla_dst->magic, bla_dst_own->magic, + sizeof(bla_dst->magic)) != 0) + return 0; + + /* if announcement packet, use the source, + * otherwise assume it is in the hw_src */ + switch (bla_dst->type) { + case CLAIM_TYPE_ADD: + backbone_addr = hw_src; + break; + case CLAIM_TYPE_REQUEST: + case CLAIM_TYPE_ANNOUNCE: + case CLAIM_TYPE_DEL: + backbone_addr = ethhdr->h_source; + break; + default: + return 0; + } + + /* don't accept claim frames from ourselves */ + if (compare_eth(backbone_addr, primary_if->net_dev->dev_addr)) + return 0; + + /* if its already the same group, it is fine. */ + if (bla_dst->group == bla_dst_own->group) + return 2; + + /* lets see if this originator is in our mesh */ + orig_node = orig_hash_find(bat_priv, backbone_addr); + + /* dont accept claims from gateways which are not in + * the same mesh or group. */ + if (!orig_node) + return 1; + + /* if our mesh friends mac is bigger, use it for ourselves. */ + if (ntohs(bla_dst->group) > ntohs(bla_dst_own->group)) { + bat_dbg(DBG_BLA, bat_priv, + "taking other backbones claim group: %04x\n", + ntohs(bla_dst->group)); + bla_dst_own->group = bla_dst->group; + } + + orig_node_free_ref(orig_node); + + return 2; +} + + /* * @bat_priv: the bat priv with all the soft interface information * @skb: the frame to be checked @@ -768,6 +847,7 @@ static int bla_process_claim(struct bat_priv *bat_priv, uint16_t proto; int headlen; short vid = -1; + int ret; ethhdr = (struct ethhdr *)skb_mac_header(skb); @@ -810,8 +890,15 @@ static int bla_process_claim(struct bat_priv *bat_priv, bla_dst = (struct bla_claim_dst *) hw_dst; /* check if it is a claim frame. */ - if (memcmp(hw_dst, claim_dest, 3) != 0) - return 0; + ret = check_claim_group(bat_priv, primary_if, hw_src, hw_dst, ethhdr); + if (ret == 1) + bat_dbg(DBG_BLA, bat_priv, "bla_process_claim(): received " + "a claim frame from another group. From: " + "%pM on vid %d ...(hw_src %pM, hw_dst %pM)\n", + ethhdr->h_source, vid, hw_src, hw_dst); + + if (ret < 2) + return ret; /* become a backbone gw ourselves on this vlan if not happened yet */ bla_update_own_backbone_gw(bat_priv, primary_if, vid); @@ -960,6 +1047,10 @@ void bla_update_orig_address(struct bat_priv *bat_priv, struct hashtable_t *hash; int i; + /* reset bridge loop avoidance group id */ + bat_priv->claim_dest.group = + htons(crc16(0, primary_if->net_dev->dev_addr, ETH_ALEN)); + if (!oldif) { bla_purge_claims(bat_priv, NULL, 1); bla_purge_backbone_gw(bat_priv, 1); @@ -1059,9 +1150,23 @@ out: int bla_init(struct bat_priv *bat_priv) { int i; + uint8_t claim_dest[ETH_ALEN] = {0xff, 0x43, 0x05, 0x00, 0x00, 0x00}; + struct hard_iface *primary_if; bat_dbg(DBG_BLA, bat_priv, "bla hash registering\n"); + /* setting claim destination address */ + memcpy(&bat_priv->claim_dest.magic, claim_dest, 3); + bat_priv->claim_dest.type = 0; + primary_if = primary_if_get_selected(bat_priv); + if (primary_if) { + bat_priv->claim_dest.group = + htons(crc16(0, primary_if->net_dev->dev_addr, + ETH_ALEN)); + hardif_free_ref(primary_if); + } else + bat_priv->claim_dest.group = 0; /* will be set later */ + /* initialize the duplicate list */ for (i = 0; i < DUPLIST_SIZE; i++) bat_priv->bcast_duplist[i].entrytime = @@ -1233,9 +1338,6 @@ int bla_is_backbone_gw(struct sk_buff *skb, if (!backbone_gw) return 0; - bat_dbg(DBG_BLA, orig_node->bat_priv, - "bla_is_backbone_gw(): originator %pM has a claim " - "for vid %d on the LAN ...\n", orig_node->orig, vid); backbone_gw_free_ref(backbone_gw); return 1; } @@ -1395,11 +1497,6 @@ int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid) memcpy(search_claim.addr, ethhdr->h_source, ETH_ALEN); search_claim.vid = vid; - bat_dbg(DBG_BLA, bat_priv, - "bla_tx(): checked for claims, now starting ..." - "%pM -> %pM [%04x], vid %d\n", - ethhdr->h_source, ethhdr->h_dest, - ntohs(ethhdr->h_proto), search_claim.vid); claim = claim_hash_find(bat_priv, &search_claim); /* if no claim exists, allow it. */ @@ -1470,8 +1567,9 @@ int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) } seq_printf(seq, "Claims announced for the mesh %s " - "(orig %pM)\n", - net_dev->name, primary_if->net_dev->dev_addr); + "(orig %pM, group id %04x)\n", + net_dev->name, primary_if->net_dev->dev_addr, + ntohs(bat_priv->claim_dest.group)); seq_printf(seq, " %-17s %-5s %-17s [o] (%-4s)\n", "Client", "VID", "Originator", "CRC"); for (i = 0; i < hash->size; i++) { diff --git a/types.h b/types.h index ad97e87..7f7f610 100644 --- a/types.h +++ b/types.h @@ -193,6 +193,7 @@ struct bat_priv { struct hashtable_t *vis_hash; struct bcast_duplist_entry bcast_duplist[DUPLIST_SIZE]; int bcast_duplist_curr; + struct bla_claim_dst claim_dest; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects */ spinlock_t tt_changes_list_lock; /* protects tt_changes */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-47-gd0d5770
by postmaster＠open-mesh.org 06 Feb '12

06 Feb '12

The following commit has been merged in the master branch: commit d0d5770eb02a0f21738231afc0e0bed7848dcf88 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:25 2012 +0100 batman-adv: drop STP over batman Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/soft-interface.c b/soft-interface.c index 2f73869..8de8779 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -129,6 +129,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct hard_iface *primary_if = NULL; struct bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; + uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; short vid = -1; @@ -158,6 +159,11 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* Register the client MAC in the transtable */ tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); + /* don't accept stp packets. STP does not help in meshes. + * better use the bridge loop avoidance ... */ + if (compare_eth(ethhdr->h_dest, stp_addr)) + goto dropped; + if (is_multicast_ether_addr(ethhdr->h_dest)) { do_bcast = true; -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-46-ge5cf86d
by postmaster＠open-mesh.org 06 Feb '12

06 Feb '12

The following commit has been merged in the master branch: commit e5cf86d30a9b32feccb6b866a3f23b0e0483a3b0 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:24 2012 +0100 batman-adv: add broadcast duplicate check When multiple backbone gateways relay the same broadcast from the backbone into the mesh, other nodes in the mesh may receive this broadcast multiple times. To avoid this, the crc checksums of received broadcasts are recorded and new broadcast packets with the same content may be dropped if received by another gateway. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index a5e0eb7..4c4b897 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1058,8 +1058,16 @@ out: /* initialize all bla structures */ int bla_init(struct bat_priv *bat_priv) { + int i; + bat_dbg(DBG_BLA, bat_priv, "bla hash registering\n"); + /* initialize the duplicate list */ + for (i = 0; i < DUPLIST_SIZE; i++) + bat_priv->bcast_duplist[i].entrytime = + jiffies - msecs_to_jiffies(DUPLIST_TIMEOUT); + bat_priv->bcast_duplist_curr = 0; + if (bat_priv->claim_hash) return 1; @@ -1077,6 +1085,71 @@ int bla_init(struct bat_priv *bat_priv) /** * @bat_priv: the bat priv with all the soft interface information + * @bcast_packet: originator mac address + * @hdr_size: maximum length of the frame + * + * check if it is on our broadcast list. Another gateway might + * have sent the same packet because it is connected to the same backbone, + * so we have to remove this duplicate. + * + * This is performed by checking the CRC, which will tell us + * with a good chance that it is the same packet. If it is furthermore + * sent by another host, drop it. We allow equal packets from + * the same host however as this might be intended. + * + **/ + +int bla_check_bcast_duplist(struct bat_priv *bat_priv, + struct bcast_packet *bcast_packet, + int hdr_size) +{ + int i, length, curr; + uint8_t *content; + uint16_t crc; + struct bcast_duplist_entry *entry; + + length = hdr_size - sizeof(*bcast_packet); + content = (uint8_t *) bcast_packet; + content += sizeof(*bcast_packet); + + /* calculate the crc ... */ + crc = crc16(0, content, length); + + for (i = 0 ; i < DUPLIST_SIZE; i++) { + curr = (bat_priv->bcast_duplist_curr + i) % DUPLIST_SIZE; + entry = &bat_priv->bcast_duplist[curr]; + + /* we can stop searching if the entry is too old ; + * later entries will be even older */ + if (has_timed_out(entry->entrytime, DUPLIST_TIMEOUT)) + break; + + if (entry->crc != crc) + continue; + + if (compare_eth(entry->orig, bcast_packet->orig)) + continue; + + /* this entry seems to match: same crc, not too old, + * and from another gw. therefore return 1 to forbid it. */ + return 1; + } + /* not found, add a new entry (overwrite the oldest entry) */ + curr = (bat_priv->bcast_duplist_curr + DUPLIST_SIZE - 1) % DUPLIST_SIZE; + entry = &bat_priv->bcast_duplist[curr]; + entry->crc = crc; + entry->entrytime = jiffies; + memcpy(entry->orig, bcast_packet->orig, ETH_ALEN); + bat_priv->bcast_duplist_curr = curr; + + /* allow it, its the first occurence. */ + return 0; +} + + + +/** + * @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address * * check if the originator is a gateway for any VLAN ID. diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index b74940f..9468c24 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -28,6 +28,8 @@ int bla_is_backbone_gw(struct sk_buff *skb, struct orig_node *orig_node, int hdr_size); int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig); +int bla_check_bcast_duplist(struct bat_priv *bat_priv, + struct bcast_packet *bcast_packet, int hdr_size); void bla_update_orig_address(struct bat_priv *bat_priv, struct hard_iface *primary_if, struct hard_iface *oldif); diff --git a/main.h b/main.h index 88aadfa..2ba8724 100644 --- a/main.h +++ b/main.h @@ -83,6 +83,9 @@ #define BLA_PERIOD_LENGTH 10000 /* 10 seconds */ #define BLA_BACKBONE_TIMEOUT (BLA_PERIOD_LENGTH * 3) #define BLA_CLAIM_TIMEOUT (BLA_PERIOD_LENGTH * 10) + +#define DUPLIST_SIZE 16 +#define DUPLIST_TIMEOUT 500 /* 500 ms */ /* don't reset again within 30 seconds */ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 diff --git a/routing.c b/routing.c index 95b9eb4..4a0e265 100644 --- a/routing.c +++ b/routing.c @@ -1074,6 +1074,10 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* check whether this has been sent by another originator before */ + if (bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + goto out; + /* rebroadcast packet */ add_bcast_packet_to_list(bat_priv, skb, 1); diff --git a/types.h b/types.h index 35cd831..ad97e87 100644 --- a/types.h +++ b/types.h @@ -140,6 +140,11 @@ struct neigh_node { spinlock_t tq_lock; /* protects: tq_recv, tq_index */ }; +struct bcast_duplist_entry { + uint8_t orig[ETH_ALEN]; + uint16_t crc; + unsigned long entrytime; +}; struct bat_priv { atomic_t mesh_state; @@ -186,6 +191,8 @@ struct bat_priv { struct list_head tt_req_list; /* list of pending tt_requests */ struct list_head tt_roam_list; struct hashtable_t *vis_hash; + struct bcast_duplist_entry bcast_duplist[DUPLIST_SIZE]; + int bcast_duplist_curr; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects */ spinlock_t tt_changes_list_lock; /* protects tt_changes */ -- batman-adv

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012