abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

lwip: fix broken default ICMPv6 handling of checksums.

Browse Source 
ICMPv6 should always have checksum generated for it as per RFC 3542
chapter 3.1.

(cherry picked from commit 5e9df2c6988f8e00185e793205f371fe817714e9)
This commit is contained in:
Knut Andre Tidemann 2017-01-11 12:11:20 +01:00 committed by goldsimon
parent cb97e27120
commit 2694486309
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/api_msg.c
View File

@ -53,6 +53,7 @@
#include "lwip/dns.h" #include "lwip/dns.h"
#include "lwip/mld6.h" #include "lwip/mld6.h"
#include "lwip/priv/tcpip_priv.h" #include "lwip/priv/tcpip_priv.h"
#include "lwip/sockets.h"
#include <string.h> #include <string.h>
@ -562,6 +563,13 @@ pcb_new(struct api_msg *msg)
case NETCONN_RAW: case NETCONN_RAW:
msg->conn->pcb.raw = raw_new_ip_type(iptype, msg->msg.n.proto); msg->conn->pcb.raw = raw_new_ip_type(iptype, msg->msg.n.proto);
if (msg->conn->pcb.raw != NULL) { if (msg->conn->pcb.raw != NULL) {
#if LWIP_IPV6
/* ICMPv6 packets should always have checksum calculated by the stack as per RFC 3542 chapter 3.1 */
if (NETCONNTYPE_ISIPV6(msg->conn->type) && msg->conn->pcb.raw->protocol == IPPROTO_ICMPV6) {
msg->conn->pcb.raw->chksum_reqd = 1;
msg->conn->pcb.raw->chksum_offset = 2;
}
#endif /* LWIP_IPV6 */
raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn); raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
} }
break; break;

6
src/api/sockets.c
View File

@ -2574,6 +2574,12 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_
switch (optname) { switch (optname) {
#if LWIP_IPV6 && LWIP_RAW #if LWIP_IPV6 && LWIP_RAW
case IPV6_CHECKSUM: case IPV6_CHECKSUM:
/* It should not be possible to disable the checksum generation with ICMPv6
* as per RFC 3542 chapter 3.1 */
if(sock->conn->pcb.raw->protocol == IPPROTO_ICMPV6) {
return EINVAL;
}
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_RAW); LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_RAW);
if (*(const int *)optval < 0) { if (*(const int *)optval < 0) {
sock->conn->pcb.raw->chksum_reqd = 0; sock->conn->pcb.raw->chksum_reqd = 0;