Replace readable with receiving where receiving means receiving anything (stun ping, response or da…

webrtc/p2p/base/transport.cc

 /*
  *  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.
  */
 
@@ skipping 222 matching lines @@
   impl->SetReceivingTimeout(channel_receiving_timeout_);
   // TODO(ronghuawu): Change CreateChannel to be able to return error since
   // below Apply**Description calls can fail.
   if (local_description_)
     ApplyLocalTransportDescription(impl, NULL);
   if (remote_description_)
     ApplyRemoteTransportDescription(impl, NULL);
   if (local_description_ && remote_description_)
     ApplyNegotiatedTransportDescription(impl, NULL);
 
-  impl->SignalReadableState.connect(this, &Transport::OnChannelReadableState);
   impl->SignalWritableState.connect(this, &Transport::OnChannelWritableState);
   impl->SignalReceivingState.connect(this, &Transport::OnChannelReceivingState);
   impl->SignalGatheringState.connect(this, &Transport::OnChannelGatheringState);
   impl->SignalCandidateGathered.connect(this,
                                         &Transport::OnChannelCandidateGathered);
   impl->SignalRouteChange.connect(this, &Transport::OnChannelRouteChange);
   impl->SignalRoleConflict.connect(this, &Transport::OnRoleConflict);
   impl->SignalConnectionRemoved.connect(
       this, &Transport::OnChannelConnectionRemoved);
 
@@ skipping 32 matching lines @@
 
   if (connect_requested_ && channels_.empty()) {
     // We're no longer attempting to connect.
     SignalConnecting(this);
   }
 
   if (impl) {
     DestroyTransportChannel(impl);
     // Need to update aggregate state after destroying a channel,
     // for example if it was the only one that wasn't yet writable.
-    UpdateReadableState();
     UpdateWritableState();
     UpdateReceivingState();
     UpdateGatheringState();
     MaybeSignalCompleted();
   }
 }
 
 void Transport::ConnectChannels() {
   if (connect_requested_ || channels_.empty())
     return;
@@ skipping 117 matching lines @@
        iter != candidates.end();
        ++iter) {
     TransportChannelImpl* channel = GetChannel(iter->component());
     if (channel != NULL) {
       channel->AddRemoteCandidate(*iter);
     }
   }
   return true;
 }
 
-void Transport::OnChannelReadableState(TransportChannel* channel) {
-  UpdateReadableState();
-}
-
 void Transport::OnChannelWritableState(TransportChannel* channel) {
   LOG(LS_INFO) << name() << " TransportChannel " << channel->component()
                << " writability changed to " << channel->writable()
                << ". Check if transport is complete.";
   UpdateWritableState();
   MaybeSignalCompleted();
 }
 
 void Transport::OnChannelReceivingState(TransportChannel* channel) {
   UpdateReceivingState();
 }
 
 TransportState Transport::GetTransportState(TransportStateType state_type) {
   bool any = false;
   bool all = !channels_.empty();
   for (const auto iter : channels_) {
     bool b = false;
     switch (state_type) {
-      case TRANSPORT_READABLE_STATE:
-        b = iter.second->readable();
-        break;
       case TRANSPORT_WRITABLE_STATE:
         b = iter.second->writable();
         break;
       case TRANSPORT_RECEIVING_STATE:
         b = iter.second->receiving();
         break;
       default:
         ASSERT(false);
     }
     any |= b;
@@ skipping 119 matching lines @@
   TransportState writable = GetTransportState(TRANSPORT_WRITABLE_STATE);
   LOG(LS_INFO) << name() << " transport writable state changed? " << writable_
                << " => " << writable;
   if (writable_ != writable) {
     was_writable_ = (writable_ == TRANSPORT_STATE_ALL);
     writable_ = writable;
     SignalWritableState(this);
   }
 }
 
-void Transport::UpdateReadableState() {
-  TransportState readable = GetTransportState(TRANSPORT_READABLE_STATE);
-  if (readable_ != readable) {
-    readable_ = readable;
-    SignalReadableState(this);
-  }
-}
-
 bool Transport::ApplyLocalTransportDescription(TransportChannelImpl* ch,
                                                std::string* error_desc) {
   ch->SetIceCredentials(local_description_->ice_ufrag,
                         local_description_->ice_pwd);
   return true;
 }
 
 bool Transport::ApplyRemoteTransportDescription(TransportChannelImpl* ch,
                                                 std::string* error_desc) {
   ch->SetRemoteIceCredentials(remote_description_->ice_ufrag,
@@ skipping 29 matching lines @@
   // creation, we have the negotiation state saved until a new
   // negotiation happens.
   for (auto& iter : channels_) {
     if (!ApplyNegotiatedTransportDescription(iter.second.get(), error_desc))
       return false;
   }
   return true;
 }
 
 }  // namespace cricket