14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
59 lines
1.8 KiB
C++
59 lines
1.8 KiB
C++
/*
|
|
* Copyright 2008 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
|
|
#define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
|
|
|
|
#include "webrtc/p2p/base/stunserver.h"
|
|
#include "webrtc/base/socketaddress.h"
|
|
#include "webrtc/base/thread.h"
|
|
|
|
namespace cricket {
|
|
|
|
// A test STUN server. Useful for unit tests.
|
|
class TestStunServer : StunServer {
|
|
public:
|
|
static TestStunServer* Create(rtc::Thread* thread,
|
|
const rtc::SocketAddress& addr) {
|
|
rtc::AsyncSocket* socket =
|
|
thread->socketserver()->CreateAsyncSocket(addr.family(), SOCK_DGRAM);
|
|
rtc::AsyncUDPSocket* udp_socket =
|
|
rtc::AsyncUDPSocket::Create(socket, addr);
|
|
|
|
return new TestStunServer(udp_socket);
|
|
}
|
|
|
|
// Set a fake STUN address to return to the client.
|
|
void set_fake_stun_addr(const rtc::SocketAddress& addr) {
|
|
fake_stun_addr_ = addr;
|
|
}
|
|
|
|
private:
|
|
explicit TestStunServer(rtc::AsyncUDPSocket* socket) : StunServer(socket) {}
|
|
|
|
void OnBindingRequest(StunMessage* msg,
|
|
const rtc::SocketAddress& remote_addr) override {
|
|
if (fake_stun_addr_.IsNil()) {
|
|
StunServer::OnBindingRequest(msg, remote_addr);
|
|
} else {
|
|
StunMessage response;
|
|
GetStunBindReqponse(msg, fake_stun_addr_, &response);
|
|
SendResponse(response, remote_addr);
|
|
}
|
|
}
|
|
|
|
private:
|
|
rtc::SocketAddress fake_stun_addr_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
|