diff options
author | Niels Möller <nisse@webrtc.org> | 2019-11-04 08:49:12 +0100 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-11-04 08:31:07 +0000 |
commit | 191e38fb47bc1b8f77888e261bc034149f401c65 (patch) | |
tree | 8dffe0c6faf0208a319f9374fda73366b92ec698 /examples | |
parent | 9dda1b3a484ebeef921e419406402039f3852427 (diff) | |
download | webrtc-191e38fb47bc1b8f77888e261bc034149f401c65.tar.gz |
Delete gturn support
Delete enum RelayType and classes RelayPort and RelayServer.
See also PSA: https://groups.google.com/forum/?#!msg/discuss-webrtc/0ROpUXpw3Gs/eikIN-eEBwAJROpUXpw3Gs/eikIN-eEBwAJ
Bug: webrtc:10998
Change-Id: I1eab760dc73df9156cd1224cf99ad4a4c12ed882
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154522
Reviewed-by: Justin Uberti <juberti@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29677}
Diffstat (limited to 'examples')
-rw-r--r-- | examples/BUILD.gn | 14 | ||||
-rw-r--r-- | examples/relayserver/relayserver_main.cc | 66 |
2 files changed, 0 insertions, 80 deletions
diff --git a/examples/BUILD.gn b/examples/BUILD.gn index 7b69c2b85c..6c3c6581f1 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -47,7 +47,6 @@ group("examples") { if (is_linux || is_win) { deps += [ ":peerconnection_server", - ":relayserver", ":stunserver", ":turnserver", ] @@ -740,19 +739,6 @@ if (is_linux || is_win) { "//third_party/abseil-cpp/absl/flags:usage", ] } - rtc_executable("relayserver") { - testonly = true - sources = [ - "relayserver/relayserver_main.cc", - ] - deps = [ - "../p2p:p2p_server_utils", - "../p2p:rtc_p2p", - "../pc:rtc_pc", - "../rtc_base", - "../rtc_base:rtc_base_approved", - ] - } rtc_executable("turnserver") { testonly = true sources = [ diff --git a/examples/relayserver/relayserver_main.cc b/examples/relayserver/relayserver_main.cc deleted file mode 100644 index 2045cb4031..0000000000 --- a/examples/relayserver/relayserver_main.cc +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2004 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. - */ - -#include <iostream> // NOLINT -#include <memory> - -#include "p2p/base/relay_server.h" -#include "rtc_base/async_udp_socket.h" -#include "rtc_base/socket_address.h" -#include "rtc_base/socket_server.h" -#include "rtc_base/thread.h" - -int main(int argc, char** argv) { - if (argc != 3) { - std::cerr << "usage: relayserver internal-address external-address" - << std::endl; - return 1; - } - - rtc::SocketAddress int_addr; - if (!int_addr.FromString(argv[1])) { - std::cerr << "Unable to parse IP address: " << argv[1]; - return 1; - } - - rtc::SocketAddress ext_addr; - if (!ext_addr.FromString(argv[2])) { - std::cerr << "Unable to parse IP address: " << argv[2]; - return 1; - } - - rtc::Thread* pthMain = rtc::Thread::Current(); - - std::unique_ptr<rtc::AsyncUDPSocket> int_socket( - rtc::AsyncUDPSocket::Create(pthMain->socketserver(), int_addr)); - if (!int_socket) { - std::cerr << "Failed to create a UDP socket bound at" << int_addr.ToString() - << std::endl; - return 1; - } - - std::unique_ptr<rtc::AsyncUDPSocket> ext_socket( - rtc::AsyncUDPSocket::Create(pthMain->socketserver(), ext_addr)); - if (!ext_socket) { - std::cerr << "Failed to create a UDP socket bound at" << ext_addr.ToString() - << std::endl; - return 1; - } - - cricket::RelayServer server(pthMain); - server.AddInternalSocket(int_socket.get()); - server.AddExternalSocket(ext_socket.get()); - - std::cout << "Listening internally at " << int_addr.ToString() << std::endl; - std::cout << "Listening externally at " << ext_addr.ToString() << std::endl; - - pthMain->Run(); - return 0; -} |