We need to memorize the MCA information attached to the OGMs to be able to prepare the tracker packets with them later.
Signed-off-by: Linus Lüssing <[email protected]> --- originator.c | 7 ++++++- routing.c | 40 +++++++++++++++++++++++++++++++++++++--- routing.h | 2 +- types.h | 2 ++ 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/batman-adv/originator.c b/batman-adv/originator.c index e8a8473..637d5f1 100644 --- a/batman-adv/originator.c +++ b/batman-adv/originator.c @@ -139,6 +139,8 @@ void orig_node_free_ref(struct kref *refcount) hna_global_del_orig(orig_node->bat_priv, orig_node, "originator timed out"); + kfree(orig_node->mca_buff); + kfree(orig_node->bcast_own); kfree(orig_node->bcast_own_sum); kfree(orig_node); @@ -228,6 +230,8 @@ struct orig_node *get_orig_node(struct bat_priv *bat_priv, uint8_t *addr) memcpy(orig_node->orig, addr, ETH_ALEN); orig_node->router = NULL; orig_node->hna_buff = NULL; + orig_node->mca_buff = NULL; + orig_node->num_mca = 0; orig_node->bcast_seqno_reset = jiffies - 1 - msecs_to_jiffies(RESET_PROTECTION_MS); orig_node->batman_seqno_reset = jiffies - 1 @@ -341,7 +345,8 @@ static bool purge_orig_node(struct bat_priv *bat_priv, update_routes(bat_priv, orig_node, best_neigh_node, orig_node->hna_buff, - orig_node->hna_buff_len); + orig_node->hna_buff_len, + orig_node->mca_buff, orig_node->num_mca); } } diff --git a/batman-adv/routing.c b/batman-adv/routing.c index 2861f18..81719d9 100644 --- a/batman-adv/routing.c +++ b/batman-adv/routing.c @@ -85,6 +85,34 @@ static void update_HNA(struct bat_priv *bat_priv, struct orig_node *orig_node, } } +/* Copy the mca buffer again if something has changed */ +static void update_MCA(struct orig_node *orig_node, + unsigned char *mca_buff, int num_mca) +{ + /* numbers differ? then reallocate buffer */ + if (num_mca != orig_node->num_mca) { + kfree(orig_node->mca_buff); + if (num_mca > 0) { + orig_node->mca_buff = + kmalloc(num_mca * ETH_ALEN, GFP_ATOMIC); + if (orig_node->mca_buff) + goto update; + } + orig_node->mca_buff = NULL; + orig_node->num_mca = 0; + /* size ok, just update? */ + } else if (num_mca > 0 && + memcmp(orig_node->mca_buff, mca_buff, num_mca * ETH_ALEN)) + goto update; + + /* it's the same, leave it like that */ + return; + +update: + memcpy(orig_node->mca_buff, mca_buff, num_mca * ETH_ALEN); + orig_node->num_mca = num_mca; +} + static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node, @@ -129,7 +157,7 @@ static void update_route(struct bat_priv *bat_priv, void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_buff, - int hna_buff_len) + int hna_buff_len, unsigned char *mca_buff, int num_mca) { if (!orig_node) @@ -141,6 +169,8 @@ void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, /* may be just HNA changed */ else update_HNA(bat_priv, orig_node, hna_buff, hna_buff_len); + + update_MCA(orig_node, mca_buff, num_mca); } static int is_bidirectional_neigh(struct orig_node *orig_node, @@ -374,6 +404,7 @@ static void update_orig(struct bat_priv *bat_priv, struct hlist_node *node; int tmp_hna_buff_len; uint8_t bcast_own_sum_orig, bcast_own_sum_neigh; + unsigned char *mca_buff; bat_dbg(DBG_BATMAN, bat_priv, "update_originator(): " "Searching and updating originator entry of received packet\n"); @@ -433,6 +464,7 @@ static void update_orig(struct bat_priv *bat_priv, tmp_hna_buff_len = (hna_buff_len > batman_packet->num_hna * ETH_ALEN ? batman_packet->num_hna * ETH_ALEN : hna_buff_len); + mca_buff = (char *)batman_packet + BAT_PACKET_LEN + tmp_hna_buff_len; /* if this neighbor already is our next hop there is nothing * to change */ @@ -465,12 +497,14 @@ static void update_orig(struct bat_priv *bat_priv, } update_routes(bat_priv, orig_node, neigh_node, - hna_buff, tmp_hna_buff_len); + hna_buff, tmp_hna_buff_len, mca_buff, + batman_packet->num_mca); goto update_gw; update_hna: update_routes(bat_priv, orig_node, orig_node->router, - hna_buff, tmp_hna_buff_len); + hna_buff, tmp_hna_buff_len, mca_buff, + batman_packet->num_mca); update_gw: if (orig_node->gw_flags != batman_packet->gw_flags) diff --git a/batman-adv/routing.h b/batman-adv/routing.h index 8b76424..d138644 100644 --- a/batman-adv/routing.h +++ b/batman-adv/routing.h @@ -31,7 +31,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_if *if_incoming); void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_buff, - int hna_buff_len); + int hna_buff_len, unsigned char *mca_buff, int num_mca); int route_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if, int hdr_size); int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if); diff --git a/batman-adv/types.h b/batman-adv/types.h index 6bd74c1..f24798e 100644 --- a/batman-adv/types.h +++ b/batman-adv/types.h @@ -77,6 +77,8 @@ struct orig_node { uint8_t flags; unsigned char *hna_buff; int16_t hna_buff_len; + unsigned char *mca_buff; + uint8_t num_mca; uint32_t last_real_seqno; uint8_t last_ttl; unsigned long bcast_bits[NUM_WORDS]; -- 1.7.2.3
