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: Use enums for related constants
by Sven Eckelmann 05 Jun '11

05 Jun '11

CodingStyle "Chapter 12: Macros, Enums and RTL" recommends to use enums for several related constants. Internal states can be used without defining the actual value, but all values which are visible to the outside must be defined as before. Normal values are assigned as usual and flags are defined by shifts of a bit. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- These patches are based on ordex's patches to reduce the amount of rebase related heart attacks for him. hard-interface.h | 14 ++++++----- main.h | 18 +++++++++----- packet.h | 65 +++++++++++++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/hard-interface.h b/hard-interface.h index 79e25cb..442eacb 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -22,12 +22,14 @@ #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ #define _NET_BATMAN_ADV_HARD_INTERFACE_H_ -#define IF_NOT_IN_USE 0 -#define IF_TO_BE_REMOVED 1 -#define IF_INACTIVE 2 -#define IF_ACTIVE 3 -#define IF_TO_BE_ACTIVATED 4 -#define IF_I_WANT_YOU 5 +enum hard_if_state { + IF_NOT_IN_USE, + IF_TO_BE_REMOVED, + IF_INACTIVE, + IF_ACTIVE, + IF_TO_BE_ACTIVATED, + IF_I_WANT_YOU +}; extern struct notifier_block hard_if_notifier; diff --git a/main.h b/main.h index 82cf523..7fbda20 100644 --- a/main.h +++ b/main.h @@ -80,9 +80,11 @@ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 -#define MESH_INACTIVE 0 -#define MESH_ACTIVE 1 -#define MESH_DEACTIVATING 2 +enum mesh_state { + MESH_INACTIVE, + MESH_ACTIVE, + MESH_DEACTIVATING +}; #define BCAST_QUEUE_LEN 256 #define BATMAN_QUEUE_LEN 256 @@ -97,10 +99,12 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt /* all messages related to routing / flooding / broadcasting / etc */ -#define DBG_BATMAN 1 -#define DBG_ROUTES 2 /* route added / changed / deleted */ -#define DBG_TT 4 /* translation table operations */ -#define DBG_ALL 7 +enum dbg_level { + DBG_BATMAN = 1 << 0, + DBG_ROUTES = 1 << 1, /* route added / changed / deleted */ + DBG_TT = 1 << 2, /* translation table operations */ + DBG_ALL = 7 +}; /* diff --git a/packet.h b/packet.h index 5e3e778..0c3e44d 100644 --- a/packet.h +++ b/packet.h @@ -24,44 +24,59 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ -#define BAT_PACKET 0x01 -#define BAT_ICMP 0x02 -#define BAT_UNICAST 0x03 -#define BAT_BCAST 0x04 -#define BAT_VIS 0x05 -#define BAT_UNICAST_FRAG 0x06 -#define BAT_TT_QUERY 0x07 -#define BAT_ROAM_ADV 0x08 +enum bat_packettype { + BAT_PACKET = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, + BAT_UNICAST_FRAG = 0x06, + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08 +}; /* this file is included by batctl which needs these defines */ #define COMPAT_VERSION 14 -#define DIRECTLINK 0x40 -#define VIS_SERVER 0x20 -#define PRIMARIES_FIRST_HOP 0x10 + +enum batman_flags { + PRIMARIES_FIRST_HOP = 1 << 4, + VIS_SERVER = 1 << 5, + DIRECTLINK = 1 << 6 +}; /* ICMP message types */ -#define ECHO_REPLY 0 -#define DESTINATION_UNREACHABLE 3 -#define ECHO_REQUEST 8 -#define TTL_EXCEEDED 11 -#define PARAMETER_PROBLEM 12 +enum icmp_packettype { + ECHO_REPLY = 0, + DESTINATION_UNREACHABLE = 3, + ECHO_REQUEST = 8, + TTL_EXCEEDED = 11, + PARAMETER_PROBLEM = 12 +}; /* vis defines */ -#define VIS_TYPE_SERVER_SYNC 0 -#define VIS_TYPE_CLIENT_UPDATE 1 +enum vis_packettype { + VIS_TYPE_SERVER_SYNC = 0, + VIS_TYPE_CLIENT_UPDATE = 1 +}; /* fragmentation defines */ -#define UNI_FRAG_HEAD 0x01 -#define UNI_FRAG_LARGETAIL 0x02 +enum unicast_frag_flags { + UNI_FRAG_HEAD = 1 << 0, + UNI_FRAG_LARGETAIL = 1 << 1 +}; /* TT_QUERY flags */ -#define TT_RESPONSE 0x01 -#define TT_REQUEST 0x02 -#define TT_FULL_TABLE 0x04 +enum tt_query_flags { + TT_RESPONSE = 1 << 0, + TT_REQUEST = 1 << 1, + TT_FULL_TABLE = 1 << 2 +}; /* TT_CHANGE flags */ -#define TT_CHANGE_DEL 0x01 -#define TT_CLIENT_ROAM 0x02 +enum tt_change_flags { + TT_CHANGE_DEL = 0x01, + TT_CLIENT_ROAM = 0x02 +}; struct batman_packet { uint8_t packet_type; -- 1.7.5.3

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Don't return value in void function
by Sven Eckelmann 05 Jun '11

05 Jun '11

gw_node_delete is defined with "void" as return type, but still tries to return a value. The called function gw_node_delete is also return as void and thus doesn't provide a value for us. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- gateway_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index ab597c4..cf7f95e 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -352,7 +352,7 @@ unlock: void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node) { - return gw_node_update(bat_priv, orig_node, 0); + gw_node_update(bat_priv, orig_node, 0); } void gw_node_purge(struct bat_priv *bat_priv) -- 1.7.5.3

2 6

[B.A.T.M.A.N.] [PATCH] batman-adv: modify TT_RESPONSE-full-table format
by Antonio Quartulli 05 Jun '11

05 Jun '11

In case of TT_REQUEST for a full table, the related TT_RESPONSE now carries a set of tt_change structures instead of pure MACs. This helps to keep the TT_RESPONSE format extensible. In particular, the flag field can be used for later purposes. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 99 +++++++++++++++++++++++++-------------------------- 1 files changed, 49 insertions(+), 50 deletions(-) diff --git a/translation-table.c b/translation-table.c index f04ab9b..3f30460 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1012,6 +1012,7 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, struct neigh_node *neigh_node = NULL; struct hard_iface *primary_if = NULL; struct tt_global_entry *tt_global_entry; + struct tt_change *tt_change; struct hlist_node *node; struct hlist_head *head; struct hashtable_t *hash; @@ -1086,14 +1087,14 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, spin_unlock_bh(&req_dst_orig_node->tt_buff_lock); } else { tt_len = (uint16_t)atomic_read(&req_dst_orig_node->tt_size) * - ETH_ALEN; + sizeof(struct tt_change); if (sizeof(struct tt_query_packet) + tt_len > primary_if->soft_iface->mtu) { tt_len = primary_if->soft_iface->mtu - sizeof(struct tt_query_packet); - tt_len -= tt_len % ETH_ALEN; + tt_len -= tt_len % sizeof(struct tt_change); } - tt_tot = tt_len / ETH_ALEN; + tt_tot = tt_len / sizeof(struct tt_change); skb = dev_alloc_skb(sizeof(struct tt_query_packet) + tt_len + ETH_HLEN); @@ -1106,7 +1107,8 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, tt_response->ttvn = (uint8_t) atomic_read(&req_dst_orig_node->last_ttvn); - tt_buff = skb->data + sizeof(struct tt_query_packet); + tt_change = (struct tt_change *)(skb->data + + sizeof(struct tt_query_packet)); /* Fill the packet with the orig_node's local table */ hash = bat_priv->tt_global_hash; tt_count = 0; @@ -1120,10 +1122,13 @@ static bool send_other_tt_response(struct bat_priv *bat_priv, break; if (tt_global_entry->orig_node == req_dst_orig_node) { - memcpy(tt_buff + tt_count * ETH_ALEN, + memcpy(tt_change->addr, tt_global_entry->addr, ETH_ALEN); + tt_change->flags = TT_CHANGE_ADD; + tt_count++; + tt_change++; } } } @@ -1173,6 +1178,7 @@ static bool send_my_tt_response(struct bat_priv *bat_priv, struct orig_node *orig_node = NULL; struct neigh_node *neigh_node = NULL; struct tt_local_entry *tt_local_entry; + struct tt_change *tt_change; struct hard_iface *primary_if = NULL; struct hlist_node *node; struct hlist_head *head; @@ -1238,14 +1244,14 @@ static bool send_my_tt_response(struct bat_priv *bat_priv, spin_unlock_bh(&bat_priv->tt_buff_lock); } else { tt_len = (uint16_t)atomic_read(&bat_priv->num_local_tt) * - ETH_ALEN; + sizeof(struct tt_change); if (sizeof(struct tt_query_packet) + tt_len > primary_if->soft_iface->mtu) { tt_len = primary_if->soft_iface->mtu - sizeof(struct tt_query_packet); - tt_len -= tt_len % ETH_ALEN; + tt_len -= tt_len % sizeof(struct tt_change); } - tt_tot = tt_len / ETH_ALEN; + tt_tot = tt_len / sizeof(struct tt_change); skb = dev_alloc_skb(sizeof(struct tt_query_packet) + tt_len + ETH_HLEN); @@ -1255,7 +1261,8 @@ static bool send_my_tt_response(struct bat_priv *bat_priv, skb_reserve(skb, ETH_HLEN); tt_response = (struct tt_query_packet *)skb_put(skb, sizeof(struct tt_query_packet) + tt_len); - tt_buff = skb->data + sizeof(struct tt_query_packet); + tt_change = (struct tt_change *)(skb->data + + sizeof(struct tt_query_packet)); /* Fill the packet with the local table */ tt_response->ttvn = (uint8_t)atomic_read(&bat_priv->ttvn); @@ -1270,10 +1277,12 @@ static bool send_my_tt_response(struct bat_priv *bat_priv, head, hash_entry) { if (tt_count == tt_tot) break; - memcpy(tt_buff + tt_count * ETH_ALEN, - tt_local_entry->addr, - ETH_ALEN); + memcpy(tt_change->addr, tt_local_entry->addr, + ETH_ALEN); + tt_change->flags = TT_CHANGE_ADD; + tt_count++; + tt_change++; } } rcu_read_unlock(); @@ -1323,23 +1332,30 @@ bool send_tt_response(struct bat_priv *bat_priv, return send_other_tt_response(bat_priv, tt_request); } -/* Substitute the TT response source's table with the newone carried by the - * packet */ -static void _tt_fill_gtable(struct bat_priv *bat_priv, - struct orig_node *orig_node, unsigned char *tt_buff, - uint16_t table_size, uint8_t ttvn) +static void _tt_update_changes(struct bat_priv *bat_priv, + struct orig_node *orig_node, + struct tt_change *tt_change, + uint16_t tt_num_changes, uint8_t ttvn) { - int count; - unsigned char *tt_ptr; - - for (count = 0; count < table_size; count++) { - tt_ptr = tt_buff + (count * ETH_ALEN); + int i; - /* If we fail to allocate a new entry we return immediatly */ - if (!tt_global_add(bat_priv, orig_node, tt_ptr, ttvn, false)) - return; + for (i = 0; i < tt_num_changes; i++) { + if ((tt_change + i)->flags & TT_CHANGE_DEL) + tt_global_del(bat_priv, orig_node, + (tt_change + i)->addr, + "tt removed by changes", + (tt_change + i)->flags & TT_CHANGE_ROAM); + else + if (!tt_global_add(bat_priv, orig_node, + (tt_change + i)->addr, ttvn, false)) + /* In case of problem while storing a + * global_entry, we stop the updating + * procedure without committing the + * ttvn change. This will avoid to send + * corrupted data on tt_request + */ + return; } - atomic_set(&orig_node->last_ttvn, ttvn); } static void tt_fill_gtable(struct bat_priv *bat_priv, @@ -1354,11 +1370,9 @@ static void tt_fill_gtable(struct bat_priv *bat_priv, /* Purge the old table first.. */ tt_global_del_orig(bat_priv, orig_node, "Received full table"); - _tt_fill_gtable(bat_priv, orig_node, - ((unsigned char *)tt_response) + - sizeof(struct tt_query_packet), - tt_response->tt_data, - tt_response->ttvn); + _tt_update_changes(bat_priv, orig_node, + (struct tt_change *)(tt_response + 1), + tt_response->tt_data, tt_response->ttvn); spin_lock_bh(&orig_node->tt_buff_lock); kfree(orig_node->tt_buff); @@ -1366,6 +1380,8 @@ static void tt_fill_gtable(struct bat_priv *bat_priv, orig_node->tt_buff = NULL; spin_unlock_bh(&orig_node->tt_buff_lock); + atomic_set(&orig_node->last_ttvn, tt_response->ttvn); + out: if (orig_node) orig_node_free_ref(orig_node); @@ -1375,25 +1391,8 @@ void tt_update_changes(struct bat_priv *bat_priv, struct orig_node *orig_node, uint16_t tt_num_changes, uint8_t ttvn, struct tt_change *tt_change) { - int i; - - for (i = 0; i < tt_num_changes; i++) { - if ((tt_change + i)->flags & TT_CHANGE_DEL) - tt_global_del(bat_priv, orig_node, - (tt_change + i)->addr, - "tt removed by changes", - (tt_change + i)->flags & TT_CHANGE_ROAM); - else - if (!tt_global_add(bat_priv, orig_node, - (tt_change + i)->addr, ttvn, false)) - /* In case of problem while storing a - * global_entry, we stop the updating - * procedure without committing the - * ttvn change. This will avoid to send - * corrupted data on tt_request - */ - return; - } + _tt_update_changes(bat_priv, orig_node, tt_change, tt_num_changes, + ttvn); tt_save_orig_buffer(bat_priv, orig_node, (unsigned char *)tt_change, tt_num_changes); -- 1.7.3.4

3 12

[B.A.T.M.A.N.] batman-adv 2011-05-30
by Sven Eckelmann 01 Jun '11

01 Jun '11

Hi, I would like to propose following patches for net-next-2.6/3.1 [1]. It is not really based on your net-next-2.6 tree, but directly on v3.0-rc1. I hope that this is ok - thought that you will merge that version anyway. Just wanted to get these patches out before doing the really work (reducing the amount of patches you get in a single pull request). Most patches are only cleanup patches - nothing really interesting. Antonio also moved the protocol specific seq_before/seq_after function to main.h like you told us [2]. Now he can use it in his translation table query patches (they are still moving, so he needs to hunt them down before I can submit them). thanks, Sven [1] wow, that sounds creepy [2] https://lkml.org/lkml/2011/5/19/88 The following changes since commit 55922c9d1b84b89cb946c777fddccb3247e7df2c: Linux 3.0-rc1 (2011-05-29 17:43:36 -0700) are available in the git repository at: git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (4): batman-adv: move neigh_node->if_incoming->if_status check in find_router() batman-adv: move smallest_signed_int(), seq_before() and seq_after() into main.h batman-adv: use is_broadcast_ether_addr() instead of compare_eth(.., brd_addr) batman-adv: a multiline comment should precede the variable it is describing Sven Eckelmann (13): batman-adv: Use kzalloc rather than kmalloc followed by memset with 0 batman-adv: Annotate functions with format strings batman-adv: Print jiffies as unsigned long batman-adv: Remove comparising < 0 for unsigned type batman-adv: Don't do pointer arithmetic with void* batman-adv: Add const type qualifier for pointers batman-adv: Only use int up and down gw representation batman-adv: Remove explicit casts cast from void* for store batman-adv: Remove casts from type x to type x batman-adv: Calculate sizeof using variable insead of types batman-adv: Use rcu_dereference_protected by update-side batman-adv: Check type of x and y in seq_(before|after) batman-adv: Ensure that we really have route changes in update_route net/batman-adv/aggregation.c | 23 +++++---- net/batman-adv/aggregation.h | 5 +- net/batman-adv/bat_debugfs.c | 11 ++-- net/batman-adv/bat_sysfs.c | 15 +++--- net/batman-adv/bitarray.c | 6 +- net/batman-adv/bitarray.h | 6 +- net/batman-adv/gateway_client.c | 19 ++++---- net/batman-adv/gateway_common.c | 19 ++++---- net/batman-adv/hard-interface.c | 25 +++++----- net/batman-adv/hard-interface.h | 6 ++- net/batman-adv/hash.c | 7 ++- net/batman-adv/hash.h | 6 +- net/batman-adv/icmp_socket.c | 4 +- net/batman-adv/main.c | 4 +- net/batman-adv/main.h | 30 ++++++++++-- net/batman-adv/originator.c | 12 ++-- net/batman-adv/originator.h | 14 +++--- net/batman-adv/ring_buffer.c | 4 +- net/batman-adv/ring_buffer.h | 2 +- net/batman-adv/routing.c | 54 +++++++++++----------- net/batman-adv/routing.h | 12 ++-- net/batman-adv/send.c | 44 +++++++++--------- net/batman-adv/send.h | 12 ++-- net/batman-adv/soft-interface.c | 22 ++++----- net/batman-adv/soft-interface.h | 4 +- net/batman-adv/translation-table.c | 44 +++++++++-------- net/batman-adv/translation-table.h | 13 +++-- net/batman-adv/types.h | 8 ++-- net/batman-adv/unicast.c | 30 +++++------- net/batman-adv/unicast.h | 8 ++-- net/batman-adv/vis.c | 91 +++++++++++++++--------------------- 31 files changed, 284 insertions(+), 276 deletions(-)

2 18

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