B.A.T.M.A.N

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

15 participants
4308 discussions

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

11 Mar '14

Introduced by: 513b2d107a4d88f62b9394926e377d2c6250775f ("batman-adv: prefer ether_addr_copy to memcpy") Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Changes from v2: - added another fix in routing.c Changes from v1: - added Reported-by clause icmp_socket.c | 2 +- routing.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; diff --git a/routing.c b/routing.c index 3855132..3514153 100644 --- a/routing.c +++ b/routing.c @@ -340,7 +340,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN) goto out; - ether_addr_copy(&(icmp_packet_rr->rr[icmp_packet_rr->rr_cur]), + ether_addr_copy(icmp_packet_rr->rr[icmp_packet_rr->rr_cur], ethhdr->h_dest); icmp_packet_rr->rr_cur++; } -- 1.8.4.5

2 1

[B.A.T.M.A.N.] [PATCHv3] batctl: add isolation_mark support
by Antonio Quartulli 11 Mar '14

11 Mar '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 v2: - added section in README Change from v1: - added section in man page README | 13 +++++++++++++ man/batctl.8 | 20 ++++++++++++++++++++ sys.c | 9 +++++++-- sys.h | 1 + 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/README b/README index 5af95c8..a4507b7 100644 --- a/README +++ b/README @@ -399,6 +399,19 @@ display or modify the packet aggregation setting Usage: batctl aggregation|ag [0|1] +batctl isolation_mark +===================== + +display or modify the isolation mark. +This value is used by Extended Isolation feature. + +Usage: batctl isolation_mark|mark $value[/0x$mask] + +Example 1: batctl mark 0x00000001/0xffffffff +Example 2: batctl mark 0x00040000/0xffff0000 +Example 3: batctl mark 16 +Example 4: batctl mark 0x0f + batctl translocal ================= 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

2 1

[B.A.T.M.A.N.] question about VIS servera
by michael.holcman1＠free.fr 27 Feb '14

27 Feb '14

Hello, I tried to configure the vis server. All is ok but i can't see the mesh network with the tool s3d (i installed the last version). I try to test batmand. Is there a bug ? Is there an another graphics server to see the global mesh ? Thank's for your answer. Michael.

3 4

[B.A.T.M.A.N.] [PATCH 1/3] batctl: fix wrong header lines number for local translation table
by Linus Lüssing 27 Feb '14

27 Feb '14

A commit in batman-adv has added a second header line to the local translation table output. Introduced by 59cb0861498776c62bd17584c31f34477fa301a0 ("batman-adv: improve local translation table output") Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug.c b/debug.c index d57324d..6836857 100644 --- a/debug.c +++ b/debug.c @@ -45,7 +45,7 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .opt_long = "translocal", .opt_short = "tl", .debugfs_name = "transtable_local", - .header_lines = 1, + .header_lines = 2, }, { .opt_long = "transglobal", -- 1.7.10.4

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: use the name of the array as pointer
by Antonio Quartulli 26 Feb '14

26 Feb '14

Introduced by fb4756fe5f6e58ca2ab208ca634ae4c8dd6e9499 ("batman-adv: use ether_addr_copy instead of memcpy in multicast code") --- multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index e69143b..998b429 100644 --- a/multicast.c +++ b/multicast.c @@ -45,7 +45,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, break; } - ether_addr_copy(&new->addr, &mc_list_entry->addr); + ether_addr_copy(new->addr, mc_list_entry->addr); hlist_add_head(&new->list, mcast_list); ret++; } -- 1.8.4.5

1 0

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

26 Feb '14

1 0

[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

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