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.] Combination of flags in tt_query packets
by Sven Eckelmann 13 Jun '11

13 Jun '11

Hi, just looked a little bit closer at your tt_query implementation and was reminded that we had a small discussion in IRC some weeks ago. <ecsv> can those flags be mixed? <ordex> mixed? in which way? <ecsv> request | table -> still a valid package <ecsv> sry, packet <ordex> yes it is, because it means "I'm requesting a full table" <ordex> all the combinations are valid This sounds wrong when I look at the tt_query packet. There we have a tt_data field which can used used exclusive by either TT_REQUEST (x)or TT_RESPONSE. Therefore, it is not possible to use both flags at the same time. Can you please explain how this is handled or otherwise change it so that only one bit in flags is used to decide if it is an response or a request. Maybe this was the result of the discussion with Marek about the roaming stuff - but i don't think that it applies here. Kind regards, Sven

2 4

[B.A.T.M.A.N.] batman-adv: added uevent support for gw and gw propagation for clients
by Antonio Quartulli 12 Jun '11

12 Jun '11

Three new features have been added: 1) generic uevent support 2) uevent triggering for gw state changes 3) gw propagation for clients Patch summary: - 1/3: a wrapper function that permits to trigger uevents has been added. The function takes a "type", an "action" and a "data" as parameters which will be used as uevent attributes. In particular they will respectively be BATTYPE, BATACTION and BATDATA in the uevent environment. The "type" and the "action" field are managed using two enum definitions and two char arrais. Currently the supported "type" is 'gw' only and the supported "actions" are 'add', 'change' and 'del'. The "data" parameter is a free field which can be filled by the programmer to send any useful data to the userspace. Uevents can be seen in userspace with the following command: "$ udevadm monitor --property" - 2/3: on a gateway add/change/del event a corresponding uevent of type 'gw' is triggered. In particular, in case of setting up a gw for the first time a uevent with action 'add' is triggered. In case of changing the best gateway a uevent with action 'change' is triggered. In case of deselection of any gateway a uevent with action DEL is triggered. - 3/3: a gw propagation feature for clients has been provided. The main target of this patch is to make clients able to change L3 gateway as soon as the mesh node currently serving them changes its default one at the batman layer. For this target a passive approach has been followed: whenever a unicast DHCPREQUEST for renewal is sent from a client, the node will inspect it and check if it is directed to the current default gateway or not. If it is not the case then the packet is dropped. In this way the client will get a timeout and a new DHCPREQUEST for discover will be sent giving the possibility to the node to select the best gw to forward this packet to (current gw selection mode).

3 29

[B.A.T.M.A.N.] [PATCH] batman-adv: Force packed placment of tt_change
by Sven Eckelmann 12 Jun '11

12 Jun '11

Every data structure which is used to send data over the wire must be fixed in layout to prevent incompatibility between different architectures. Those incompatibilities could be generated by extra bytes between members and at the end of the structure. tt_changes_fill_buffer and tt_len use that structure to copy the correct amount of data from an internal structure to the actual packet. We must ensure that this packet buffer only has data which can be interpreted by any architecture. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- packet.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packet.h b/packet.h index 0c3e44d..ef7476f 100644 --- a/packet.h +++ b/packet.h @@ -202,6 +202,6 @@ struct roam_adv_packet { struct tt_change { uint8_t flags; uint8_t addr[ETH_ALEN]; -}; +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- 1.7.5.4

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: use NO_FLAGS define instead of hard-coding 0
by Marek Lindner 10 Jun '11

10 Jun '11

The definition NO_FLAGS was introduced to make the code more readable and shall be used to initialize flag fields. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- aggregation.c | 2 +- gateway_client.c | 4 ++-- hard-interface.c | 2 +- send.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aggregation.c b/aggregation.c index ef26011..ede0a56 100644 --- a/aggregation.c +++ b/aggregation.c @@ -146,7 +146,7 @@ static void new_aggregated_packet(const unsigned char *packet_buff, forw_packet_aggr->own = own_packet; forw_packet_aggr->if_incoming = if_incoming; forw_packet_aggr->num_packets = 0; - forw_packet_aggr->direct_link_flags = 0; + forw_packet_aggr->direct_link_flags = NO_FLAGS; forw_packet_aggr->send_time = send_time; /* save packet direct link flag status */ diff --git a/gateway_client.c b/gateway_client.c index cf7f95e..24aee56 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -322,7 +322,7 @@ void gw_node_update(struct bat_priv *bat_priv, gw_node->deleted = 0; - if (new_gwflags == 0) { + if (new_gwflags == NO_FLAGS) { gw_node->deleted = jiffies; bat_dbg(DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", @@ -335,7 +335,7 @@ void gw_node_update(struct bat_priv *bat_priv, goto unlock; } - if (new_gwflags == 0) + if (new_gwflags == NO_FLAGS) goto unlock; gw_node_add(bat_priv, orig_node, new_gwflags); diff --git a/hard-interface.c b/hard-interface.c index cf972c3..db7aacf 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -331,7 +331,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, batman_packet = (struct batman_packet *)(hard_iface->packet_buff); batman_packet->packet_type = BAT_PACKET; batman_packet->version = COMPAT_VERSION; - batman_packet->flags = 0; + batman_packet->flags = NO_FLAGS; batman_packet->ttl = 2; batman_packet->tq = TQ_MAX_VALUE; batman_packet->tt_num_changes = 0; diff --git a/send.c b/send.c index 0c5d671..a150c7c 100644 --- a/send.c +++ b/send.c @@ -334,7 +334,7 @@ void schedule_own_packet(struct hard_iface *hard_iface) batman_packet->gw_flags = (uint8_t)atomic_read(&bat_priv->gw_bandwidth); else - batman_packet->gw_flags = 0; + batman_packet->gw_flags = NO_FLAGS; atomic_inc(&hard_iface->seqno); -- 1.7.5.3

2 2

[B.A.T.M.A.N.] pull request: batman-adv 2011-06-09
by Sven Eckelmann 09 Jun '11

09 Jun '11

Hi, I would like to propose following changes for net-next-2.6/3.1. Most patches are simple cleanup patches and only Daniele Furlan provided an enhancement which should fix some routing decisions when a mesh node is overloaded and OGMs get delayed. Thanks, Sven The following changes since commit bb899b89f46eb1fd6f62a4c360f6511b9714e479: batman-adv: Ensure that we really have route changes in update_route (2011-05-30 07:39:37 +0200) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Daniele Furlan (1): batman-adv: accept delayed rebroadcasts to avoid bogus routing under heavy load Marek Lindner (1): batman-adv: use NO_FLAGS define instead of hard-coding 0 Sven Eckelmann (4): batman-adv: Don't return value in void function batman-adv: Fix signedness problem in parse_gw_bandwidth batman-adv: Rewrite debugfs kobj_to_* helpers as functions batman-adv: Use enums for related constants net/batman-adv/aggregation.c | 2 +- net/batman-adv/bat_sysfs.c | 14 +++++++++-- net/batman-adv/gateway_client.c | 6 ++-- net/batman-adv/gateway_common.c | 4 +- net/batman-adv/hard-interface.c | 2 +- net/batman-adv/hard-interface.h | 14 ++++++----- net/batman-adv/main.h | 19 ++++++++++----- net/batman-adv/packet.h | 47 ++++++++++++++++++++++++--------------- net/batman-adv/routing.c | 9 +++---- net/batman-adv/send.c | 2 +- 10 files changed, 72 insertions(+), 47 deletions(-)

2 7

[B.A.T.M.A.N.] [PATCH] batman-adv: Fix line over 80 characters
by Sven Eckelmann 09 Jun '11

09 Jun '11

Regression was introduced in 4d30670880c84071dba4b220f595e64d6c01d1ba. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- routing.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/routing.c b/routing.c index 5e99188..7f458e9 100644 --- a/routing.c +++ b/routing.c @@ -728,7 +728,8 @@ void receive_bat_packet(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_mark(word, if_incoming_seqno - batman_packet->seqno - 2); + bit_mark(word, + if_incoming_seqno - batman_packet->seqno - 2); orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bit_packet_count(word); spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock); -- 1.7.5.3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Remove cast after kmalloc
by Sven Eckelmann 09 Jun '11

09 Jun '11

Casting (void *) value returned by kmalloc is useless as mentioned in Documentation/CodingStyle, Chap 14. This regression was introduced in cea194d90b11aff7fc289149e4c7f305fad3535a Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- translation-table.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/translation-table.c b/translation-table.c index d2a9f80..adecf1b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -148,8 +148,7 @@ static void tt_local_event(struct bat_priv *bat_priv, uint8_t op, { struct tt_change_node *tt_change_node; - tt_change_node = (struct tt_change_node *) - kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); + tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC); if (!tt_change_node) return; -- 1.7.5.3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Mark as received also old rebroadcast
by Daniele Furlan 08 Jun '11

08 Jun '11

This patch avoid local TQ drop in case of heavy load. In this case, rebroadcast can be delayed more than orig_interval causing the receiver to incorrectly drop old packets without marking them as received. Signed-off-by: Daniele Furlan <daniele.furlan(a)gmail.com> --- routing.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/routing.c b/routing.c index c620d4f..5e99188 100644 --- a/routing.c +++ b/routing.c @@ -720,17 +720,15 @@ void receive_bat_packet(const struct ethhdr *ethhdr, /* neighbor has to indicate direct link and it has to * come via the corresponding interface */ - /* if received seqno equals last send seqno save new - * seqno for bidirectional check */ + /* save packet seqno for bidirectional check */ if (has_directlink_flag && compare_eth(if_incoming->net_dev->dev_addr, - batman_packet->orig) && - (batman_packet->seqno - if_incoming_seqno + 2 == 0)) { + batman_packet->orig)) { offset = if_incoming->if_num * NUM_WORDS; spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_mark(word, 0); + bit_mark(word, if_incoming_seqno - batman_packet->seqno - 2); orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bit_packet_count(word); spin_unlock_bh(&orig_neigh_node->ogm_cnt_lock); -- 1.7.1

2 5

[B.A.T.M.A.N.] [PATCH] batctl: tcpdump - display tt_crc field which is part of the OGM packet
by Marek Lindner 08 Jun '11

08 Jun '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- tcpdump.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 85d461e..4e09274 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -315,15 +315,15 @@ static void dump_batman_ogm(unsigned char *packet_buff, ssize_t buff_len, int re printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_packet->orig, read_opt)); - printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", - get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), - ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttvn, - batman_packet->ttl, batman_packet->version, - (batman_packet->flags & DIRECTLINK ? 'D' : '.'), - (batman_packet->flags & VIS_SERVER ? 'V' : '.'), - (batman_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), - (batman_packet->gw_flags ? 'G' : '.'), - (size_t)buff_len - sizeof(struct ether_header)); + printf("OGM via neigh %s, seq %u, tq %3d, ttvn %d, ttcrc %d, ttl %2d, v %d, flags [%c%c%c%c], length %zu\n", + get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), + ntohl(batman_packet->seqno), batman_packet->tq, batman_packet->ttvn, + ntohl(batman_packet->tt_crc), batman_packet->ttl, batman_packet->version, + (batman_packet->flags & DIRECTLINK ? 'D' : '.'), + (batman_packet->flags & VIS_SERVER ? 'V' : '.'), + (batman_packet->flags & PRIMARIES_FIRST_HOP ? 'F' : '.'), + (batman_packet->gw_flags ? 'G' : '.'), + (size_t)buff_len - sizeof(struct ether_header)); } static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) -- 1.7.5.3

1 1

[B.A.T.M.A.N.] customize batman-adv for a new dashboard (was: Marek Linder)
by Sven Eckelmann 07 Jun '11

07 Jun '11

Michel de Geofroy wrote: > Hi Sven, Marek, All > > First thanks for the feedback really appreciated, I actually dont know if > it is Batman or the Robin script that we would need to customize or both > not being a programmer its hard for me to tell... I try to help. batman-adv can be understood as layer above the data link layer and below the network layer. When you don't need to get the discovery or routing/path finding algorithms to be changed then your actual target isn't batman-adv. > At present the dashboard we have developed supports Olsr Robin and we would > like to also support Batman Robin unfortunately Antonio is very occupied > developing another firmware called Mesh Root and as far as I understand the > development of Batman Robin is at a standstill. > > To answer your comment: > > "Why should batman-adv be customized for a dashboard? Shouldn't be the > dashboard customized for batman-adv?" > > Maybe Batman already has it all and it is just a question of updating the > robin script I have no idea :( but I know I need someone who dose > understand and is able to provide the right kind of support for the > firmware. I don't see any kind of requirement for batman-adv in this mail - so I can't tell. > We are NOT looking for proprietary firmware even though we are ready > to finance a firmware that would function with our dashboard but would stay > open source. batman-adv and batmand are not some kind of firmware, but daemons/kernel- modules for neighbor discovery/path finding in already established link layer connections. > I am not even sure we are knocking on the right door since as far as I > understand Robin is more like a script. Never touched it - so I can't exactly specify what ROBIN is. > Being new to Batman any help appreciated > > Some Features needed > > 1. Connect to Alien AP as Client. > 2. Enable to test connection speed from the gateway to the dashboard > (similar to repeaters) > 3. Support for N and 5ghz > 4. Branding > 5. Robin Batman Adv Firmware Update All those topics aren't batman-adv related topics, but related to the firmware/helper scripts. I know that Marek is working on a complete environment (hw, firmware, helper utilities, dashboard, ...). But I would guess that you will only get some promo material for the open-mesh.com ng firmware.... Kind regards, Sven

1 0

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