zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat the WebRTC code base

Browse Source 
Running clang-format with chromium's style guide.

The goal is n-fold:
 * providing consistency and readability (that's what code guidelines are for)
 * preventing noise with presubmit checks and git cl format
 * building on the previous point: making it easier to automatically fix format issues
 * you name it

Please consider using git-hyper-blame to ignore this commit.

Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
Yves Gerey
2018-06-19 15:03:05 +02:00
parent b602123a5a
commit 665174fdbb
1569 changed files with 30495 additions and 30309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
rtc_base/nat_unittest.cc
View File

@ -26,15 +26,16 @@
using namespace rtc;
bool CheckReceive(
TestClient* client, bool should_receive, const char* buf, size_t size) {
return (should_receive) ?
client->CheckNextPacket(buf, size, 0) :
client->CheckNoPacket();
bool CheckReceive(TestClient* client,
bool should_receive,
const char* buf,
size_t size) {
return (should_receive) ? client->CheckNextPacket(buf, size, 0)
: client->CheckNoPacket();
}
TestClient* CreateTestClient(
SocketFactory* factory, const SocketAddress& local_addr) {
TestClient* CreateTestClient(SocketFactory* factory,
const SocketAddress& local_addr) {
return new TestClient(
WrapUnique(AsyncUDPSocket::Create(factory, local_addr)));
}
@ -46,10 +47,12 @@ TestClient* CreateTCPTestClient(AsyncSocket* socket) {
// Tests that when sending from internal_addr to external_addrs through the
// NAT type specified by nat_type, all external addrs receive the sent packet
// and, if exp_same is true, all use the same mapped-address on the NAT.
void TestSend(
SocketServer* internal, const SocketAddress& internal_addr,
SocketServer* external, const SocketAddress external_addrs[4],
NATType nat_type, bool exp_same) {
void TestSend(SocketServer* internal,
const SocketAddress& internal_addr,
SocketServer* external,
const SocketAddress external_addrs[4],
NATType nat_type,
bool exp_same) {
Thread th_int(internal);
Thread th_ext(external);
@ -57,9 +60,8 @@ void TestSend(
server_addr.SetPort(0); // Auto-select a port
NATServer* nat = new NATServer(nat_type, internal, server_addr, server_addr,
external, external_addrs[0]);
NATSocketFactory* natsf = new NATSocketFactory(internal,
nat->internal_udp_address(),
nat->internal_tcp_address());
NATSocketFactory* natsf = new NATSocketFactory(
internal, nat->internal_udp_address(), nat->internal_tcp_address());
TestClient* in = CreateTestClient(natsf, internal_addr);
TestClient* out[4];
@ -98,10 +100,13 @@ void TestSend(
// Tests that when sending from external_addrs to internal_addr, the packet
// is delivered according to the specified filter_ip and filter_port rules.
void TestRecv(
SocketServer* internal, const SocketAddress& internal_addr,
SocketServer* external, const SocketAddress external_addrs[4],
NATType nat_type, bool filter_ip, bool filter_port) {
void TestRecv(SocketServer* internal,
const SocketAddress& internal_addr,
SocketServer* external,
const SocketAddress external_addrs[4],
NATType nat_type,
bool filter_ip,
bool filter_port) {
Thread th_int(internal);
Thread th_ext(external);
@ -109,9 +114,8 @@ void TestRecv(
server_addr.SetPort(0); // Auto-select a port
NATServer* nat = new NATServer(nat_type, internal, server_addr, server_addr,
external, external_addrs[0]);
NATSocketFactory* natsf = new NATSocketFactory(internal,
nat->internal_udp_address(),
nat->internal_tcp_address());
NATSocketFactory* natsf = new NATSocketFactory(
internal, nat->internal_udp_address(), nat->internal_tcp_address());
TestClient* in = CreateTestClient(natsf, internal_addr);
TestClient* out[4];
@ -148,31 +152,33 @@ void TestRecv(
}
// Tests that NATServer allocates bindings properly.
void TestBindings(
SocketServer* internal, const SocketAddress& internal_addr,
SocketServer* external, const SocketAddress external_addrs[4]) {
TestSend(internal, internal_addr, external, external_addrs,
NAT_OPEN_CONE, true);
void TestBindings(SocketServer* internal,
const SocketAddress& internal_addr,
SocketServer* external,
const SocketAddress external_addrs[4]) {
TestSend(internal, internal_addr, external, external_addrs, NAT_OPEN_CONE,
true);
TestSend(internal, internal_addr, external, external_addrs,
NAT_ADDR_RESTRICTED, true);
TestSend(internal, internal_addr, external, external_addrs,
NAT_PORT_RESTRICTED, true);
TestSend(internal, internal_addr, external, external_addrs,
NAT_SYMMETRIC, false);
TestSend(internal, internal_addr, external, external_addrs, NAT_SYMMETRIC,
false);
}
// Tests that NATServer filters packets properly.
void TestFilters(
SocketServer* internal, const SocketAddress& internal_addr,
SocketServer* external, const SocketAddress external_addrs[4]) {
TestRecv(internal, internal_addr, external, external_addrs,
NAT_OPEN_CONE, false, false);
void TestFilters(SocketServer* internal,
const SocketAddress& internal_addr,
SocketServer* external,
const SocketAddress external_addrs[4]) {
TestRecv(internal, internal_addr, external, external_addrs, NAT_OPEN_CONE,
false, false);
TestRecv(internal, internal_addr, external, external_addrs,
NAT_ADDR_RESTRICTED, true, false);
TestRecv(internal, internal_addr, external, external_addrs,
NAT_PORT_RESTRICTED, true, true);
TestRecv(internal, internal_addr, external, external_addrs,
NAT_SYMMETRIC, true, true);
TestRecv(internal, internal_addr, external, external_addrs, NAT_SYMMETRIC,
true, true);
}
bool TestConnectivity(const SocketAddress& src, const IPAddress& dst) {
@ -224,7 +230,7 @@ void TestPhysicalInternal(const SocketAddress& int_addr) {
// Find an available IP with matching family. The test breaks if int_addr
// can't talk to ip, so check for connectivity as well.
for (std::vector<Network*>::iterator it = networks.begin();
it != networks.end(); ++it) {
it != networks.end(); ++it) {
const IPAddress& ip = (*it)->GetBestIP();
if (ip.family() == int_addr.family() && TestConnectivity(int_addr, ip)) {
ext_addr2.SetIP(ip);
@ -240,11 +246,8 @@ void TestPhysicalInternal(const SocketAddress& int_addr) {
RTC_LOG(LS_INFO) << "selected ip " << ext_addr2.ipaddr().ToString();
SocketAddress ext_addrs[4] = {
SocketAddress(ext_addr1),
SocketAddress(ext_addr2),
SocketAddress(ext_addr1),
SocketAddress(ext_addr2)
};
SocketAddress(ext_addr1), SocketAddress(ext_addr2),
SocketAddress(ext_addr1), SocketAddress(ext_addr2)};
std::unique_ptr<PhysicalSocketServer> int_pss(new PhysicalSocketServer());
std::unique_ptr<PhysicalSocketServer> ext_pss(new PhysicalSocketServer());
@ -328,16 +331,13 @@ class NatTcpTest : public testing::Test, public sigslot::has_slots<> {
ext_thread_->Start();
}
void OnConnectEvent(AsyncSocket* socket) {
connected_ = true;
}
void OnConnectEvent(AsyncSocket* socket) { connected_ = true; }
void OnAcceptEvent(AsyncSocket* socket) {
accepted_.reset(server_->Accept(nullptr));
}
void OnCloseEvent(AsyncSocket* socket, int error) {
}
void OnCloseEvent(AsyncSocket* socket, int error) {}
void ConnectEvents() {
server_->SignalReadEvent.connect(this, &NatTcpTest::OnAcceptEvent);