commit 576743f053b4c2726ed563d93ae6dd4aca99ab80 parent d75a21ae09d73a40aac4ca517cde6d28f757dbf7 Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 16:10:13 -0500 Bug 1993083 - Vendor libwebrtc from 5fa352fa8f Upstream commit: https://webrtc.googlesource.com/src/+/5fa352fa8f323b1238a51ba854b3d5a6ae50a77e IWYU net/ again even after https://webrtc-review.googlesource.com/c/src/+/392040 IWYU found issues in net/. Another pass of find net -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner followed by find net -name "*.h" -o -name "*.cc" | xargs sed -i '/<stdint.h>/d' find net -name "*.h" -o -name "*.cc" | xargs sed -i '/<stddef.h>/d' followed by another pass of find net -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner then tools_webrtc/gn_check_autofix.py -C out/Default/ and git cl format Manual changes: tlv_trait.h: replaced string.h with cstring chunk_validators.cc: added "absl/algorithm/container.h" Bug: webrtc:42226242 Change-Id: I7b562e12ed9f6f4b0a21a6095eee70b2bea0b9b9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396360 Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45013} Diffstat:
162 files changed, 605 insertions(+), 430 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T21:08:56.310516+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T21:10:03.575817+00:00. # base of lastest vendoring -d27b4ef208 +5fa352fa8f diff --git a/third_party/libwebrtc/moz-patch-stack/s0125.patch b/third_party/libwebrtc/moz-patch-stack/s0125.patch @@ -28,10 +28,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b85c57c2d6f060407 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/net/dcsctp/tx/outstanding_data.cc b/net/dcsctp/tx/outstanding_data.cc -index a92fc6f638..e74843d6c7 100644 +index 074e3c0461..63e750b5fc 100644 --- a/net/dcsctp/tx/outstanding_data.cc +++ b/net/dcsctp/tx/outstanding_data.cc -@@ -392,6 +392,7 @@ std::vector<std::pair<TSN, Data>> OutstandingData::GetChunksToBeRetransmitted( +@@ -402,6 +402,7 @@ std::vector<std::pair<TSN, Data>> OutstandingData::GetChunksToBeRetransmitted( } void OutstandingData::ExpireOutstandingChunks(Timestamp now) { @@ -39,7 +39,7 @@ index a92fc6f638..e74843d6c7 100644 UnwrappedTSN tsn = last_cumulative_tsn_ack_; for (const Item& item : outstanding_data_) { tsn.Increment(); -@@ -401,15 +402,22 @@ void OutstandingData::ExpireOutstandingChunks(Timestamp now) { +@@ -411,15 +412,22 @@ void OutstandingData::ExpireOutstandingChunks(Timestamp now) { if (item.is_abandoned()) { // Already abandoned. } else if (item.is_nacked() && item.has_expired(now)) { diff --git a/third_party/libwebrtc/net/dcsctp/common/BUILD.gn b/third_party/libwebrtc/net/dcsctp/common/BUILD.gn @@ -40,6 +40,7 @@ if (rtc_include_tests) { "../../../api:array_view", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", + "../../../rtc_base:strong_alias", "../../../test:test_support", ] sources = [ diff --git a/third_party/libwebrtc/net/dcsctp/common/handover_testing.cc b/third_party/libwebrtc/net/dcsctp/common/handover_testing.cc @@ -9,6 +9,8 @@ */ #include "net/dcsctp/common/handover_testing.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" + namespace dcsctp { namespace { // Default transformer function does nothing - dcSCTP does not implement diff --git a/third_party/libwebrtc/net/dcsctp/common/internal_types.h b/third_party/libwebrtc/net/dcsctp/common/internal_types.h @@ -10,10 +10,8 @@ #ifndef NET_DCSCTP_COMMON_INTERNAL_TYPES_H_ #define NET_DCSCTP_COMMON_INTERNAL_TYPES_H_ -#include <functional> -#include <utility> +#include <cstdint> -#include "net/dcsctp/public/types.h" #include "rtc_base/strong_alias.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/common/math_test.cc b/third_party/libwebrtc/net/dcsctp/common/math_test.cc @@ -9,7 +9,9 @@ */ #include "net/dcsctp/common/math.h" -#include "test/gmock.h" +#include <cstdint> + +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/common/sequence_numbers_test.cc b/third_party/libwebrtc/net/dcsctp/common/sequence_numbers_test.cc @@ -9,7 +9,10 @@ */ #include "net/dcsctp/common/sequence_numbers.h" -#include "test/gmock.h" +#include <cstdint> + +#include "rtc_base/strong_alias.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/fuzzers/BUILD.gn b/third_party/libwebrtc/net/dcsctp/fuzzers/BUILD.gn @@ -13,15 +13,20 @@ rtc_library("dcsctp_fuzzers") { deps = [ "../../../api:array_view", "../../../api/task_queue:task_queue", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", + "../common:internal_types", "../common:math", "../packet:chunk", + "../packet:data", "../packet:error_cause", "../packet:parameter", + "../packet:sctp_packet", "../public:socket", "../public:types", "../socket:dcsctp_socket", + "//third_party/abseil-cpp/absl/strings:string_view", ] sources = [ "dcsctp_fuzzers.cc", @@ -42,6 +47,7 @@ if (rtc_include_tests) { "../../../test:test_support", "../packet:sctp_packet", "../public:socket", + "../public:types", "../socket:dcsctp_socket", "../testing:testing_macros", ] diff --git a/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers.cc b/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers.cc @@ -9,27 +9,49 @@ */ #include "net/dcsctp/fuzzers/dcsctp_fuzzers.h" +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "net/dcsctp/common/math.h" +#include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/packet/chunk/abort_chunk.h" +#include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/cookie_ack_chunk.h" #include "net/dcsctp/packet/chunk/cookie_echo_chunk.h" #include "net/dcsctp/packet/chunk/data_chunk.h" +#include "net/dcsctp/packet/chunk/error_chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" +#include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h" +#include "net/dcsctp/packet/chunk/idata_chunk.h" +#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" +#include "net/dcsctp/packet/chunk/init_ack_chunk.h" +#include "net/dcsctp/packet/chunk/init_chunk.h" +#include "net/dcsctp/packet/chunk/reconfig_chunk.h" +#include "net/dcsctp/packet/chunk/sack_chunk.h" +#include "net/dcsctp/packet/chunk/shutdown_ack_chunk.h" #include "net/dcsctp/packet/chunk/shutdown_chunk.h" +#include "net/dcsctp/packet/chunk/shutdown_complete_chunk.h" +#include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/error_cause/protocol_violation_cause.h" #include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h" #include "net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h" +#include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h" #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/parameter/state_cookie_parameter.h" +#include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/dcsctp_socket.h" #include "net/dcsctp/socket/state_cookie.h" -#include "rtc_base/logging.h" +#include "rtc_base/checks.h" namespace dcsctp { namespace dcsctp_fuzzers { diff --git a/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers.h b/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers.h @@ -10,14 +10,24 @@ #ifndef NET_DCSCTP_FUZZERS_DCSCTP_FUZZERS_H_ #define NET_DCSCTP_FUZZERS_DCSCTP_FUZZERS_H_ +#include <cstddef> +#include <cstdint> #include <deque> +#include <iterator> #include <memory> +#include <optional> #include <set> #include <vector> +#include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/checks.h" namespace dcsctp { namespace dcsctp_fuzzers { diff --git a/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers_test.cc b/third_party/libwebrtc/net/dcsctp/fuzzers/dcsctp_fuzzers_test.cc @@ -9,14 +9,12 @@ */ #include "net/dcsctp/fuzzers/dcsctp_fuzzers.h" +#include <cstdint> + #include "api/array_view.h" -#include "net/dcsctp/packet/sctp_packet.h" -#include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/socket/dcsctp_socket.h" -#include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" -#include "rtc_base/logging.h" -#include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace dcsctp_fuzzers { diff --git a/third_party/libwebrtc/net/dcsctp/packet/BUILD.gn b/third_party/libwebrtc/net/dcsctp/packet/BUILD.gn @@ -39,6 +39,7 @@ rtc_library("tlv_trait") { rtc_source_set("data") { deps = [ "../../../rtc_base:checks", + "../../../rtc_base:strong_alias", "../common:internal_types", "../public:types", ] @@ -159,6 +160,7 @@ rtc_library("chunk") { "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", + "../../../rtc_base:strong_alias", "../common:internal_types", "../common:math", "../packet:bounded_io", @@ -213,6 +215,7 @@ rtc_library("chunk_validators") { ":chunk", "../../../rtc_base:checks", "../../../rtc_base:logging", + "//third_party/abseil-cpp/absl/algorithm:container", ] sources = [ "chunk_validators.cc", @@ -249,6 +252,7 @@ if (rtc_include_tests) { ":chunk", ":chunk_validators", ":crc32c", + ":data", ":error_cause", ":parameter", ":sctp_packet", diff --git a/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_reader.h b/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_reader.h @@ -11,9 +11,11 @@ #ifndef NET_DCSCTP_PACKET_BOUNDED_BYTE_READER_H_ #define NET_DCSCTP_PACKET_BOUNDED_BYTE_READER_H_ +#include <cstddef> #include <cstdint> #include "api/array_view.h" +#include "rtc_base/checks.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_reader_test.cc b/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_reader_test.cc @@ -10,11 +10,11 @@ #include "net/dcsctp/packet/bounded_byte_reader.h" +#include <cstdint> + #include "api/array_view.h" -#include "rtc_base/buffer.h" -#include "rtc_base/checks.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_writer.h b/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_writer.h @@ -12,8 +12,12 @@ #define NET_DCSCTP_PACKET_BOUNDED_BYTE_WRITER_H_ #include <algorithm> +#include <cstddef> +#include <cstdint> +#include <cstring> #include "api/array_view.h" +#include "rtc_base/checks.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_writer_test.cc b/third_party/libwebrtc/net/dcsctp/packet/bounded_byte_writer_test.cc @@ -10,13 +10,12 @@ #include "net/dcsctp/packet/bounded_byte_writer.h" +#include <cstdint> #include <vector> #include "api/array_view.h" -#include "rtc_base/buffer.h" -#include "rtc_base/checks.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/abort_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/abort_chunk.h @@ -9,17 +9,17 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_ABORT_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_ABORT_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/chunk.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/chunk.cc @@ -10,12 +10,10 @@ #include "net/dcsctp/packet/chunk/chunk.h" #include <cstdint> -#include <memory> #include <optional> -#include <utility> +#include <string> #include "api/array_view.h" -#include "net/dcsctp/common/math.h" #include "net/dcsctp/packet/chunk/abort_chunk.h" #include "net/dcsctp/packet/chunk/cookie_ack_chunk.h" #include "net/dcsctp/packet/chunk/cookie_echo_chunk.h" @@ -33,7 +31,7 @@ #include "net/dcsctp/packet/chunk/shutdown_ack_chunk.h" #include "net/dcsctp/packet/chunk/shutdown_chunk.h" #include "net/dcsctp/packet/chunk/shutdown_complete_chunk.h" -#include "net/dcsctp/packet/tlv_trait.h" +#include "rtc_base/strings/string_builder.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/chunk.h @@ -10,24 +10,12 @@ #ifndef NET_DCSCTP_PACKET_CHUNK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_CHUNK_H_ -#include <stddef.h> -#include <sys/types.h> #include <cstdint> -#include <iterator> -#include <memory> -#include <optional> #include <string> -#include <utility> #include <vector> -#include "absl/algorithm/container.h" -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/data.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" -#include "net/dcsctp/packet/parameter/parameter.h" -#include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/cookie_ack_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/cookie_ack_chunk.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_COOKIE_ACK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_COOKIE_ACK_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/cookie_echo_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/cookie_echo_chunk.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_COOKIE_ECHO_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_COOKIE_ECHO_CHUNK_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/data_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/data_chunk.h @@ -9,20 +9,21 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_DATA_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_DATA_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/data_common.h" #include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/data_chunk_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/data_chunk_test.cc @@ -10,13 +10,14 @@ #include "net/dcsctp/packet/chunk/data_chunk.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/data_common.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/data_common.h @@ -9,14 +9,17 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_DATA_COMMON_H_ #define NET_DCSCTP_PACKET_CHUNK_DATA_COMMON_H_ -#include <stdint.h> +#include <cstdint> #include <utility> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/strong_alias.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/error_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/error_chunk.h @@ -9,17 +9,17 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_ERROR_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_ERROR_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/error_chunk_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/error_chunk_test.cc @@ -10,15 +10,14 @@ #include "net/dcsctp/packet/chunk/error_chunk.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" #include "net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/forward_tsn_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/forward_tsn_chunk.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_FORWARD_TSN_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_FORWARD_TSN_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/forward_tsn_common.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/forward_tsn_common.h @@ -9,13 +9,14 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_FORWARD_TSN_COMMON_H_ #define NET_DCSCTP_PACKET_CHUNK_FORWARD_TSN_COMMON_H_ -#include <stdint.h> #include <utility> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/heartbeat_ack_chunk.h @@ -9,14 +9,14 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_HEARTBEAT_ACK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_HEARTBEAT_ACK_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/heartbeat_request_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/heartbeat_request_chunk.h @@ -9,14 +9,14 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_HEARTBEAT_REQUEST_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_HEARTBEAT_REQUEST_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/idata_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/idata_chunk.h @@ -9,20 +9,21 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_IDATA_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_IDATA_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/data_common.h" #include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/idata_chunk_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/idata_chunk_test.cc @@ -10,13 +10,15 @@ #include "net/dcsctp/packet/chunk/idata_chunk.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/iforward_tsn_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/iforward_tsn_chunk.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_IFORWARD_TSN_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_IFORWARD_TSN_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/init_ack_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/init_ack_chunk.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_INIT_ACK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_INIT_ACK_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/init_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/init_chunk.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_INIT_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_INIT_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/reconfig_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/reconfig_chunk.h @@ -9,14 +9,14 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_RECONFIG_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_RECONFIG_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/parameter/parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/reconfig_chunk_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/reconfig_chunk_test.cc @@ -10,16 +10,16 @@ #include "net/dcsctp/packet/chunk/reconfig_chunk.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" #include "net/dcsctp/packet/parameter/parameter.h" -#include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/sack_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/sack_chunk.h @@ -9,16 +9,17 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_SACK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_SACK_CHUNK_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <set> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/sack_chunk_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk/sack_chunk_test.cc @@ -10,13 +10,13 @@ #include "net/dcsctp/packet/chunk/sack_chunk.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_ack_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_ack_chunk.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_ACK_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_ACK_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_chunk.h @@ -9,14 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_complete_chunk.h b/third_party/libwebrtc/net/dcsctp/packet/chunk/shutdown_complete_chunk.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_COMPLETE_CHUNK_H_ #define NET_DCSCTP_PACKET_CHUNK_SHUTDOWN_COMPLETE_CHUNK_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk_validators.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk_validators.cc @@ -10,9 +10,12 @@ #include "net/dcsctp/packet/chunk_validators.h" #include <algorithm> +#include <cstddef> +#include <cstdint> #include <utility> #include <vector> +#include "absl/algorithm/container.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" #include "rtc_base/logging.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/chunk_validators_test.cc b/third_party/libwebrtc/net/dcsctp/packet/chunk_validators_test.cc @@ -11,8 +11,10 @@ #include <utility> -#include "rtc_base/gunit.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/packet/chunk/sack_chunk.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/crc32c.cc b/third_party/libwebrtc/net/dcsctp/packet/crc32c.cc @@ -11,6 +11,7 @@ #include <cstdint> +#include "api/array_view.h" #include "third_party/crc32c/src/include/crc32c/crc32c.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/crc32c_test.cc b/third_party/libwebrtc/net/dcsctp/packet/crc32c_test.cc @@ -9,7 +9,10 @@ */ #include "net/dcsctp/packet/crc32c.h" -#include "test/gmock.h" +#include <array> +#include <cstdint> + +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/data.h b/third_party/libwebrtc/net/dcsctp/packet/data.h @@ -10,12 +10,14 @@ #ifndef NET_DCSCTP_PACKET_DATA_H_ #define NET_DCSCTP_PACKET_DATA_H_ +#include <cstddef> #include <cstdint> #include <utility> #include <vector> #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/public/types.h" +#include "rtc_base/strong_alias.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/cookie_received_while_shutting_down_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_COOKIE_RECEIVED_WHILE_SHUTTING_DOWN_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_COOKIE_RECEIVED_WHILE_SHUTTING_DOWN_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/error_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/error_cause.h @@ -10,22 +10,10 @@ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_ERROR_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_ERROR_CAUSE_H_ -#include <stddef.h> -#include <cstdint> -#include <iosfwd> -#include <memory> -#include <optional> #include <string> -#include <type_traits> -#include <utility> -#include <vector> -#include "absl/algorithm/container.h" -#include "absl/strings/string_view.h" -#include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" -#include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/invalid_mandatory_parameter_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_INVALID_MANDATORY_PARAMETER_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_INVALID_MANDATORY_PARAMETER_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/invalid_stream_identifier_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_INVALID_STREAM_IDENTIFIER_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_INVALID_STREAM_IDENTIFIER_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/missing_mandatory_parameter_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_MISSING_MANDATORY_PARAMETER_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_MISSING_MANDATORY_PARAMETER_CAUSE_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/no_user_data_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/no_user_data_cause.h @@ -9,16 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_NO_USER_DATA_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_NO_USER_DATA_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/out_of_resource_error_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_OUT_OF_RESOURCE_ERROR_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_OUT_OF_RESOURCE_ERROR_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/protocol_violation_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/protocol_violation_cause.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_PROTOCOL_VIOLATION_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_PROTOCOL_VIOLATION_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> #include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/restart_of_an_association_with_new_address_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_RESTART_OF_AN_ASSOCIATION_WITH_NEW_ADDRESS_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_RESTART_OF_AN_ASSOCIATION_WITH_NEW_ADDRESS_CAUSE_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/stale_cookie_error_cause.h @@ -9,15 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_STALE_COOKIE_ERROR_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_STALE_COOKIE_ERROR_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc b/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.cc @@ -18,7 +18,6 @@ #include "api/array_view.h" #include "net/dcsctp/packet/bounded_byte_reader.h" #include "net/dcsctp/packet/bounded_byte_writer.h" -#include "net/dcsctp/packet/tlv_trait.h" #include "rtc_base/strings/string_builder.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h @@ -9,17 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_UNRECOGNIZED_CHUNK_TYPE_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_UNRECOGNIZED_CHUNK_TYPE_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause_test.cc b/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause_test.cc @@ -10,13 +10,12 @@ #include "net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/unrecognized_parameter_cause.h @@ -9,16 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_UNRECOGNIZED_PARAMETER_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_UNRECOGNIZED_PARAMETER_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/unresolvable_address_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/unresolvable_address_cause.h @@ -9,16 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_UNRESOLVABLE_ADDRESS_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_UNRESOLVABLE_ADDRESS_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h b/third_party/libwebrtc/net/dcsctp/packet/error_cause/user_initiated_abort_cause.h @@ -9,15 +9,16 @@ */ #ifndef NET_DCSCTP_PACKET_ERROR_CAUSE_USER_INITIATED_ABORT_CAUSE_H_ #define NET_DCSCTP_PACKET_ERROR_CAUSE_USER_INITIATED_ABORT_CAUSE_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> #include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/add_incoming_streams_request_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_ADD_INCOMING_STREAMS_REQUEST_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_ADD_INCOMING_STREAMS_REQUEST_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/add_outgoing_streams_request_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_ADD_OUTGOING_STREAMS_REQUEST_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_ADD_OUTGOING_STREAMS_REQUEST_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/forward_tsn_supported_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_FORWARD_TSN_SUPPORTED_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_FORWARD_TSN_SUPPORTED_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/heartbeat_info_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/heartbeat_info_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_HEARTBEAT_INFO_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_HEARTBEAT_INFO_PARAMETER_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h @@ -9,17 +9,18 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_INCOMING_SSN_RESET_REQUEST_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_INCOMING_SSN_RESET_REQUEST_PARAMETER_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/parameter.h" +#include "net/dcsctp/packet/tlv_trait.h" #include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter_test.cc b/third_party/libwebrtc/net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter_test.cc @@ -10,13 +10,14 @@ #include "net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h @@ -9,15 +9,14 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_OUTGOING_SSN_RESET_REQUEST_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_OUTGOING_SSN_RESET_REQUEST_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc b/third_party/libwebrtc/net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter_test.cc @@ -10,15 +10,14 @@ #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/parameter.h @@ -10,23 +10,15 @@ #ifndef NET_DCSCTP_PACKET_PARAMETER_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_PARAMETER_H_ -#include <stddef.h> -#include <algorithm> #include <cstdint> -#include <iterator> -#include <memory> #include <optional> #include <string> #include <type_traits> #include <utility> #include <vector> -#include "absl/algorithm/container.h" -#include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/tlv_trait.h" -#include "rtc_base/strings/string_builder.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/parameter_test.cc b/third_party/libwebrtc/net/dcsctp/packet/parameter/parameter_test.cc @@ -10,15 +10,15 @@ #include "net/dcsctp/packet/parameter/parameter.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" -#include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/reconfiguration_response_parameter.h @@ -9,8 +9,8 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_RECONFIGURATION_RESPONSE_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_RECONFIGURATION_RESPONSE_PARAMETER_H_ -#include <stddef.h> +#include <cstddef> #include <cstdint> #include <optional> #include <string> diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_SSN_TSN_RESET_REQUEST_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_SSN_TSN_RESET_REQUEST_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/parameter/parameter.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/state_cookie_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/state_cookie_parameter.h @@ -9,14 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_STATE_COOKIE_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_STATE_COOKIE_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter.cc b/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter.cc @@ -18,7 +18,6 @@ #include "api/array_view.h" #include "net/dcsctp/packet/bounded_byte_reader.h" #include "net/dcsctp/packet/bounded_byte_writer.h" -#include "net/dcsctp/packet/tlv_trait.h" #include "rtc_base/strings/str_join.h" #include "rtc_base/strings/string_builder.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter.h @@ -9,16 +9,15 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_SUPPORTED_EXTENSIONS_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_SUPPORTED_EXTENSIONS_PARAMETER_H_ -#include <stddef.h> #include <algorithm> +#include <cstddef> #include <cstdint> -#include <iterator> +#include <optional> #include <string> #include <utility> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter_test.cc b/third_party/libwebrtc/net/dcsctp/packet/parameter/supported_extensions_parameter_test.cc @@ -10,13 +10,12 @@ #include "net/dcsctp/packet/parameter/supported_extensions_parameter.h" #include <cstdint> -#include <type_traits> #include <vector> #include "api/array_view.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h b/third_party/libwebrtc/net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h @@ -9,13 +9,13 @@ */ #ifndef NET_DCSCTP_PACKET_PARAMETER_ZERO_CHECKSUM_ACCEPTABLE_CHUNK_PARAMETER_H_ #define NET_DCSCTP_PACKET_PARAMETER_ZERO_CHECKSUM_ACCEPTABLE_CHUNK_PARAMETER_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> +#include <optional> #include <string> #include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/tlv_trait.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/sctp_packet.h b/third_party/libwebrtc/net/dcsctp/packet/sctp_packet.h @@ -10,11 +10,9 @@ #ifndef NET_DCSCTP_PACKET_SCTP_PACKET_H_ #define NET_DCSCTP_PACKET_SCTP_PACKET_H_ -#include <stddef.h> - +#include <cstddef> #include <cstdint> -#include <functional> -#include <memory> +#include <optional> #include <utility> #include <vector> diff --git a/third_party/libwebrtc/net/dcsctp/packet/sctp_packet_test.cc b/third_party/libwebrtc/net/dcsctp/packet/sctp_packet_test.cc @@ -9,8 +9,8 @@ */ #include "net/dcsctp/packet/sctp_packet.h" +#include <cstddef> #include <cstdint> -#include <utility> #include <vector> #include "api/array_view.h" @@ -21,14 +21,13 @@ #include "net/dcsctp/packet/chunk/data_chunk.h" #include "net/dcsctp/packet/chunk/init_chunk.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" #include "net/dcsctp/packet/error_cause/user_initiated_abort_cause.h" #include "net/dcsctp/packet/parameter/parameter.h" -#include "net/dcsctp/packet/tlv_trait.h" #include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/packet/tlv_trait.cc b/third_party/libwebrtc/net/dcsctp/packet/tlv_trait.cc @@ -9,6 +9,8 @@ */ #include "net/dcsctp/packet/tlv_trait.h" +#include <cstddef> + #include "rtc_base/logging.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/packet/tlv_trait.h b/third_party/libwebrtc/net/dcsctp/packet/tlv_trait.h @@ -10,14 +10,10 @@ #ifndef NET_DCSCTP_PACKET_TLV_TRAIT_H_ #define NET_DCSCTP_PACKET_TLV_TRAIT_H_ -#include <stdint.h> -#include <string.h> - -#include <algorithm> #include <cstddef> #include <cstdint> +#include <cstring> #include <optional> -#include <string> #include <vector> #include "api/array_view.h" diff --git a/third_party/libwebrtc/net/dcsctp/packet/tlv_trait_test.cc b/third_party/libwebrtc/net/dcsctp/packet/tlv_trait_test.cc @@ -9,13 +9,16 @@ */ #include "net/dcsctp/packet/tlv_trait.h" +#include <cstddef> +#include <cstdint> +#include <optional> #include <vector> #include "api/array_view.h" -#include "rtc_base/buffer.h" -#include "rtc_base/checks.h" -#include "rtc_base/gunit.h" +#include "net/dcsctp/packet/bounded_byte_reader.h" +#include "net/dcsctp/packet/bounded_byte_writer.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/public/BUILD.gn b/third_party/libwebrtc/net/dcsctp/public/BUILD.gn @@ -29,6 +29,7 @@ rtc_library("socket") { "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:strong_alias", + "//third_party/abseil-cpp/absl/base:core_headers", "//third_party/abseil-cpp/absl/strings:string_view", ] sources = [ @@ -62,7 +63,10 @@ rtc_source_set("mocks") { deps = [ ":factory", ":socket", + ":types", + "../../../api:array_view", "../../../test:test_support", + "//third_party/abseil-cpp/absl/strings:string_view", ] } diff --git a/third_party/libwebrtc/net/dcsctp/public/dcsctp_handover_state.cc b/third_party/libwebrtc/net/dcsctp/public/dcsctp_handover_state.cc @@ -9,6 +9,7 @@ */ #include "net/dcsctp/public/dcsctp_handover_state.h" +#include <cstdint> #include <string> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/dcsctp_options.h b/third_party/libwebrtc/net/dcsctp/public/dcsctp_options.h @@ -10,9 +10,8 @@ #ifndef NET_DCSCTP_PUBLIC_DCSCTP_OPTIONS_H_ #define NET_DCSCTP_PUBLIC_DCSCTP_OPTIONS_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <optional> #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/dcsctp_socket.h b/third_party/libwebrtc/net/dcsctp/public/dcsctp_socket.h @@ -10,12 +10,13 @@ #ifndef NET_DCSCTP_PUBLIC_DCSCTP_SOCKET_H_ #define NET_DCSCTP_PUBLIC_DCSCTP_SOCKET_H_ +#include <cstddef> #include <cstdint> #include <memory> #include <optional> -#include <utility> #include <vector> +#include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/task_queue/task_queue_base.h" @@ -23,7 +24,6 @@ #include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_options.h" -#include "net/dcsctp/public/packet_observer.h" #include "net/dcsctp/public/timeout.h" #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket.h b/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket.h @@ -10,9 +10,17 @@ #ifndef NET_DCSCTP_PUBLIC_MOCK_DCSCTP_SOCKET_H_ #define NET_DCSCTP_PUBLIC_MOCK_DCSCTP_SOCKET_H_ +#include <cstddef> +#include <cstdint> +#include <optional> #include <vector> +#include "api/array_view.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/types.h" #include "test/gmock.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket_factory.h b/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket_factory.h @@ -12,7 +12,11 @@ #include <memory> +#include "absl/strings/string_view.h" +#include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/dcsctp_socket_factory.h" +#include "net/dcsctp/public/packet_observer.h" #include "test/gmock.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket_test.cc b/third_party/libwebrtc/net/dcsctp/public/mock_dcsctp_socket_test.cc @@ -9,8 +9,8 @@ */ #include "net/dcsctp/public/mock_dcsctp_socket.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/public/packet_observer.h b/third_party/libwebrtc/net/dcsctp/public/packet_observer.h @@ -10,7 +10,7 @@ #ifndef NET_DCSCTP_PUBLIC_PACKET_OBSERVER_H_ #define NET_DCSCTP_PUBLIC_PACKET_OBSERVER_H_ -#include <stdint.h> +#include <cstdint> #include "api/array_view.h" #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/text_pcap_packet_observer.cc b/third_party/libwebrtc/net/dcsctp/public/text_pcap_packet_observer.cc @@ -9,6 +9,9 @@ */ #include "net/dcsctp/public/text_pcap_packet_observer.h" +#include <cstdint> + +#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/public/types.h" #include "rtc_base/logging.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/text_pcap_packet_observer.h b/third_party/libwebrtc/net/dcsctp/public/text_pcap_packet_observer.h @@ -10,6 +10,7 @@ #ifndef NET_DCSCTP_PUBLIC_TEXT_PCAP_PACKET_OBSERVER_H_ #define NET_DCSCTP_PUBLIC_TEXT_PCAP_PACKET_OBSERVER_H_ +#include <cstdint> #include <string> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/timeout.h b/third_party/libwebrtc/net/dcsctp/public/timeout.h @@ -10,7 +10,6 @@ #ifndef NET_DCSCTP_PUBLIC_TIMEOUT_H_ #define NET_DCSCTP_PUBLIC_TIMEOUT_H_ -#include <cstdint> #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/public/types_test.cc b/third_party/libwebrtc/net/dcsctp/public/types_test.cc @@ -9,8 +9,7 @@ */ #include "net/dcsctp/public/types.h" -#include "rtc_base/gunit.h" -#include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/rx/BUILD.gn b/third_party/libwebrtc/net/dcsctp/rx/BUILD.gn @@ -14,6 +14,7 @@ rtc_library("data_tracker") { "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", + "../common:internal_types", "../common:sequence_numbers", "../packet:chunk", "../packet:data", @@ -120,6 +121,8 @@ if (rtc_include_tests) { ":traditional_reassembly_streams", "../../../api:array_view", "../../../api/task_queue:task_queue", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", "../../../test:test_support", diff --git a/third_party/libwebrtc/net/dcsctp/rx/data_tracker.cc b/third_party/libwebrtc/net/dcsctp/rx/data_tracker.cc @@ -10,21 +10,22 @@ #include "net/dcsctp/rx/data_tracker.h" #include <algorithm> +#include <cstddef> #include <cstdint> -#include <iterator> -#include <optional> #include <set> -#include <string> #include <utility> #include <vector> #include "absl/algorithm/container.h" #include "absl/strings/string_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" +#include "net/dcsctp/packet/chunk/data_common.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/timer/timer.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" -#include "rtc_base/strings/string_builder.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/rx/data_tracker.h b/third_party/libwebrtc/net/dcsctp/rx/data_tracker.h @@ -10,20 +10,16 @@ #ifndef NET_DCSCTP_RX_DATA_TRACKER_H_ #define NET_DCSCTP_RX_DATA_TRACKER_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> #include <cstdint> #include <set> -#include <string> -#include <utility> #include <vector> #include "absl/strings/string_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/data_common.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" -#include "net/dcsctp/packet/data.h" #include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/timer/timer.h" diff --git a/third_party/libwebrtc/net/dcsctp/rx/data_tracker_test.cc b/third_party/libwebrtc/net/dcsctp/rx/data_tracker_test.cc @@ -9,19 +9,23 @@ */ #include "net/dcsctp/rx/data_tracker.h" +#include <cstddef> #include <cstdint> #include <initializer_list> #include <memory> -#include <optional> -#include "api/array_view.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/handover_testing.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/packet/chunk/data_common.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/timer/fake_timeout.h" #include "net/dcsctp/timer/timer.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams.h b/third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams.h @@ -10,16 +10,18 @@ #ifndef NET_DCSCTP_RX_INTERLEAVED_REASSEMBLY_STREAMS_H_ #define NET_DCSCTP_RX_INTERLEAVED_REASSEMBLY_STREAMS_H_ -#include <cstdint> +#include <cstddef> #include <map> -#include <string> #include <utility> #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_streams.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_test.cc b/third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_test.cc @@ -10,18 +10,21 @@ #include "net/dcsctp/rx/interleaved_reassembly_streams.h" #include <cstdint> -#include <memory> #include <utility> #include "net/dcsctp/common/handover_testing.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_streams.h" #include "net/dcsctp/testing/data_generator.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/rx/reassembly_queue.h b/third_party/libwebrtc/net/dcsctp/rx/reassembly_queue.h @@ -10,13 +10,10 @@ #ifndef NET_DCSCTP_RX_REASSEMBLY_QUEUE_H_ #define NET_DCSCTP_RX_REASSEMBLY_QUEUE_H_ -#include <stddef.h> - -#include <cstdint> +#include <cstddef> #include <deque> #include <memory> -#include <set> -#include <string> +#include <optional> #include <utility> #include <vector> @@ -27,9 +24,9 @@ #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/data.h" -#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" -#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_streams.h" #include "rtc_base/containers/flat_set.h" diff --git a/third_party/libwebrtc/net/dcsctp/rx/reassembly_streams.h b/third_party/libwebrtc/net/dcsctp/rx/reassembly_streams.h @@ -10,19 +10,16 @@ #ifndef NET_DCSCTP_RX_REASSEMBLY_STREAMS_H_ #define NET_DCSCTP_RX_REASSEMBLY_STREAMS_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> #include <functional> -#include <vector> -#include "absl/strings/string_view.h" #include "api/array_view.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/data.h" #include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams.h b/third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams.h @@ -9,17 +9,18 @@ */ #ifndef NET_DCSCTP_RX_TRADITIONAL_REASSEMBLY_STREAMS_H_ #define NET_DCSCTP_RX_TRADITIONAL_REASSEMBLY_STREAMS_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> #include <map> -#include <string> #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_streams.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_test.cc b/third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_test.cc @@ -10,18 +10,21 @@ #include "net/dcsctp/rx/traditional_reassembly_streams.h" #include <cstdint> -#include <memory> #include <utility> #include "net/dcsctp/common/handover_testing.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_streams.h" #include "net/dcsctp/testing/data_generator.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/BUILD.gn b/third_party/libwebrtc/net/dcsctp/socket/BUILD.gn @@ -54,6 +54,7 @@ rtc_library("stream_reset_handler") { "../../../rtc_base:stringutils", "../../../rtc_base/containers:flat_set", "../common:internal_types", + "../common:sequence_numbers", "../packet:chunk", "../packet:parameter", "../packet:sctp_packet", @@ -75,6 +76,7 @@ rtc_library("stream_reset_handler") { rtc_library("packet_sender") { deps = [ + "../../../api:array_view", "../packet:sctp_packet", "../public:socket", "../public:types", @@ -95,9 +97,11 @@ rtc_library("transmission_control_block") { "../../../api:array_view", "../../../api/task_queue:task_queue", "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", + "../common:internal_types", "../common:sequence_numbers", "../packet:chunk", "../packet:sctp_packet", @@ -132,6 +136,8 @@ rtc_library("dcsctp_socket") { "../../../api:refcountedbase", "../../../api:scoped_refptr", "../../../api/task_queue:task_queue", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", @@ -175,6 +181,8 @@ if (rtc_include_tests) { deps = [ "../../../api:array_view", "../../../api/task_queue:task_queue", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:logging", "../../../rtc_base:random", "../../../test:test_support", @@ -191,6 +199,7 @@ if (rtc_include_tests) { deps = [ ":context", ":mock_callbacks", + "../../../api/units:time_delta", "../../../test:test_support", "../common:internal_types", "../packet:sctp_packet", @@ -214,10 +223,13 @@ if (rtc_include_tests) { "../../../api:array_view", "../../../api:create_network_emulation_manager", "../../../api:network_emulation_manager_api", + "../../../api:simulated_network_api", "../../../api/task_queue", "../../../api/task_queue:pending_task_safety_flag", + "../../../api/test/network_emulation", "../../../api/units:data_rate", "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:copy_on_write_buffer", "../../../rtc_base:gunit_helpers", @@ -226,12 +238,14 @@ if (rtc_include_tests) { "../../../rtc_base:rtc_base_tests_utils", "../../../rtc_base:socket_address", "../../../rtc_base:stringutils", + "../../../rtc_base:threading", "../../../rtc_base:timeutils", "../../../test:test_support", "../common:handover_testing", "../common:internal_types", "../common:math", "../packet:chunk", + "../packet:data", "../packet:error_cause", "../packet:parameter", "../packet:sctp_packet", diff --git a/third_party/libwebrtc/net/dcsctp/socket/callback_deferrer.cc b/third_party/libwebrtc/net/dcsctp/socket/callback_deferrer.cc @@ -9,7 +9,21 @@ */ #include "net/dcsctp/socket/callback_deferrer.h" -#include "api/make_ref_counted.h" +#include <cstdint> +#include <memory> +#include <string> +#include <utility> +#include <variant> +#include <vector> + +#include "absl/strings/string_view.h" +#include "api/array_view.h" +#include "api/task_queue/task_queue_base.h" +#include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/checks.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/socket/callback_deferrer.h b/third_party/libwebrtc/net/dcsctp/socket/callback_deferrer.h @@ -11,7 +11,6 @@ #define NET_DCSCTP_SOCKET_CALLBACK_DEFERRER_H_ #include <cstdint> -#include <functional> #include <memory> #include <string> #include <utility> @@ -20,11 +19,12 @@ #include "absl/strings/string_view.h" #include "api/array_view.h" -#include "api/ref_counted_base.h" -#include "api/scoped_refptr.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/timestamp.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { // Defers callbacks until they can be safely triggered. diff --git a/third_party/libwebrtc/net/dcsctp/socket/context.h b/third_party/libwebrtc/net/dcsctp/socket/context.h @@ -10,14 +10,12 @@ #ifndef NET_DCSCTP_SOCKET_CONTEXT_H_ #define NET_DCSCTP_SOCKET_CONTEXT_H_ -#include <cstdint> #include "absl/strings/string_view.h" #include "api/units/time_delta.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/dcsctp_socket.h" -#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket.cc b/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket.cc @@ -10,6 +10,7 @@ #include "net/dcsctp/socket/dcsctp_socket.h" #include <algorithm> +#include <cstddef> #include <cstdint> #include <limits> #include <memory> @@ -19,9 +20,12 @@ #include <vector> #include "absl/functional/bind_front.h" -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/abort_chunk.h" #include "net/dcsctp/packet/chunk/chunk.h" #include "net/dcsctp/packet/chunk/cookie_ack_chunk.h" @@ -57,7 +61,7 @@ #include "net/dcsctp/packet/parameter/supported_extensions_parameter.h" #include "net/dcsctp/packet/parameter/zero_checksum_acceptable_chunk_parameter.h" #include "net/dcsctp/packet/sctp_packet.h" -#include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" @@ -73,7 +77,6 @@ #include "net/dcsctp/socket/transmission_control_block.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/retransmission_queue.h" -#include "net/dcsctp/tx/send_queue.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket.h b/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket.h @@ -10,50 +10,32 @@ #ifndef NET_DCSCTP_SOCKET_DCSCTP_SOCKET_H_ #define NET_DCSCTP_SOCKET_DCSCTP_SOCKET_H_ +#include <cstddef> #include <cstdint> #include <memory> +#include <optional> #include <string> -#include <utility> #include <vector> #include "absl/strings/string_view.h" #include "api/array_view.h" -#include "net/dcsctp/packet/chunk/abort_chunk.h" -#include "net/dcsctp/packet/chunk/chunk.h" -#include "net/dcsctp/packet/chunk/cookie_ack_chunk.h" -#include "net/dcsctp/packet/chunk/cookie_echo_chunk.h" -#include "net/dcsctp/packet/chunk/data_chunk.h" +#include "api/units/time_delta.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/data_common.h" -#include "net/dcsctp/packet/chunk/error_chunk.h" -#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" -#include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h" -#include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h" -#include "net/dcsctp/packet/chunk/idata_chunk.h" -#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" -#include "net/dcsctp/packet/chunk/init_ack_chunk.h" -#include "net/dcsctp/packet/chunk/init_chunk.h" -#include "net/dcsctp/packet/chunk/reconfig_chunk.h" -#include "net/dcsctp/packet/chunk/sack_chunk.h" -#include "net/dcsctp/packet/chunk/shutdown_ack_chunk.h" -#include "net/dcsctp/packet/chunk/shutdown_chunk.h" -#include "net/dcsctp/packet/chunk/shutdown_complete_chunk.h" -#include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/packet_observer.h" -#include "net/dcsctp/rx/data_tracker.h" -#include "net/dcsctp/rx/reassembly_queue.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/callback_deferrer.h" +#include "net/dcsctp/socket/capabilities.h" #include "net/dcsctp/socket/packet_sender.h" #include "net/dcsctp/socket/state_cookie.h" #include "net/dcsctp/socket/transmission_control_block.h" #include "net/dcsctp/timer/timer.h" -#include "net/dcsctp/tx/retransmission_error_counter.h" -#include "net/dcsctp/tx/retransmission_queue.h" -#include "net/dcsctp/tx/retransmission_timeout.h" #include "net/dcsctp/tx/rr_send_queue.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_network_test.cc b/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_network_test.cc @@ -7,37 +7,44 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include <cstddef> #include <cstdint> -#include <deque> +#include <functional> #include <memory> #include <optional> #include <string> #include <utility> #include <vector> -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/task_queue_base.h" #include "api/test/create_network_emulation_manager.h" +#include "api/test/network_emulation/network_emulation_interfaces.h" #include "api/test/network_emulation_manager.h" +#include "api/test/simulated_network.h" #include "api/units/data_rate.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/timeout.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/dcsctp_socket.h" #include "net/dcsctp/testing/testing_macros.h" #include "net/dcsctp/timer/task_queue_timeout.h" #include "rtc_base/copy_on_write_buffer.h" -#include "rtc_base/gunit.h" #include "rtc_base/logging.h" #include "rtc_base/random.h" #include "rtc_base/socket_address.h" +#include "rtc_base/strings/string_builder.h" #include "rtc_base/strings/string_format.h" +#include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "test/gmock.h" +#include "test/gtest.h" #if !defined(WEBRTC_ANDROID) && defined(NDEBUG) && \ !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) diff --git a/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_test.cc b/third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_test.cc @@ -10,8 +10,8 @@ #include "net/dcsctp/socket/dcsctp_socket.h" #include <algorithm> +#include <cstddef> #include <cstdint> -#include <deque> #include <memory> #include <optional> #include <string> @@ -19,10 +19,12 @@ #include <vector> #include "absl/flags/flag.h" -#include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/handover_testing.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/math.h" #include "net/dcsctp/packet/chunk/abort_chunk.h" #include "net/dcsctp/packet/chunk/chunk.h" @@ -34,13 +36,12 @@ #include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h" #include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h" -#include "net/dcsctp/packet/chunk/idata_chunk.h" #include "net/dcsctp/packet/chunk/init_ack_chunk.h" #include "net/dcsctp/packet/chunk/init_chunk.h" #include "net/dcsctp/packet/chunk/reconfig_chunk.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" #include "net/dcsctp/packet/chunk/shutdown_chunk.h" -#include "net/dcsctp/packet/error_cause/error_cause.h" +#include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/error_cause/unrecognized_chunk_type_cause.h" #include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h" #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" @@ -48,16 +49,19 @@ #include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" #include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/packet_observer.h" #include "net/dcsctp/public/text_pcap_packet_observer.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/reassembly_queue.h" #include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" +#include "rtc_base/logging.h" #include "test/gmock.h" +#include "test/gtest.h" ABSL_FLAG(bool, dcsctp_capture_packets, false, "Print packet capture."); diff --git a/third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler.h b/third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler.h @@ -10,15 +10,13 @@ #ifndef NET_DCSCTP_SOCKET_HEARTBEAT_HANDLER_H_ #define NET_DCSCTP_SOCKET_HEARTBEAT_HANDLER_H_ -#include <stdint.h> #include <memory> -#include <string> #include "absl/strings/string_view.h" +#include "api/units/time_delta.h" #include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h" #include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h" -#include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/socket/context.h" #include "net/dcsctp/timer/timer.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_test.cc b/third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_test.cc @@ -9,19 +9,26 @@ */ #include "net/dcsctp/socket/heartbeat_handler.h" -#include <memory> +#include <cstdint> +#include <optional> #include <utility> #include <vector> #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" #include "net/dcsctp/packet/chunk/heartbeat_ack_chunk.h" #include "net/dcsctp/packet/chunk/heartbeat_request_chunk.h" #include "net/dcsctp/packet/parameter/heartbeat_info_parameter.h" +#include "net/dcsctp/packet/parameter/parameter.h" +#include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/mock_context.h" +#include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" +#include "net/dcsctp/timer/timer.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/mock_context.h b/third_party/libwebrtc/net/dcsctp/socket/mock_context.h @@ -10,10 +10,10 @@ #ifndef NET_DCSCTP_SOCKET_MOCK_CONTEXT_H_ #define NET_DCSCTP_SOCKET_MOCK_CONTEXT_H_ -#include <cstdint> -#include <optional> #include "absl/strings/string_view.h" +#include "api/units/time_delta.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h b/third_party/libwebrtc/net/dcsctp/socket/mock_dcsctp_socket_callbacks.h @@ -21,6 +21,8 @@ #include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/timeout.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/packet_sender.cc b/third_party/libwebrtc/net/dcsctp/socket/packet_sender.cc @@ -9,10 +9,14 @@ */ #include "net/dcsctp/socket/packet_sender.h" +#include <cstdint> +#include <functional> #include <utility> #include <vector> -#include "net/dcsctp/public/types.h" +#include "api/array_view.h" +#include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_socket.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/socket/packet_sender.h b/third_party/libwebrtc/net/dcsctp/socket/packet_sender.h @@ -10,6 +10,10 @@ #ifndef NET_DCSCTP_SOCKET_PACKET_SENDER_H_ #define NET_DCSCTP_SOCKET_PACKET_SENDER_H_ +#include <cstdint> +#include <functional> + +#include "api/array_view.h" #include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/dcsctp_socket.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/packet_sender_test.cc b/third_party/libwebrtc/net/dcsctp/socket/packet_sender_test.cc @@ -9,11 +9,17 @@ */ #include "net/dcsctp/socket/packet_sender.h" +#include <cstdint> + +#include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/cookie_ack_chunk.h" +#include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/state_cookie.cc b/third_party/libwebrtc/net/dcsctp/socket/state_cookie.cc @@ -9,11 +9,13 @@ */ #include "net/dcsctp/socket/state_cookie.h" +#include <cstddef> #include <cstdint> #include <optional> #include <vector> #include "api/array_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/bounded_byte_reader.h" #include "net/dcsctp/packet/bounded_byte_writer.h" #include "net/dcsctp/socket/capabilities.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/state_cookie.h b/third_party/libwebrtc/net/dcsctp/socket/state_cookie.h @@ -10,6 +10,7 @@ #ifndef NET_DCSCTP_SOCKET_STATE_COOKIE_H_ #define NET_DCSCTP_SOCKET_STATE_COOKIE_H_ +#include <cstddef> #include <cstdint> #include <optional> #include <vector> diff --git a/third_party/libwebrtc/net/dcsctp/socket/state_cookie_test.cc b/third_party/libwebrtc/net/dcsctp/socket/state_cookie_test.cc @@ -9,9 +9,15 @@ */ #include "net/dcsctp/socket/state_cookie.h" +#include <cstdint> +#include <vector> + +#include "absl/strings/string_view.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/socket/capabilities.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler.cc b/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler.cc @@ -12,7 +12,6 @@ #include <cstdint> #include <memory> #include <optional> -#include <utility> #include <vector> #include "api/array_view.h" @@ -27,15 +26,18 @@ #include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" #include "net/dcsctp/packet/parameter/ssn_tsn_reset_request_parameter.h" #include "net/dcsctp/packet/sctp_packet.h" -#include "net/dcsctp/packet/tlv_trait.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/data_tracker.h" #include "net/dcsctp/rx/reassembly_queue.h" #include "net/dcsctp/socket/context.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/retransmission_queue.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/str_join.h" +#include "rtc_base/strings/string_builder.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler.h b/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler.h @@ -10,10 +10,8 @@ #ifndef NET_DCSCTP_SOCKET_STREAM_RESET_HANDLER_H_ #define NET_DCSCTP_SOCKET_STREAM_RESET_HANDLER_H_ -#include <cstdint> #include <memory> #include <optional> -#include <string> #include <utility> #include <vector> @@ -22,18 +20,17 @@ #include "api/array_view.h" #include "api/units/time_delta.h" #include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/reconfig_chunk.h" -#include "net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h" -#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" +#include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" -#include "net/dcsctp/packet/sctp_packet.h" -#include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/data_tracker.h" #include "net/dcsctp/rx/reassembly_queue.h" #include "net/dcsctp/socket/context.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/retransmission_queue.h" -#include "rtc_base/containers/flat_set.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_test.cc b/third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_test.cc @@ -13,11 +13,12 @@ #include <cstdint> #include <memory> #include <optional> -#include <type_traits> +#include <utility> #include <vector> #include "api/array_view.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" #include "net/dcsctp/common/handover_testing.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/forward_tsn_common.h" @@ -26,7 +27,9 @@ #include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" #include "net/dcsctp/packet/parameter/parameter.h" #include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" -#include "net/dcsctp/public/dcsctp_message.h" +#include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" +#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/data_tracker.h" #include "net/dcsctp/rx/reassembly_queue.h" @@ -37,8 +40,8 @@ #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/mock_send_queue.h" #include "net/dcsctp/tx/retransmission_queue.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block.cc b/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block.cc @@ -10,30 +10,38 @@ #include "net/dcsctp/socket/transmission_control_block.h" #include <algorithm> -#include <cstdint> +#include <cstddef> +#include <functional> #include <memory> #include <optional> #include <string> #include <utility> #include <vector> +#include "absl/functional/bind_front.h" +#include "absl/strings/string_view.h" +#include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/data_chunk.h" -#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/idata_chunk.h" -#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/reconfig_chunk.h" -#include "net/dcsctp/packet/chunk/sack_chunk.h" #include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/rx/data_tracker.h" #include "net/dcsctp/rx/reassembly_queue.h" #include "net/dcsctp/socket/capabilities.h" +#include "net/dcsctp/socket/packet_sender.h" #include "net/dcsctp/socket/stream_reset_handler.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/retransmission_queue.h" #include "net/dcsctp/tx/retransmission_timeout.h" +#include "net/dcsctp/tx/send_queue.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/string_builder.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block.h b/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block.h @@ -10,19 +10,20 @@ #ifndef NET_DCSCTP_SOCKET_TRANSMISSION_CONTROL_BLOCK_H_ #define NET_DCSCTP_SOCKET_TRANSMISSION_CONTROL_BLOCK_H_ -#include <cstdint> +#include <cstddef> #include <functional> #include <memory> +#include <optional> #include <string> #include <utility> -#include <vector> -#include "absl/functional/bind_front.h" #include "absl/strings/string_view.h" -#include "api/task_queue/task_queue_base.h" -#include "net/dcsctp/common/sequence_numbers.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/chunk/cookie_echo_chunk.h" #include "net/dcsctp/packet/sctp_packet.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/rx/data_tracker.h" diff --git a/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_test.cc b/third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_test.cc @@ -9,35 +9,21 @@ */ #include "net/dcsctp/socket/transmission_control_block.h" -#include <array> +#include <cstddef> #include <cstdint> -#include <memory> -#include <optional> -#include <type_traits> -#include <vector> #include "api/array_view.h" #include "api/task_queue/task_queue_base.h" -#include "net/dcsctp/common/handover_testing.h" #include "net/dcsctp/common/internal_types.h" -#include "net/dcsctp/packet/chunk/reconfig_chunk.h" -#include "net/dcsctp/packet/parameter/incoming_ssn_reset_request_parameter.h" -#include "net/dcsctp/packet/parameter/outgoing_ssn_reset_request_parameter.h" -#include "net/dcsctp/packet/parameter/parameter.h" -#include "net/dcsctp/packet/parameter/reconfiguration_response_parameter.h" -#include "net/dcsctp/public/dcsctp_message.h" -#include "net/dcsctp/rx/data_tracker.h" -#include "net/dcsctp/rx/reassembly_queue.h" +#include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/socket/capabilities.h" -#include "net/dcsctp/socket/mock_context.h" #include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" -#include "net/dcsctp/testing/data_generator.h" -#include "net/dcsctp/testing/testing_macros.h" +#include "net/dcsctp/socket/packet_sender.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/mock_send_queue.h" -#include "net/dcsctp/tx/retransmission_queue.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/testing/data_generator.cc b/third_party/libwebrtc/net/dcsctp/testing/data_generator.cc @@ -15,6 +15,7 @@ #include <vector> #include "absl/strings/string_view.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/data.h" #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/testing/data_generator.h b/third_party/libwebrtc/net/dcsctp/testing/data_generator.h @@ -15,9 +15,9 @@ #include <vector> #include "absl/strings/string_view.h" -#include "api/array_view.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/types.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/testing/testing_macros.h b/third_party/libwebrtc/net/dcsctp/testing/testing_macros.h @@ -10,7 +10,7 @@ #ifndef NET_DCSCTP_TESTING_TESTING_MACROS_H_ #define NET_DCSCTP_TESTING_TESTING_MACROS_H_ -#include <utility> +#include <utility> // IWYU pragma: keep namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/BUILD.gn b/third_party/libwebrtc/net/dcsctp/timer/BUILD.gn @@ -33,12 +33,15 @@ rtc_library("timer") { rtc_library("task_queue_timeout") { deps = [ "../../../api:array_view", + "../../../api:scoped_refptr", + "../../../api:sequence_checker", "../../../api/task_queue:pending_task_safety_flag", "../../../api/task_queue:task_queue", "../../../api/units:time_delta", "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", + "../../../rtc_base/system:no_unique_address", "../public:socket", "../public:types", ] @@ -60,11 +63,14 @@ if (rtc_include_tests) { "../../../api/task_queue:task_queue", "../../../api/task_queue/test:mock_task_queue_base", "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", + "../../../rtc_base:threading", "../../../test:test_support", "../../../test/time_controller:time_controller", "../public:socket", + "../public:types", ] sources = [ "task_queue_timeout_test.cc", diff --git a/third_party/libwebrtc/net/dcsctp/timer/fake_timeout.h b/third_party/libwebrtc/net/dcsctp/timer/fake_timeout.h @@ -10,15 +10,14 @@ #ifndef NET_DCSCTP_TIMER_FAKE_TIMEOUT_H_ #define NET_DCSCTP_TIMER_FAKE_TIMEOUT_H_ -#include <cstdint> #include <functional> -#include <limits> #include <memory> #include <optional> #include <utility> #include <vector> #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "net/dcsctp/public/timeout.h" #include "net/dcsctp/public/types.h" diff --git a/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout.cc b/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout.cc @@ -9,8 +9,13 @@ */ #include "net/dcsctp/timer/task_queue_timeout.h" +#include "api/sequence_checker.h" #include "api/task_queue/pending_task_safety_flag.h" +#include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout.h b/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout.h @@ -10,13 +10,18 @@ #ifndef NET_DCSCTP_TIMER_TASK_QUEUE_TIMEOUT_H_ #define NET_DCSCTP_TIMER_TASK_QUEUE_TIMEOUT_H_ +#include <functional> #include <memory> #include <utility> +#include "api/scoped_refptr.h" +#include "api/sequence_checker.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/task_queue_base.h" #include "api/units/timestamp.h" #include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/system/no_unique_address.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_test.cc b/third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_test.cc @@ -13,8 +13,13 @@ #include "api/task_queue/task_queue_base.h" #include "api/task_queue/test/mock_task_queue_base.h" -#include "rtc_base/gunit.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" +#include "rtc_base/thread.h" #include "test/gmock.h" +#include "test/gtest.h" #include "test/time_controller/simulated_time_controller.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/timer.cc b/third_party/libwebrtc/net/dcsctp/timer/timer.cc @@ -17,7 +17,9 @@ #include "absl/memory/memory.h" #include "absl/strings/string_view.h" +#include "api/units/time_delta.h" #include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" #include "rtc_base/checks.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/timer.h b/third_party/libwebrtc/net/dcsctp/timer/timer.h @@ -10,9 +10,9 @@ #ifndef NET_DCSCTP_TIMER_TIMER_H_ #define NET_DCSCTP_TIMER_TIMER_H_ -#include <stdint.h> #include <algorithm> +#include <cstdint> #include <functional> #include <map> #include <memory> @@ -24,6 +24,7 @@ #include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" #include "net/dcsctp/public/timeout.h" +#include "net/dcsctp/public/types.h" #include "rtc_base/strong_alias.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/timer/timer_test.cc b/third_party/libwebrtc/net/dcsctp/timer/timer_test.cc @@ -9,15 +9,17 @@ */ #include "net/dcsctp/timer/timer.h" +#include <cmath> #include <memory> #include <optional> #include "api/task_queue/task_queue_base.h" #include "api/units/time_delta.h" -#include "net/dcsctp/public/timeout.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/timer/fake_timeout.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/BUILD.gn b/third_party/libwebrtc/net/dcsctp/tx/BUILD.gn @@ -26,6 +26,8 @@ rtc_library("rr_send_queue") { ":send_queue", ":stream_scheduler", "../../../api:array_view", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", @@ -47,6 +49,7 @@ rtc_library("stream_scheduler") { deps = [ ":send_queue", "../../../api:array_view", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", @@ -124,9 +127,12 @@ rtc_library("retransmission_queue") { ":retransmission_timeout", ":send_queue", "../../../api:array_view", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:logging", "../../../rtc_base:stringutils", + "../common:internal_types", "../common:math", "../common:sequence_numbers", "../packet:chunk", @@ -151,6 +157,8 @@ if (rtc_include_tests) { "../../../api:array_view", "../../../api/units:timestamp", "../../../test:test_support", + "../common:internal_types", + "../public:types", ] sources = [ "mock_send_queue.h" ] } @@ -169,6 +177,8 @@ if (rtc_include_tests) { ":stream_scheduler", "../../../api:array_view", "../../../api/task_queue:task_queue", + "../../../api/units:time_delta", + "../../../api/units:timestamp", "../../../rtc_base:checks", "../../../rtc_base:gunit_helpers", "../../../test:test_support", diff --git a/third_party/libwebrtc/net/dcsctp/tx/mock_send_queue.h b/third_party/libwebrtc/net/dcsctp/tx/mock_send_queue.h @@ -10,12 +10,13 @@ #ifndef NET_DCSCTP_TX_MOCK_SEND_QUEUE_H_ #define NET_DCSCTP_TX_MOCK_SEND_QUEUE_H_ -#include <cstdint> +#include <cstddef> #include <optional> #include <vector> -#include "api/array_view.h" #include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/tx/send_queue.h" #include "test/gmock.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/outstanding_data.cc b/third_party/libwebrtc/net/dcsctp/tx/outstanding_data.cc @@ -10,14 +10,24 @@ #include "net/dcsctp/tx/outstanding_data.h" #include <algorithm> +#include <cstddef> +#include <cstdint> +#include <map> +#include <optional> #include <set> #include <utility> #include <vector> +#include "api/array_view.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/math.h" #include "net/dcsctp/common/sequence_numbers.h" +#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" +#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" +#include "net/dcsctp/packet/chunk/sack_chunk.h" +#include "net/dcsctp/packet/data.h" #include "net/dcsctp/public/types.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/outstanding_data.h b/third_party/libwebrtc/net/dcsctp/tx/outstanding_data.h @@ -10,13 +10,17 @@ #ifndef NET_DCSCTP_TX_OUTSTANDING_DATA_H_ #define NET_DCSCTP_TX_OUTSTANDING_DATA_H_ +#include <cstddef> +#include <cstdint> #include <deque> -#include <map> +#include <functional> #include <optional> #include <set> #include <utility> #include <vector> +#include "api/array_view.h" +#include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/outstanding_data_test.cc b/third_party/libwebrtc/net/dcsctp/tx/outstanding_data_test.cc @@ -12,17 +12,19 @@ #include <optional> #include <vector> +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/math.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/data_chunk.h" #include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" -#include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/packet/chunk/sack_chunk.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/testing/data_generator.h" #include "net/dcsctp/testing/testing_macros.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter.h b/third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter.h @@ -10,9 +10,7 @@ #ifndef NET_DCSCTP_TX_RETRANSMISSION_ERROR_COUNTER_H_ #define NET_DCSCTP_TX_RETRANSMISSION_ERROR_COUNTER_H_ -#include <functional> -#include <string> -#include <utility> +#include <optional> #include "absl/strings/string_view.h" #include "net/dcsctp/public/dcsctp_options.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_test.cc b/third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_test.cc @@ -9,9 +9,10 @@ */ #include "net/dcsctp/tx/retransmission_error_counter.h" +#include <optional> + #include "net/dcsctp/public/dcsctp_options.h" -#include "rtc_base/gunit.h" -#include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue.cc b/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue.cc @@ -10,29 +10,28 @@ #include "net/dcsctp/tx/retransmission_queue.h" #include <algorithm> +#include <cstddef> #include <cstdint> #include <functional> -#include <iterator> -#include <map> #include <optional> -#include <set> -#include <string> #include <utility> #include <vector> #include "absl/algorithm/container.h" #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/math.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/data_chunk.h" -#include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" -#include "net/dcsctp/packet/chunk/forward_tsn_common.h" #include "net/dcsctp/packet/chunk/idata_chunk.h" -#include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/outstanding_data.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue.h b/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue.h @@ -10,17 +10,17 @@ #ifndef NET_DCSCTP_TX_RETRANSMISSION_QUEUE_H_ #define NET_DCSCTP_TX_RETRANSMISSION_QUEUE_H_ +#include <cstddef> #include <cstdint> #include <functional> -#include <map> #include <optional> -#include <set> -#include <string> #include <utility> #include <vector> #include "absl/strings/string_view.h" -#include "api/array_view.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/sequence_numbers.h" #include "net/dcsctp/packet/chunk/forward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" @@ -29,9 +29,9 @@ #include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/outstanding_data.h" -#include "net/dcsctp/tx/retransmission_timeout.h" #include "net/dcsctp/tx/send_queue.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_test.cc b/third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_test.cc @@ -17,8 +17,9 @@ #include <utility> #include <vector> -#include "api/array_view.h" #include "api/task_queue/task_queue_base.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/handover_testing.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/common/math.h" @@ -28,7 +29,9 @@ #include "net/dcsctp/packet/chunk/iforward_tsn_chunk.h" #include "net/dcsctp/packet/chunk/sack_chunk.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_options.h" +#include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" #include "net/dcsctp/testing/data_generator.h" #include "net/dcsctp/testing/testing_macros.h" @@ -36,8 +39,8 @@ #include "net/dcsctp/timer/timer.h" #include "net/dcsctp/tx/mock_send_queue.h" #include "net/dcsctp/tx/send_queue.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout.cc b/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout.cc @@ -10,7 +10,6 @@ #include "net/dcsctp/tx/retransmission_timeout.h" #include <algorithm> -#include <cstdint> #include "api/units/time_delta.h" #include "net/dcsctp/public/dcsctp_options.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout.h b/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout.h @@ -10,9 +10,7 @@ #ifndef NET_DCSCTP_TX_RETRANSMISSION_TIMEOUT_H_ #define NET_DCSCTP_TX_RETRANSMISSION_TIMEOUT_H_ -#include <cstdint> -#include <functional> - +#include "api/units/time_delta.h" #include "net/dcsctp/public/dcsctp_options.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_test.cc b/third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_test.cc @@ -9,9 +9,10 @@ */ #include "net/dcsctp/tx/retransmission_timeout.h" +#include "api/units/time_delta.h" #include "net/dcsctp/public/dcsctp_options.h" -#include "rtc_base/gunit.h" -#include "test/gmock.h" +#include "net/dcsctp/public/types.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue.cc b/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue.cc @@ -9,25 +9,32 @@ */ #include "net/dcsctp/tx/rr_send_queue.h" +#include <cstddef> #include <cstdint> #include <deque> -#include <limits> #include <map> #include <optional> #include <set> +#include <tuple> #include <utility> #include <vector> #include "absl/algorithm/container.h" +#include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/tx/send_queue.h" +#include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/strings/str_join.h" +#include "rtc_base/strings/string_builder.h" namespace dcsctp { using ::webrtc::TimeDelta; diff --git a/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue.h b/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue.h @@ -10,24 +10,26 @@ #ifndef NET_DCSCTP_TX_RR_SEND_QUEUE_H_ #define NET_DCSCTP_TX_RR_SEND_QUEUE_H_ -#include <cstdint> +#include <cstddef> #include <deque> +#include <functional> #include <map> #include <memory> #include <optional> -#include <string> #include <utility> #include <vector> -#include "absl/algorithm/container.h" #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/tx/send_queue.h" #include "net/dcsctp/tx/stream_scheduler.h" +#include "rtc_base/checks.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_test.cc b/third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_test.cc @@ -9,21 +9,24 @@ */ #include "net/dcsctp/tx/rr_send_queue.h" +#include <cstddef> #include <cstdint> -#include <type_traits> +#include <optional> #include <vector> +#include "api/units/time_delta.h" +#include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/data.h" +#include "net/dcsctp/public/dcsctp_handover_state.h" #include "net/dcsctp/public/dcsctp_message.h" -#include "net/dcsctp/public/dcsctp_options.h" #include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/socket/mock_dcsctp_socket_callbacks.h" #include "net/dcsctp/testing/testing_macros.h" #include "net/dcsctp/tx/send_queue.h" -#include "rtc_base/gunit.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace { diff --git a/third_party/libwebrtc/net/dcsctp/tx/send_queue.h b/third_party/libwebrtc/net/dcsctp/tx/send_queue.h @@ -10,13 +10,11 @@ #ifndef NET_DCSCTP_TX_SEND_QUEUE_H_ #define NET_DCSCTP_TX_SEND_QUEUE_H_ -#include <cstdint> -#include <limits> +#include <cstddef> #include <optional> #include <utility> #include <vector> -#include "api/array_view.h" #include "api/units/timestamp.h" #include "net/dcsctp/common/internal_types.h" #include "net/dcsctp/packet/data.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler.cc b/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler.cc @@ -10,18 +10,20 @@ #include "net/dcsctp/tx/stream_scheduler.h" #include <algorithm> +#include <cstddef> #include <optional> +#include <set> #include "absl/algorithm/container.h" -#include "api/array_view.h" +#include "api/units/timestamp.h" #include "net/dcsctp/packet/data.h" -#include "net/dcsctp/public/dcsctp_message.h" -#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/tx/send_queue.h" #include "rtc_base/checks.h" +#include "rtc_base/containers/flat_set.h" #include "rtc_base/logging.h" #include "rtc_base/strings/str_join.h" +#include "rtc_base/strings/string_builder.h" namespace dcsctp { diff --git a/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler.h b/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler.h @@ -11,24 +11,16 @@ #define NET_DCSCTP_TX_STREAM_SCHEDULER_H_ #include <algorithm> -#include <cstdint> -#include <deque> -#include <map> +#include <cstddef> #include <memory> #include <optional> -#include <queue> #include <set> -#include <string> -#include <utility> -#include "absl/algorithm/container.h" #include "absl/memory/memory.h" #include "absl/strings/string_view.h" -#include "api/array_view.h" +#include "api/units/timestamp.h" #include "net/dcsctp/packet/chunk/idata_chunk.h" #include "net/dcsctp/packet/sctp_packet.h" -#include "net/dcsctp/public/dcsctp_message.h" -#include "net/dcsctp/public/dcsctp_socket.h" #include "net/dcsctp/public/types.h" #include "net/dcsctp/tx/send_queue.h" #include "rtc_base/containers/flat_set.h" diff --git a/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_test.cc b/third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_test.cc @@ -9,11 +9,23 @@ */ #include "net/dcsctp/tx/stream_scheduler.h" +#include <cstddef> +#include <cstdint> +#include <functional> +#include <map> +#include <memory> +#include <optional> #include <vector> +#include "api/units/timestamp.h" +#include "net/dcsctp/common/internal_types.h" +#include "net/dcsctp/packet/chunk/idata_chunk.h" +#include "net/dcsctp/packet/data.h" #include "net/dcsctp/packet/sctp_packet.h" #include "net/dcsctp/public/types.h" +#include "net/dcsctp/tx/send_queue.h" #include "test/gmock.h" +#include "test/gtest.h" namespace dcsctp { namespace {