From a88161d93086425271676223efbb94a937de1acf Mon Sep 17 00:00:00 2001
From: Aomx <julian.cordes@gmail.com>
Date: Thu, 26 Nov 2015 20:39:39 +0100
Subject: [PATCH] adjustments
---
gtests/net/packetdrill/run_packet.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gtests/net/packetdrill/run_packet.c b/gtests/net/packetdrill/run_packet.c
index 51286489..cbb0b0e5 100644
--- a/gtests/net/packetdrill/run_packet.c
+++ b/gtests/net/packetdrill/run_packet.c
@@ -569,10 +569,6 @@ static int map_inbound_icmp_packet(
return STATUS_ERR;
}
-static inline bool is_valid_sack_length(struct sctp_sack_chunk *sack) {
- return sack->length == 16+2*sack->nr_gap_blocks+4*sack->nr_dup_tsns;
-}
-
static int map_inbound_sctp_packet(
struct socket *socket, struct packet *live_packet, char **error)
{
@@ -640,7 +636,7 @@ static int map_inbound_sctp_packet(
nr_gap_blocks = ntohs(sack->nr_gap_blocks);
nr_dup_tsns = ntohs(sack->nr_dup_tsns);
- if (is_valid_sack_length(sack)) {
+ if (ntohs(sack->length) == (sizeof(struct sctp_sack_chunk)+(sizeof(union sctp_sack_block()))*nr_gap_blocks+(sizeof(union sctp_sack_block))*nr_dup_tsns)) {
for (i = 0; i < nr_dup_tsns; i++) {
sack->block[i + nr_gap_blocks].tsn = htonl(ntohl(sack->block[i + nr_gap_blocks].tsn) + local_diff);
}
--
GitLab