006521d5bd
PeerConnectionTest.java currently works, but only on a device with
network interfaces up. This is not a problem for desktop, but it is a
problem when running on Android devices since the devices in the lab
generally don't have network (due to the chaotic radio environment in
the device labs, devices are simply kept in flight mode).
The test does work if one modifies this line in the file
webrtc/base/network.cc:
bool ignored = ((cursor->ifa_flags & IFF_LOOPBACK) ||
IsIgnoredNetwork(*network));
If we remove the IFF_LOOPBACK clause, the test starts working on
an Android device in flight mode. This is nice - we're running the
call and packets interact with the OS network stack, which is good
for this end-to-end test. We can't just remove the clause though since
having loopback is undesirable for everyone except the test (right)?
so we need to make this behavior configurable.
This CL takes a stab at a complete solution where we pass a boolean
all the way through the Java PeerConnectionFactory down to the
BasicNetworkManager. This comes as a heavy price in interface
changes though. It's pretty out of proportion, but fundamentally we
need some way of telling the network manager that it is on Android
and in test mode. Passing the boolean all the way through is one way.
Another way might be to put the loopback filter behind an ifdef and
link a custom libjingle_peerconnection.so with the test. That is hacky
but doesn't pollute the interfaces. Not sure how to solve that in GYP
but it could mean some duplication between the production and
test .so files.
It would have been perfect to use flags here, but then we need to
hook up gflags parsing to some main() somewhere to make sure the
flag gets parsed, and make sure to pass that flag in our tests.
I'm not sure how that can be done.
Making the loopback filtering conditional is exactly how we solved the
equivalent problem in content_browsertests in Chrome, and it worked
great.
That's all I could think of.
BUG=4181
R=perkj@webrtc.org, pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/36769004
Cr-Commit-Position: refs/heads/master@{#8344}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8344 4adac7df-926f-26a2-2b94-8c16560cd09d
73 lines
2.7 KiB
C++
73 lines
2.7 KiB
C++
/*
|
|
* libjingle
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
// This file defines the default implementation of
|
|
// PortAllocatorFactoryInterface.
|
|
// This implementation creates instances of cricket::HTTPPortAllocator and uses
|
|
// the BasicNetworkManager and BasicPacketSocketFactory.
|
|
|
|
#ifndef TALK_APP_WEBRTC_PORTALLOCATORFACTORY_H_
|
|
#define TALK_APP_WEBRTC_PORTALLOCATORFACTORY_H_
|
|
|
|
#include "talk/app/webrtc/peerconnectioninterface.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
|
|
namespace cricket {
|
|
class PortAllocator;
|
|
}
|
|
|
|
namespace rtc {
|
|
class BasicNetworkManager;
|
|
class BasicPacketSocketFactory;
|
|
}
|
|
|
|
namespace webrtc {
|
|
|
|
class PortAllocatorFactory : public PortAllocatorFactoryInterface {
|
|
public:
|
|
static rtc::scoped_refptr<PortAllocatorFactoryInterface> Create(
|
|
rtc::Thread* worker_thread);
|
|
|
|
virtual cricket::PortAllocator* CreatePortAllocator(
|
|
const std::vector<StunConfiguration>& stun,
|
|
const std::vector<TurnConfiguration>& turn);
|
|
|
|
virtual void SetNetworkIgnoreMask(int network_ignore_mask);
|
|
|
|
protected:
|
|
explicit PortAllocatorFactory(rtc::Thread* worker_thread);
|
|
~PortAllocatorFactory();
|
|
|
|
private:
|
|
rtc::scoped_ptr<rtc::BasicNetworkManager> network_manager_;
|
|
rtc::scoped_ptr<rtc::BasicPacketSocketFactory> socket_factory_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // TALK_APP_WEBRTC_PORTALLOCATORFACTORY_H_
|