batman-adv: correctly set the data field in the TT_REPONSE message

Message ID 1318513370-9868-1-git-send-email-ordex@autistici.org (mailing list archive)
State Accepted, archived
Commit ff7887c2e9ee76a9a5c22e25bf6e46cdcdcd46eb
Headers

Commit Message

Antonio Quartulli Oct. 13, 2011, 1:42 p.m. UTC
  In the TT_RESPONSE message, the number of carried entries was not correctly set.
In case of TT_QUERY message of type TT_RESPONSE the data field represents the
number of entries that are going to be sent. Such number has to be set *after*
counting the number of successfully copied entries.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 translation-table.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
  

Patch

diff --git a/translation-table.c b/translation-table.c
index 6102cd2..b3e670b 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -1050,7 +1050,6 @@  static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
 	tt_response = (struct tt_query_packet *)skb_put(skb,
 						     tt_query_size + tt_len);
 	tt_response->ttvn = ttvn;
-	tt_response->tt_data = htons(tt_tot);
 
 	tt_change = (struct tt_change *)(skb->data + tt_query_size);
 	tt_count = 0;
@@ -1076,6 +1075,10 @@  static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
 	}
 	rcu_read_unlock();
 
+	/* store in the message the number of entries we have successfully
+	 * copied */
+	tt_response->tt_data = htons(tt_count);
+
 out:
 	return skb;
 }