Updated usrsctp to latest version with fixes upstream. Fixed usrsctp gyp file; removed overides.

third_party/usrsctp/usrsctp.gyp

Index: third_party/usrsctp/usrsctp.gyp
diff --git a/third_party/usrsctp/usrsctp.gyp b/third_party/usrsctp/usrsctp.gyp
index d2733851ebde5a9a8e6c3fe6db0a99b8d10496c1..6ab8b28adb5e83ecb17d899eecb7777051e81f34 100644
--- a/third_party/usrsctp/usrsctp.gyp
+++ b/third_party/usrsctp/usrsctp.gyp
@@ -13,42 +13,28 @@
       # 'SCTP_DEBUG', # Uncomment for SCTP debugging.
     ],
     'include_dirs': [
-      'overrides/usrsctplib',
-      'overrides/usrsctplib/netinet',
       'usrsctplib/',
       'usrsctplib/netinet',
-      'usrsctplib/netinet6',
     ],
     'direct_dependent_settings': {
       'include_dirs': [
-        'overrides/usrsctplib',
-        'overrides/usrsctplib/netinet',
         'usrsctplib/',
         'usrsctplib/netinet',
-        'usrsctplib/netinet6',
       ],
     },
     'conditions': [
       ['use_openssl==1', {
         'defines': [
-          'SSL_USE_OPENSSL',
+          'SCTP_USE_OPENSSL_SHA1',
         ],
         'dependencies': [
           '<(DEPTH)/third_party/openssl/openssl.gyp:openssl',
         ],
-        'sources': [
-          'overrides/usrsctplib/netinet/sctp_openssl_sha1.h',
-        ],
       },
       {  # else use_openssl==0, use NSS.
         'defines' : [
-          'SSL_USE_NSS',
           'SCTP_USE_NSS_SHA1',
         ],
-        'sources': [
-          'overrides/usrsctplib/netinet/sctp_nss_sha1.c',
-          'overrides/usrsctplib/netinet/sctp_nss_sha1.h',
-        ],
         'conditions': [
           ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
             'dependencies': [  # The system.gyp:ssl dependency includes nss
@@ -70,30 +56,10 @@
       'target_name': 'usrsctplib',
       'type': 'static_library',
       'sources': [
-        'overrides/usrsctplib/netinet/sctp_auth.h',
-        'overrides/usrsctplib/netinet/sctp_os.h',
-        'overrides/usrsctplib/netinet/sctp_os_userspace.h',
-        'overrides/usrsctplib/netinet/sctp_sha1.h',
-        'usrsctplib/usrsctp.h',
-        'usrsctplib/user_atomic.h',
-        'usrsctplib/user_environment.c',
-        'usrsctplib/user_environment.h',
-        'usrsctplib/user_inpcb.h',
-        'usrsctplib/user_ip6_var.h',
-        'usrsctplib/user_ip_icmp.h',
-        'usrsctplib/user_mbuf.c',
-        'usrsctplib/user_mbuf.h',
-        'usrsctplib/user_queue.h',
-        'usrsctplib/user_recv_thread.c',
-        'usrsctplib/user_recv_thread.h',
-        'usrsctplib/user_route.h',
-        'usrsctplib/user_sctp_timer_iterate.c',
-        'usrsctplib/user_socket.c',
-        'usrsctplib/user_socketvar.h',
-        'usrsctplib/user_uma.h',
         'usrsctplib/netinet/sctp_asconf.c',
         'usrsctplib/netinet/sctp_asconf.h',
         'usrsctplib/netinet/sctp_auth.c',
+        'usrsctplib/netinet/sctp_auth.h',
         'usrsctplib/netinet/sctp_bsd_addr.c',
         'usrsctplib/netinet/sctp_bsd_addr.h',
         'usrsctplib/netinet/sctp_callout.c',
@@ -108,12 +74,16 @@
         'usrsctplib/netinet/sctp_input.c',
         'usrsctplib/netinet/sctp_input.h',
         'usrsctplib/netinet/sctp_lock_userspace.h',
+        'usrsctplib/netinet/sctp_os.h',
+        'usrsctplib/netinet/sctp_os_userspace.h',
         'usrsctplib/netinet/sctp_output.c',
         'usrsctplib/netinet/sctp_output.h',
         'usrsctplib/netinet/sctp_pcb.c',
         'usrsctplib/netinet/sctp_pcb.h',
         'usrsctplib/netinet/sctp_peeloff.c',
         'usrsctplib/netinet/sctp_peeloff.h',
+        'usrsctplib/netinet/sctp_sha1.c',
+        'usrsctplib/netinet/sctp_sha1.h',
         'usrsctplib/netinet/sctp_ss_functions.c',
         'usrsctplib/netinet/sctp_structs.h',
         'usrsctplib/netinet/sctp_sysctl.c',
@@ -123,9 +93,26 @@
         'usrsctplib/netinet/sctp_uio.h',
         'usrsctplib/netinet/sctp_userspace.c',
         'usrsctplib/netinet/sctp_usrreq.c',
+        'usrsctplib/netinet/sctp_var.h',
         'usrsctplib/netinet/sctputil.c',
         'usrsctplib/netinet/sctputil.h',
-        'usrsctplib/netinet/sctp_var.h',
+        'usrsctplib/user_atomic.h',
+        'usrsctplib/user_environment.c',
+        'usrsctplib/user_environment.h',
+        'usrsctplib/user_inpcb.h',
+        'usrsctplib/user_ip6_var.h',
+        'usrsctplib/user_ip_icmp.h',
+        'usrsctplib/user_mbuf.c',
+        'usrsctplib/user_mbuf.h',
+        'usrsctplib/user_queue.h',
+        'usrsctplib/user_recv_thread.c',
+        'usrsctplib/user_recv_thread.h',
+        'usrsctplib/user_route.h',
+        'usrsctplib/user_sctp_timer_iterate.c',
+        'usrsctplib/user_socket.c',
+        'usrsctplib/user_socketvar.h',
+        'usrsctplib/user_uma.h',
+        'usrsctplib/usrsctp.h',
       ],  # sources
       'conditions': [
         ['OS=="linux"', {
@@ -142,15 +129,23 @@
             '__APPLE_USE_RFC_2292',
             '__Userspace_os_Darwin',
           ],
-          # TODO(ldixon): explore why gyp cflags here does not get picked up.
+          # usrsctp requires that __APPLE__ is undefined for compilation (for
+          # historical reasons). There is a plan to change this, and when it
+          # happens and we re-roll DEPS for usrsctp, we can remove the manual
+          # undefining of __APPLE__.
           'xcode_settings': {
             'OTHER_CFLAGS!': [ '-Werror', '-Wall' ],
-            'OTHER_CFLAGS': [ '-w' ],
+            'OTHER_CFLAGS': [ '-U__APPLE__', '-w' ],
           },
         }],
         ['OS=="win"', {
           'defines': [
             '__Userspace_os_Windows',
+            # Manually setting WINVER and _WIN32_WINNT is needed because Chrome
+            # sets WINVER to a newer version of  windows. But compiling usrsctp
+            # this way would is incompatible  with windows XP.
+            'WINVER=0x0502',
+            '_WIN32_WINNT=0x0502',
           ],
           'cflags!': [ '/W3', '/WX' ],
           'cflags': [ '/w' ],