Index: webrtc/p2p/client/basicportallocator.h |
diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h |
index 8ea66c431e76d560a6299c2831d77a1a83dfeb06..bd0483e3b80cd3a312f846e406e377506e758ca8 100644 |
--- a/webrtc/p2p/client/basicportallocator.h |
+++ b/webrtc/p2p/client/basicportallocator.h |
@@ -163,6 +163,10 @@ class BasicPortAllocatorSession : public PortAllocatorSession, |
void AddAllocatedPort(Port* port, AllocationSequence* seq, |
bool prepare_address); |
void OnCandidateReady(Port* port, const Candidate& c); |
+ void MaybeSignalPortReady(Port* port); |
+ void MaybeSignalCandidatesReady(Port* port, |
+ const std::vector<Candidate>& candidates); |
+ bool IsPortInUse(Port* port) const; |
void OnPortComplete(Port* port); |
void OnPortError(Port* port); |
void OnProtocolEnabled(AllocationSequence* seq, ProtocolType proto); |
@@ -191,6 +195,10 @@ class BasicPortAllocatorSession : public PortAllocatorSession, |
std::vector<PortData> ports_; |
uint32_t candidate_filter_ = CF_ALL; |
+ typedef std::vector<Port*> PortArray; |
pthatcher1
2016/06/27 20:35:55
I'd prefer not to have a typedef and just have
s
honghaiz3
2016/06/28 01:49:26
Done.
|
+ // The currently used turn ports keyed by the network names. |
+ std::map<std::string, PortArray> turn_ports_in_use_by_network_names_; |
pthatcher1
2016/06/27 20:35:55
Why not just turn_ports_by_network_name?
honghaiz3
2016/06/28 01:49:26
Removed this.
|
+ |
pthatcher1
2016/06/27 20:35:55
Actually, instead of having a separate map for tur
honghaiz3
2016/06/28 01:49:26
Done.
|
friend class AllocationSequence; |
}; |