B.A.T.M.A.N January 2011

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

20 participants
35 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: protect bit operations to count OGMs with spinlock
by Marek Lindner 25 Jan '11

25 Jan '11

Reported-by: Linus Lüssing <linus.luessing(a)saxnet.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/routing.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/batman-adv/routing.c b/batman-adv/routing.c index a90d105..fe3471a 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -539,18 +539,19 @@ static char count_real_packets(struct ethhdr *ethhdr, char is_duplicate = 0; int32_t seq_diff; int need_update = 0; - int set_mark; + int set_mark, ret = -1; orig_node = get_orig_node(bat_priv, batman_packet->orig); if (!orig_node) return 0; + spin_lock_bh(&orig_node->ogm_cnt_lock); seq_diff = batman_packet->seqno - orig_node->last_real_seqno; /* signalize caller that the packet is to be dropped. */ if (window_protected(bat_priv, seq_diff, &orig_node->batman_seqno_reset)) - goto err; + goto out; rcu_read_lock(); hlist_for_each_entry_rcu(tmp_neigh_node, node, @@ -583,12 +584,12 @@ static char count_real_packets(struct ethhdr *ethhdr, orig_node->last_real_seqno = batman_packet->seqno; } - kref_put(&orig_node->refcount, orig_node_free_ref); - return is_duplicate; + ret = is_duplicate; -err: +out: + spin_unlock_bh(&orig_node->ogm_cnt_lock); kref_put(&orig_node->refcount, orig_node_free_ref); - return -1; + return ret; } void receive_bat_packet(struct ethhdr *ethhdr, -- 1.7.2.3

1 2

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Mark bucket_free_orig_rcu as static
by Sven Eckelmann 21 Jan '11

21 Jan '11

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv/originator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/originator.c b/batman-adv/originator.c index 35ab3ab..5a6745f 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -179,7 +179,7 @@ void originator_free(struct bat_priv *bat_priv) hash_destroy(hash); } -void bucket_free_orig_rcu(struct rcu_head *rcu) +static void bucket_free_orig_rcu(struct rcu_head *rcu) { struct element_t *bucket; struct orig_node *orig_node; -- 1.7.2.3

2 3

[B.A.T.M.A.N.] Stup batman ADv devel on openWRT
by Michael Y. Gluhovchenko 21 Jan '11

21 Jan '11

Hello All; I am truing to setup two batman openWRT nodes; I have that topology br-lan 0002.001e8cc9451b yes bat0 eth0 eth1 wlan0 Counters of RX & TX packets are increase on wlan0, but no RX packets on Batman Iface Bat0 In logs first(ha00) node i am only see "[ 69443] Sending own packet (originator c4:17:fe:b4:0b:97 seqno 70438, TQ 255, TTL 50, IDF off) on interface wlan0 [c4:17:fe:b4:0b:97]". Second(ha01) node I am see "[ 69553] Sending own packet (originator c4:17:fe:b2:50:c8 seqno 70549, TQ 255, TTL 50, IDF off) on interface wlan0 [c4:17:fe:b2:50:c8]" What am i doing wrong? First Node don't see Second Node. Bat Setup: ha00 - /etc/config/wireless: config wifi-device radio0 option type mac80211 option channel 1 option macaddr c4:17:fe:b4:0b:97 option hwmode 11g option htmode HT20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 config wifi-iface option device radio0 option network lan option mtu 1527 option mode ahdemo option ssid g_mesh option encryption none /etc/config/batman-adv config 'mesh' 'bat0' option 'interfaces' 'wlan0' option 'orig_interval' option 'log_level' option 'aggregated_ogms' option 'bonding' option 'vis_mode' ------------------------------------- ha01 - /etc/config/wireless config wifi-device radio0 option type mac80211 option channel 1 option macaddr c4:17:fe:b2:50:c8 option hwmode 11g option htmode HT20 list ht_capab SHORT-GI-40 list ht_capab TX-STBC list ht_capab RX-STBC1 list ht_capab DSSS_CCK-40 config wifi-iface option device radio0 option network lan option mode ahdemo option ssid g_mesh option encryption none /etc/config/batman-adv config 'mesh' 'bat0' option 'interfaces' 'wlan0' option 'orig_interval' option 'log_level' option 'aggregated_ogms' option 'bonding' option 'vis_mode' .

4 5

[B.A.T.M.A.N.] [PATCH] batman-adv: update compat version
by Marek Lindner 20 Jan '11

20 Jan '11

The compatibility version has to be updated as the OGM packet received a new field (gw_flags). Reported-by: Russell Senior <russell(a)personaltelco.net> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/packet.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/packet.h b/batman-adv/packet.h index 2284e81..b595bde 100644 --- a/batman-adv/packet.h +++ b/batman-adv/packet.h @@ -32,7 +32,7 @@ #define BAT_UNICAST_FRAG 0x06 /* this file is included by batctl which needs these defines */ -#define COMPAT_VERSION 12 +#define COMPAT_VERSION 14 #define DIRECTLINK 0x40 #define VIS_SERVER 0x20 #define PRIMARIES_FIRST_HOP 0x10 -- 1.7.2.3

2 4

[B.A.T.M.A.N.] performance patches (v3)
by Marek Lindner 19 Jan '11

19 Jan '11

Hi, the performance patches progress step by step. A few patches already went into the repository the rest is waiting for more review. Thanks to Sven's feedback quite some bugs were squashed. Changes since v2: * code rebased on top of the trunk * some more neigh_node protected by reference counters * call_rcu and kref_put race condition fixed Known issues: * bonding / alternating candidates are not secured by refcounting [see find_router()] - ideas welcome Regards, Marek

2 10

[B.A.T.M.A.N.] [PATCH] batman-adv: free neighbors when an interface is deactivated
by Marek Lindner 19 Jan '11

19 Jan '11

hardif_disable_interface() calls purge_orig_ref() to immediately free all neighbors associated with the interface that is going down. purge_orig_neighbors() checked if the interface status is IF_INACTIVE which is set to IF_NOT_IN_USE shortly before calling purge_orig_ref(). Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- batman-adv/hard-interface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/batman-adv/hard-interface.c b/batman-adv/hard-interface.c index 4f95777..52b2b72 100644 --- a/batman-adv/hard-interface.c +++ b/batman-adv/hard-interface.c @@ -398,7 +398,6 @@ void hardif_disable_interface(struct batman_if *batman_if) kfree(batman_if->packet_buff); batman_if->packet_buff = NULL; - batman_if->if_status = IF_NOT_IN_USE; /* delete all references to this batman_if */ purge_orig_ref(bat_priv); @@ -410,6 +409,7 @@ void hardif_disable_interface(struct batman_if *batman_if) softif_destroy(batman_if->soft_iface); batman_if->soft_iface = NULL; + batman_if->if_status = IF_NOT_IN_USE; } static struct batman_if *hardif_add_interface(struct net_device *net_dev) -- 1.7.2.3

1 2

[B.A.T.M.A.N.] Announcing the Wireless Battle Mesh v4 (16-20 March 2011, Sant Bartomeu del Grau, Spain)
by Marek Lindner 18 Jan '11

18 Jan '11

========================================================== Announcing the Wireless Battle Mesh v4 (16-20 March 2011, Sant Bartomeu del Grau, Spain) ========================================================== The next 'Wireless Battle of the Mesh' will take place from Wed 16th till Sun 20th of March in Sant Bartomeu del Grau (80km far from Barcelona), Spain. The event aims to bring together people from across Europe to test the performance of different routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX, and OLSR. If you are a mesh networking enthusiast, community networking activist, or have an interest in mesh networks you have to check this out! Informations about the event are gathered at: http://battlemesh.org/BattleMeshV4 Location ======== The event will take place in the Can Roca turistic resort in Sant Bartomeu del Grau, Catalunya, in the pre-Pyrenees Lluçanès area, 80 km far from Barcelona. Registration ============ Registrations will be available at different hackerspaces (Fusolab, HSBXL, /tmp/lab, metalab, CCC, ...) and on the official website for the event at http://battlemesh.org/BattleMeshV4 Fees ==== Every participant needs to donate 50 EUR (this should cover the costs for accomodation , and the infrastructure). To finance this event, we ask you to pay when subscribing (bank transfer or cash). Contact ======= * Web: http://battlemesh.org/BattleMeshV4 * Email: wbmv4_aatt_exo_dot_cat * IRC: irc.freenode.net #battlemesh

1 0

[B.A.T.M.A.N.] pull request: batman-adv 2011-01-16
by Sven Eckelmann 16 Jan '11

16 Jan '11

Hi, i would propose some smaller corrections. The following changes since commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5: batman-adv: Return hna count on local buffer fill (2010-12-20 10:32:03 -0800) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git for-david Jesper Juhl (1): batman-adv: Even Batman should not dereference NULL pointers Sven Eckelmann (1): batman-adv: Use "__attribute__" shortcut macros net/batman-adv/main.h | 6 +++--- net/batman-adv/packet.h | 14 +++++++------- net/batman-adv/types.h | 4 ++-- net/batman-adv/unicast.c | 6 ++++-- 4 files changed, 16 insertions(+), 14 deletions(-)

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Use "__attribute__" shortcut macros
by Sven Eckelmann 15 Jan '11

15 Jan '11

Linux 2.6.21 defines different macros for __attribute__ which are also used inside batman-adv. The next version of checkpatch.pl warns about the usage of __attribute__((packed))). Linux 2.6.33 defines an extra macro __always_unused which is used to assist source code analyzers and can be used to removed the last existing __attribute__ inside the source code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- batman-adv/compat.h | 6 ++++++ batman-adv/main.h | 6 +++--- batman-adv/packet.h | 14 +++++++------- batman-adv/types.h | 4 ++-- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/batman-adv/compat.h b/batman-adv/compat.h index b01455f..6074969 100644 --- a/batman-adv/compat.h +++ b/batman-adv/compat.h @@ -264,4 +264,10 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...); #endif /* < KERNEL_VERSION(2, 6, 29) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) + +#define __always_unused __attribute__((unused)) + +#endif /* < KERNEL_VERSION(2, 6, 33) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/batman-adv/main.h b/batman-adv/main.h index a362433..c239c97 100644 --- a/batman-adv/main.h +++ b/batman-adv/main.h @@ -153,9 +153,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -static inline void bat_dbg(char type __attribute__((unused)), - struct bat_priv *bat_priv __attribute__((unused)), - char *fmt __attribute__((unused)), ...) +static inline void bat_dbg(char type __always_unused, + struct bat_priv *bat_priv __always_unused, + char *fmt __always_unused, ...) { } #endif diff --git a/batman-adv/packet.h b/batman-adv/packet.h index b49fdf7..2284e81 100644 --- a/batman-adv/packet.h +++ b/batman-adv/packet.h @@ -63,7 +63,7 @@ struct batman_packet { uint8_t num_hna; uint8_t gw_flags; /* flags related to gateway class */ uint8_t align; -} __attribute__((packed)); +} __packed; #define BAT_PACKET_LEN sizeof(struct batman_packet) @@ -76,7 +76,7 @@ struct icmp_packet { uint8_t orig[6]; uint16_t seqno; uint8_t uid; -} __attribute__((packed)); +} __packed; #define BAT_RR_LEN 16 @@ -93,14 +93,14 @@ struct icmp_packet_rr { uint8_t uid; uint8_t rr_cur; uint8_t rr[BAT_RR_LEN][ETH_ALEN]; -} __attribute__((packed)); +} __packed; struct unicast_packet { uint8_t packet_type; uint8_t version; /* batman version field */ uint8_t dest[6]; uint8_t ttl; -} __attribute__((packed)); +} __packed; struct unicast_frag_packet { uint8_t packet_type; @@ -110,7 +110,7 @@ struct unicast_frag_packet { uint8_t flags; uint8_t orig[6]; uint16_t seqno; -} __attribute__((packed)); +} __packed; struct bcast_packet { uint8_t packet_type; @@ -118,7 +118,7 @@ struct bcast_packet { uint8_t orig[6]; uint8_t ttl; uint32_t seqno; -} __attribute__((packed)); +} __packed; struct vis_packet { uint8_t packet_type; @@ -131,6 +131,6 @@ struct vis_packet { * neighbors */ uint8_t target_orig[6]; /* who should receive this packet */ uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ -} __attribute__((packed)); +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ diff --git a/batman-adv/types.h b/batman-adv/types.h index 09d18d8..9e636c2 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -249,13 +249,13 @@ struct vis_info { /* this packet might be part of the vis send queue. */ struct sk_buff *skb_packet; /* vis_info may follow here*/ -} __attribute__((packed)); +} __packed; struct vis_info_entry { uint8_t src[ETH_ALEN]; uint8_t dest[ETH_ALEN]; uint8_t quality; /* quality = 0 means HNA */ -} __attribute__((packed)); +} __packed; struct recvlist_node { struct list_head list; -- 1.7.2.3

2 1

[B.A.T.M.A.N.] NDP patches v5
by Linus Lüssing 15 Jan '11

15 Jan '11

Hi folks, Changes this time: * fix memory leak on "ifconfig xxx down && ifconfig xxx up" -> always clear neigh_list on interface going down * 4 Byte alignment for neigh_entry structure + packed-attribute * adding sysfs entry for the ndp interval Cheers, Linus

2 13

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2011