Added send-thresholding and fixed text packet dumping.

talk/media/sctp/sctpdataengine.h

 /*
  * libjingle
  * Copyright 2012 Google Inc. and Robin Seggelmann
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 11 matching lines @@
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
 #define TALK_MEDIA_SCTP_SCTPDATAENGINE_H_
 
 #include <errno.h>
+#include <map>
 #include <string>
 #include <vector>
 
 namespace cricket {
 // Some ERRNO values get re-#defined to WSA* equivalents in some talk/
 // headers.  We save the original ones in an enum.
 enum PreservedErrno {
   SCTP_EINPROGRESS = EINPROGRESS,
   SCTP_EWOULDBLOCK = EWOULDBLOCK
 };
@@ skipping 141 matching lines @@
                               const rtc::PacketTime& packet_time) {}
   virtual void OnReadyToSend(bool ready) {}
 
   // Helper for debugging.
   void set_debug_name(const std::string& debug_name) {
     debug_name_ = debug_name;
   }
   const std::string& debug_name() const { return debug_name_; }
 
  private:
+  // Maps sockets back to their SctpDataMediaChannels.  For usrsctp
+  // send-threshold callbacks, we only get the socket* on invocation, but
+  // need to find the SctpDataMediaChannels.  We can get that through the
+  // library, but would cost us an allocation/free each time the callback is
+  // invoked.
+  typedef std::map<struct socket*, SctpDataMediaChannel*> SocketChannelMap;
+  static SocketChannelMap sock_channel_map_;

[pthatcher1, 2015/08/05 21:42:55]

Instead of being a static member of the SctpDataMediaChannel, I think it would
be cleaner to make this a member of SctpDataMediaEngine.  

[lally1, 2015/08/18 20:38:56]

That makes a lot of sense, but the SctpDataMediaChannel doesn't have an instance
pointer back to the SctpDataMediaEngine.  I think we'd need it to notify
SctpDataMediaEngine when the Channel's being destroyed.  We could certainly pass
one in construction.  Is it worth it?

[pthatcher1, 2015/08/18 21:51:52]

We could add SctpDataMediaChannel::SignalDestroyed that fires in the destructor,
and the MediaEngine could listen to that and remove it from the collection.  We
use a this pattern in other places in our code.  Down underneath, that is a
pointer back, but in a cleaner way.

   sockaddr_conn GetSctpSockAddr(int port);
 
   // Creates the socket and connects. Sets sending_ to true.
   bool Connect();
   // Closes the socket. Sets sending_ to false.
   void Disconnect();
 
   // Returns false when openning the socket failed; when successfull sets
   // sending_ to true
   bool OpenSctpSocket();
@@ skipping 12 matching lines @@
   void OnPacketFromSctpToNetwork(rtc::Buffer* buffer);
   // Called by OnMessage to decide what to do with the packet.
   void OnInboundPacketFromSctpToChannel(SctpInboundPacket* packet);
   void OnDataFromSctpToChannel(const ReceiveDataParams& params,
                                rtc::Buffer* buffer);
   void OnNotificationFromSctp(rtc::Buffer* buffer);
   void OnNotificationAssocChange(const sctp_assoc_change& change);
 
   void OnStreamResetEvent(const struct sctp_stream_reset_event* evt);
 
+  static int SendThresholdCallback(struct socket* sock, uint32_t sb_free);
+
   // Responsible for marshalling incoming data to the channels listeners, and
   // outgoing data to the network interface.
   rtc::Thread* worker_thread_;
   // The local and remote SCTP port to use. These are passed along the wire
   // and the listener and connector must be using the same port. It is not
   // related to the ports at the IP level.  If set to -1, we default to
   // kSctpDefaultPort.
   int local_port_;
   int remote_port_;
   struct socket* sock_;  // The socket created by usrsctp_socket(...).
@@ skipping 14 matching lines @@
   StreamSet queued_reset_streams_;
   StreamSet sent_reset_streams_;
 
   // A human-readable name for debugging messages.
   std::string debug_name_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_SCTP_SCTPDATAENGINE_H_