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

tapdev update for uIPv6

Browse source
This commit is contained in:
julienabeille 2008-10-14 14:38:10 +00:00
parent 08465a6c19
commit 085df124fd
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cpu/native/net/tapdev-drv.c
View file

@ -28,28 +28,34 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: tapdev-drv.c,v 1.4 2007/08/10 14:59:59 oliverschmidt Exp $ * @(#)$Id: tapdev-drv.c,v 1.5 2008/10/14 14:38:10 julienabeille Exp $
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#if UIP_CONF_IPV6
#include "tapdev6.h"
#else
#include "tapdev.h" #include "tapdev.h"
#include "net/uip-neighbor.h" #endif /* UIP_CONF_IPV6 */
#include "tapdev-drv.h" #include "tapdev-drv.h"
#define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
#define IPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
PROCESS(tapdev_process, "TAP driver"); PROCESS(tapdev_process, "TAP driver");
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if !UIP_CONF_IPV6
u8_t u8_t
tapdev_output(void) tapdev_output(void)
{ {
uip_arp_out(); uip_arp_out();
tapdev_send(); tapdev_send();
return 0; return 0;
} }
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
pollhandler(void) pollhandler(void)
@ -60,7 +66,6 @@ pollhandler(void)
if(uip_len > 0) { if(uip_len > 0) {
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
if(BUF->type == htons(UIP_ETHTYPE_IPV6)) { if(BUF->type == htons(UIP_ETHTYPE_IPV6)) {
uip_neighbor_add(&IPBUF->srcipaddr, &BUF->src);
tcpip_input(); tcpip_input();
} else } else
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
@ -68,6 +73,7 @@ pollhandler(void)
uip_len -= sizeof(struct uip_eth_hdr); uip_len -= sizeof(struct uip_eth_hdr);
tcpip_input(); tcpip_input();
} else if(BUF->type == htons(UIP_ETHTYPE_ARP)) { } else if(BUF->type == htons(UIP_ETHTYPE_ARP)) {
#if !UIP_CONF_IPV6 //math
uip_arp_arpin(); uip_arp_arpin();
/* If the above function invocation resulted in data that /* If the above function invocation resulted in data that
should be sent out on the network, the global variable should be sent out on the network, the global variable
@ -75,6 +81,9 @@ pollhandler(void)
if(uip_len > 0) { if(uip_len > 0) {
tapdev_send(); tapdev_send();
} }
#endif
} else {
uip_len = 0;
} }
} }
} }
@ -86,9 +95,11 @@ PROCESS_THREAD(tapdev_process, ev, data)
PROCESS_BEGIN(); PROCESS_BEGIN();
tapdev_init(); tapdev_init();
#if !UIP_CONF_IPV6
tcpip_set_outputfunc(tapdev_output); tcpip_set_outputfunc(tapdev_output);
#else
tcpip_set_outputfunc(tapdev_send);
#endif
process_poll(&tapdev_process); process_poll(&tapdev_process);
PROCESS_WAIT_UNTIL(ev == PROCESS_EVENT_EXIT); PROCESS_WAIT_UNTIL(ev == PROCESS_EVENT_EXIT);