We now have two downstream users of stun.h, so it appears to be generally usable. I put this in a new dir networking/, but I'm open to suggestions here (maybe some things in api/ should move in there). I checked what our downstream users are actually using, and it's cricket::ComputeStunCredentialHash cricket::<constants> cricket::TurnMessage cricket::GetStunErrorResponseType cricket::StunAttribute::CreateAddress cricket::StunErrorCodeAttribute cricket::StunByteStringAttribute StunAttribute::CreateUnknownAttributes cricket::TurnErrorType cricket::StunMessage I reckoned that was pretty much everything in stun.h, so I didn't bother splitting it up. They don't use every function and constant in there, but all _types_ of functions and constants, so for the sake of coherence I don't think it makes sense to split it. There's some old stuff in there like GTURN which could arguably be split out, but it should likely go away soon anyway, so I don't think it's worth the effort. Steps: 1) land this 2) update downstream to point to the new header and target 3) remove p2p/base:stun_types. Bug: webrtc:11091 Change-Id: I1f05bf06055475d25601197ec6fefb8d3b55e8e3 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/159923 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29822}
46 lines
1.3 KiB
C++
46 lines
1.3 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 P2P_BASE_TEST_STUN_SERVER_H_
|
|
#define P2P_BASE_TEST_STUN_SERVER_H_
|
|
|
|
#include "api/transport/stun.h"
|
|
#include "p2p/base/stun_server.h"
|
|
#include "rtc_base/async_udp_socket.h"
|
|
#include "rtc_base/socket_address.h"
|
|
#include "rtc_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);
|
|
|
|
// 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;
|
|
|
|
private:
|
|
rtc::SocketAddress fake_stun_addr_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // P2P_BASE_TEST_STUN_SERVER_H_
|