From 9cd856a7d3ba96e77e9b66e22394b41d3fc143b4 Mon Sep 17 00:00:00 2001
From: Aomx <aomx@riseup.net>
Date: Sat, 16 Jul 2016 23:50:49 +0200
Subject: [PATCH] two small fixes
---
gtests/net/packetdrill/packet_to_string_test.c | 6 +++---
gtests/net/packetdrill/sctp.h | 2 +-
gtests/net/packetdrill/sctp_chunk_to_string.c | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gtests/net/packetdrill/packet_to_string_test.c b/gtests/net/packetdrill/packet_to_string_test.c
index 98394649..1715a1b9 100644
--- a/gtests/net/packetdrill/packet_to_string_test.c
+++ b/gtests/net/packetdrill/packet_to_string_test.c
@@ -328,7 +328,7 @@ static void test_sctp_ipv6_packet_to_string(void)
"ECNE[flgs=0x00, tsn=16909060]; "
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
- "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]; "
+ "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]]; "
"I-DATA[flgs=IUBE, len=23, tsn=4, sid=255, mid=1, ppid=0]; "
"I-DATA[flgs=IUE, len=23, tsn=4, sid=255, mid=2, fsn=1]; "
"PAD[flgs=0x00, len=16, val=...]";
@@ -390,7 +390,7 @@ static void test_sctp_ipv6_packet_to_string(void)
"ECNE[flgs=0x00, tsn=16909060]; "
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
- "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]; "
+ "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]]; "
"I-DATA[flgs=IUBE, len=23, tsn=4, sid=255, mid=1, ppid=0]; "
"I-DATA[flgs=IUE, len=23, tsn=4, sid=255, mid=2, fsn=1]; "
"PAD[flgs=0x00, len=16, val=...]";
@@ -452,7 +452,7 @@ static void test_sctp_ipv6_packet_to_string(void)
"ECNE[flgs=0x00, tsn=16909060]; "
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
- "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]; "
+ "FORWARD_TSN[flgs=0x00, len=12, cum_tsn=3047862031, sids=[1:2]]; "
"I-DATA[flgs=IUBE, len=23, tsn=4, sid=255, mid=1, ppid=0]; "
"I-DATA[flgs=IUE, len=23, tsn=4, sid=255, mid=2, fsn=1]; "
"PAD[flgs=0x00, len=16, val=...]"
diff --git a/gtests/net/packetdrill/sctp.h b/gtests/net/packetdrill/sctp.h
index 3c3e6315..6a17a416 100644
--- a/gtests/net/packetdrill/sctp.h
+++ b/gtests/net/packetdrill/sctp.h
@@ -270,7 +270,7 @@ struct sctp_reconfig_chunk {
struct sctp_stream_identifier_block {
__u16 stream;
- __u16 stream_sequence;
+ __u16 stream_sequence;
} __packed;
struct sctp_forward_tsn_chunk {
diff --git a/gtests/net/packetdrill/sctp_chunk_to_string.c b/gtests/net/packetdrill/sctp_chunk_to_string.c
index 18401747..77d5052f 100644
--- a/gtests/net/packetdrill/sctp_chunk_to_string.c
+++ b/gtests/net/packetdrill/sctp_chunk_to_string.c
@@ -1737,7 +1737,8 @@ static int sctp_forward_tsn_chunk_to_string(
}
}
- fprintf(s, "]");
+ fputs("]", s);
+ fputs("]", s);
return STATUS_OK;
}
--
GitLab