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

Set stream bit only on non-FIN TCP segments

Browse source
This commit is contained in:
adamdunkels 2010-04-01 10:01:01 +00:00
parent b43f7830b3
commit 5b121b4829
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/sicslowpan.c
View file

@ -32,7 +32,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: sicslowpan.c,v 1.35 2010/03/29 11:48:09 fros4943 Exp $ * $Id: sicslowpan.c,v 1.36 2010/04/01 10:01:01 adamdunkels Exp $
*/ */
/** /**
* \file * \file
@ -157,6 +157,7 @@ void uip_log(char *msg);
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLIPH_LEN])
#define UIP_TCP_BUF ((struct uip_tcp_hdr *)&uip_buf[UIP_LLIPH_LEN])
/** @} */ /** @} */
@ -1342,10 +1343,12 @@ output(uip_lladdr_t *localdest)
rime_ptr = packetbuf_dataptr(); rime_ptr = packetbuf_dataptr();
packetbuf_set_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS, 3); packetbuf_set_attr(PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS, 3);
if(UIP_IP_BUF->proto == UIP_PROTO_TCP) { /* Set stream mode for all TCP packets, except FIN packets. */
/* packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE, if(UIP_IP_BUF->proto == UIP_PROTO_TCP &&
PACKETBUF_ATTR_PACKET_TYPE_STREAM);*/ (UIP_TCP_BUF->flags & TCP_FIN) == 0) {
packetbuf_set_attr(PACKETBUF_ATTR_PACKET_TYPE,
PACKETBUF_ATTR_PACKET_TYPE_STREAM);
} }
/* /*
@ -1533,7 +1536,7 @@ input(void)
PRINTFI("size %d, tag %d, offset %d)\n", PRINTFI("size %d, tag %d, offset %d)\n",
frag_size, frag_tag, frag_offset); frag_size, frag_tag, frag_offset);
rime_hdr_len += SICSLOWPAN_FRAG1_HDR_LEN; rime_hdr_len += SICSLOWPAN_FRAG1_HDR_LEN;
/* printf("frag1 %d %d\n", reass_tag, frag_tag);*/
break; break;
case SICSLOWPAN_DISPATCH_FRAGN: case SICSLOWPAN_DISPATCH_FRAGN:
/* /*
@ -1557,6 +1560,7 @@ input(void)
if(processed_ip_len > 0) { if(processed_ip_len > 0) {
/* reassembly is ongoing */ /* reassembly is ongoing */
/* printf("frag %d %d\n", reass_tag, frag_tag);*/
if((frag_size > 0 && if((frag_size > 0 &&
(frag_size != sicslowpan_len || (frag_size != sicslowpan_len ||
reass_tag != frag_tag || reass_tag != frag_tag ||