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

Merge pull request #898 from g-oikonomou/tcp-rst-fix

Browse source 
Fill IPv6->Next-Hdr field for outgoing RSTs
This commit is contained in:
Adam Dunkels 2014-12-09 10:48:29 +01:00
parent ed1ae2eba4 ffc27061fe
commit 72679a819b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/ipv4/uip.c
View file

@ -1875,8 +1875,6 @@ uip_process(uint8_t flag)
BUF->seqno[2] = uip_connr->snd_nxt[2];
BUF->seqno[3] = uip_connr->snd_nxt[3];
BUF->proto = UIP_PROTO_TCP;
BUF->srcport = uip_connr->lport;
BUF->destport = uip_connr->rport;
@ -1893,6 +1891,8 @@ uip_process(uint8_t flag)
}
tcp_send_noconn:
BUF->proto = UIP_PROTO_TCP;
BUF->ttl = UIP_TTL;
#if NETSTACK_CONF_WITH_IPV6
/* For IPv6, the IP length field does not include the IPv6 IP header

4
core/net/ipv6/uip6.c
View file

@ -2239,8 +2239,6 @@ uip_process(uint8_t flag)
UIP_TCP_BUF->seqno[2] = uip_connr->snd_nxt[2];
UIP_TCP_BUF->seqno[3] = uip_connr->snd_nxt[3];
UIP_IP_BUF->proto = UIP_PROTO_TCP;
UIP_TCP_BUF->srcport = uip_connr->lport;
UIP_TCP_BUF->destport = uip_connr->rport;
@ -2262,6 +2260,8 @@ uip_process(uint8_t flag)
}
tcp_send_noconn:
UIP_IP_BUF->proto = UIP_PROTO_TCP;
UIP_IP_BUF->ttl = uip_ds6_if.cur_hop_limit;
UIP_IP_BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
UIP_IP_BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);