4d47e0b2be
This reverts commit c4b0bde7f2daabc4e0667fb73d096d1cf0819226. Reason for revert: Breaks downstream tests. Basically, ParseIceServers() and other functions have changed the return type, and this breaks tests at compile time. Is it possible to reland with backwards compatible versions that return the previous type? Then they can be removed afterwards. Original change's description: > ice server parsing: return RTCError with more details > > surfacing those errors to the API (without specific details) instead of just the logging. > > BUG=webrtc:14539 > > Change-Id: Id907ebeb08b96b0e4225a016a37a12d58889091b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278340 > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Philipp Hancke <phancke@microsoft.com> > Cr-Commit-Position: refs/heads/main@{#38356} Bug: webrtc:14539 Change-Id: I4df936ff865f87759936c5d0425478fe51051dc8 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/278960 Owners-Override: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#38359}
38 lines
1.3 KiB
C++
38 lines
1.3 KiB
C++
/*
|
|
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef PC_ICE_SERVER_PARSING_H_
|
|
#define PC_ICE_SERVER_PARSING_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/peer_connection_interface.h"
|
|
#include "api/rtc_error.h"
|
|
#include "p2p/base/port.h"
|
|
#include "p2p/base/port_allocator.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Parses the URLs for each server in `servers` to build `stun_servers` and
|
|
// `turn_servers`. Can return SYNTAX_ERROR if the URL is malformed, or
|
|
// INVALID_PARAMETER if a TURN server is missing `username` or `password`.
|
|
//
|
|
// Intended to be used to convert/validate the servers passed into a
|
|
// PeerConnection through RTCConfiguration.
|
|
RTC_EXPORT RTCErrorType
|
|
ParseIceServers(const PeerConnectionInterface::IceServers& servers,
|
|
cricket::ServerAddresses* stun_servers,
|
|
std::vector<cricket::RelayServerConfig>* turn_servers);
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_ICE_SERVER_PARSING_H_
|