From a856bc0bcce41a82f191b01256ae93966b46214c Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Thu, 14 May 2015 17:17:00 +0200
Subject: [PATCH] Get SCTP/IPv6 working on Linux.
This disables the IPv6 payload length check for now, similar to the
hack for IPv4. Will add a fix later.
---
gtests/net/packetdrill/run_packet.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/gtests/net/packetdrill/run_packet.c b/gtests/net/packetdrill/run_packet.c
index d6fd27eb..4278dcb3 100644
--- a/gtests/net/packetdrill/run_packet.c
+++ b/gtests/net/packetdrill/run_packet.c
@@ -980,8 +980,8 @@ static int verify_ipv4(
case IPPROTO_TCP:
if (check_field("ipv4_total_length",
(ntohs(script_ipv4->tot_len) +
- tcp_options_allowance(actual_packet,
- script_packet)),
+ tcp_options_allowance(actual_packet,
+ script_packet)),
ntohs(actual_ipv4->tot_len), error))
return STATUS_ERR;
break;
@@ -1014,15 +1014,29 @@ static int verify_ipv6(
if (check_field("ipv6_version",
script_ipv6->version,
actual_ipv6->version, error) ||
- check_field("ipv6_payload_len",
- (ntohs(script_ipv6->payload_len) +
- tcp_options_allowance(actual_packet,
- script_packet)),
- ntohs(actual_ipv6->payload_len), error) ||
check_field("ipv6_next_header",
script_ipv6->next_header,
actual_ipv6->next_header, error))
return STATUS_ERR;
+ switch (script_ipv6->next_header) {
+ case IPPROTO_SCTP:
+ /* FIXME */
+ break;
+ case IPPROTO_TCP:
+ if (check_field("ipv6_payload_len",
+ (ntohs(script_ipv6->payload_len) +
+ tcp_options_allowance(actual_packet,
+ script_packet)),
+ ntohs(actual_ipv6->payload_len), error))
+ return STATUS_ERR;
+ break;
+ default:
+ if (check_field("ipv6_payload_len",
+ ntohs(script_ipv6->payload_len),
+ ntohs(actual_ipv6->payload_len), error))
+ return STATUS_ERR;
+ break;
+ }
if (verify_outbound_live_ecn(script_packet->ecn,
ipv6_ecn_bits(actual_ipv6),
--
GitLab