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

On branch : master

commit 692ed0dfac2c485763b367d525bdc6138e869b3a Author: Antonio Quartulli ordex@autistici.org Date: Tue May 28 14:06:06 2013 +0200

batman-adv: fix network order complaints in the TVLV code

Intorduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure")

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

692ed0dfac2c485763b367d525bdc6138e869b3a main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main.c b/main.c index 9df71bc..1192e61 100644 --- a/main.c +++ b/main.c @@ -630,7 +630,7 @@ static uint16_t batadv_tvlv_container_list_size(struct batadv_priv *bat_priv)

hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) { tvlv_len += sizeof(struct batadv_tvlv_hdr); - tvlv_len += tvlv->tvlv_hdr.len; + tvlv_len += ntohs(tvlv->tvlv_hdr.len); }

return tvlv_len; @@ -701,9 +701,9 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv,

tvlv_new->tvlv_hdr.version = version; tvlv_new->tvlv_hdr.type = type; - tvlv_new->tvlv_hdr.len = tvlv_value_len; + tvlv_new->tvlv_hdr.len = htons(tvlv_value_len);

- memcpy(tvlv_new + 1, tvlv_value, tvlv_new->tvlv_hdr.len); + memcpy(tvlv_new + 1, tvlv_value, ntohs(tvlv_new->tvlv_hdr.len)); INIT_HLIST_NODE(&tvlv_new->list); atomic_set(&tvlv_new->refcount, 1);

@@ -790,10 +790,10 @@ uint16_t batadv_tvlv_container_ogm_append(struct batadv_priv *bat_priv, tvlv_hdr = tvlv_value; tvlv_hdr->type = tvlv->tvlv_hdr.type; tvlv_hdr->version = tvlv->tvlv_hdr.version; - tvlv_hdr->len = htons(tvlv->tvlv_hdr.len); + tvlv_hdr->len = tvlv->tvlv_hdr.len; tvlv_value = tvlv_hdr + 1; - memcpy(tvlv_value, tvlv + 1, tvlv->tvlv_hdr.len); - tvlv_value = (uint8_t *)tvlv_value + tvlv->tvlv_hdr.len; + memcpy(tvlv_value, tvlv + 1, ntohs(tvlv->tvlv_hdr.len)); + tvlv_value = (uint8_t *)tvlv_value + ntohs(tvlv->tvlv_hdr.len); }

end: