Updated usrsctp to fix various issues for windows (using changes pushed upstream) and unified SHA1 …

third_party/usrsctp/overrides/usrsctplib/netinet/sctp_os_userspace.h

 /*-
  * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
  * Copyright (c) 2008-2011, by Randall Stewart. All rights reserved.
  * Copyright (c) 2008-2011, by Michael Tuexen. All rights reserved.
  * Copyright (c) 2008-2011, by Brad Penoff. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * a) Redistributions of source code must retain the above copyright notice,
@@ skipping 26 matching lines @@
  * Userspace includes
  * All the opt_xxx.h files are placed in the kernel build directory.
  * We will place them in userspace stack build directory.
  */
 
 #include <errno.h>
 
 #if defined(__Userspace_os_Windows)
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#include <ws2ipdef.h>
-#include <ws2def.h>
 #include <iphlpapi.h>
 #include <Mswsock.h>
 #include <Windows.h>
 #include "user_environment.h"
 typedef CRITICAL_SECTION userland_mutex_t;
 #if WINVER < 0x0600
 enum {
         C_SIGNAL = 0,
         C_BROADCAST = 1,
         C_MAX_EVENTS = 2
 };
 typedef struct
 {
         u_int waiters_count;
         CRITICAL_SECTION waiters_count_lock;
         HANDLE events_[C_MAX_EVENTS];
 } userland_cond_t;
+void InitializeXPConditionVariable(userland_cond_t *);
+void DeleteXPConditionVariable(userland_cond_t *);
+int SleepXPConditionVariable(userland_cond_t *, userland_mutex_t *);
+void WakeAllXPConditionVariable(userland_cond_t *);
 #define InitializeConditionVariable(cond) InitializeXPConditionVariable(cond)
 #define DeleteConditionVariable(cond) DeleteXPConditionVariable(cond)
 #define SleepConditionVariableCS(cond, mtx, time) SleepXPConditionVariable(cond, mtx)
 #define WakeAllConditionVariable(cond) WakeAllXPConditionVariable(cond)
 #else
 #define DeleteConditionVariable(cond)
 typedef CONDITION_VARIABLE userland_cond_t;
 #endif
 typedef HANDLE userland_thread_t;
 #define ADDRESS_FAMILY  unsigned __int8
@@ skipping 127 matching lines @@
 #endif
 #ifndef ESTALE
 #define ESTALE                  WSAESTALE
 #endif
 #ifndef EREMOTE
 #define EREMOTE                 WSAEREMOTE
 #endif
 
 typedef char* caddr_t;
 
+int Win_getifaddrs(struct ifaddrs**);
 #define getifaddrs(interfaces)  (int)Win_getifaddrs(interfaces)
-#define if_nametoindex(x) (int)win_if_nametoindex(x)
+int win_if_nametoindex(const char *);
+#define if_nametoindex(x) win_if_nametoindex(x)
 
 #define bzero(buf, len) memset(buf, 0, len)
 #define bcopy(srcKey, dstKey, len) memcpy(dstKey, srcKey, len)
 #define snprintf(data, size, format, name) _snprintf_s(data, size, _TRUNCATE, format, name)
 #define inline __inline
 #define __inline__ __inline
 #define random() rand()
 #define srandom(s) srand(s)
 #define MSG_EOR         0x8             /* data completes record */
 #define MSG_DONTWAIT    0x80            /* this message should be nonblocking */
@@ skipping 179 matching lines @@
 #include <stdio.h>
 #include <string.h>
 /* #include <sys/param.h>  in FreeBSD defines MSIZE */
 /* #include <sys/ktr.h> */
 /* #include <sys/systm.h> */
 #if defined(__Userspace_os_Windows)
 #include <user_queue.h>
 #else
 #include <sys/queue.h>
 #endif
+#include <user_malloc.h>
 /* #include <sys/kernel.h> */
 /* #include <sys/sysctl.h> */
 /* #include <sys/protosw.h> */
 /* on FreeBSD, this results in a redefintion of SOCK(BUF)_(UN)LOCK and
  *  uknown type of struct mtx for sb_mtx in struct sockbuf */
+#include "user_socketvar.h" /* MALLOC_DECLARE's M_PCB. Replacement for sys/socketvar.h */
 /* #include <sys/jail.h> */
 /* #include <sys/sysctl.h> */
+#include <user_environment.h>
 #include <user_atomic.h>
-#include <user_environment.h>
-#include <user_malloc.h>
 #include <user_mbuf.h>
-#include "user_socketvar.h" /* MALLOC_DECLARE's M_PCB. Replacement for sys/socketvar.h */
 /* #include <sys/uio.h> */
 /* #include <sys/lock.h> */
 #if defined(__FreeBSD__) && __FreeBSD_version > 602000
 #include <sys/rwlock.h>
 #endif
 /* #include <sys/kthread.h> */
 #if defined(__FreeBSD__) && __FreeBSD_version > 602000
 #include <sys/priv.h>
 #endif
 /* #include <sys/random.h> */
@@ skipping 550 matching lines @@
  */
 /* #define USE_SCTP_SHA1 */
 
 /* #define HAVE_SHA2 sha2.h exists on Linux? */
 
 
 #define SCTP_READ_RANDOM(buf, len)      read_random(buf, len)
 
 
 #include <netinet/sctp_sha1.h>
-#if 0 /*this was old _KERNEL code... */
-#include <crypto/sha1.h>
-/* map standard crypto API names */
-#define SHA1_Init       SHA1Init
-#define SHA1_Update     SHA1Update
-#define SHA1_Final(x,y) SHA1Final((caddr_t)x, y)
-#endif
+
 
 #if defined(HAVE_SHA2)
 #include <crypto/sha2/sha2.h>
 #endif
 #if 0
 /*  going to have to port so generic across OS's... */
 #if 1 /* openssl header files on FreeBSD 6.3 on Emulab and libssl-dev for Ubuntu */
 #include <openssl/md5.h>
 #include <openssl/sha.h>
 /* libssl-dev calls this SHA_CTX, but it's refered to as SHA1_CTX within the
@@ skipping 142 matching lines @@
          for ((var) = ((head)->tqh_first);                     \
               (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
               (var) = (tvar))
 
 #define LIST_FOREACH_SAFE(var, head, field, tvar)              \
          for ((var) = ((head)->lh_first);                      \
               (var) && ((tvar) = LIST_NEXT((var), field), 1);  \
               (var) = (tvar))
 #endif
 #endif