Source code

Revision control

Other Tools

1
exporting patch:
2
# HG changeset patch
3
# User Randell Jesup <rjesup@jesup.org>
4
# Date 1425533209 18000
5
# Thu Mar 05 00:26:49 2015 -0500
6
# Node ID 4c7148e103e122f2fae1736685210b70be452c49
7
# Parent 190f209ef80df453961b357a4a31d80247afd72b
8
Bug 1297418: rollup of sctp modifications for Android and a capitalization change rs=jesup
9
10
diff --git a/netwerk/sctp/src/netinet/sctp_bsd_addr.c b/netwerk/sctp/src/netinet/sctp_bsd_addr.c
11
--- a/netwerk/sctp/src/netinet/sctp_bsd_addr.c
12
+++ b/netwerk/sctp/src/netinet/sctp_bsd_addr.c
13
@@ -43,19 +43,24 @@
14
#include <netinet/sctp_output.h>
15
#include <netinet/sctp_bsd_addr.h>
16
#include <netinet/sctp_uio.h>
17
#include <netinet/sctputil.h>
18
#include <netinet/sctp_timer.h>
19
#include <netinet/sctp_asconf.h>
20
#include <netinet/sctp_sysctl.h>
21
#include <netinet/sctp_indata.h>
22
+#if defined(ANDROID)
23
+#include <unistd.h>
24
+#include <ifaddrs-android-ext.h>
25
+#else
26
#if defined(__FreeBSD__)
27
#include <sys/unistd.h>
28
#endif
29
+#endif
30
31
/* Declare all of our malloc named types */
32
#ifndef __Panda__
33
MALLOC_DEFINE(SCTP_M_MAP, "sctp_map", "sctp asoc map descriptor");
34
MALLOC_DEFINE(SCTP_M_STRMI, "sctp_stri", "sctp stream in array");
35
MALLOC_DEFINE(SCTP_M_STRMO, "sctp_stro", "sctp stream out array");
36
MALLOC_DEFINE(SCTP_M_ASC_ADDR, "sctp_aadr", "sctp asconf address");
37
MALLOC_DEFINE(SCTP_M_ASC_IT, "sctp_a_it", "sctp asconf iterator");
38
diff --git a/netwerk/sctp/src/netinet/sctp_os_userspace.h b/netwerk/sctp/src/netinet/sctp_os_userspace.h
39
--- a/netwerk/sctp/src/netinet/sctp_os_userspace.h
40
+++ b/netwerk/sctp/src/netinet/sctp_os_userspace.h
41
@@ -40,18 +40,18 @@
42
*/
43
44
#include <errno.h>
45
46
#if defined(__Userspace_os_Windows)
47
#include <winsock2.h>
48
#include <ws2tcpip.h>
49
#include <iphlpapi.h>
50
-#include <Mswsock.h>
51
-#include <Windows.h>
52
+#include <mswsock.h>
53
+#include <windows.h>
54
#include "user_environment.h"
55
typedef CRITICAL_SECTION userland_mutex_t;
56
#if WINVER < 0x0600
57
enum {
58
C_SIGNAL = 0,
59
C_BROADCAST = 1,
60
C_MAX_EVENTS = 2
61
};
62
@@ -490,17 +490,17 @@ struct sx {int dummy;};
63
#include <user_ip_icmp.h>
64
#endif
65
/* #include <netinet/in_pcb.h> ported to userspace */
66
#include <user_inpcb.h>
67
68
/* for getifaddrs */
69
#include <sys/types.h>
70
#if !defined(__Userspace_os_Windows)
71
-#if defined(INET) || defined(INET6)
72
+#if !defined(ANDROID) && (defined(INET) || defined(INET6))
73
#include <ifaddrs.h>
74
#endif
75
76
/* for ioctl */
77
#include <sys/ioctl.h>
78
79
/* for close, etc. */
80
#include <unistd.h>