B.A.T.M.A.N June 2011

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

14 participants
44 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: Keep interface_tx as local function
by Sven Eckelmann 15 Jun '11

15 Jun '11

interface_tx is not used outside of soft-interface.c and thus doesn't need to be declared inside soft-interface.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- soft-interface.c | 2 +- soft-interface.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 7aeed0d..7c554b4 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -554,7 +554,7 @@ static int interface_change_mtu(struct net_device *dev, int new_mtu) return 0; } -int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) +static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct bat_priv *bat_priv = netdev_priv(soft_iface); diff --git a/soft-interface.h b/soft-interface.h index c24906d..001546f 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -25,7 +25,6 @@ int my_skb_head_push(struct sk_buff *skb, unsigned int len); int softif_neigh_seq_print_text(struct seq_file *seq, void *offset); void softif_neigh_purge(struct bat_priv *bat_priv); -int interface_tx(struct sk_buff *skb, struct net_device *soft_iface); void interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct hard_iface *recv_if, int hdr_size); -- 1.7.5.3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Move compare_orig to originator.c
by Sven Eckelmann 15 Jun '11

15 Jun '11

compare_orig is only used in context of orig_node which is managed inside originator.c. It is not necessary to keep that function inside the header originator.h. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- originator.c | 8 ++++++++ originator.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/originator.c b/originator.c index 62d8196..338b3c5 100644 --- a/originator.c +++ b/originator.c @@ -37,6 +37,14 @@ static void start_purge_timer(struct bat_priv *bat_priv) queue_delayed_work(bat_event_workqueue, &bat_priv->orig_work, 1 * HZ); } +/* returns 1 if they are the same originator */ +static int compare_orig(const struct hlist_node *node, const void *data2) +{ + const void *data1 = container_of(node, struct orig_node, hash_entry); + + return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +} + int originator_init(struct bat_priv *bat_priv) { if (bat_priv->orig_hash) diff --git a/originator.h b/originator.h index 8e307af..cfc1f60 100644 --- a/originator.h +++ b/originator.h @@ -40,14 +40,6 @@ int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num); int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); -/* returns 1 if they are the same originator */ -static inline int compare_orig(const struct hlist_node *node, const void *data2) -{ - const void *data1 = container_of(node, struct orig_node, hash_entry); - - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); -} - /* hashfunction to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ static inline int choose_orig(const void *data, int32_t size) -- 1.7.5.3

2 1

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

15 Jun '11

This regression was introduced in 02585b0b59becfbf14749f08069862f120000bdf. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- routing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/routing.c b/routing.c index 3a3cfb8..7ca4b42 100644 --- a/routing.c +++ b/routing.c @@ -1232,7 +1232,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; case TT_RESPONSE: - /* packet needs to be linearised to access the TT changes records */ + /* packet needs to be linearised to access the TT changes */ if (skb_linearize(skb) < 0) goto out; -- 1.7.5.3

2 5

[B.A.T.M.A.N.] Linux bridge-code for something like BATMAN
by fboehm 15 Jun '11

15 Jun '11

Hi, I know bridging is not routing but I was thinking since some time if it is possible to modify the linux bridge-code for forwarding layer2 packets according to the rules of some routing algorithm. This means the bridge would not learn mac addresses from ARP protocol any longer but from a daemon. The result would be a layer2 mesh routing like BATMAN does. OLSR is doing quite the same one layer above by manipulating the routing table with the OLSR daemon. Of course it's much easier to manipulate a routing table because there are interfaces for doing this. It's just an idea and I would like to hear your expert opinions. Kind regards, Franz

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: the skb has not to be freed in recv_tt_query()
by Antonio Quartulli 15 Jun '11

15 Jun '11

In recv_tt_query(), in case of error the skb is freed and then NET_RX_DROP is returned. This makes the caller function wrongly invoke kfree_skb() again. To avoid this double free recv_tt_query() has to always return NET_RX_DROP and not to free the skb. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- routing.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/routing.c b/routing.c index 3a3cfb8..fc8eb87 100644 --- a/routing.c +++ b/routing.c @@ -1194,7 +1194,6 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct tt_query_packet *tt_query; struct ethhdr *ethhdr; - int ret = NET_RX_DROP; /* drop packet if it has not necessary minimum size */ if (unlikely(!pskb_may_pull(skb, sizeof(struct tt_query_packet)))) @@ -1248,11 +1247,11 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) } break; } - ret = NET_RX_SUCCESS; out: - kfree_skb(skb); - return ret; + /* returning NET_RX_DROP will make the caller function to kfree the + * skb */ + return NET_RX_DROP; } int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if) -- 1.7.3.4

2 2

[B.A.T.M.A.N.] [PATCH] batctl: tcpdump - cleanup tt_query packet parser
by Marek Lindner 15 Jun '11

15 Jun '11

Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- tcpdump.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 4e09274..5500899 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -254,6 +254,7 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct tt_query_packet *tt_query_packet; + char *tt_desc, *tt_data, tt_type; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct tt_query_packet), "BAT TT"); @@ -262,17 +263,32 @@ static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int rea if (!time_printed) print_time(); + switch (tt_query_packet->flags & TT_QUERY_TYPE_MASK) { + case TT_REQUEST: + tt_desc = "request"; + tt_data = "crc"; + tt_type = 'Q'; + break; + case TT_RESPONSE: + tt_desc = "response"; + tt_data = "entries"; + tt_type = 'P'; + break; + default: + tt_desc = "unknown"; + tt_data = "unknown"; + tt_type = '?'; + break; + } + printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)tt_query_packet->src, read_opt)); - printf("%s: TT %s, ttvn %d, %s %d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", + printf("%s: TT %s, ttvn %d, %s %d, ttl %2d, v %d, flags [%c%c], length %zu\n", get_name_by_macaddr((struct ether_addr *)tt_query_packet->dst, read_opt), - tt_query_packet->flags & TT_RESPONSE ? "response" : "request", - tt_query_packet->ttvn, tt_query_packet->flags & TT_RESPONSE ? "entries" : "crc", - ntohs(tt_query_packet->tt_data), tt_query_packet->ttl, tt_query_packet->version, - (tt_query_packet->flags & TT_REQUEST ? 'Q' : '.'), - (tt_query_packet->flags & TT_RESPONSE ? 'P' : '.'), - (tt_query_packet->flags & TT_FULL_TABLE ? 'F' : '.'), + tt_desc, tt_query_packet->ttvn, tt_data, ntohs(tt_query_packet->tt_data), + tt_query_packet->ttl, tt_query_packet->version, + tt_type, (tt_query_packet->flags & TT_FULL_TABLE ? 'F' : '.'), (size_t)buff_len - sizeof(struct ether_header)); } -- 1.7.5.3

1 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: count_real_packets() in batman-adv assumes char is signed
by David Howells 15 Jun '11

15 Jun '11

count_real_packets() in batman-adv assumes char is signed, and returns -1 through it: net/batman-adv/routing.c: In function 'receive_bat_packet': net/batman-adv/routing.c:739: warning: comparison is always false due to limited range of data type Use int instead. This is also looks a bit weird as (presumably signed) is_duplicate is constructed by OR'ding together the unsigned results of get_bit_status() (though the latter only returns 0 or 1). Signed-off-by: David Howells <dhowells(a)redhat.com> cc: Marek Lindner <lindner_marek(a)yahoo.de> cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> cc: Sven Eckelmann <sven(a)narfation.org> cc: b.a.t.m.a.n(a)lists.open-mesh.org cc: netdev(a)vger.kernel.org --- net/batman-adv/routing.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index bb1c3ec..3075fcb 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -531,15 +531,15 @@ static int window_protected(struct bat_priv *bat_priv, * -1 the packet is old and has been received while the seqno window * was protected. Caller should drop it. */ -static char count_real_packets(struct ethhdr *ethhdr, - struct batman_packet *batman_packet, - struct hard_iface *if_incoming) +static int count_real_packets(struct ethhdr *ethhdr, + struct batman_packet *batman_packet, + struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct orig_node *orig_node; struct neigh_node *tmp_neigh_node; struct hlist_node *node; - char is_duplicate = 0; + uint8_t is_duplicate = 0; int32_t seq_diff; int need_update = 0; int set_mark, ret = -1; @@ -608,7 +608,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, char has_directlink_flag; char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; char is_broadcast = 0, is_bidirectional, is_single_hop_neigh; - char is_duplicate; + int is_duplicate; uint32_t if_incoming_seqno; /* Silently drop when the batman packet is actually not a

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: clean up the tt_query flags field
by Antonio Quartulli 14 Jun '11

14 Jun '11

The tt_query subtype is represented by the two leading bits (lsb) of the tt_query->flags field. Therefore it cannot be handled by simple "flags" but by two bits wide integer. The TT_QUERY_TYPE_MASK is used to extract the relevant bits that can be compared to the related enum values (TT_RESPONSE, TT_REQUEST) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- packet.h | 10 ++++++++-- routing.c | 30 ++++++++++++++++-------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packet.h b/packet.h index ef7476f..c5f081d 100644 --- a/packet.h +++ b/packet.h @@ -65,10 +65,16 @@ enum unicast_frag_flags { UNI_FRAG_LARGETAIL = 1 << 1 }; +/* TT_QUERY subtypes */ +#define TT_QUERY_TYPE_MASK 0x3 + +enum tt_query_packettype { + TT_REQUEST = 0, + TT_RESPONSE = 1 +}; + /* TT_QUERY flags */ enum tt_query_flags { - TT_RESPONSE = 1 << 0, - TT_REQUEST = 1 << 1, TT_FULL_TABLE = 1 << 2 }; diff --git a/routing.c b/routing.c index 7f458e9..027e988 100644 --- a/routing.c +++ b/routing.c @@ -1218,7 +1218,8 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) tt_query->tt_data = ntohs(tt_query->tt_data); - if (tt_query->flags & TT_REQUEST) { + switch (tt_query->flags & TT_QUERY_TYPE_MASK) { + case TT_REQUEST: /* If we cannot provide an answer the tt_request is * forwarded */ if (!send_tt_response(bat_priv, tt_query)) { @@ -1229,22 +1230,23 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if) tt_query->tt_data = htons(tt_query->tt_data); return route_unicast_packet(skb, recv_if); } - ret = NET_RX_SUCCESS; - goto out; - } - /* packet needs to be linearised to access the TT changes records */ - if (skb_linearize(skb) < 0) - goto out; + break; + case TT_RESPONSE: + /* packet needs to be linearised to access the TT changes records */ + if (skb_linearize(skb) < 0) + goto out; - if (is_my_mac(tt_query->dst)) - handle_tt_response(bat_priv, tt_query); - else { - bat_dbg(DBG_TT, bat_priv, + if (is_my_mac(tt_query->dst)) + handle_tt_response(bat_priv, tt_query); + else { + bat_dbg(DBG_TT, bat_priv, "Routing TT_RESPONSE to %pM [%c]\n", tt_query->dst, (tt_query->flags & TT_FULL_TABLE ? 'F' : '.')); - tt_query->tt_data = htons(tt_query->tt_data); - return route_unicast_packet(skb, recv_if); + tt_query->tt_data = htons(tt_query->tt_data); + return route_unicast_packet(skb, recv_if); + } + break; } ret = NET_RX_SUCCESS; -- 1.7.3.4

3 3

[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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N June 2011