(try 2) Added send-thresholding and fixed text packet dumping

talk/media/sctp/sctpdataengine.h

Index: talk/media/sctp/sctpdataengine.h
diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h
index 86bfa37a48c10dca4c3f5b0cad9a330d27aea10e..c788b8b5ffaee912a1d1f499388d5e23fa0b3fe4 100644
--- a/talk/media/sctp/sctpdataengine.h
+++ b/talk/media/sctp/sctpdataengine.h
@@ -64,6 +64,8 @@ const uint32 kMaxSctpSid = 1023;
 // usrsctp.h)
 const int kSctpDefaultPort = 5000;
 
+class SctpDataMediaChannel;
+
 // A DataEngine that interacts with usrsctp.
 //
 // From channel calls, data flows like this:
@@ -88,7 +90,7 @@ const int kSctpDefaultPort = 5000;
 //  14. SctpDataMediaChannel::SignalDataReceived(data)
 // [from the same thread, methods registered/connected to
 //  SctpDataMediaChannel are called with the recieved data]
-class SctpDataEngine : public DataEngineInterface {
+class SctpDataEngine : public DataEngineInterface, public sigslot::has_slots<> {
  public:
   SctpDataEngine();
   virtual ~SctpDataEngine();
@@ -97,9 +99,13 @@ class SctpDataEngine : public DataEngineInterface {
 
   virtual const std::vector<DataCodec>& data_codecs() { return codecs_; }
 
+  static int SendThresholdCallback(struct socket* sock, uint32_t sb_free);

[tommi, 2015/08/28 11:44:04]

nit: lose "struct"

[lally1, 2015/08/28 17:54:49]

Compiler wouldn't let me. It says "must use 'struct' tag to refer to type
'socket' in this scope".

+
  private:
   static int usrsctp_engines_count;
   std::vector<DataCodec> codecs_;
+
+  static SctpDataMediaChannel* GetChannelFromSocket(struct socket* sock);

[tommi, 2015/08/28 11:44:04]

ditto

[lally1, 2015/08/28 17:54:49]

Acknowledged.

 };
 
 // TODO(ldixon): Make into a special type of TypedMessageData.
@@ -188,7 +194,7 @@ class SctpDataMediaChannel : public DataMediaChannel,
     debug_name_ = debug_name;
   }
   const std::string& debug_name() const { return debug_name_; }
-
+  struct socket* socket() const { return sock_; }

[tommi, 2015/08/28 11:44:04]

here too.

This is a const method that returns a non-const pointer to an internal member
variable.  We don't do this usually, so if this method doesn't really need to be
const, it shouldn't be.

[lally1, 2015/08/28 17:54:49]

Made const.

  private:
   sockaddr_conn GetSctpSockAddr(int port);