From 1b3c2da7ab1ea258edb0be5fb1407627c5f1f2f6 Mon Sep 17 00:00:00 2001 From: bg- Date: Wed, 9 May 2007 13:45:16 +0000 Subject: [PATCH] * Make it explicit that some seqno:s are in host byte order by naming them hseqno. * Change uaodv_rt_add to take argument in (standard) network byte order (and change it to be a pointer). --- core/net/uaodv-rt.c | 6 +++--- core/net/uaodv-rt.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/net/uaodv-rt.c b/core/net/uaodv-rt.c index 21954e534..2ebeae898 100644 --- a/core/net/uaodv-rt.c +++ b/core/net/uaodv-rt.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: uaodv-rt.c,v 1.4 2007/05/08 08:30:49 bg- Exp $ + * $Id: uaodv-rt.c,v 1.5 2007/05/09 13:45:41 bg- Exp $ */ /** @@ -62,7 +62,7 @@ uaodv_rt_init(void) /*---------------------------------------------------------------------------*/ struct uaodv_rt_entry * uaodv_rt_add(uip_ipaddr_t *dest, uip_ipaddr_t *nexthop, - unsigned hop_count, u32_t seqno) + unsigned hop_count, const u32_t *seqno) { struct uaodv_rt_entry *e; @@ -81,7 +81,7 @@ uaodv_rt_add(uip_ipaddr_t *dest, uip_ipaddr_t *nexthop, uip_ipaddr_copy(&e->dest, dest); uip_ipaddr_copy(&e->nexthop, nexthop); e->hop_count = hop_count; - e->seqno = seqno; + e->hseqno = ntohl(*seqno); e->is_bad = 0; /* New entry goes first. */ diff --git a/core/net/uaodv-rt.h b/core/net/uaodv-rt.h index 0036eecf1..bf8876246 100644 --- a/core/net/uaodv-rt.h +++ b/core/net/uaodv-rt.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: uaodv-rt.h,v 1.3 2007/05/08 08:31:09 bg- Exp $ + * $Id: uaodv-rt.h,v 1.4 2007/05/09 13:45:16 bg- Exp $ */ /** @@ -47,14 +47,14 @@ struct uaodv_rt_entry { struct uaodv_rt_entry *next; uip_ipaddr_t dest; uip_ipaddr_t nexthop; - u32_t seqno; + u32_t hseqno; /* In host byte order! */ u8_t hop_count; - u8_t is_bad; /* one bit used */ + u8_t is_bad; /* Only one bit is used. */ }; struct uaodv_rt_entry * uaodv_rt_add(uip_ipaddr_t *dest, uip_ipaddr_t *nexthop, - unsigned hop_count, u32_t seqno); + unsigned hop_count, const u32_t *seqno); struct uaodv_rt_entry *uaodv_rt_lookup_any(uip_ipaddr_t *dest); struct uaodv_rt_entry *uaodv_rt_lookup(uip_ipaddr_t *dest); void uaodv_rt_remove(struct uaodv_rt_entry *e);