1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
$NetBSD: patch-mozilla_netwerk_sctp_src_user__socket.c,v 1.1 2013/11/12 20:50:51 ryoon Exp $
--- mozilla/netwerk/sctp/src/user_socket.c.orig 2013-10-23 22:09:15.000000000 +0000
+++ mozilla/netwerk/sctp/src/user_socket.c
@@ -1044,8 +1044,13 @@ userspace_sctp_recvmsg(struct socket *so
(struct sctp_sndrcvinfo *)sinfo, 1);
if (error) {
+#if defined(__Userspace_os_NetBSD)
+ if (auio.uio_resid != (int)ulen && (
+ error == EINTR || error == EWOULDBLOCK))
+#else
if (auio.uio_resid != (int)ulen && (error == ERESTART ||
error == EINTR || error == EWOULDBLOCK))
+#endif
error = 0;
}
if ((fromlenp != NULL) && (fromlen > 0) && (from != NULL)) {
@@ -1133,7 +1138,11 @@ usrsctp_recvv(struct socket *so,
(struct sctp_sndrcvinfo *)&seinfo, 1);
if (errno) {
if (auio.uio_resid != (int)ulen &&
+#if defined(__Userspace_os_NetBSD)
+ (errno == EINTR || errno == EWOULDBLOCK)) {
+#else
(errno == ERESTART || errno == EINTR || errno == EWOULDBLOCK)) {
+#endif
errno = 0;
}
}
@@ -2083,7 +2092,11 @@ int user_connect(struct socket *so, stru
error = pthread_cond_wait(SOCK_COND(so), SOCK_MTX(so));
#endif
if (error) {
+#if defined(__Userspace_os_NetBSD)
+ if (error == EINTR)
+#else
if (error == EINTR || error == ERESTART)
+#endif
interrupted = 1;
break;
}
@@ -2097,8 +2110,10 @@ int user_connect(struct socket *so, stru
bad:
if (!interrupted)
so->so_state &= ~SS_ISCONNECTING;
+#if !defined(__Userspace_os_NetBSD)
if (error == ERESTART)
error = EINTR;
+#endif
done1:
return (error);
}
|
