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: improve DAT documentation
by Antonio Quartulli 11 Mar '14

11 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Add missing documentation for BATADV_DAT_ADDR_MAX and convert an existing documentation to kerneldoc Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- distributed-arp-table.h | 3 +++ types.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/distributed-arp-table.h b/distributed-arp-table.h index ac9be9b..d76e1d0 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -25,6 +25,9 @@ #include <linux/if_arp.h> +/** + * BATADV_DAT_ADDR_MAX - maximum address value in the DHT space + */ #define BATADV_DAT_ADDR_MAX ((batadv_dat_addr_t)~(batadv_dat_addr_t)0) void batadv_dat_status_update(struct net_device *net_dev); diff --git a/types.h b/types.h index d4b923c..34891a5 100644 --- a/types.h +++ b/types.h @@ -24,8 +24,9 @@ #ifdef CONFIG_BATMAN_ADV_DAT -/* batadv_dat_addr_t is the type used for all DHT addresses. If it is changed, - * BATADV_DAT_ADDR_MAX is changed as well. +/** + * batadv_dat_addr_t - it is the type used for all DHT addresses. If it is + * changed, BATADV_DAT_ADDR_MAX is changed as well. * * *Please be careful: batadv_dat_addr_t must be UNSIGNED* */ -- 1.8.4.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: improve the TT flags documentation
by Antonio Quartulli 11 Mar '14

11 Mar '14

From: Antonio Quartulli <antonio(a)open-mesh.com> Convert the current documentation for the TT flags in proper kerneldoc and improve it by adding an explanation for each of the flags. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- packet.h | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/packet.h b/packet.h index c7f6eef..34e096d 100644 --- a/packet.h +++ b/packet.h @@ -119,10 +119,30 @@ enum batadv_tt_data_flags { BATADV_TT_FULL_TABLE = BIT(4), }; -/* BATADV_TT_CLIENT flags. - * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only. - * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. +/** + * enum batadv_tt_client_flags - TT client specific flags + * @BATADV_TT_CLIENT_DEL: the client has to be deleted from the table + * @BATADV_TT_CLIENT_ROAM: the client roamed to/from another node and the new + * update telling its new real location has not been received/sent yet + * @BATADV_TT_CLIENT_WIFI: this client is connected through a wifi interface. + * This information is used by the "AP Isolation" feature + * @BATADV_TT_CLIENT_ISOLA: this client is considered "isolated". This + * information is used by the Extended Isolation feature + * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from the table + * @BATADV_TT_CLIENT_NEW: this client has been added to the local table but has + * not been announced yet + * @BATADV_TT_CLIENT_PENDING: this client is marked for removal but it is kept + * in the table for one more originator interval for consistency purposes + * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be part of + * the network but no nnode has already announced it + * + * Bits from 0 to 7 are called _remote flags_ because they are sent on the wire. + * Bits from 8 to 15 are called _local flags_ because they are used for local + * computations only. + * + * Bits from 4 to 7 - a subset of remote flags - are ensured to be in sync with + * the other nodes in the network. To achieve this goal these flags are included + * in the TT CRC computation. */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0), -- 1.8.4.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: properly align constant assignments
by Antonio Quartulli 11 Mar '14

11 Mar '14

All the assignments in packet.h are properly aligned. Also the multicast constants have to have a similar shape. Introduced by 1c090349e2f65d19a7f356cc0b61f13644c53bb6 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- packet.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packet.h b/packet.h index feaa336..c7f6eef 100644 --- a/packet.h +++ b/packet.h @@ -97,9 +97,9 @@ enum batadv_icmp_packettype { * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets */ enum batadv_mcast_flags { - BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), - BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), - BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), + BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), + BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), + BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), }; /* tt data subtypes */ -- 1.8.4.5

2 1

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

11 Mar '14

Introduced by fb4756fe5f6e58ca2ab208ca634ae4c8dd6e9499 ("batman-adv: use ether_addr_copy instead of memcpy in multicast code") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- change from v1: - added Signed-off-by clause 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

2 1

[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

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