deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rewrote the netif time code so that is avoids the use of floating point numbers; some code style fixes

Browse source
This commit is contained in:
adamdunkels 2010-02-02 16:32:03 +00:00
parent 88fb1c80c9
commit 88c661b0c2
2 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/net/uip-nd6.h
View file

@ -89,8 +89,8 @@
#define UIP_ND6_REACHABLE_TIME 30000 #define UIP_ND6_REACHABLE_TIME 30000
#define UIP_ND6_RETRANS_TIMER 1000 #define UIP_ND6_RETRANS_TIMER 1000
#define UIP_ND6_DELAY_FIRST_PROBE_TIME 5 #define UIP_ND6_DELAY_FIRST_PROBE_TIME 5
#define UIP_ND6_MIN_RANDOM_FACTOR 0.5 #define UIP_ND6_MIN_RANDOM_FACTOR(x) (x / 2)
#define UIP_ND6_MAX_RANDOM_FACTOR 1.5 #define UIP_ND6_MAX_RANDOM_FACTOR(x) ((x) + (x) / 2)
/** @} */ /** @} */
@ -171,7 +171,7 @@ typedef enum {
* @{ * @{
*/ */
/** \brief An entry in the neighbor cache */ /** \brief An entry in the neighbor cache */
struct uip_nd6_neighbor{ struct uip_nd6_neighbor {
uip_ipaddr_t ipaddr; uip_ipaddr_t ipaddr;
uip_lladdr_t lladdr; uip_lladdr_t lladdr;
u8_t isrouter; u8_t isrouter;

33
core/net/uip-netif.c
View file

@ -118,8 +118,9 @@ uip_netif_init(void)
uip_netif_physical_if.addresses[0].is_infinite = 1; uip_netif_physical_if.addresses[0].is_infinite = 1;
/* set all other addresses to NOT_USED initialy */ /* set all other addresses to NOT_USED initialy */
for(i = 1; i < UIP_CONF_NETIF_MAX_ADDRESSES; i ++) for(i = 1; i < UIP_CONF_NETIF_MAX_ADDRESSES; i ++) {
uip_netif_physical_if.addresses[i].state = NOT_USED; uip_netif_physical_if.addresses[i].state = NOT_USED;
}
uip_ip6addr_u8(&(uip_netif_physical_if.solicited_node_mcastaddr), uip_ip6addr_u8(&(uip_netif_physical_if.solicited_node_mcastaddr),
0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff,
@ -135,11 +136,10 @@ uip_netif_init(void)
/* Reset the timer */ /* Reset the timer */
etimer_set(&uip_netif_timer_periodic, CLOCK_SECOND); etimer_set(&uip_netif_timer_periodic, CLOCK_SECOND);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_periodic(void) { uip_netif_periodic(void)
{
for(i = 1; i < UIP_CONF_NETIF_MAX_ADDRESSES; i++) { for(i = 1; i < UIP_CONF_NETIF_MAX_ADDRESSES; i++) {
if((uip_netif_physical_if.addresses[i].state != NOT_USED) && if((uip_netif_physical_if.addresses[i].state != NOT_USED) &&
(uip_netif_physical_if.addresses[i].is_infinite != 1) && (uip_netif_physical_if.addresses[i].is_infinite != 1) &&
@ -155,10 +155,11 @@ uip_netif_periodic(void) {
u32_t u32_t
uip_netif_compute_reachable_time(void) uip_netif_compute_reachable_time(void)
{ {
return (u32_t)(uip_netif_physical_if.base_reachable_time * UIP_ND6_MIN_RANDOM_FACTOR) + ((u16_t)(random_rand() << 8) + (u16_t)random_rand()) % (u32_t)(uip_netif_physical_if.base_reachable_time *(UIP_ND6_MAX_RANDOM_FACTOR - UIP_ND6_MIN_RANDOM_FACTOR)); return (u32_t)(UIP_ND6_MIN_RANDOM_FACTOR(uip_netif_physical_if.base_reachable_time)) +
((u16_t)(random_rand() << 8) + (u16_t)random_rand()) %
(u32_t)(UIP_ND6_MAX_RANDOM_FACTOR(uip_netif_physical_if.base_reachable_time) -
UIP_ND6_MIN_RANDOM_FACTOR(uip_netif_physical_if.base_reachable_time));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
u8_t u8_t
uip_netif_is_addr_my_solicited(uip_ipaddr_t *ipaddr) uip_netif_is_addr_my_solicited(uip_ipaddr_t *ipaddr)
@ -170,7 +171,8 @@ uip_netif_is_addr_my_solicited(uip_ipaddr_t *ipaddr)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
struct uip_netif_addr * struct uip_netif_addr *
uip_netif_addr_lookup(uip_ipaddr_t *ipaddr, u8_t length, uip_netif_type type) { uip_netif_addr_lookup(uip_ipaddr_t *ipaddr, u8_t length, uip_netif_type type)
{
for(i = 0; i < UIP_CONF_NETIF_MAX_ADDRESSES; i ++) { for(i = 0; i < UIP_CONF_NETIF_MAX_ADDRESSES; i ++) {
if((uip_netif_physical_if.addresses[i].state != NOT_USED) && if((uip_netif_physical_if.addresses[i].state != NOT_USED) &&
(uip_netif_physical_if.addresses[i].type == type || type == 0) && (uip_netif_physical_if.addresses[i].type == type || type == 0) &&
@ -180,7 +182,6 @@ uip_netif_addr_lookup(uip_ipaddr_t *ipaddr, u8_t length, uip_netif_type type) {
} }
return NULL; return NULL;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_addr_add(uip_ipaddr_t *ipaddr, u8_t length, unsigned long vlifetime, uip_netif_type type) { uip_netif_addr_add(uip_ipaddr_t *ipaddr, u8_t length, unsigned long vlifetime, uip_netif_type type) {
@ -231,8 +232,6 @@ uip_netif_addr_add(uip_ipaddr_t *ipaddr, u8_t length, unsigned long vlifetime, u
UIP_LOG("ADDRESS LIST FULL"); UIP_LOG("ADDRESS LIST FULL");
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
@ -255,8 +254,6 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
exit(-1); exit(-1);
#endif #endif
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
u8_t u8_t
get_match_length(uip_ipaddr_t *src, uip_ipaddr_t *dst) get_match_length(uip_ipaddr_t *src, uip_ipaddr_t *dst)
@ -282,8 +279,6 @@ get_match_length(uip_ipaddr_t *src, uip_ipaddr_t *dst)
} }
return len; return len;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst) uip_netif_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst)
@ -307,8 +302,6 @@ uip_netif_select_src(uip_ipaddr_t *src, uip_ipaddr_t *dst)
uip_ipaddr_copy(src, &(uip_netif_physical_if.addresses[index].ipaddr)); uip_ipaddr_copy(src, &(uip_netif_physical_if.addresses[index].ipaddr));
return; return;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_sched_dad(struct uip_netif_addr *ifaddr) uip_netif_sched_dad(struct uip_netif_addr *ifaddr)
@ -335,8 +328,6 @@ uip_netif_sched_dad(struct uip_netif_addr *ifaddr)
etimer_set(&uip_netif_timer_dad, random_rand()%(UIP_ND6_MAX_RTR_SOLICITATION_DELAY * CLOCK_SECOND)); etimer_set(&uip_netif_timer_dad, random_rand()%(UIP_ND6_MAX_RTR_SOLICITATION_DELAY * CLOCK_SECOND));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_dad(void) uip_netif_dad(void)
@ -390,8 +381,6 @@ uip_netif_dad(void)
} }
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_dad_failed(uip_ipaddr_t *ipaddr) uip_netif_dad_failed(uip_ipaddr_t *ipaddr)
@ -410,8 +399,6 @@ uip_netif_dad_failed(uip_ipaddr_t *ipaddr)
exit(-1); exit(-1);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
uip_netif_sched_send_rs(void) uip_netif_sched_send_rs(void)