diff --git a/gtests/net/packetdrill/lexer.l b/gtests/net/packetdrill/lexer.l
index d452e25dc515b249501508be61899e7d4613ca56..0fa52409cf7d383407124cc5ef743cb4f4d0d0e9 100644
--- a/gtests/net/packetdrill/lexer.l
+++ b/gtests/net/packetdrill/lexer.l
@@ -557,6 +557,7 @@ I-DATA return I_DATA;
PAD return PAD;
RECONFIG return RECONFIG;
FORWARD_TSN return FORWARD_TSN;
+I_FORWARD_TSN return I_FORWARD_TSN;
type return TYPE;
flgs return FLAGS;
len return LEN;
diff --git a/gtests/net/packetdrill/packet_to_string_test.c b/gtests/net/packetdrill/packet_to_string_test.c
index 136a075272bdb4413bd6c340c8178727dbfd72f9..4774f7ed30dab34395652e13d702877500aef44e 100644
--- a/gtests/net/packetdrill/packet_to_string_test.c
+++ b/gtests/net/packetdrill/packet_to_string_test.c
@@ -103,7 +103,7 @@ static void test_sctp_ipv6_packet_to_string(void)
/* An IPv6/SCTP packet. */
u8 data[] = {
/* IPv6 Base Header: */
- 0x60, 0x00, 0x00, 0x00, 0x02, 0x0c, 0x84, 0xff,
+ 0x60, 0x00, 0x00, 0x00, 0x02, 0x1c, 0x84, 0xff,
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22,
0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -111,7 +111,7 @@ static void test_sctp_ipv6_packet_to_string(void)
/* SCTP Common Header: */
0x04, 0xd2, 0x1f, 0x90,
0x01, 0x02, 0x03, 0x04,
- 0xd8, 0x6a, 0x11, 0x71,
+ 0xc9, 0xc7, 0x27, 0x40,
/* SCTP DATA Chunk */
0x00, 0x0f, 0x00, 0x13,
0x01, 0x02, 0x03, 0x04,
@@ -242,6 +242,11 @@ static void test_sctp_ipv6_packet_to_string(void)
0xb5, 0xaa, 0xaf, 0x0f,
0x00, 0x01, 0x00, 0x02,
0x00, 0x03, 0x00, 0x04,
+ /* I_FORWARD_TSN Chunk*/
+ 0xc2, 0x00, 0x00, 0x10,
+ 0xb5, 0xaa, 0xaf, 0x0f,
+ 0x00, 0x01, 0x00, 0x01,
+ 0x00, 0x00, 0x01, 0x00,
/* SCTP I-DATA Chunk */
0x40, 0x0f, 0x00, 0x17,
0x00, 0x00, 0x00, 0x04,
@@ -341,6 +346,7 @@ static void test_sctp_ipv6_packet_to_string(void)
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
"FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,2},{3,4}]]; "
+ "I_FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,1,256}]]; "
"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=...]";
@@ -403,6 +409,7 @@ static void test_sctp_ipv6_packet_to_string(void)
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
"FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,2},{3,4}]]; "
+ "I_FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,1,256}]]; "
"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=...]";
@@ -465,14 +472,15 @@ static void test_sctp_ipv6_packet_to_string(void)
"CWR[flgs=0x00, tsn=16909060]; "
"SHUTDOWN_COMPLETE[flgs=T]; "
"FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,2},{3,4}]]; "
+ "I_FORWARD_TSN[flgs=0x00, len=16, cum_tsn=3047862031, ids=[{1,1,256}]]; "
"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=...]"
"\n"
- "0x0000: 60 00 00 00 02 0c 84 ff 00 02 00 00 00 00 00 00 " "\n"
+ "0x0000: 60 00 00 00 02 1c 84 ff 00 02 00 00 00 00 00 00 " "\n"
"0x0010: 00 00 00 00 00 00 22 22 00 01 00 00 00 00 00 00 " "\n"
"0x0020: 00 00 00 00 00 00 11 11 04 d2 1f 90 01 02 03 04 " "\n"
- "0x0030: d8 6a 11 71 00 0f 00 13 01 02 03 04 00 ff 01 00 " "\n"
+ "0x0030: c9 c7 27 40 00 0f 00 13 01 02 03 04 00 ff 01 00 " "\n"
"0x0040: 00 00 00 00 00 01 02 00 01 00 00 68 00 00 00 01 " "\n"
"0x0050: 00 01 00 00 00 0f 00 0f 01 02 03 04 00 05 00 08 " "\n"
"0x0060: 01 02 03 04 00 06 00 14 00 00 00 00 00 00 00 00 " "\n"
@@ -500,11 +508,13 @@ static void test_sctp_ipv6_packet_to_string(void)
"0x01c0: 09 00 00 04 0a 00 00 05 45 00 00 00 0b 00 00 04 " "\n"
"0x01d0: 0c 00 00 08 01 02 03 04 0d 00 00 08 01 02 03 04 " "\n"
"0x01e0: 0e 01 00 04 c0 00 00 10 b5 aa af 0f 00 01 00 02 " "\n"
- "0x01f0: 00 03 00 04 40 0f 00 17 00 00 00 04 00 ff 00 00 " "\n"
- "0x0200: 00 00 00 01 00 00 00 00 00 01 02 00 40 0d 00 17 " "\n"
- "0x0210: 00 00 00 04 00 ff 00 00 00 00 00 02 00 00 00 01 " "\n"
- "0x0220: 00 01 02 00 84 00 00 10 50 50 50 50 50 50 50 50 " "\n"
- "0x0230: 50 50 50 50 " "\n";
+ "0x01f0: 00 03 00 04 c2 00 00 10 b5 aa af 0f 00 01 00 01 " "\n"
+ "0x0200: 00 00 01 00 40 0f 00 17 00 00 00 04 00 ff 00 00 " "\n"
+ "0x0210: 00 00 00 01 00 00 00 00 00 01 02 00 40 0d 00 17 " "\n"
+ "0x0220: 00 00 00 04 00 ff 00 00 00 00 00 02 00 00 00 01 " "\n"
+ "0x0230: 00 01 02 00 84 00 00 10 50 50 50 50 50 50 50 50 " "\n"
+ "0x0240: 50 50 50 50 " "\n";
+
printf("expected = '%s'\n", expected);
assert(strcmp(dump, expected) == 0);
free(dump);
diff --git a/gtests/net/packetdrill/parser.y b/gtests/net/packetdrill/parser.y
index f2bc2b49151d17f13ebb88284f7051f9a5397e20..51843f8d1efe7a8c3367c671f90a7fb9f44d6b75 100644
--- a/gtests/net/packetdrill/parser.y
+++ b/gtests/net/packetdrill/parser.y
@@ -474,6 +474,8 @@ static struct tcp_option *new_tcp_fast_open_option(const char *cookie_string,
struct sctp_sack_block_list *sack_block_list;
struct sctp_forward_tsn_ids_list *forward_tsn_ids_list;
struct sctp_forward_tsn_ids_list_item *forward_tsn_ids_list_item;
+ struct sctp_i_forward_tsn_ids_list *i_forward_tsn_ids_list;
+ struct sctp_i_forward_tsn_ids_list_item *i_forward_tsn_ids_list_item;
struct sctp_address_type_list_item *address_type_list_item;
struct sctp_address_type_list *address_type_list;
struct sctp_parameter_type_list_item *parameter_type_list_item;
@@ -521,7 +523,7 @@ static struct tcp_option *new_tcp_fast_open_option(const char *cookie_string,
%token <reserved> SPINFO_MTU GAUTH_ASSOC_ID GAUTH_NUMBER_OF_CHUNKS GAUTH_CHUNKS
%token <reserved> CHUNK DATA INIT INIT_ACK HEARTBEAT HEARTBEAT_ACK ABORT
%token <reserved> SHUTDOWN SHUTDOWN_ACK ERROR COOKIE_ECHO COOKIE_ACK ECNE CWR
-%token <reserved> SHUTDOWN_COMPLETE I_DATA PAD RECONFIG FORWARD_TSN
+%token <reserved> SHUTDOWN_COMPLETE I_DATA PAD RECONFIG FORWARD_TSN I_FORWARD_TSN
%token <reserved> TYPE FLAGS LEN
%token <reserved> TAG A_RWND OS IS TSN SID SSN MID PPID FSN CUM_TSN GAPS NR_GAPS DUPS
%token <reserved> PARAMETER HEARTBEAT_INFORMATION IPV4_ADDRESS IPV6_ADDRESS
@@ -677,7 +679,7 @@ static struct tcp_option *new_tcp_fast_open_option(const char *cookie_string,
%type <chunk_list_item> sctp_shutdown_complete_chunk_spec
%type <chunk_list_item> sctp_i_data_chunk_spec
%type <chunk_list_item> sctp_pad_chunk_spec sctp_reconfig_chunk_spec
-%type <chunk_list_item> sctp_forward_tsn_spec
+%type <chunk_list_item> sctp_forward_tsn_spec sctp_i_forward_tsn_spec
%type <parameter_list> opt_parameter_list_spec sctp_parameter_list_spec
%type <parameter_list_item> sctp_parameter_spec
%type <parameter_list_item> sctp_generic_parameter_spec
@@ -726,8 +728,10 @@ static struct tcp_option *new_tcp_fast_open_option(const char *cookie_string,
%type <u16_item> u16_item
%type <sack_block_list> opt_gaps opt_nr_gaps gap_list opt_dups dup_list
%type <sack_block_list_item> gap dup
-%type <forward_tsn_ids_list> opt_stream_identifier ids_list
+%type <forward_tsn_ids_list> opt_stream_identifier ids_list
%type <forward_tsn_ids_list_item> id
+%type <i_forward_tsn_ids_list> opt_i_forward_tsn_stream_identifier i_forward_tsn_ids_list
+%type <i_forward_tsn_ids_list_item> i_forward_tsn_id
%type <address_type_list> address_types_list
%type <address_type_list_item> address_type
%type <parameter_type_list> parameter_types_list
@@ -1061,6 +1065,7 @@ sctp_chunk_spec
| sctp_pad_chunk_spec { $$ = $1; }
| sctp_reconfig_chunk_spec { $$ = $1; }
| sctp_forward_tsn_spec { $$ = $1; }
+| sctp_i_forward_tsn_spec { $$ = $1; }
;
chunk_type
@@ -1610,6 +1615,35 @@ id
}
;
+opt_i_forward_tsn_stream_identifier
+: IDS '=' ELLIPSIS { $$ = NULL; }
+| IDS '=' '[' ELLIPSIS ']' { $$ = NULL; }
+| IDS '=' '[' i_forward_tsn_ids_list ']' { $$ = $4; }
+;
+
+i_forward_tsn_ids_list
+: { $$ = sctp_i_forward_tsn_ids_list_new(); }
+| i_forward_tsn_id { $$ =sctp_i_forward_tsn_ids_list_new();
+ sctp_i_forward_tsn_ids_list_append($$, $1); }
+| i_forward_tsn_ids_list ',' i_forward_tsn_id { $$ = $1;
+ sctp_i_forward_tsn_ids_list_append($1, $3); }
+;
+
+i_forward_tsn_id
+: '{' INTEGER ',' INTEGER ',' INTEGER '}' {
+ if (!is_valid_u16($2)) {
+ semantic_error("stream identifier out of range");
+ }
+ if (!is_valid_u16($4)) {
+ semantic_error("reserved out of range");
+ }
+ if (!is_valid_u32($6)) {
+ semantic_error("message identifier number out of range");
+ }
+ $$ = sctp_i_forward_tsn_ids_list_item_new($2, $4, $6);
+}
+;
+
sctp_generic_chunk_spec
: CHUNK '[' opt_chunk_type ',' opt_flags ',' opt_len ',' opt_val ']' {
if (($7 != -1) &&
@@ -1752,6 +1786,11 @@ sctp_forward_tsn_spec
$$ = sctp_forward_tsn_chunk_new($3, $5);
}
+sctp_i_forward_tsn_spec
+: I_FORWARD_TSN '[' opt_cum_tsn ',' opt_i_forward_tsn_stream_identifier']' {
+ $$ = sctp_i_forward_tsn_chunk_new($3, $5);
+}
+
opt_req_sn
: REQ_SN '=' INTEGER {
if (!is_valid_u32($3)) {
diff --git a/gtests/net/packetdrill/run_packet.c b/gtests/net/packetdrill/run_packet.c
index 65f2cc7fa920898d13eaf364ab48fe5ad5d54468..a1459d72f9cb0bc2c7c18b960b0452e5e62204b3 100644
--- a/gtests/net/packetdrill/run_packet.c
+++ b/gtests/net/packetdrill/run_packet.c
@@ -655,6 +655,7 @@ static int map_inbound_sctp_packet(
struct sctp_i_data_chunk *i_data;
struct sctp_reconfig_chunk *reconfig;
struct sctp_forward_tsn_chunk *forward_tsn;
+ struct sctp_i_forward_tsn_chunk *i_forward_tsn;
u32 local_diff, remote_diff;
u32 v_tag;
@@ -761,6 +762,10 @@ static int map_inbound_sctp_packet(
forward_tsn = (struct sctp_forward_tsn_chunk *) chunk;
forward_tsn->cum_tsn = htonl(ntohl(forward_tsn->cum_tsn) + local_diff);
break;
+ case SCTP_I_FORWARD_TSN_CHUNK_TYPE:
+ i_forward_tsn = (struct sctp_i_forward_tsn_chunk *) chunk;
+ i_forward_tsn->cum_tsn = htonl(ntohl(i_forward_tsn->cum_tsn) + local_diff);
+ break;
case SCTP_RECONFIG_CHUNK_TYPE:
reconfig = (struct sctp_reconfig_chunk *)chunk;
if (htons(reconfig->length) >= sizeof(struct sctp_reconfig_chunk) + 4) {
@@ -973,6 +978,7 @@ static int map_outbound_live_sctp_packet(
struct sctp_i_data_chunk *i_data;
struct sctp_reconfig_chunk *reconfig;
struct sctp_forward_tsn_chunk *forward_tsn;
+ struct sctp_i_forward_tsn_chunk *i_forward_tsn;
u32 local_diff, remote_diff;
u16 nr_gap_blocks, nr_dup_tsns, number_of_nr_gap_blocks, i;
@@ -1048,6 +1054,10 @@ static int map_outbound_live_sctp_packet(
forward_tsn = (struct sctp_forward_tsn_chunk *) chunk;
forward_tsn->cum_tsn = htonl(ntohl(forward_tsn->cum_tsn) + local_diff);
break;
+ case SCTP_I_FORWARD_TSN_CHUNK_TYPE:
+ i_forward_tsn = (struct sctp_i_forward_tsn_chunk *) chunk;
+ i_forward_tsn->cum_tsn = htonl(ntohl(i_forward_tsn->cum_tsn) + local_diff);
+ break;
case SCTP_RECONFIG_CHUNK_TYPE:
reconfig = (struct sctp_reconfig_chunk *)chunk;
if (reconfig->length > sizeof(struct sctp_reconfig_chunk)) {
@@ -2214,6 +2224,58 @@ static int verify_forward_tsn_chunk(struct sctp_forward_tsn_chunk *actual_chunk,
return STATUS_OK;
}
+static u16 get_num_id_blocks_for_i_forward_tsn (u16 packet_length) {
+ return (packet_length - sizeof(struct sctp_i_forward_tsn_chunk)) / sizeof(struct sctp_i_forward_tsn_identifier_block);
+}
+
+static int verify_i_forward_tsn_chunk(struct sctp_i_forward_tsn_chunk *actual_chunk,
+ struct sctp_i_forward_tsn_chunk *script_chunk,
+ u32 flags, char **error) {
+ u16 actual_packet_length = ntohs(script_chunk->length);
+ u16 script_packet_length = ntohs(script_chunk->length);
+ u16 actual_nr_id_blocks = get_num_id_blocks_for_i_forward_tsn(actual_packet_length);
+ u16 script_nr_id_blocks = get_num_id_blocks_for_i_forward_tsn(script_packet_length);
+ u16 i;
+
+ if ((flags & FLAG_I_FORWARD_TSN_CHUNK_CUM_TSN_NOCHECK) == 0) {
+ if (check_field("sctp_i_forward_tsn_cum_tsn",
+ ntohl(script_chunk->cum_tsn),
+ ntohl(actual_chunk->cum_tsn),
+ error) == STATUS_ERR) {
+ return STATUS_ERR;
+ }
+ }
+
+ if ((flags & FLAG_I_FORWARD_TSN_CHUNK_IDS_NOCHECK) == 0) {
+ if (check_field("nr_id_blocks",
+ actual_nr_id_blocks,
+ script_nr_id_blocks,
+ error) == STATUS_ERR) {
+ return STATUS_ERR;
+ }
+
+ for (i = 0; i < script_nr_id_blocks; i++) {
+ if (check_field("sctp_i_forward_tsn_stream_identifier",
+ ntohs(script_chunk->stream_identifier_blocks[i].stream_identifier),
+ ntohs(actual_chunk->stream_identifier_blocks[i].stream_identifier),
+ error) == STATUS_ERR ||
+ check_field("sctp_i_forward_tsn_u_bit",
+ ntohs(script_chunk->stream_identifier_blocks[i].reserved),
+ ntohs(actual_chunk->stream_identifier_blocks[i].reserved),
+ error) == STATUS_ERR ||
+ check_field("sctp_i_forward_tsn_message_identifier",
+ ntohs(script_chunk->stream_identifier_blocks[i].message_identifier),
+ ntohs(actual_chunk->stream_identifier_blocks[i].message_identifier),
+ error) == STATUS_ERR
+ ) {
+ return STATUS_ERR;
+ }
+ }
+ }
+
+ return STATUS_OK;
+}
+
/* Verify that required actual SCTP packet fields are as the script expected. */
static int verify_sctp(
const struct packet *actual_packet,
@@ -2369,6 +2431,11 @@ static int verify_sctp(
(struct sctp_forward_tsn_chunk *)script_chunk,
flags, error);
break;
+ case SCTP_I_FORWARD_TSN_CHUNK_TYPE:
+ result = verify_i_forward_tsn_chunk((struct sctp_i_forward_tsn_chunk *)actual_chunk,
+ (struct sctp_i_forward_tsn_chunk *)script_chunk,
+ flags, error);
+ break;
default:
result = STATUS_ERR;
assert(!"unsupported SCTP chunk type");
diff --git a/gtests/net/packetdrill/sctp.h b/gtests/net/packetdrill/sctp.h
index 6a17a416edbba0903362c603adca544e56c051c4..e8d0650b5cdd220bb22306feecd143fc7bde5a64 100644
--- a/gtests/net/packetdrill/sctp.h
+++ b/gtests/net/packetdrill/sctp.h
@@ -57,6 +57,8 @@ struct sctp_common_header {
#define SCTP_RECONFIG_CHUNK_TYPE 0x82
#define SCTP_PAD_CHUNK_TYPE 0x84
#define SCTP_FORWARD_TSN_CHUNK_TYPE 0xc0
+#define SCTP_I_FORWARD_TSN_CHUNK_TYPE 0xc2
+
#define MAX_SCTP_CHUNK_BYTES 0xffff
@@ -281,6 +283,20 @@ struct sctp_forward_tsn_chunk {
struct sctp_stream_identifier_block stream_identifier_blocks[];
} __packed;
+struct sctp_i_forward_tsn_identifier_block {
+ __u16 stream_identifier;
+ __u16 reserved;
+ __u32 message_identifier;
+};
+
+struct sctp_i_forward_tsn_chunk {
+ __u8 type;
+ __u8 flags;
+ __be16 length;
+ __be32 cum_tsn;
+ struct sctp_i_forward_tsn_identifier_block stream_identifier_blocks[];
+} __packed;
+
#define SCTP_HEARTBEAT_INFORMATION_PARAMETER_TYPE 0x0001
#define SCTP_IPV4_ADDRESS_PARAMETER_TYPE 0x0005
#define SCTP_IPV6_ADDRESS_PARAMETER_TYPE 0x0006
diff --git a/gtests/net/packetdrill/sctp_chunk_to_string.c b/gtests/net/packetdrill/sctp_chunk_to_string.c
index 386cab745171ad3cdfeb011dcb8fd398d074da59..51b8c217640d55267c1ac379e6b9cac104ca075a 100644
--- a/gtests/net/packetdrill/sctp_chunk_to_string.c
+++ b/gtests/net/packetdrill/sctp_chunk_to_string.c
@@ -1742,6 +1742,46 @@ static int sctp_forward_tsn_chunk_to_string(
return STATUS_OK;
}
+static u16 get_num_id_blocks_for_i_forward_tsn (u16 packet_length) {
+ return (packet_length - sizeof(struct sctp_i_forward_tsn_chunk)) / sizeof(struct sctp_i_forward_tsn_identifier_block);
+}
+
+static int sctp_i_forward_tsn_chunk_to_string(
+ FILE *s,
+ struct sctp_i_forward_tsn_chunk *chunk,
+ char **error)
+{
+ u16 length, i;
+ length = ntohs(chunk->length);
+ u16 num_id_blocks = get_num_id_blocks_for_i_forward_tsn(length);
+
+ if (length < sizeof(struct sctp_i_forward_tsn_chunk)) {
+ asprintf(error, "I_FORWARD_TSN chunk too short (length=%u)", length);
+ return STATUS_ERR;
+ }
+
+ fputs("I_FORWARD_TSN[", s);
+ fprintf(s, "flgs=0x%02x, ", chunk->flags);
+ fprintf(s, "len=%u, ", length);
+ fprintf(s, "cum_tsn=%u, ", ntohl(chunk->cum_tsn));
+
+ fprintf(s, "ids=[");
+
+ for (i = 0; i < num_id_blocks; i++) {
+ fprintf(s, "{%u,%u,%u}",
+ ntohs(chunk->stream_identifier_blocks[i].stream_identifier),
+ ntohs(chunk->stream_identifier_blocks[i].reserved),
+ ntohl(chunk->stream_identifier_blocks[i].message_identifier));
+ if (i != num_id_blocks-1) {
+ fprintf(s, ",");
+ }
+ }
+
+ fputs("]]", s);
+
+ return STATUS_OK;
+}
+
static int sctp_unknown_chunk_to_string(FILE *s,
struct sctp_chunk *chunk,
char **error)
@@ -1846,6 +1886,10 @@ int sctp_chunk_to_string(FILE *s, struct sctp_chunk *chunk, char **error)
result = sctp_forward_tsn_chunk_to_string(s,
(struct sctp_forward_tsn_chunk *)chunk, error);
break;
+ case SCTP_I_FORWARD_TSN_CHUNK_TYPE:
+ result = sctp_i_forward_tsn_chunk_to_string(s,
+ (struct sctp_i_forward_tsn_chunk *)chunk, error);
+ break;
default:
result = sctp_unknown_chunk_to_string(s, chunk, error);
break;
diff --git a/gtests/net/packetdrill/sctp_packet.c b/gtests/net/packetdrill/sctp_packet.c
index ad7048918e205345628b099d9d2390e607a1a85d..8be43c6e81cd68a191467c364eec22f7dc3184db 100644
--- a/gtests/net/packetdrill/sctp_packet.c
+++ b/gtests/net/packetdrill/sctp_packet.c
@@ -293,6 +293,66 @@ sctp_forward_tsn_ids_list_item_new(u16 stream_identifier, u16 stream_sequence_nu
return item;
}
+struct sctp_i_forward_tsn_ids_list *
+sctp_i_forward_tsn_ids_list_new () {
+ struct sctp_i_forward_tsn_ids_list *list;
+
+ list = malloc(sizeof(struct sctp_i_forward_tsn_ids_list));
+ assert(list != NULL);
+ list->first = NULL;
+ list->last = NULL;
+ list->nr_entries = 0;
+ return list;
+}
+
+void
+sctp_i_forward_tsn_ids_list_append(struct sctp_i_forward_tsn_ids_list *list,
+ struct sctp_i_forward_tsn_ids_list_item *item) {
+ assert(item->next == NULL);
+ if (list->last == NULL) {
+ assert(list->first == NULL);
+ assert(list->nr_entries == 0);
+ list->first = item;
+ } else {
+ assert(list->first != NULL);
+ list->last->next = item;
+ }
+ list->last = item;
+ list->nr_entries++;
+}
+
+void sctp_i_forward_tsn_ids_list_free (struct sctp_i_forward_tsn_ids_list *list) {
+ struct sctp_i_forward_tsn_ids_list_item *current_item, *next_item;
+
+ if (list == NULL) {
+ return;
+ }
+ current_item = list->first;
+ while (current_item != NULL) {
+ assert(list->nr_entries > 0);
+ next_item = current_item->next;
+ assert(next_item != NULL || current_item == list->last);
+ free(current_item);
+ current_item = next_item;
+ list->nr_entries--;
+ }
+ assert(list->nr_entries == 0);
+ free(list);
+}
+
+struct sctp_i_forward_tsn_ids_list_item *
+sctp_i_forward_tsn_ids_list_item_new(u16 stream_identifier, u16 reserved, u32 message_identifier) {
+ struct sctp_i_forward_tsn_ids_list_item *item;
+
+ item = malloc(sizeof(struct sctp_i_forward_tsn_ids_list_item));
+ assert(item != NULL);
+ item->next = NULL;
+ item->stream_identifier = stream_identifier;
+ item->reserved = reserved;
+ item->message_identifier = message_identifier;
+ return item;
+}
+
struct sctp_address_type_list *
sctp_address_type_list_new(void)
{
@@ -786,6 +846,8 @@ sctp_sack_chunk_new(s64 flgs, s64 cum_tsn, s64 a_rwnd,
chunk->block[i].gap.end = htons(item->block.gap.end);
}
assert((i == nr_gaps) && (item == NULL));
+ sctp_sack_block_list_free(gaps);
+
}
if (dups != NULL) {
for (i = 0, item = dups->first;
@@ -794,6 +856,7 @@ sctp_sack_chunk_new(s64 flgs, s64 cum_tsn, s64 a_rwnd,
chunk->block[i + nr_gaps].tsn= htonl(item->block.tsn);
}
assert((i == nr_dups) && (item == NULL));
+ sctp_sack_block_list_free(dups);
}
return sctp_chunk_list_item_new((struct sctp_chunk *)chunk,
length, flags,
@@ -874,6 +937,7 @@ sctp_nr_sack_chunk_new(s64 flgs, s64 cum_tsn, s64 a_rwnd,
chunk->block[i].gap.end = htons(item->block.gap.end);
}
assert((i == nr_gaps) && (item == NULL));
+ sctp_sack_block_list_free(gaps);
}
if (nr_gaps_list != NULL) {
for (i = 0, item = nr_gaps_list->first;
@@ -883,6 +947,7 @@ sctp_nr_sack_chunk_new(s64 flgs, s64 cum_tsn, s64 a_rwnd,
chunk->block[i + nr_gaps].gap.end = htons(item->block.gap.end);
}
assert((i == number_of_nr_gaps) && (item == NULL));
+ sctp_sack_block_list_free(nr_gaps_list);
}
if (dups != NULL) {
for (i = 0, item = dups->first;
@@ -891,6 +956,7 @@ sctp_nr_sack_chunk_new(s64 flgs, s64 cum_tsn, s64 a_rwnd,
chunk->block[i + nr_gaps + number_of_nr_gaps].tsn= htonl(item->block.tsn);
}
assert((i == nr_dups) && (item == NULL));
+ sctp_sack_block_list_free(dups);
}
return sctp_chunk_list_item_new((struct sctp_chunk *)chunk,
length, flags,
@@ -1440,11 +1506,11 @@ sctp_pad_chunk_new(s64 flgs, s64 len, u8* padding)
}
struct sctp_chunk_list_item *
-sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *sids) {
+sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *ids_list) {
struct sctp_forward_tsn_chunk *chunk;
struct sctp_forward_tsn_ids_list_item *item;
- DEBUGP("sctp_forward_tsn_chunk_new called with cum_tsn = %d and sids_list = %p", cum_tsn, sids);
+ DEBUGP("sctp_forward_tsn_chunk_new called with cum_tsn = %d and sids_list = %p", cum_tsn, ids_list);
u32 flags;
u32 length;
@@ -1452,12 +1518,12 @@ sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *sids)
flags = 0;
length = sizeof(struct sctp_forward_tsn_chunk);
- if (sids == NULL) {
+ if (ids_list == NULL) {
nr_sids = 0;
flags |= FLAG_CHUNK_LENGTH_NOCHECK;
flags |= FLAG_FORWARD_TSN_CHUNK_IDS_NOCHECK;
} else {
- nr_sids = sids->nr_entries;
+ nr_sids = ids_list->nr_entries;
length += nr_sids * sizeof(struct sctp_stream_identifier_block);
}
@@ -1475,12 +1541,12 @@ sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *sids)
chunk->cum_tsn = htonl((u32)cum_tsn);
}
- if (nr_sids == 0 || sids == NULL) {
+ if (nr_sids == 0 || ids_list == NULL) {
flags |= FLAG_FORWARD_TSN_CHUNK_IDS_NOCHECK;
}
- if (sids != NULL) {
- for (i = 0, item = sids->first;
+ if (ids_list != NULL) {
+ for (i = 0, item = ids_list->first;
(i < nr_sids) && (item != NULL);
i++, item = item->next) {
chunk->stream_identifier_blocks[i].stream= htons(item->stream_identifier);
@@ -1488,7 +1554,68 @@ sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *sids)
}
assert((i == nr_sids) && (item == NULL));
+ sctp_forward_tsn_ids_list_free(ids_list);
+ }
+
+ return sctp_chunk_list_item_new((struct sctp_chunk *)chunk,
+ length, flags,
+ sctp_parameter_list_new(),
+ sctp_cause_list_new());
+}
+
+struct sctp_chunk_list_item *
+sctp_i_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_i_forward_tsn_ids_list *ids_list) {
+ struct sctp_i_forward_tsn_chunk *chunk;
+ struct sctp_i_forward_tsn_ids_list_item *item;
+
+ DEBUGP("sctp_i_forward_tsn_chunk_new called with cum_tsn = %d and sids_list = %p", cum_tsn, ids_list);
+
+ u32 flags;
+ u32 length;
+ u16 i, nr_ids;
+
+ flags = 0;
+ length = sizeof(struct sctp_i_forward_tsn_chunk);
+ if (ids_list == NULL) {
+ nr_ids = 0;
+ flags |= FLAG_CHUNK_LENGTH_NOCHECK;
+ flags |= FLAG_I_FORWARD_TSN_CHUNK_IDS_NOCHECK;
+ } else {
+ nr_ids = ids_list->nr_entries;
+ length += nr_ids * sizeof(struct sctp_i_forward_tsn_identifier_block);
}
+
+ assert(is_valid_u16(length));
+ assert(length % 4 == 0);
+ chunk = malloc(length);
+ assert(chunk != NULL);
+ chunk->type = SCTP_I_FORWARD_TSN_CHUNK_TYPE;
+ chunk->flags = 0;
+ chunk->length = htons(length);
+ if (cum_tsn == -1) {
+ chunk->cum_tsn = htonl(0);
+ flags |= FLAG_I_FORWARD_TSN_CHUNK_CUM_TSN_NOCHECK;
+ } else {
+ chunk->cum_tsn = htonl((u32)cum_tsn);
+ }
+
+ if (nr_ids == 0 || ids_list == NULL) {
+ flags |= FLAG_I_FORWARD_TSN_CHUNK_IDS_NOCHECK;
+ }
+
+ if (ids_list != NULL) {
+ for (i = 0, item = ids_list->first;
+ (i < nr_ids) && (item != NULL);
+ i++, item = item->next) {
+ chunk->stream_identifier_blocks[i].stream_identifier= htons(item->stream_identifier);
+ chunk->stream_identifier_blocks[i].reserved = htons(item->reserved);
+ chunk->stream_identifier_blocks[i].message_identifier = htonl(item->message_identifier);
+ }
+
+ assert((i == nr_ids) && (item == NULL));
+ sctp_i_forward_tsn_ids_list_free(ids_list);
+ }
+
return sctp_chunk_list_item_new((struct sctp_chunk *)chunk,
length, flags,
sctp_parameter_list_new(),
diff --git a/gtests/net/packetdrill/sctp_packet.h b/gtests/net/packetdrill/sctp_packet.h
index f41521fd274e2ddf4f8d12a56443eaff59e9e68e..6fece3a3f5de69163eadb8e49f379df1eb8462db 100644
--- a/gtests/net/packetdrill/sctp_packet.h
+++ b/gtests/net/packetdrill/sctp_packet.h
@@ -123,13 +123,37 @@ void
sctp_forward_tsn_ids_list_append(struct sctp_forward_tsn_ids_list *list,
struct sctp_forward_tsn_ids_list_item *item);
-// TODO: where to call this freeing method... sctp_sack_block_list_free and sctp_byte_list_free are unused...?
void sctp_forward_tsn_ids_list_free (struct sctp_forward_tsn_ids_list *list);
struct sctp_forward_tsn_ids_list_item *
sctp_forward_tsn_ids_list_item_new(u16 stream_identifier, u16 stream_sequence_number);
+struct sctp_i_forward_tsn_ids_list_item {
+ struct sctp_i_forward_tsn_ids_list_item *next;
+ u16 stream_identifier;
+ u16 reserved;
+ u32 message_identifier;
+};
+
+struct sctp_i_forward_tsn_ids_list {
+ struct sctp_i_forward_tsn_ids_list_item *first;
+ struct sctp_i_forward_tsn_ids_list_item *last;
+ u16 nr_entries;
+};
+
+struct sctp_i_forward_tsn_ids_list *
+sctp_i_forward_tsn_ids_list_new ();
+
+void
+sctp_i_forward_tsn_ids_list_append(struct sctp_i_forward_tsn_ids_list *list,
+ struct sctp_i_forward_tsn_ids_list_item *item);
+
+void sctp_i_forward_tsn_ids_list_free (struct sctp_i_forward_tsn_ids_list *list);
+
+struct sctp_i_forward_tsn_ids_list_item *
+sctp_i_forward_tsn_ids_list_item_new(u16 stream_identifier, u16 reserved, u32 message_identifier);
+
struct sctp_address_type_list_item {
struct sctp_address_type_list_item *next;
u16 address_type;
@@ -357,6 +381,12 @@ sctp_pad_chunk_new(s64 flgs, s64 len, u8* padding);
struct sctp_chunk_list_item *
sctp_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_forward_tsn_ids_list *sids_list);
+#define FLAG_I_FORWARD_TSN_CHUNK_CUM_TSN_NOCHECK 0x00000100
+#define FLAG_I_FORWARD_TSN_CHUNK_IDS_NOCHECK 0x00000200
+
+struct sctp_chunk_list_item *
+sctp_i_forward_tsn_chunk_new(u32 cum_tsn, struct sctp_i_forward_tsn_ids_list *ids_list);
+
struct sctp_chunk_list_item *
sctp_reconfig_chunk_new(s64 flgs, struct sctp_parameter_list *parameters);