diff --git a/net/dcsctp/common/internal_types.h b/net/dcsctp/common/internal_types.h index 8f12d0d706..4551fd17d3 100644 --- a/net/dcsctp/common/internal_types.h +++ b/net/dcsctp/common/internal_types.h @@ -31,9 +31,6 @@ using TSN = StrongAlias; // Reconfiguration Request Sequence Number using ReconfigRequestSN = StrongAlias; -// Reconfiguration Response Sequence Number -using ReconfigResponseSN = StrongAlias; - // Verification Tag, used for packet validation. using VerificationTag = StrongAlias; diff --git a/net/dcsctp/packet/chunk/reconfig_chunk_test.cc b/net/dcsctp/packet/chunk/reconfig_chunk_test.cc index 2eb9419b14..dbf40ff8c0 100644 --- a/net/dcsctp/packet/chunk/reconfig_chunk_test.cc +++ b/net/dcsctp/packet/chunk/reconfig_chunk_test.cc @@ -64,7 +64,7 @@ TEST(ReConfigChunkTest, FromCapture) { TEST(ReConfigChunkTest, SerializeAndDeserialize) { Parameters::Builder params_builder = Parameters::Builder().Add(OutgoingSSNResetRequestParameter( - ReconfigRequestSN(123), ReconfigResponseSN(456), TSN(789), + ReconfigRequestSN(123), ReconfigRequestSN(456), TSN(789), {StreamID(42), StreamID(43)})); ReConfigChunk chunk(params_builder.Build()); diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc index 5c0797ec4f..c25a2426be 100644 --- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc +++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.cc @@ -56,7 +56,7 @@ OutgoingSSNResetRequestParameter::Parse(rtc::ArrayView data) { } ReconfigRequestSN request_sequence_number(reader->Load32<4>()); - ReconfigResponseSN response_sequence_number(reader->Load32<8>()); + ReconfigRequestSN response_sequence_number(reader->Load32<8>()); TSN sender_last_assigned_tsn(reader->Load32<12>()); size_t stream_count = reader->variable_data_size() / kStreamIdSize; diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h index ae3e027cc6..6eb44e079f 100644 --- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h +++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h @@ -41,7 +41,7 @@ class OutgoingSSNResetRequestParameter explicit OutgoingSSNResetRequestParameter( ReconfigRequestSN request_sequence_number, - ReconfigResponseSN response_sequence_number, + ReconfigRequestSN response_sequence_number, TSN sender_last_assigned_tsn, std::vector stream_ids) : request_sequence_number_(request_sequence_number), @@ -58,7 +58,7 @@ class OutgoingSSNResetRequestParameter ReconfigRequestSN request_sequence_number() const { return request_sequence_number_; } - ReconfigResponseSN response_sequence_number() const { + ReconfigRequestSN response_sequence_number() const { return response_sequence_number_; } TSN sender_last_assigned_tsn() const { return sender_last_assigned_tsn_; } @@ -68,7 +68,7 @@ class OutgoingSSNResetRequestParameter static constexpr size_t kStreamIdSize = sizeof(uint16_t); ReconfigRequestSN request_sequence_number_; - ReconfigResponseSN response_sequence_number_; + ReconfigRequestSN response_sequence_number_; TSN sender_last_assigned_tsn_; std::vector stream_ids_; }; diff --git a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc index c0466e517f..dae73c2fba 100644 --- a/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc +++ b/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc @@ -26,7 +26,7 @@ using ::testing::ElementsAre; TEST(OutgoingSSNResetRequestParameterTest, SerializeAndDeserialize) { OutgoingSSNResetRequestParameter parameter( - ReconfigRequestSN(1), ReconfigResponseSN(2), TSN(3), + ReconfigRequestSN(1), ReconfigRequestSN(2), TSN(3), {StreamID(4), StreamID(5), StreamID(6)}); std::vector serialized; diff --git a/net/dcsctp/packet/parameter/parameter_test.cc b/net/dcsctp/packet/parameter/parameter_test.cc index e76dcade17..467e324592 100644 --- a/net/dcsctp/packet/parameter/parameter_test.cc +++ b/net/dcsctp/packet/parameter/parameter_test.cc @@ -29,7 +29,7 @@ TEST(ParameterTest, SerializeDeserializeParameter) { Parameters parameters = Parameters::Builder() .Add(OutgoingSSNResetRequestParameter(ReconfigRequestSN(123), - ReconfigResponseSN(456), + ReconfigRequestSN(456), TSN(789), {StreamID(42)})) .Build(); diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc index 6d4efed284..fafb204acc 100644 --- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc +++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.cc @@ -71,7 +71,7 @@ ReconfigurationResponseParameter::Parse(rtc::ArrayView data) { return absl::nullopt; } - ReconfigResponseSN response_sequence_number(reader->Load32<4>()); + ReconfigRequestSN response_sequence_number(reader->Load32<4>()); Result result; uint32_t result_nbr = reader->Load32<8>(); switch (result_nbr) { diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h index 0933617e78..c5a68acb33 100644 --- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h +++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h @@ -47,7 +47,7 @@ class ReconfigurationResponseParameter kInProgress = 6, }; - ReconfigurationResponseParameter(ReconfigResponseSN response_sequence_number, + ReconfigurationResponseParameter(ReconfigRequestSN response_sequence_number, Result result) : response_sequence_number_(response_sequence_number), result_(result), @@ -55,7 +55,7 @@ class ReconfigurationResponseParameter receiver_next_tsn_(absl::nullopt) {} explicit ReconfigurationResponseParameter( - ReconfigResponseSN response_sequence_number, + ReconfigRequestSN response_sequence_number, Result result, TSN sender_next_tsn, TSN receiver_next_tsn) @@ -70,7 +70,7 @@ class ReconfigurationResponseParameter void SerializeTo(std::vector& out) const override; std::string ToString() const override; - ReconfigResponseSN response_sequence_number() const { + ReconfigRequestSN response_sequence_number() const { return response_sequence_number_; } Result result() const { return result_; } @@ -79,7 +79,7 @@ class ReconfigurationResponseParameter private: static constexpr size_t kNextTsnHeaderSize = 8; - ReconfigResponseSN response_sequence_number_; + ReconfigRequestSN response_sequence_number_; Result result_; absl::optional sender_next_tsn_; absl::optional receiver_next_tsn_; diff --git a/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc b/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc index f06003da69..8125d93cd0 100644 --- a/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc +++ b/net/dcsctp/packet/parameter/reconfiguration_response_parameter_test.cc @@ -24,7 +24,7 @@ namespace { TEST(ReconfigurationResponseParameterTest, SerializeAndDeserializeFirstForm) { ReconfigurationResponseParameter parameter( - ReconfigResponseSN(1), + ReconfigRequestSN(1), ReconfigurationResponseParameter::Result::kSuccessPerformed); std::vector serialized; @@ -44,7 +44,7 @@ TEST(ReconfigurationResponseParameterTest, SerializeAndDeserializeFirstForm) { TEST(ReconfigurationResponseParameterTest, SerializeAndDeserializeFirstFormSecondForm) { ReconfigurationResponseParameter parameter( - ReconfigResponseSN(1), + ReconfigRequestSN(1), ReconfigurationResponseParameter::Result::kSuccessPerformed, TSN(2), TSN(3));