Index: webrtc/p2p/client/basicportallocator.h |
diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h |
index 8ea66c431e76d560a6299c2831d77a1a83dfeb06..44202a710bb5f5450b0e596dc954033b0d1c3c9f 100644 |
--- a/webrtc/p2p/client/basicportallocator.h |
+++ b/webrtc/p2p/client/basicportallocator.h |
@@ -47,7 +47,9 @@ class BasicPortAllocator : public PortAllocator { |
int network_ignore_mask() const { return network_ignore_mask_; } |
- rtc::NetworkManager* network_manager() { return network_manager_; } |
+ rtc::NetworkManager* network_manager() const override { |
+ return network_manager_; |
+ } |
// If socket_factory() is set to NULL each PortAllocatorSession |
// creates its own socket factory. |
@@ -89,6 +91,7 @@ class BasicPortAllocatorSession : public PortAllocatorSession, |
rtc::PacketSocketFactory* socket_factory() { return socket_factory_; } |
void SetCandidateFilter(uint32_t filter) override; |
+ |
void StartGettingPorts() override; |
void StopGettingPorts() override; |
void ClearGettingPorts() override; |
@@ -96,7 +99,9 @@ class BasicPortAllocatorSession : public PortAllocatorSession, |
// These will all be cricket::Ports. |
std::vector<PortInterface*> ReadyPorts() const override; |
std::vector<Candidate> ReadyCandidates() const override; |
+ std::vector<Candidate> ReadyCandidates(PortInterface* port) const override; |
bool CandidatesAllocationDone() const override; |
+ void GetPortsOnNetworks(const std::vector<rtc::Network*>* networks) override; |
protected: |
void UpdateIceParametersInternal() override; |
@@ -255,11 +260,15 @@ class AllocationSequence : public rtc::MessageHandler, |
~AllocationSequence(); |
bool Init(); |
void Clear(); |
- void OnNetworkRemoved(); |
+ void OnNetworkInactivated(); |
State state() const { return state_; } |
const rtc::Network* network() const { return network_; } |
- bool network_removed() const { return network_removed_; } |
+ |
+ bool network_inactive() const { return network_inactive_; } |
+ void set_network_inactive(bool network_inactive) { |
+ network_inactive_ = network_inactive; |
+ } |
// Disables the phases for a new sequence that this one already covers for an |
// equivalent network setup. |
@@ -309,7 +318,7 @@ class AllocationSequence : public rtc::MessageHandler, |
void OnPortDestroyed(PortInterface* port); |
BasicPortAllocatorSession* session_; |
- bool network_removed_ = false; |
+ bool network_inactive_ = false; |
rtc::Network* network_; |
rtc::IPAddress ip_; |
PortConfiguration* config_; |