102b2270c7
I made several updates to the Windows version as well so that both implementations share a big portion of the code. The underlying PeerConnection notifications have changed a bit since the last update so that there's still a known issue that I plan to fix in my next change: // TODO(tommi): There's a problem now with terminating connections: // When ending a conversation, both peers now send a signaling message // that indicates that their ports are closed (port=0). The trouble this // causes us here is that we can interpret such a message as an invite // to a new conversation. So, currently there is a bug that ending // a conversation can immediately start a new one. // To fix this I plan to change how conversations start and have a special // notification message via the server that prepares a client for a // conversation instead of automatically recognizing the first signaling // message as an invite. Review URL: http://webrtc-codereview.appspot.com/112008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@446 4adac7df-926f-26a2-2b94-8c16560cd09d
58 lines
1.5 KiB
C++
58 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2011 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 "peerconnection/samples/client/defaults.h"
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#ifdef WIN32
|
|
#include <winsock2.h>
|
|
#else
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "talk/base/common.h"
|
|
|
|
const char kAudioLabel[] = "audio_label";
|
|
const char kVideoLabel[] = "video_label";
|
|
const uint16 kDefaultServerPort = 8888;
|
|
|
|
std::string GetEnvVarOrDefault(const char* env_var_name,
|
|
const char* default_value) {
|
|
std::string value;
|
|
const char* env_var = getenv(env_var_name);
|
|
if (env_var)
|
|
value = env_var;
|
|
|
|
if (value.empty())
|
|
value = default_value;
|
|
|
|
return value;
|
|
}
|
|
|
|
std::string GetPeerConnectionString() {
|
|
return GetEnvVarOrDefault("WEBRTC_CONNECT", "STUN stun.l.google.com:19302");
|
|
}
|
|
|
|
std::string GetDefaultServerName() {
|
|
return GetEnvVarOrDefault("WEBRTC_SERVER", "localhost");
|
|
}
|
|
|
|
std::string GetPeerName() {
|
|
char computer_name[256];
|
|
if (gethostname(computer_name, ARRAY_SIZE(computer_name)) != 0)
|
|
strcpy(computer_name, "host");
|
|
std::string ret(GetEnvVarOrDefault("USERNAME", "user"));
|
|
ret += '@';
|
|
ret += computer_name;
|
|
return ret;
|
|
}
|