diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:33 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:33 +0100 |
| commit | da0509e3087cc5ee9adc0fe1abb85112ea6529a5 (patch) | |
| tree | 532416c2f3025131e902ab655f3d404945485a6b /p2p/client/basicportallocator.h | |
| parent | 67bbc8e3efef31646fec91b0b422a78708a3f4aa (diff) | |
| parent | 6fd722a3e5cdf933ad206ec7cd697ce95a5630cd (diff) | |
| download | talk-da0509e3087cc5ee9adc0fe1abb85112ea6529a5.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85candroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-release
This commit was generated by merge_to_master.py.
Change-Id: I3cccc8f04ad0036aecdb7eefe316a059ebcefaf9
Diffstat (limited to 'p2p/client/basicportallocator.h')
| -rw-r--r-- | p2p/client/basicportallocator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/p2p/client/basicportallocator.h b/p2p/client/basicportallocator.h index 5f43880..d424772 100644 --- a/p2p/client/basicportallocator.h +++ b/p2p/client/basicportallocator.h @@ -160,7 +160,6 @@ class BasicPortAllocatorSession : public PortAllocatorSession, void set_ready() { ASSERT(state_ == STATE_INIT); state_ = STATE_READY; } void set_complete() { - ASSERT(state_ == STATE_READY); state_ = STATE_COMPLETE; } void set_error() { @@ -201,6 +200,8 @@ class BasicPortAllocatorSession : public PortAllocatorSession, void OnPortAllocationComplete(AllocationSequence* seq); PortData* FindPort(Port* port); + bool CheckCandidateFilter(const Candidate& c); + BasicPortAllocator* allocator_; rtc::Thread* network_thread_; rtc::scoped_ptr<rtc::PacketSocketFactory> owned_socket_factory_; |