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

Fixed IPv6 compilation problems

Browse source
This commit is contained in:
adamdunkels 2009-03-07 09:32:41 +00:00
parent 0a12098bd5
commit 4519f07a9b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/shell/shell-ping.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: shell-ping.c,v 1.1 2009/03/06 00:29:33 adamdunkels Exp $ * $Id: shell-ping.c,v 1.2 2009/03/07 09:32:41 adamdunkels Exp $
*/ */
#include <string.h> #include <string.h>
@ -65,12 +65,13 @@ static void
send_ping(uip_ipaddr_t *dest_addr) send_ping(uip_ipaddr_t *dest_addr)
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
{ {
static uint16_t count;
UIP_IP_BUF->vtc = 0x60; UIP_IP_BUF->vtc = 0x60;
UIP_IP_BUF->tcflow = 1; UIP_IP_BUF->tcflow = 1;
UIP_IP_BUF->flow = 0; UIP_IP_BUF->flow = 0;
UIP_IP_BUF->proto = UIP_PROTO_ICMP6; UIP_IP_BUF->proto = UIP_PROTO_ICMP6;
UIP_IP_BUF->ttl = uip_netif_physical_if.cur_hop_limit; UIP_IP_BUF->ttl = uip_netif_physical_if.cur_hop_limit;
uip_ipaddr_copy(&UIP_IP_BUF->destipaddr, &dest_addr); uip_ipaddr_copy(&UIP_IP_BUF->destipaddr, dest_addr);
uip_netif_select_src(&UIP_IP_BUF->srcipaddr, &UIP_IP_BUF->destipaddr); uip_netif_select_src(&UIP_IP_BUF->srcipaddr, &UIP_IP_BUF->destipaddr);
UIP_ICMP_BUF->type = ICMP6_ECHO_REQUEST; UIP_ICMP_BUF->type = ICMP6_ECHO_REQUEST;
@ -80,7 +81,7 @@ send_ping(uip_ipaddr_t *dest_addr)
/* put one byte of data */ /* put one byte of data */
memset((void *)UIP_ICMP_BUF + UIP_ICMPH_LEN + UIP_ICMP6_ECHO_REQUEST_LEN, memset((void *)UIP_ICMP_BUF + UIP_ICMPH_LEN + UIP_ICMP6_ECHO_REQUEST_LEN,
count, PING_DATALEN); count, PING_DATALEN);
count++;
uip_len = UIP_ICMPH_LEN + UIP_ICMP6_ECHO_REQUEST_LEN + uip_len = UIP_ICMPH_LEN + UIP_ICMP6_ECHO_REQUEST_LEN +
UIP_IPH_LEN + PING_DATALEN; UIP_IPH_LEN + PING_DATALEN;