Fixing off-by-one error with max SCTP id.

webrtc/media/sctp/sctpdataengine.cc

 /*
  *  Copyright (c) 2012 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 266 matching lines @@
   // TODO(ldixon): Consider turning this on/off.
   // Add a blackhole sysctl. Setting it to 1 results in no ABORTs
   // being sent in response to INITs, setting it to 2 results
   // in no ABORTs being sent for received OOTB packets.
   // This is similar to the TCP sysctl.
   //
   // See: http://lakerest.net/pipermail/sctp-coders/2012-January/009438.html
   // See: http://svnweb.freebsd.org/base?view=revision&revision=229805
   // usrsctp_sysctl_set_sctp_blackhole(2);
 
-  // Set the number of default outgoing streams.  This is the number we'll
-  // send in the SCTP INIT message.  The 'appropriate default' in the
-  // second paragraph of
-  // http://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-05#section-6.2
-  // is kMaxSctpSid.
-  usrsctp_sysctl_set_sctp_nr_outgoing_streams_default(kMaxSctpSid);
+  // Set the number of default outgoing streams. This is the number we'll
+  // send in the SCTP INIT message.
+  usrsctp_sysctl_set_sctp_nr_outgoing_streams_default(kMaxSctpStreams);
 }
 
 void UninitializeUsrSctp() {
   LOG(LS_INFO) << __FUNCTION__;
   // usrsctp_finish() may fail if it's called too soon after the channels are
   // closed. Wait and try again until it succeeds for up to 3 seconds.
   for (size_t i = 0; i < 300; ++i) {
     if (usrsctp_finish() == 0) {
       return;
     }
@@ skipping 441 matching lines @@
                     << " len=" << buffer.size() << " before SetReceive(true).";
   }
 }
 
 bool SctpDataMediaChannel::AddStream(const StreamParams& stream) {
   if (!stream.has_ssrcs()) {
     return false;
   }
 
   const uint32_t ssrc = stream.first_ssrc();
-  if (ssrc >= kMaxSctpSid) {
+  if (ssrc >= kMaxSctpStreams) {
     LOG(LS_WARNING) << debug_name_ << "->Add(Send|Recv)Stream(...): "
                     << "Not adding data stream '" << stream.id
-                    << "' with ssrc=" << ssrc
-                    << " because stream ssrc is too high.";
+                    << "' with sid=" << ssrc << " because sid is too high.";
     return false;
   } else if (open_streams_.find(ssrc) != open_streams_.end()) {
     LOG(LS_WARNING) << debug_name_ << "->Add(Send|Recv)Stream(...): "
                     << "Not adding data stream '" << stream.id
-                    << "' with ssrc=" << ssrc
+                    << "' with sid=" << ssrc
                     << " because stream is already open.";
     return false;
   } else if (queued_reset_streams_.find(ssrc) != queued_reset_streams_.end()
              || sent_reset_streams_.find(ssrc) != sent_reset_streams_.end()) {
     LOG(LS_WARNING) << debug_name_ << "->Add(Send|Recv)Stream(...): "
                     << "Not adding data stream '" << stream.id
-                    << "' with ssrc=" << ssrc
+                    << "' with sid=" << ssrc
                     << " because stream is still closing.";
     return false;
   }
 
   open_streams_.insert(ssrc);
   return true;
 }
 
 bool SctpDataMediaChannel::ResetStream(uint32_t ssrc) {
   // We typically get this called twice for the same stream, once each for
@@ skipping 287 matching lines @@
     }
     case MSG_SCTPOUTBOUNDPACKET: {
       std::unique_ptr<OutboundPacketMessage> pdata(
           static_cast<OutboundPacketMessage*>(msg->pdata));
       OnPacketFromSctpToNetwork(pdata->data().get());
       break;
     }
   }
 }
 }  // namespace cricket