Update examples GYP to avoid rtc_base_approved warning.
Updated peerconnection_server to not need stuff from rtc_base. BUG= Review URL: https://codereview.webrtc.org/1789463002 Cr-Commit-Position: refs/heads/master@{#11966}
This commit is contained in:
tkchin
Commit bot
parent
d44c077dce
commit
bad7b091af
@ -17,10 +17,7 @@
|
||||
#include "webrtc/examples/peerconnection/server/data_socket.h"
|
||||
#include "webrtc/examples/peerconnection/server/peer_channel.h"
|
||||
#include "webrtc/examples/peerconnection/server/utils.h"
|
||||
#include "webrtc/base/flags.h"
|
||||
|
||||
DEFINE_bool(help, false, "Prints this message");
|
||||
DEFINE_int(port, 8888, "The port on which to listen.");
|
||||
#include "webrtc/tools/simple_command_line_parser.h"
|
||||
|
||||
static const size_t kMaxConnections = (FD_SETSIZE - 2);
|
||||
|
||||
@ -50,16 +47,26 @@ void HandleBrowserRequest(DataSocket* ds, bool* quit) {
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
|
||||
if (FLAG_help) {
|
||||
rtc::FlagList::Print(NULL, false);
|
||||
std::string program_name = argv[0];
|
||||
std::string usage = "Example usage: " + program_name + " --port=8888";
|
||||
webrtc::test::CommandLineParser parser;
|
||||
parser.Init(argc, argv);
|
||||
parser.SetUsageMessage(usage);
|
||||
parser.SetFlag("port", "8888");
|
||||
parser.SetFlag("help", "false");
|
||||
parser.ProcessFlags();
|
||||
|
||||
if (parser.GetFlag("help") == "true") {
|
||||
parser.PrintUsageMessage();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int port = strtol((parser.GetFlag("port")).c_str(), NULL, 10);
|
||||
|
||||
// Abort if the user specifies a port that is outside the allowed
|
||||
// range [1, 65535].
|
||||
if ((FLAG_port < 1) || (FLAG_port > 65535)) {
|
||||
printf("Error: %i is not a valid port.\n", FLAG_port);
|
||||
if ((port < 1) || (port > 65535)) {
|
||||
printf("Error: %i is not a valid port.\n", port);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -67,12 +74,12 @@ int main(int argc, char** argv) {
|
||||
if (!listener.Create()) {
|
||||
printf("Failed to create server socket\n");
|
||||
return -1;
|
||||
} else if (!listener.Listen(FLAG_port)) {
|
||||
} else if (!listener.Listen(port)) {
|
||||
printf("Failed to listen on server socket\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("Server listening on port %i\n", FLAG_port);
|
||||
printf("Server listening on port %i\n", port);
|
||||
|
||||
PeerChannel clients;
|
||||
typedef std::vector<DataSocket*> SocketArray;
|
||||
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
#include "webrtc/examples/peerconnection/server/data_socket.h"
|
||||
#include "webrtc/examples/peerconnection/server/utils.h"
|
||||
#include "webrtc/base/stringencode.h"
|
||||
#include "webrtc/base/stringutils.h"
|
||||
#include "webrtc/base/urlencode.h"
|
||||
|
||||
using rtc::sprintfn;
|
||||
|
||||
@ -60,7 +60,7 @@ ChannelMember::ChannelMember(DataSocket* socket)
|
||||
assert(socket);
|
||||
assert(socket->method() == DataSocket::GET);
|
||||
assert(socket->PathEquals("/sign_in"));
|
||||
name_ = rtc::UrlDecodeString(socket->request_arguments());
|
||||
name_ = rtc::s_url_decode(socket->request_arguments());
|
||||
if (name_.empty())
|
||||
name_ = "peer_" + int2str(id_);
|
||||
else if (name_.length() > kMaxNameLength)
|
||||
|
||||
@ -9,64 +9,64 @@
|
||||
'includes': [
|
||||
'../talk/build/common.gypi',
|
||||
],
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'relayserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/relayserver/relayserver_main.cc',
|
||||
],
|
||||
}, # target relayserver
|
||||
{
|
||||
'target_name': 'stunserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/stunserver/stunserver_main.cc',
|
||||
],
|
||||
}, # target stunserver
|
||||
{
|
||||
'target_name': 'turnserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/turnserver/turnserver_main.cc',
|
||||
],
|
||||
}, # target turnserver
|
||||
{
|
||||
'target_name': 'peerconnection_server',
|
||||
'type': 'executable',
|
||||
'sources': [
|
||||
'examples/peerconnection/server/data_socket.cc',
|
||||
'examples/peerconnection/server/data_socket.h',
|
||||
'examples/peerconnection/server/main.cc',
|
||||
'examples/peerconnection/server/peer_channel.cc',
|
||||
'examples/peerconnection/server/peer_channel.h',
|
||||
'examples/peerconnection/server/utils.cc',
|
||||
'examples/peerconnection/server/utils.h',
|
||||
],
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base',
|
||||
'<(webrtc_root)/common.gyp:webrtc_common',
|
||||
],
|
||||
# TODO(ronghuawu): crbug.com/167187 fix size_t to int truncations.
|
||||
'msvs_disabled_warnings': [ 4309, ],
|
||||
}, # target peerconnection_server
|
||||
],
|
||||
|
||||
'conditions': [
|
||||
['OS=="linux" or OS=="win"', {
|
||||
'targets': [
|
||||
{
|
||||
'target_name': 'relayserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base_approved',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/relayserver/relayserver_main.cc',
|
||||
],
|
||||
}, # target relayserver
|
||||
{
|
||||
'target_name': 'stunserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base_approved',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/stunserver/stunserver_main.cc',
|
||||
],
|
||||
}, # target stunserver
|
||||
{
|
||||
'target_name': 'turnserver',
|
||||
'type': 'executable',
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base_approved',
|
||||
'<(webrtc_root)/pc/pc.gyp:rtc_pc',
|
||||
],
|
||||
'sources': [
|
||||
'examples/turnserver/turnserver_main.cc',
|
||||
],
|
||||
}, # target turnserver
|
||||
{
|
||||
'target_name': 'peerconnection_server',
|
||||
'type': 'executable',
|
||||
'sources': [
|
||||
'examples/peerconnection/server/data_socket.cc',
|
||||
'examples/peerconnection/server/data_socket.h',
|
||||
'examples/peerconnection/server/main.cc',
|
||||
'examples/peerconnection/server/peer_channel.cc',
|
||||
'examples/peerconnection/server/peer_channel.h',
|
||||
'examples/peerconnection/server/utils.cc',
|
||||
'examples/peerconnection/server/utils.h',
|
||||
],
|
||||
'dependencies': [
|
||||
'<(webrtc_root)/base/base.gyp:rtc_base_approved',
|
||||
'<(webrtc_root)/common.gyp:webrtc_common',
|
||||
'<(webrtc_root)/tools/internal_tools.gyp:command_line_parser',
|
||||
],
|
||||
# TODO(ronghuawu): crbug.com/167187 fix size_t to int truncations.
|
||||
'msvs_disabled_warnings': [ 4309, ],
|
||||
}, # target peerconnection_server
|
||||
{
|
||||
'target_name': 'peerconnection_client',
|
||||
'type': 'executable',
|
||||
'sources': [
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user