This reverts commit 056a68da896d9a578b9ea83e56d261648ea0adc6. Reason for revert: Trying to reland. Original change's description: > Revert "Enable any address ports by default." > > This reverts commit f04148c810aad2a0809dc8978650c55308381c47. > > Reason for revert: Speculative revert. I suspect this is breaking a > downstream test (I'll reland if it is not the culprit). > > Original change's description: > > Enable any address ports by default. > > > > Ports not bound to any specific network interface are allocated by > > default. These any address ports are pruned after allocation, > > conditional on the allocation results of normal ports that are bound to > > the enumerated interfaces. > > > > Bug: webrtc:9313 > > Change-Id: I3ce12eeab0cf3547224e5f8c188d061fc530e145 > > Reviewed-on: https://webrtc-review.googlesource.com/78383 > > Commit-Queue: Qingsi Wang <qingsi@google.com> > > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#23673} > > TBR=deadbeef@webrtc.org,pthatcher@webrtc.org,qingsi@google.com > > Change-Id: I3b3dc42c7de46d198d4b9c270020dcf1100dd907 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9313 > Reviewed-on: https://webrtc-review.googlesource.com/84300 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23678} TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:9313 Change-Id: I98442346babb5d8953d37dc5825efaf79804ed7f Reviewed-on: https://webrtc-review.googlesource.com/85000 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Qingsi Wang <qingsi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23720}
104 lines
3.4 KiB
C++
104 lines
3.4 KiB
C++
/*
|
|
* Copyright 2004 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.
|
|
*/
|
|
|
|
#include "p2p/base/stunserver.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "rtc_base/bytebuffer.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace cricket {
|
|
|
|
StunServer::StunServer(rtc::AsyncUDPSocket* socket) : socket_(socket) {
|
|
socket_->SignalReadPacket.connect(this, &StunServer::OnPacket);
|
|
}
|
|
|
|
StunServer::~StunServer() {
|
|
socket_->SignalReadPacket.disconnect(this);
|
|
}
|
|
|
|
void StunServer::OnPacket(rtc::AsyncPacketSocket* socket,
|
|
const char* buf,
|
|
size_t size,
|
|
const rtc::SocketAddress& remote_addr,
|
|
const rtc::PacketTime& packet_time) {
|
|
// Parse the STUN message; eat any messages that fail to parse.
|
|
rtc::ByteBufferReader bbuf(buf, size);
|
|
StunMessage msg;
|
|
if (!msg.Read(&bbuf)) {
|
|
return;
|
|
}
|
|
|
|
// TODO(?): If unknown non-optional (<= 0x7fff) attributes are found, send a
|
|
// 420 "Unknown Attribute" response.
|
|
|
|
// Send the message to the appropriate handler function.
|
|
switch (msg.type()) {
|
|
case STUN_BINDING_REQUEST:
|
|
OnBindingRequest(&msg, remote_addr);
|
|
break;
|
|
|
|
default:
|
|
SendErrorResponse(msg, remote_addr, 600, "Operation Not Supported");
|
|
}
|
|
}
|
|
|
|
void StunServer::OnBindingRequest(StunMessage* msg,
|
|
const rtc::SocketAddress& remote_addr) {
|
|
StunMessage response;
|
|
GetStunBindResponse(msg, remote_addr, &response);
|
|
SendResponse(response, remote_addr);
|
|
}
|
|
|
|
void StunServer::SendErrorResponse(const StunMessage& msg,
|
|
const rtc::SocketAddress& addr,
|
|
int error_code,
|
|
const char* error_desc) {
|
|
StunMessage err_msg;
|
|
err_msg.SetType(GetStunErrorResponseType(msg.type()));
|
|
err_msg.SetTransactionID(msg.transaction_id());
|
|
|
|
auto err_code = StunAttribute::CreateErrorCode();
|
|
err_code->SetCode(error_code);
|
|
err_code->SetReason(error_desc);
|
|
err_msg.AddAttribute(std::move(err_code));
|
|
|
|
SendResponse(err_msg, addr);
|
|
}
|
|
|
|
void StunServer::SendResponse(const StunMessage& msg,
|
|
const rtc::SocketAddress& addr) {
|
|
rtc::ByteBufferWriter buf;
|
|
msg.Write(&buf);
|
|
rtc::PacketOptions options;
|
|
if (socket_->SendTo(buf.Data(), buf.Length(), addr, options) < 0)
|
|
RTC_LOG_ERR(LS_ERROR) << "sendto";
|
|
}
|
|
|
|
void StunServer::GetStunBindResponse(StunMessage* request,
|
|
const rtc::SocketAddress& remote_addr,
|
|
StunMessage* response) const {
|
|
response->SetType(STUN_BINDING_RESPONSE);
|
|
response->SetTransactionID(request->transaction_id());
|
|
|
|
// Tell the user the address that we received their request from.
|
|
std::unique_ptr<StunAddressAttribute> mapped_addr;
|
|
if (!request->IsLegacy()) {
|
|
mapped_addr = StunAttribute::CreateAddress(STUN_ATTR_MAPPED_ADDRESS);
|
|
} else {
|
|
mapped_addr = StunAttribute::CreateXorAddress(STUN_ATTR_XOR_MAPPED_ADDRESS);
|
|
}
|
|
mapped_addr->SetAddress(remote_addr);
|
|
response->AddAttribute(std::move(mapped_addr));
|
|
}
|
|
|
|
} // namespace cricket
|