This reverts commit b23ed7f1af467a228cbdc63e839cac8856e9df8d.
Reason for revert: Breaks Chromium FYI build
Sample error log:
../../remoting/test/fake_port_allocator.cc:52:7: error: no matching constructor for initialization of 'cricket::BasicPortAllocator'
: BasicPortAllocator(network_manager, socket_factory),
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../third_party/webrtc/p2p/client/basicportallocator.h:32:12: note: candidate constructor not viable: requires single argument 'network_manager', but 2 arguments were provided
explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
^
../../third_party/webrtc/p2p/client/basicportallocator.h:27:7: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
class BasicPortAllocator : public PortAllocator {
^
../../third_party/webrtc/p2p/client/basicportallocator.h:29:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:33:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:36:3: note: candidate constructor not viable: requires 5 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
Original change's description:
> TurnCustomizer - an interface for modifying stun messages sent by TurnPort
>
> This patch adds an interface that allows modification of stun messages
> sent by TurnPort. A user can inject a TurnCustomizer on the RTCConfig
> and the TurnCustomizer will be invoked by TurnPort before sending
> message. This allows user to e.g add custom attributes as described
> in rtf5389.
>
> BUG=webrtc:8313
>
> Change-Id: Ibf5cc10af84c57288f1eb4c578ca064611a769f1
> Reviewed-on: https://webrtc-review.googlesource.com/4781
> Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20197}
TBR=deadbeef@webrtc.org,sakal@webrtc.org,jonaso@webrtc.org
Change-Id: I624efb22f6e3ceac1b2ff8af1ec47e4cfdde9140
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8313
Reviewed-on: https://webrtc-review.googlesource.com/7680
Reviewed-by: Guido Urdaneta <guidou@webrtc.org>
Commit-Queue: Guido Urdaneta <guidou@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20199}
145 lines
4.3 KiB
C++
145 lines
4.3 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.
|
|
*/
|
|
|
|
#ifndef P2P_BASE_STUNREQUEST_H_
|
|
#define P2P_BASE_STUNREQUEST_H_
|
|
|
|
#include <map>
|
|
#include <string>
|
|
#include "p2p/base/stun.h"
|
|
#include "rtc_base/sigslot.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace cricket {
|
|
|
|
class StunRequest;
|
|
|
|
const int kAllRequests = 0;
|
|
|
|
// Total max timeouts: 39.75 seconds
|
|
// For years, this was 9.5 seconds, but for networks that experience moments of
|
|
// high RTT (such as 40s on 2G networks), this doesn't work well.
|
|
const int STUN_TOTAL_TIMEOUT = 39750; // milliseconds
|
|
|
|
// Manages a set of STUN requests, sending and resending until we receive a
|
|
// response or determine that the request has timed out.
|
|
class StunRequestManager {
|
|
public:
|
|
StunRequestManager(rtc::Thread* thread);
|
|
~StunRequestManager();
|
|
|
|
// Starts sending the given request (perhaps after a delay).
|
|
void Send(StunRequest* request);
|
|
void SendDelayed(StunRequest* request, int delay);
|
|
|
|
// If |msg_type| is kAllRequests, sends all pending requests right away.
|
|
// Otherwise, sends those that have a matching type right away.
|
|
// Only for testing.
|
|
void Flush(int msg_type);
|
|
|
|
// Returns true if at least one request with |msg_type| is scheduled for
|
|
// transmission. For testing only.
|
|
bool HasRequest(int msg_type);
|
|
|
|
// Removes a stun request that was added previously. This will happen
|
|
// automatically when a request succeeds, fails, or times out.
|
|
void Remove(StunRequest* request);
|
|
|
|
// Removes all stun requests that were added previously.
|
|
void Clear();
|
|
|
|
// Determines whether the given message is a response to one of the
|
|
// outstanding requests, and if so, processes it appropriately.
|
|
bool CheckResponse(StunMessage* msg);
|
|
bool CheckResponse(const char* data, size_t size);
|
|
|
|
bool empty() { return requests_.empty(); }
|
|
|
|
// Set the Origin header for outgoing stun messages.
|
|
void set_origin(const std::string& origin) { origin_ = origin; }
|
|
|
|
// Raised when there are bytes to be sent.
|
|
sigslot::signal3<const void*, size_t, StunRequest*> SignalSendPacket;
|
|
|
|
private:
|
|
typedef std::map<std::string, StunRequest*> RequestMap;
|
|
|
|
rtc::Thread* thread_;
|
|
RequestMap requests_;
|
|
std::string origin_;
|
|
|
|
friend class StunRequest;
|
|
};
|
|
|
|
// Represents an individual request to be sent. The STUN message can either be
|
|
// constructed beforehand or built on demand.
|
|
class StunRequest : public rtc::MessageHandler {
|
|
public:
|
|
StunRequest();
|
|
StunRequest(StunMessage* request);
|
|
virtual ~StunRequest();
|
|
|
|
// Causes our wrapped StunMessage to be Prepared
|
|
void Construct();
|
|
|
|
// The manager handling this request (if it has been scheduled for sending).
|
|
StunRequestManager* manager() { return manager_; }
|
|
|
|
// Returns the transaction ID of this request.
|
|
const std::string& id() { return msg_->transaction_id(); }
|
|
|
|
// the origin value
|
|
const std::string& origin() const { return origin_; }
|
|
void set_origin(const std::string& origin) { origin_ = origin; }
|
|
|
|
// Returns the STUN type of the request message.
|
|
int type();
|
|
|
|
// Returns a const pointer to |msg_|.
|
|
const StunMessage* msg() const;
|
|
|
|
// Time elapsed since last send (in ms)
|
|
int Elapsed() const;
|
|
|
|
protected:
|
|
int count_;
|
|
bool timeout_;
|
|
std::string origin_;
|
|
|
|
// Fills in a request object to be sent. Note that request's transaction ID
|
|
// will already be set and cannot be changed.
|
|
virtual void Prepare(StunMessage* request) {}
|
|
|
|
// Called when the message receives a response or times out.
|
|
virtual void OnResponse(StunMessage* response) {}
|
|
virtual void OnErrorResponse(StunMessage* response) {}
|
|
virtual void OnTimeout() {}
|
|
// Called when the message is sent.
|
|
virtual void OnSent();
|
|
// Returns the next delay for resends.
|
|
virtual int resend_delay();
|
|
|
|
private:
|
|
void set_manager(StunRequestManager* manager);
|
|
|
|
// Handles messages for sending and timeout.
|
|
void OnMessage(rtc::Message* pmsg);
|
|
|
|
StunRequestManager* manager_;
|
|
StunMessage* msg_;
|
|
int64_t tstamp_;
|
|
|
|
friend class StunRequestManager;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // P2P_BASE_STUNREQUEST_H_
|