Update libjingle to 53057474.
R=wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2274004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4818 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/media/sctp/sctpdataengine.h b/talk/media/sctp/sctpdataengine.h
index d62eff1..429016e 100644
--- a/talk/media/sctp/sctpdataengine.h
+++ b/talk/media/sctp/sctpdataengine.h
@@ -54,6 +54,10 @@
struct socket;
namespace cricket {
+// The highest stream ID (Sid) that SCTP allows, and the number of streams we
+// tell SCTP we're going to use.
+const uint32 kMaxSctpSid = USHRT_MAX;
+
// A DataEngine that interacts with usrsctp.
//
// From channel calls, data flows like this:
@@ -108,12 +112,14 @@
// on top of SCTP.
enum PayloadProtocolIdentifier {
PPID_NONE = 0, // No protocol is specified.
- // Specified by Mozilla. Not clear that this is actually part of the
- // standard. Use with caution!
- // http://mxr.mozilla.org/mozilla-central/source/netwerk/sctp/datachannel/DataChannelProtocol.h#22
+ // Matches the PPIDs in mozilla source and
+ // https://datatracker.ietf.org/doc/draft-ietf-rtcweb-data-protocol Sec. 9
+ // They're not yet assigned by IANA.
PPID_CONTROL = 50,
- PPID_TEXT = 51,
- PPID_BINARY = 52,
+ PPID_BINARY_PARTIAL = 52,
+ PPID_BINARY_LAST = 53,
+ PPID_TEXT_PARTIAL = 54,
+ PPID_TEXT_LAST = 51
};
// Given a thread which will be used to post messages (received data) to this
@@ -208,11 +214,7 @@
// related to the ports at the IP level.
int local_port_;
int remote_port_;
- // TODO(ldixon): investigate why removing 'struct' makes the compiler
- // complain.
- //
- // The socket created by usrsctp_socket(...).
- struct socket* sock_;
+ struct socket* sock_; // The socket created by usrsctp_socket(...).
// sending_ is true iff there is a connected socket.
bool sending_;