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..a591542bd676622a31e11bdabca3ce87dbcf97ee 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,15 @@ class SctpDataEngine : public DataEngineInterface {
 
   virtual const std::vector<DataCodec>& data_codecs() { return codecs_; }
 
+  static int SendThresholdCallback(struct socket* sock, uint32_t sb_free);
+
  private:
+  static std::vector<SctpDataMediaChannel*> channels_;

[Nico, 2015/08/27 03:56:46]

This adds a static initializer, that's no good. (I'm not sure why codecs_
doesn't add one too – I guess it's not referenced from any code used in chromium
and gets dead-stripped?)

# sctpdataengine.cc _GLOBAL__sub_I_sctpdataengine.cc+0xf
# sctpdataengine.cc __cxa_atexit@plt [registers a dtor to run at exit]

[pthatcher1, 2015/08/27 16:45:33]

codecs_ isn't static.

And when I reviewed this code I didn't notice that channels_ was static.  I
don't see any reason why it needs to be.

[lally1, 2015/08/27 17:56:09]

Ah, I didn't know that wasn't allowed.  I've wrapped it in a static function, so
the initializer's only run when the function's first invoked.  codecs_ isn't
static.

Is that allowed?  If not, then the only other way to get the relevant data for
us involves a malloc/free cycle on each callback invocation.

   static int usrsctp_engines_count;
   std::vector<DataCodec> codecs_;
+
+  static SctpDataMediaChannel* GetChannelFromSocket(struct socket* sock);
+  void OnChannelDestroyed(SctpDataMediaChannel *channel);
 };
 
 // TODO(ldixon): Make into a special type of TypedMessageData.
@@ -188,6 +196,9 @@ class SctpDataMediaChannel : public DataMediaChannel,
     debug_name_ = debug_name;
   }
   const std::string& debug_name() const { return debug_name_; }
+  const struct socket* socket() { return sock_; }
+
+  sigslot::signal1<SctpDataMediaChannel*> SignalDestroyed;
 
  private:
   sockaddr_conn GetSctpSockAddr(int port);