B.A.T.M.A.N February 2014

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

25 participants
68 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: use the proper location in ether_addr_copy()
by Antonio Quartulli 26 Feb '14

26 Feb '14

Introduced by: 513b2d107a4d88f62b9394926e377d2c6250775f ("batman-adv: prefer ether_addr_copy to memcpy") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- icmp_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icmp_socket.c b/icmp_socket.c index bf07dfd..161ef8f 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -230,7 +230,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmp_header; if (packet_len == sizeof(*icmp_packet_rr)) { addr = neigh_node->if_incoming->net_dev->dev_addr; - ether_addr_copy(icmp_packet_rr->rr, addr); + ether_addr_copy(icmp_packet_rr->rr[0], addr); } break; -- 1.8.4.5

1 0

[B.A.T.M.A.N.] [PATCH 00/10] pull request net: batman-adv 2014-02-17
by Antonio Quartulli 25 Feb '14

25 Feb '14

Hello David, here you have a pull request intended for net/linux-3.14 and linux-3.13 (please take care of queuing these patches for merging in the latter). Patch 1 fixes the computation of the MTU assigned to a soft-interface. This value is based on the MTUs of the real interfaces handled by batman-adv and due to an arithmetical error the result was always smaller than what it was supposed to be. Patch 2 fixes the access to a TT TVLV message in the RX path this avoiding to read random memory. This bug was leading to a bogus TT update messages parsing, thus to a continuous generation of useless traffic needed to recover the entire table from another node in the network. Patch 3 is fixing a memory leak caused by a reference counting unbalance: after having used a VLAN object to compare its CRC with the value received by another node, the reference counter was never decreased so preventing the object to be free'd when needed. Patch 4 is a minor fix which properly addresses a wrong assumption on the pskb_may_pull return value. Patch 5 fixes a potential race condition when adding a new neighbour. Patch 6 fixes a potential memory leak that could be triggered in case of failure of the originator node initialization routine by Simon Wunderlich. Patch 7 fixes the TranslationTable CRC computation (used for consistency check) by taking into consideration the endianess of the host machine. Prior to this fix, hosts having different endianess would compute different CRCs thus continuously triggering an "inconsistency" exception with respect to the received data which resulted in an endless sequence of recovery messages. Patch 8 fixes a severe memory leak caused by a missing SKB consumption after a successful TVLV message parsing. Patch 9 avoids a potential double free that could be trigger in case of orig_node initialization failure. Patch 10 fixes a potential kernel paging error caused by the wrong usage of an old skb->data pointer after that the skb itself was reallocated (by pskb_may_pull()) by me in collaboration with Linus Lüssing. Please pull or let me know of any problem! Thanks a lot, Antonio The following changes since commit 0fd5d57ba3456c4d0b77d1ae64be4818b47d7545: packet: check for ndo_select_queue during queue selection (2014-02-17 00:36:34 -0500) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to 70b271a78beba787155d6696aacd7c4d4a251c50: batman-adv: fix potential kernel paging error for unicast transmissions (2014-02-17 17:17:02 +0100) ---------------------------------------------------------------- Included changes: - fix soft-interface MTU computation - fix bogus pointer mangling when parsing the TT-TVLV container. This bug led to a wrong memory access. - fix memory leak by properly releasing the VLAN object after CRC check - properly check pskb_may_pull() return value - avoid potential race condition while adding new neighbour - fix potential memory leak by removing all the references to the orig_node object in case of initialization failure - fix the TT CRC computation by ensuring that every node uses the same byte order when hosts with different endianess are part of the same network - fix severe memory leak by freeing skb after a successful TVLV parsing - avoid potential double free when orig_node initialization fails - fix potential kernel paging error caused by the usage of the old value of skb->data after skb reallocation ---------------------------------------------------------------- Antonio Quartulli (9): batman-adv: fix soft-interface MTU computation batman-adv: fix TT-TVLV parsing on OGM reception batman-adv: release vlan object after checking the CRC batman-adv: properly check pskb_may_pull return value batman-adv: avoid potential race condition when adding a new neighbour batman-adv: fix TT CRC computation by ensuring byte order batman-adv: free skb on TVLV parsing success batman-adv: avoid double free when orig_node initialization fails batman-adv: fix potential kernel paging error for unicast transmissions Simon Wunderlich (1): batman-adv: fix potential orig_node reference leak net/batman-adv/bat_iv_ogm.c | 30 ++++++++++++++++++++---------- net/batman-adv/hard-interface.c | 22 ++++++++++++++-------- net/batman-adv/originator.c | 36 ++++++++++++++++++++++++++++++++++++ net/batman-adv/originator.h | 4 ++++ net/batman-adv/routing.c | 4 +++- net/batman-adv/send.c | 9 +++++++-- net/batman-adv/translation-table.c | 23 +++++++++++++++++------ 7 files changed, 101 insertions(+), 27 deletions(-) -- 1.8.5.3

2 17

[B.A.T.M.A.N.] [PATCH] batman-adv: fix merge resolution
by Antonio Quartulli 24 Feb '14

24 Feb '14

While resolving a merge conflict a variable declaration was accidentally moved onto another line. Move it back to its original location to avoid messing up with the in-kernel source code. Introduced by merge commit fbe649dfdd07d871f5b47b5e8ea1b03d104feb9d Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/send.c b/send.c index d27161e..3d64ed2 100644 --- a/send.c +++ b/send.c @@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct batadv_unicast_packet *unicast_packet; struct ethhdr *ethhdr; + struct batadv_unicast_packet *unicast_packet; int ret = NET_XMIT_DROP; if (!orig_node) -- 1.8.4.5

2 3

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

24 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> --- Change from v1: - added section in man page man/batctl.8 | 20 ++++++++++++++++++++ sys.c | 9 +++++++-- sys.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/man/batctl.8 b/man/batctl.8 index 2fe5941..b808293 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -151,6 +151,26 @@ least XX TQ better than the currently selected gateway (XX has to be a number be .RE .RE .br +.IP "\fBisolation_mark\fP|\fBmark\fP" +If no parameter is given the current isolation mark value is displayed. +Otherwise the parameter is used to set or unset the isolation mark used by the +Extended Isolation feature. +.br +The input is supposed to be of the form $value/$mask, where $value can be any +32bit long integer (expressed in decimal or hex base) and $mask is a generic +bitmask (expressed in hex base) that selects the bits to take into consideration +from $value. It is also possible to enter the input using only $value and in +this case the full bitmask is used by default. + +.br +.br +Example 1: 0x00000001/0xffffffff +.br +Example 2: 0x00040000/0xffff0000 +.br +Example 3: 16 or 0x0F +.br +.br .PP .I \fBdebug tables: .IP 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.4.5

1 1

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N February 2014