diff options
author | ldixon@google.com <ldixon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 15:21:22 +0000 |
---|---|---|
committer | ldixon@google.com <ldixon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 15:21:22 +0000 |
commit | e033cd3ffebcc4cc00765e2ba23a482583c9f8b0 (patch) | |
tree | ea8bbc55acfa4cb1908ee06d8469ca7c1964c849 | |
parent | e47f61f22a568a69e74cbf8d0b70c4858879b9b5 (diff) | |
download | chromium_src-e033cd3ffebcc4cc00765e2ba23a482583c9f8b0.zip chromium_src-e033cd3ffebcc4cc00765e2ba23a482583c9f8b0.tar.gz chromium_src-e033cd3ffebcc4cc00765e2ba23a482583c9f8b0.tar.bz2 |
Initial addition of usrsctp.
About to become a dependency for LibJingle's WebRTC reliable data channels.
(Note: have already got git and svn repositories setup, and open-source approval from: https://codereview.chromium.org/12779026/
but I accentually created that CL/issue from a client without commit access, on a different machine. I don't know how to update that CL from my new git checkout of chromium...)
BUG=238870
TEST=none
Review URL: https://chromiumcodereview.appspot.com/14453006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198908 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 7 | ||||
-rw-r--r-- | third_party/usrsctp/LICENSE | 30 | ||||
-rw-r--r-- | third_party/usrsctp/README.chromium | 14 | ||||
-rw-r--r-- | third_party/usrsctp/usrsctp.gyp | 98 |
4 files changed, 148 insertions, 1 deletions
@@ -247,6 +247,10 @@ deps = { (Var("googlecode_url") % "libjingle") + "/trunk@" + Var("libjingle_revision"), + "src/third_party/usrsctp/usrsctplib": + (Var("googlecode_url") % "sctp-refimpl") + + "/trunk/KERN/usrsctp/usrsctplib@8463", + "src/third_party/libsrtp": "/trunk/deps/third_party/libsrtp@189528", @@ -303,7 +307,7 @@ deps = { "/trunk/deps/third_party/undoview@119694", "src/tools/deps2git": - "/trunk/tools/deps2git@194189", + "/trunk/tools/deps2git@197957", "src/third_party/webpagereplay": (Var("googlecode_url") % "web-page-replay") + "/trunk@511", @@ -444,6 +448,7 @@ deps_os = { "src/third_party/libphonenumber/src/test": None, "src/third_party/libphonenumber/src/resources": None, "src/third_party/libsrtp": None, + "src/third_party/usrsctp": None, "src/third_party/libvpx": None, "src/third_party/libyuv": None, "src/third_party/ots": None, diff --git a/third_party/usrsctp/LICENSE b/third_party/usrsctp/LICENSE new file mode 100644 index 0000000..f614be9 --- /dev/null +++ b/third_party/usrsctp/LICENSE @@ -0,0 +1,30 @@ +(Copied from the COPYRIGHT file of +https://code.google.com/p/sctp-refimpl/source/browse/trunk/COPYRIGHT) +-------------------------------------------------------------------------------- + +Copyright (c) 2001, 2002 Cisco Systems, Inc. +Copyright (c) 2002-12 Randall R. Stewart +Copyright (c) 2002-12 Michael Tuexen +All rights reserved. + +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, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 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. diff --git a/third_party/usrsctp/README.chromium b/third_party/usrsctp/README.chromium new file mode 100644 index 0000000..9dc2298 --- /dev/null +++ b/third_party/usrsctp/README.chromium @@ -0,0 +1,14 @@ +Name: usrsctp +URL: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp +Version: 0 +Date: 16 March 2013 +Revision: 8439 +License: New BSD License +License File: LICENSE +Security Critical: yes + +Description: +The libjingle/webrtc uses usrsctp as the reliability layer for data channels. + +Local Modifications: +None.
\ No newline at end of file diff --git a/third_party/usrsctp/usrsctp.gyp b/third_party/usrsctp/usrsctp.gyp new file mode 100644 index 0000000..af82e0d --- /dev/null +++ b/third_party/usrsctp/usrsctp.gyp @@ -0,0 +1,98 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'usrsctplib', + 'type': 'static_library', + 'direct_dependent_settings': { + 'include_dirs': [ + '.', + ], + 'defines': [ + 'INET', + 'SCTP_PROCESS_LEVEL_LOCKS', + 'SCTP_SIMPLE_ALLOCATOR', + 'STDC_HEADERS', + 'USE_SCTP_SHA1', + '__Userspace__', + # 'SCTP_DEBUG', # Uncomment for SCTP debugging. + ], + }, + 'include_dirs': [ + 'usrsctplib/', + 'usrsctplib/netinet', + 'usrsctplib/netinet6', + ], + 'sources': [ + 'usrsctplib/user_environment.c', + 'usrsctplib/user_mbuf.c', + 'usrsctplib/user_recv_thread.c', + 'usrsctplib/user_sctp_timer_iterate.c', + 'usrsctplib/user_socket.c', + 'usrsctplib/netinet/sctp_asconf.c', + 'usrsctplib/netinet/sctp_auth.c', + 'usrsctplib/netinet/sctp_bsd_addr.c', + 'usrsctplib/netinet/sctp_callout.c', + 'usrsctplib/netinet/sctp_cc_functions.c', + 'usrsctplib/netinet/sctp_crc32.c', + 'usrsctplib/netinet/sctp_hashdriver.c', + 'usrsctplib/netinet/sctp_indata.c', + 'usrsctplib/netinet/sctp_input.c', + 'usrsctplib/netinet/sctp_output.c', + 'usrsctplib/netinet/sctp_pcb.c', + 'usrsctplib/netinet/sctp_peeloff.c', + 'usrsctplib/netinet/sctp_sha1.c', + 'usrsctplib/netinet/sctp_ss_functions.c', + 'usrsctplib/netinet/sctp_sysctl.c', + 'usrsctplib/netinet/sctp_userspace.c', + 'usrsctplib/netinet/sctp_timer.c', + 'usrsctplib/netinet/sctp_usrreq.c', + 'usrsctplib/netinet/sctputil.c', + 'usrsctplib/netinet6/sctp6_usrreq.c', + ], # sources + 'conditions': [ + ['OS=="linux"', { + 'defines': [ + 'HAVE_INET_ADDR', + 'HAVE_SOCKET', + '__Userspace_os_Linux', + ], + 'ccflags!': [ '-Werror', '-Wall' ], + 'ccflags': [ '-w' ], + }], + ['OS=="mac"', { + 'defines': [ + 'HAVE_INET_ADDR', + 'HAVE_SA_LEN', + 'HAVE_SCONN_LEN', + 'HAVE_SIN6_LEN', + 'HAVE_SIN_LEN', + 'HAVE_SOCKET', + 'INET6', + '__APPLE_USE_RFC_2292', + '__Userspace_os_Darwin', + ], + # TODO(ldixon): explore why gyp cflags here does not get picked up. + 'xcode_settings': { + 'OTHER_CFLAGS!': [ '-Werror', '-Wall' ], + 'OTHER_CFLAGS': [ '-U__APPLE__', '-w' ], + }, + }], + ['OS=="win"', { + 'defines': [ + 'INET6', + '__Userspace_os_Windows', + ], + 'ccflags!': [ '/W3', '/WX' ], + 'ccflags': [ '/w' ], + }, { # OS != "win", + 'defines': [ + 'NON_WINDOWS_DEFINE', + ], + }], + ], # conditions + }, # target usrsctp + ], # targets +} |