B.A.T.M.A.N

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

15 participants
4308 discussions

Re: [B.A.T.M.A.N.] Suggestion for routing improvement on poor links
by whangarei & opua 23 Feb '14

23 Feb '14

On 20.02.2014, at 10:09, Antonio Quartulli wrote: > Why don't you send this numbers to the ML as well? :) > > On 20/02/14 09:00, whangarei & opua wrote: >> Hi Antonio, >> >> have found the output of such a case in my scrollback buffer of the >> terminal. >> Have also set hop_penalty to a high value, so don't worry about >> some 0 >> TQ values in alternative routes. >> Please look at the TQ of 101, that will never change... > > You have to give these nodes a name: e.g. who is the destination you > are > looking at? who are the direct neighbours you have towards this > destination? > > Otherwise I cannot understand. > The setup is like this: whangarei is my router, it has one Wlan link to each of this 3 neighbor router, MAC in the grep, hostname as comment. This 3 routers are in one large building (across a park) but sometimes don't see each other. 2 of them have VPN connects. I've looked only to the next hop, by grep the lines beginning with the MAC of this neighbor routers. The intension was to get a better feeling of the link quality then with the 'iw dev wlan0-1 station dump' output. So i have observed this behavior... Have attached the router output as a file, it should be more readable. >> >> By, >> Joe >> >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 3.070s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 5.810s ( 78) a2:f3:c1:75:6a:ed [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 78) 76:ea:3a:d6:1d:6b ( 75) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 31.150s ( 78) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 78) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 7.510s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 10.230s ( 78) a2:f3:c1:75:6a:ed [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 78) 76:ea:3a:d6:1d:6b ( 75) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 35.580s ( 78) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 78) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 9.460s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 12.190s ( 78) a2:f3:c1:75:6a:ed [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 78) 76:ea:3a:d6:1d:6b ( 75) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 37.540s ( 78) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 78) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 10.780s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 13.500s ( 78) a2:f3:c1:75:6a:ed [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 78) 76:ea:3a:d6:1d:6b ( 75) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 38.850s ( 78) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 78) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 11.840s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 14.560s ( 78) a2:f3:c1:75:6a:ed [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 78) 76:ea:3a:d6:1d:6b ( 75) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 39.910s ( 78) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 78) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 14.700s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 2.320s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 2.680s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 17.580s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 5.210s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 5.590s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 18.860s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 6.480s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 6.850s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 19.850s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 7.470s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 7.840s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 20.730s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 8.370s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 8.740s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 21.900s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 9.520s ( 81) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 79) 76:ea:3a:d6:1d:6b ( 81) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 9.910s ( 84) 66:66:b3:64:fe:95 [ wlan0-1]: >> 76:ea:3a:d6:1d:6b ( 1) 66:66:b3:64:fe:95 ( 84) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 28.570s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 1.380s ( 90) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 80) 76:ea:3a:d6:1d:6b ( 90) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 1.320s ( 89) 66:66:b3:64:fe:95 [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 3) 76:ea:3a:d6:1d:6b ( 2) 66:66:b3:64:fe:95 >> ( 89) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 30.270s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 3.090s ( 90) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 80) 76:ea:3a:d6:1d:6b ( 90) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 3.030s ( 89) 66:66:b3:64:fe:95 [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 3) 76:ea:3a:d6:1d:6b ( 2) 66:66:b3:64:fe:95 >> ( 89) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 32.680s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 0.310s ( 91) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 83) 76:ea:3a:d6:1d:6b ( 91) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 0.640s ( 93) 66:66:b3:64:fe:95 [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 3) 76:ea:3a:d6:1d:6b ( 2) 66:66:b3:64:fe:95 >> ( 93) >> root@whangarei:~# >> root@whangarei:~# batctl o | grep ^a2:f3:c1:75:6a:ed # >> Black-Mesa-Research-Facility >> a2:f3:c1:75:6a:ed 39.560s (101) a2:f3:c1:75:6a:ed [ wlan0-1]: >> 66:66:b3:64:fe:95 ( 0) 76:ea:3a:d6:1d:6b ( 0) a2:f3:c1:75:6a:ed >> (101) >> root@whangarei:~# batctl o | grep ^76:ea:3a:d6:1d:6b # Kundenzentrum >> 76:ea:3a:d6:1d:6b 2.130s ( 91) 76:ea:3a:d6:1d:6b [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 86) 76:ea:3a:d6:1d:6b ( 91) >> root@whangarei:~# batctl o | grep ^66:66:b3:64:fe:95 # >> Kuchenchef-3000 >> 66:66:b3:64:fe:95 2.480s ( 99) 66:66:b3:64:fe:95 [ wlan0-1]: >> a2:f3:c1:75:6a:ed ( 3) 76:ea:3a:d6:1d:6b ( 2) 66:66:b3:64:fe:95 >> ( 99) >> root@whangarei:~# >> >> On 19.02.2014, at 23:30, Antonio Quartulli wrote: >> >>> On 19/02/14 23:12, whangarei & opua wrote: >>>> Hi Antonio, >>>> >>>> have only a live environment, so only have access to my own >>>> router, but >>>> anyway, >>>> looks you aware of this issue... >>>> >>>> But I have seen no change of the TQ over the time ( up to 180 >>>> sec) on my >>>> side with my (maybe old) version of batman. >>>> Is it an new feature, or it is maybe not working like expected, >>>> in my >>>> old version? :( >>>> >>> >>> I think this is something that is part of batman-adv since the >>> beginning >>> (somebody else can confirm this). >>> >>>> Or I'm a little bit blind, sometimes, maybe? ;-) >>> >>> I have the feeling that you are not looking at the right entry in >>> the >>> originator table :-) >>> >>> >>> You may want to report some output/real numbers (at different >>> times) so >>> that we can comment on those. >>> >>> >>> Cheers, >>> >>> -- >>> Antonio Quartulli >>> >> > > > -- > Antonio Quartulli >

2 2

[B.A.T.M.A.N.] [PATCH] batctl: add isolation_mark support
by Antonio Quartulli 22 Feb '14

22 Feb '14

From: Antonio Quartulli <antonio(a)open-mesh.com> With this patch it is now possible to set/unset the value of the isolation_mark used by the Extended Isolation feature in batman-adv. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- sys.c | 9 +++++++-- sys.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys.c b/sys.c index 5cebf52..fd6e107 100644 --- a/sys.c +++ b/sys.c @@ -96,8 +96,13 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { .opt_short = "nc", .sysfs_name = "network_coding", .params = sysfs_param_enable, - } - + }, + { + .opt_long = "isolation_mark", + .opt_short = "mark", + .sysfs_name = "isolation_mark", + .params = NULL, + }, }; static void interface_usage(void) diff --git a/sys.h b/sys.h index 2cbbcfb..5633822 100644 --- a/sys.h +++ b/sys.h @@ -46,6 +46,7 @@ enum batctl_settings_list { BATCTL_SETTINGS_BONDING, BATCTL_SETTINGS_FRAGMENTATION, BATCTL_SETTINGS_NETWORK_CODING, + BATCTL_SETTINGS_ISOLATION_MARK, BATCTL_SETTINGS_NUM, }; -- 1.8.5.5

2 1

[B.A.T.M.A.N.] [PATCHv2] batman-adv: use ether_addr_copy instead of memcpy in multicast code
by Linus Lüssing 20 Feb '14

20 Feb '14

ether_addr_copy is supposed to be slightly more efficient for copying mac addresses, so let's use it. This makes recent versions of checkpatch happy, too. Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table") Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index 00bb30e..e69143b 100644 --- a/multicast.c +++ b/multicast.c @@ -45,7 +45,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, break; } - memcpy(&new->addr, &mc_list_entry->addr, ETH_ALEN); + ether_addr_copy(&new->addr, &mc_list_entry->addr); hlist_add_head(&new->list, mcast_list); ret++; } -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv add compat code for consume_skb
by Antonio Quartulli 20 Feb '14

20 Feb '14

consume_skb() has been implemented in 2.6.30, therefore some some compat code is needed for 2.6.29. This patch adds it. Introduced by 9289542085d7e298b90c7b6fb6efb509dab69d8b ("batman-adv: free skb on TVLV parsing success") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index deea92b..94407a6 100644 --- a/compat.h +++ b/compat.h @@ -26,6 +26,8 @@ #include <linux/version.h> /* LINUX_VERSION_CODE */ +#define consume_skb(_skb) kfree_skb(_skb) + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) #undef __alloc_percpu -- 1.8.5.3

2 1

[B.A.T.M.A.N.] Suggestion for routing improvement on poor links
by whangarei & opua 20 Feb '14

20 Feb '14

Hi all, have running batman-adv 2013.4.0 on a hamburg.freifunk.net out-of-the- box router. Have 3 uplinks over Wlan, with trees in the way and some rain at this time... So not perfect conditions... Have seen via 'batctl o' 3 uplinks to the other side of the park. (logging was unfortunately not compiled in) Of cause, one was the best link based on the metric (or what you called it) at this time. But also seen that the metric was not changed during packet lost => increased last-seen time on this best link :-( So there was a entry with a last-seen of up to 180 sec while other links have had much better update times because of less packet lost, but not so good metric like the main link at his 'best time'. So the 'old' best link was also active, at least by the metric shown by 'batctl o'. Expect the traffic will be sent to this way... Is it maybe a good idea to decrease the metric after a last seen time of a links has increased 15 or 20 sec, step by step on the best link (or all links with increased last seen time) , so a more reliable link ( at this time) has a chance to be activated? I only think about the local routing decision, not about to announce anything to a neighbor... Sorry, have not much experiences with Wlan links, also be not familiar with programming, but with some layer 3 routing protocols... Hope you understand my issue anyway :) By, Joe

4 9

[B.A.T.M.A.N.] [PATCH] batctl: add option for multiif orig table
by Simon Wunderlich 19 Feb '14

19 Feb '14

From: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- debug.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/debug.c b/debug.c index d57324d..78c6e55 100644 --- a/debug.c +++ b/debug.c @@ -89,8 +89,10 @@ static void debug_table_usage(int debug_table) fprintf(stderr, " \t -H don't show the header\n"); fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); - if (debug_table == BATCTL_TABLE_ORIGINATORS) + if (debug_table == BATCTL_TABLE_ORIGINATORS) { fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); + fprintf(stderr, " \t -i [interface] - show multiif originator table for a specific interface\n"); + } } int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) @@ -98,11 +100,12 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) int optchar, read_opt = USE_BAT_HOSTS; char full_path[MAX_PATH+1]; char *debugfs_mnt; + char *orig_iface = NULL; float orig_timeout; float watch_interval = 1; opterr = 0; - while ((optchar = getopt(argc, argv, "hnw:t:H")) != -1) { + while ((optchar = getopt(argc, argv, "hnw:t:Hi:")) != -1) { switch (optchar) { case 'h': debug_table_usage(debug_table); @@ -138,11 +141,21 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) case 'H': read_opt |= SKIP_HEADER; break; + case 'i': + if (debug_table != BATCTL_TABLE_ORIGINATORS) { + fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); + debug_table_usage(debug_table); + return EXIT_FAILURE; + } + + orig_iface = optarg; + break; case '?': - if (optopt == 't') + if (optopt == 't') { fprintf(stderr, "Error - option '-t' needs a number as argument\n"); - - else if (optopt == 'w') { + } else if (optopt == 'i') { + fprintf(stderr, "Error - option '-i' needs an interface as argument\n"); + } else if (optopt == 'w') { read_opt |= CLR_CONT_READ; break; } @@ -162,7 +175,10 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv) return EXIT_FAILURE; } - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); + if (orig_iface) + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", orig_iface, full_path, sizeof(full_path)); + else + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); return read_file(full_path, (char *)batctl_debug_tables[debug_table].debugfs_name, read_opt, orig_timeout, watch_interval, batctl_debug_tables[debug_table].header_lines); -- 1.7.10.4

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: make the use of braces in if-else consistent
by Martin Hundebøll 19 Feb '14

19 Feb '14

To avoid confusion, the linux kernel coding style discourage the use of one if-else branch with braces and another without braces. Introduced-by: 65d8217193427026169c48112c561c5ca4d1bd18 ("batman-adv: compat: fix null pointer exception for kernels < 3.9") Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- compat.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index 7beba36..0ceb2b1 100644 --- a/compat.h +++ b/compat.h @@ -167,8 +167,9 @@ static inline int batadv_param_set_copystring(const char *val, rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } else \ - dev = NULL; + } else {\ + dev = NULL; \ + } #endif /* < KERNEL_VERSION(2, 6, 36) */ -- 1.9.0

2 1

[B.A.T.M.A.N.] Hiding the ad-hoc network
by Dirk van der Walt 18 Feb '14

18 Feb '14

Hi List, Although not strictly Batman-adv related I was wondering if someone here knows how to 'hide' the Ad-hoc network of the mesh. Another person asked the same on the OpenWrt forum but no-one gave him a proper or clear answer: https://forum.openwrt.org/viewtopic.php?id=44665 I've managed to get hold of him and he said he still has no clear answer on this one. Kind regards

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: compat: fix null pointer exception for kernels < 3.9
by Linus Lüssing 18 Feb '14

18 Feb '14

The compat code of the new multicast patchset leads to null pointer derefernces for kernels 3.9 in netdev_master_upper_dev_get_rcu(). This is because the initially NULL is assigned to upper, which is equal to dev. dev is dereferenced one line later, though, leading to a crash. Fixing this by assigning NULL only when we are sure that the according pointer is not going to be dereferenced anymore. Introduced by: 532cadf26cfbb1099ef31fae9ccafcbbfc37b9b5 ("batman-adv: Multicast Listener Announcements via Translation Table") Reported-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- compat.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compat.h b/compat.h index 7a3d235..7beba36 100644 --- a/compat.h +++ b/compat.h @@ -162,12 +162,13 @@ static inline int batadv_param_set_copystring(const char *val, #define NET_ADDR_RANDOM 0 #define netdev_master_upper_dev_get_rcu(dev) \ - NULL; \ + upper; \ if (dev->br_port ? 1 : 0) { \ rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } + } else \ + dev = NULL; #endif /* < KERNEL_VERSION(2, 6, 36) */ @@ -371,12 +372,13 @@ static int __batadv_interface_tx(struct sk_buff *skb, \ #ifndef netdev_master_upper_dev_get_rcu #define netdev_master_upper_dev_get_rcu(dev) \ - NULL; \ + upper; \ if (dev->priv_flags & IFF_BRIDGE_PORT) { \ rcu_read_unlock(); \ dev_hold(dev); \ return dev; \ - } + } else \ + dev = NULL; #endif /* netdev_master_upper_dev_get_rcu */ -- 1.7.10.4

3 3

[B.A.T.M.A.N.] [PATCH] batman-adv: use ether_addr_copy instead of memcpy in multicast code
by Linus Lüssing 18 Feb '14

18 Feb '14

ether_addr_copy is supposed to be slightly more efficient for copying mac addresses, so let's use it. This makes recent versions of checkpatch happy, too. Reported-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index 00bb30e..e69143b 100644 --- a/multicast.c +++ b/multicast.c @@ -45,7 +45,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, break; } - memcpy(&new->addr, &mc_list_entry->addr, ETH_ALEN); + ether_addr_copy(&new->addr, &mc_list_entry->addr); hlist_add_head(&new->list, mcast_list); ret++; } -- 1.7.10.4

2 1

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N