wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1200763 - Remove hard-coded STUN IP address from ice_unittest, and do a DNS lookup instead. r=drno

Browse Source
This commit is contained in:
Byron Campen [:bwc] 2015-09-04 10:21:12 -05:00
parent 52b4f195d3
commit 802f583509
4 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/mtransport/nriceresolver.cpp
View File

@ -154,7 +154,7 @@ int NrIceResolver::resolve(nr_resolver_resource *resource,
if (resource->transport_protocol != IPPROTO_UDP &&
resource->transport_protocol != IPPROTO_TCP) {
MOZ_MTLOG(ML_ERROR, "Only UDP and TCP are is supported.");
MOZ_MTLOG(ML_ERROR, "Only UDP and TCP are supported.");
ABORT(R_NOT_FOUND);
}
pr = new PendingResolution(sts_thread_,

8
media/mtransport/nriceresolver.h
View File

@ -71,6 +71,10 @@ class NrIceResolver
void DestroyResolver();
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(NrIceResolver)
int resolve(nr_resolver_resource *resource,
int (*cb)(void *cb_arg, nr_transport_addr *addr),
void *cb_arg, void **handle);
private:
// Implementations of vtbl functions
static int destroy(void **objp);
@ -80,10 +84,6 @@ class NrIceResolver
static void resolve_cb(NR_SOCKET s, int how, void *cb_arg);
static int cancel(void *obj, void *handle);
int resolve(nr_resolver_resource *resource,
int (*cb)(void *cb_arg, nr_transport_addr *addr),
void *cb_arg, void **handle);
class PendingResolution : public nsIDNSListener
{
public:

53
media/mtransport/test/ice_unittest.cpp
View File

@ -50,6 +50,7 @@
extern "C" {
#include "r_data.h"
#include "util.h"
}
#define GTEST_HAS_RTTI 0
@ -65,7 +66,6 @@ static unsigned int kDefaultTimeout = 7000;
//TODO(nils@mozilla.com): This should get replaced with some non-external
//solution like discussed in bug 860775.
const std::string kDefaultStunServerAddress((char *)"52.27.56.60");
const std::string kDefaultStunServerHostname(
(char *)"global.stun.twilio.com");
const std::string kBogusStunServerHostname(
@ -77,7 +77,7 @@ const std::string kBogusIceCandidate(
const std::string kUnreachableHostIceCandidate(
(char *)"candidate:0 1 UDP 2113601790 192.168.178.20 50769 typ host");
std::string g_stun_server_address(kDefaultStunServerAddress);
std::string g_stun_server_address;
std::string g_stun_server_hostname(kDefaultStunServerHostname);
std::string g_turn_server;
std::string g_turn_user;
@ -3060,6 +3060,48 @@ static std::string get_environment(const char *name) {
return value;
}
// DNS resolution helper code
static std::string
Resolve(const std::string& fqdn, int address_family)
{
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_family = address_family;
hints.ai_protocol = IPPROTO_UDP;
struct addrinfo *res;
int err = getaddrinfo(fqdn.c_str(), nullptr, &hints, &res);
if (err) {
std::cerr << "Error in getaddrinfo: " << err << std::endl;
return "";
}
char str_addr[64] = {0};
switch (res->ai_family) {
case AF_INET:
inet_ntop(
AF_INET,
&reinterpret_cast<struct sockaddr_in*>(res->ai_addr)->sin_addr,
str_addr,
sizeof(str_addr));
case AF_INET6:
inet_ntop(
AF_INET6,
&reinterpret_cast<struct sockaddr_in6*>(res->ai_addr)->sin6_addr,
str_addr,
sizeof(str_addr));
default:
std::cerr << "Got unexpected address family in DNS lookup: "
<< res->ai_family << std::endl;
return "";
}
if (!strlen(str_addr)) {
std::cerr << "inet_ntop failed" << std::endl;
}
return str_addr;
}
int main(int argc, char **argv)
{
#ifdef ANDROID
@ -3071,6 +3113,7 @@ int main(int argc, char **argv)
g_turn_user = get_environment("TURN_SERVER_USER");
g_turn_password = get_environment("TURN_SERVER_PASSWORD");
if (g_turn_server.empty() ||
g_turn_user.empty(),
g_turn_password.empty()) {
@ -3104,6 +3147,12 @@ int main(int argc, char **argv)
NSS_NoDB_Init(nullptr);
NSS_SetDomesticPolicy();
// If only a STUN server FQDN was provided, look up its IP address for the
// address-only tests.
if (g_stun_server_address.empty() && !g_stun_server_hostname.empty()) {
g_stun_server_address = Resolve(g_stun_server_hostname, AF_INET);
}
// Start the tests
::testing::InitGoogleTest(&argc, argv);

2
media/mtransport/third_party/nICEr/src/net/nr_resolver.h vendored
View File

@ -42,7 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define NR_RESOLVE_PROTOCOL_TURN 2
typedef struct nr_resolver_resource_ {
char *domain_name;
const char *domain_name;
UINT2 port;
int stun_turn;
UCHAR transport_protocol;