From 55542302b3cbcd4d833d134bc588fcb4f9711905 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 3 Aug 2021 08:09:56 +0200 Subject: [PATCH] remove GICE-specific stun error code GICE was removed around M42 BUG=webrtc:4299 Change-Id: I4e83a888c3ecc1681799c07b47b75c9f31b40baa Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227348 Reviewed-by: Harald Alvestrand Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#34680} --- api/transport/stun.cc | 1 - api/transport/stun.h | 2 -- p2p/base/connection.cc | 2 -- 3 files changed, 5 deletions(-) diff --git a/api/transport/stun.cc b/api/transport/stun.cc index 1b5bf0c409..0f86267ec2 100644 --- a/api/transport/stun.cc +++ b/api/transport/stun.cc @@ -94,7 +94,6 @@ const char STUN_ERROR_REASON_BAD_REQUEST[] = "Bad Request"; const char STUN_ERROR_REASON_UNAUTHORIZED[] = "Unauthorized"; const char STUN_ERROR_REASON_UNKNOWN_ATTRIBUTE[] = "Unknown Attribute"; const char STUN_ERROR_REASON_FORBIDDEN[] = "Forbidden"; -const char STUN_ERROR_REASON_STALE_CREDENTIALS[] = "Stale Credentials"; const char STUN_ERROR_REASON_ALLOCATION_MISMATCH[] = "Allocation Mismatch"; const char STUN_ERROR_REASON_STALE_NONCE[] = "Stale Nonce"; const char STUN_ERROR_REASON_WRONG_CREDENTIALS[] = "Wrong Credentials"; diff --git a/api/transport/stun.h b/api/transport/stun.h index 32a8a433f5..b5f9ce1a6c 100644 --- a/api/transport/stun.h +++ b/api/transport/stun.h @@ -95,7 +95,6 @@ enum StunErrorCode { STUN_ERROR_BAD_REQUEST = 400, STUN_ERROR_UNAUTHORIZED = 401, STUN_ERROR_UNKNOWN_ATTRIBUTE = 420, - STUN_ERROR_STALE_CREDENTIALS = 430, // GICE only STUN_ERROR_STALE_NONCE = 438, STUN_ERROR_SERVER_ERROR = 500, STUN_ERROR_GLOBAL_FAILURE = 600 @@ -106,7 +105,6 @@ extern const char STUN_ERROR_REASON_TRY_ALTERNATE_SERVER[]; extern const char STUN_ERROR_REASON_BAD_REQUEST[]; extern const char STUN_ERROR_REASON_UNAUTHORIZED[]; extern const char STUN_ERROR_REASON_UNKNOWN_ATTRIBUTE[]; -extern const char STUN_ERROR_REASON_STALE_CREDENTIALS[]; extern const char STUN_ERROR_REASON_STALE_NONCE[]; extern const char STUN_ERROR_REASON_SERVER_ERROR[]; diff --git a/p2p/base/connection.cc b/p2p/base/connection.cc index 0ee9a6a5a1..ebfe6fd5fe 100644 --- a/p2p/base/connection.cc +++ b/p2p/base/connection.cc @@ -1138,8 +1138,6 @@ void Connection::OnConnectionRequestErrorResponse(ConnectionRequest* request, error_code == STUN_ERROR_SERVER_ERROR || error_code == STUN_ERROR_UNAUTHORIZED) { // Recoverable error, retry - } else if (error_code == STUN_ERROR_STALE_CREDENTIALS) { - // Race failure, retry } else if (error_code == STUN_ERROR_ROLE_CONFLICT) { HandleRoleConflictFromPeer(); } else if (request->msg()->type() == GOOG_PING_REQUEST) {