Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 0ff0af1165f9d2156805a4a16202ab7e0c830b81 Author: Antonio Quartulli ordex@autistici.org Date: Thu Apr 18 15:13:01 2013 +0200

batman-adv: pass a 16bit long flag argument to tt_global_add()

it may be the case that we want to store some local TT client flags in a global entry, therefore the tt_global_add needs to get a proper argument for this

Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

0ff0af1165f9d2156805a4a16202ab7e0c830b81 translation-table.c | 19 +++++++++++++++++-- translation-table.h | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/translation-table.c b/translation-table.c index 52808c4..e272f68 100644 --- a/translation-table.c +++ b/translation-table.c @@ -798,10 +798,25 @@ out: batadv_tt_orig_list_entry_free_ref(orig_entry); }

-/* caller must hold orig_node refcount */ +/** + * batadv_tt_global_add - add a new TT global entry or update an existing one + * @bat_priv: the bat priv with all the soft interface information + * @orig_node: the originator announcing the client + * @tt_addr: the mac address of the non-mesh client + * @flags: TT flags that have to be set for this non-mesh client + * @ttvn: the tt version number ever announcing this non-mesh client + * + * Add a new TT global entry for the given originator. If the entry already + * exists add a new reference to the given originator (a global entry can have + * references to multiple originators) and adjust the flags attribute to reflect + * the function argument. + * If a TT local entry exists for this non-mesh client remove it. + * + * The caller must hold orig_node refcount. + */ int batadv_tt_global_add(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, - const unsigned char *tt_addr, uint8_t flags, + const unsigned char *tt_addr, uint16_t flags, uint8_t ttvn) { struct batadv_tt_global_entry *tt_global_entry; diff --git a/translation-table.h b/translation-table.h index ab8e683..659a3bb 100644 --- a/translation-table.h +++ b/translation-table.h @@ -33,7 +33,7 @@ void batadv_tt_global_add_orig(struct batadv_priv *bat_priv, const unsigned char *tt_buff, int tt_buff_len); int batadv_tt_global_add(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, - const unsigned char *addr, uint8_t flags, + const unsigned char *addr, uint16_t flags, uint8_t ttvn); int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,