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

webrtc/p2p/base/transportchannel.h

 /*
  *  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 28 matching lines @@
 // Used to indicate channel's connection state.
 enum TransportChannelState { STATE_CONNECTING, STATE_COMPLETED, STATE_FAILED };
 
 // A TransportChannel represents one logical stream of packets that are sent
 // between the two sides of a session.
 class TransportChannel : public sigslot::has_slots<> {
  public:
   explicit TransportChannel(const std::string& content_name, int component)
       : content_name_(content_name),
         component_(component),
-        writable_(false),
-        receiving_(false) {}
+        readable_(false), writable_(false), receiving_(false) {}
   virtual ~TransportChannel() {}
 
   // TODO(guoweis) - Make this pure virtual once all subclasses of
   // TransportChannel have this defined.
   virtual TransportChannelState GetState() const {
     return TransportChannelState::STATE_CONNECTING;
   }
 
   // TODO(mallinath) - Remove this API, as it's no longer useful.
   // Returns the session id of this channel.
   virtual const std::string SessionId() const { return std::string(); }
 
   const std::string& content_name() const { return content_name_; }
   int component() const { return component_; }
 
-  // Returns the states of this channel.  Each time one of these states changes,
-  // a signal is raised.  These states are aggregated by the TransportManager.
+  // Returns the readable and states of this channel.  Each time one of these
+  // states changes, a signal is raised.  These states are aggregated by the
+  // TransportManager.
+  bool readable() const { return readable_; }
   bool writable() const { return writable_; }
   bool receiving() const { return receiving_; }
+  sigslot::signal1<TransportChannel*> SignalReadableState;
   sigslot::signal1<TransportChannel*> SignalWritableState;
   // Emitted when the TransportChannel's ability to send has changed.
   sigslot::signal1<TransportChannel*> SignalReadyToSend;
   sigslot::signal1<TransportChannel*> SignalReceivingState;
 
   // Attempts to send the given packet.  The return value is < 0 on failure.
   // TODO: Remove the default argument once channel code is updated.
   virtual int SendPacket(const char* data, size_t len,
                          const rtc::PacketOptions& options,
                          int flags = 0) = 0;
@@ skipping 50 matching lines @@
   // indicates where and how we are currently sending media.
   sigslot::signal2<TransportChannel*, const Candidate&> SignalRouteChange;
 
   // Invoked when the channel is being destroyed.
   sigslot::signal1<TransportChannel*> SignalDestroyed;
 
   // Debugging description of this transport channel.
   std::string ToString() const;
 
  protected:
+  // Sets the readable state, signaling if necessary.
+  void set_readable(bool readable);
 
   // Sets the writable state, signaling if necessary.
   void set_writable(bool writable);
 
   // Sets the receiving state, signaling if necessary.
   void set_receiving(bool receiving);
 
 
  private:
   // Used mostly for debugging.
   std::string content_name_;
   int component_;
+  bool readable_;
   bool writable_;
   bool receiving_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_