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

Use the new shared ND-packet queue buffers

Browse source
This commit is contained in:
adamdunkels 2010-10-29 05:36:07 +00:00
parent 3c65b1d5bc
commit 5230e64112
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/net/tcpip.c
View file

@ -29,7 +29,7 @@
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* *
* $Id: tcpip.c,v 1.29 2010/10/24 21:05:42 adamdunkels Exp $ * $Id: tcpip.c,v 1.30 2010/10/29 05:36:07 adamdunkels Exp $
*/ */
/** /**
* \file * \file
@ -43,6 +43,8 @@
#include "net/uip-split.h" #include "net/uip-split.h"
#include "net/uip-packetqueue.h"
#include <string.h> #include <string.h>
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
@ -589,14 +591,18 @@ tcpip_ipv6_output(void)
} }
/* end of next hop determination */ /* end of next hop determination */
if((nbr = uip_ds6_nbr_lookup(nexthop)) == NULL) { if((nbr = uip_ds6_nbr_lookup(nexthop)) == NULL) {
// printf("add1 %d\n", nexthop->u8[15]);
if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE)) == NULL) { if((nbr = uip_ds6_nbr_add(nexthop, NULL, 0, NBR_INCOMPLETE)) == NULL) {
// printf("add n\n");
uip_len = 0; uip_len = 0;
return; return;
} else { } else {
#if UIP_CONF_IPV6_QUEUE_PKT #if UIP_CONF_IPV6_QUEUE_PKT
/* copy outgoing pkt in the queuing buffer for later transmmit */ /* copy outgoing pkt in the queuing buffer for later transmmit */
memcpy(nbr->queue_buf, UIP_IP_BUF, uip_len); if(uip_packetqueue_alloc(&nbr->packethandle, UIP_DS6_NBR_PACKET_LIFETIME) != NULL) {
nbr->queue_buf_len = uip_len; memcpy(uip_packetqueue_buf(&nbr->packethandle), UIP_IP_BUF, uip_len);
uip_packetqueue_set_buflen(&nbr->packethandle, uip_len);
}
#endif #endif
/* RFC4861, 7.2.2: /* RFC4861, 7.2.2:
* "If the source address of the packet prompting the solicitation is the * "If the source address of the packet prompting the solicitation is the
@ -619,8 +625,12 @@ tcpip_ipv6_output(void)
#if UIP_CONF_IPV6_QUEUE_PKT #if UIP_CONF_IPV6_QUEUE_PKT
/* copy outgoing pkt in the queuing buffer for later transmmit and set /* copy outgoing pkt in the queuing buffer for later transmmit and set
the destination nbr to nbr */ the destination nbr to nbr */
memcpy(nbr->queue_buf, UIP_IP_BUF, uip_len); if(uip_packetqueue_alloc(&nbr->packethandle, UIP_DS6_NBR_PACKET_LIFETIME) != NULL) {
nbr->queue_buf_len = uip_len; memcpy(uip_packetqueue_buf(&nbr->packethandle), UIP_IP_BUF, uip_len);
uip_packetqueue_set_buflen(&nbr->packethandle, uip_len);
}
/* memcpy(nbr->queue_buf, UIP_IP_BUF, uip_len);
nbr->queue_buf_len = uip_len;*/
uip_len = 0; uip_len = 0;
#endif /*UIP_CONF_IPV6_QUEUE_PKT*/ #endif /*UIP_CONF_IPV6_QUEUE_PKT*/
return; return;
@ -648,11 +658,17 @@ tcpip_ipv6_output(void)
* NA after sendiong a NS, you receive a NS with SLLAO: the entry moves * NA after sendiong a NS, you receive a NS with SLLAO: the entry moves
*to STALE, and you must both send a NA and the queued packet *to STALE, and you must both send a NA and the queued packet
*/ */
if(nbr->queue_buf_len != 0) { /* if(nbr->queue_buf_len != 0) {
uip_len = nbr->queue_buf_len; uip_len = nbr->queue_buf_len;
memcpy(UIP_IP_BUF, nbr->queue_buf, uip_len); memcpy(UIP_IP_BUF, nbr->queue_buf, uip_len);
nbr->queue_buf_len = 0; nbr->queue_buf_len = 0;
tcpip_output(&(nbr->lladdr)); tcpip_output(&(nbr->lladdr));
}*/
if(uip_packetqueue_buflen(&nbr->packethandle) != 0) {
uip_len = uip_packetqueue_buflen(&nbr->packethandle);
memcpy(UIP_IP_BUF, uip_packetqueue_buf(&nbr->packethandle), uip_len);
uip_packetqueue_free(&nbr->packethandle);
tcpip_output(&(nbr->lladdr));
} }
#endif /*UIP_CONF_IPV6_QUEUE_PKT*/ #endif /*UIP_CONF_IPV6_QUEUE_PKT*/