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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
--- trickle-overload.c.orig 2004-12-13 02:21:53.000000000 +0100
+++ trickle-overload.c 2008-04-21 19:23:49.000000000 +0200
@@ -61,6 +61,7 @@
#define SD_INSELECT 0x01
+
struct sockdesc {
int sock;
int flags;
@@ -141,8 +142,12 @@
DECLARE(dup2, int, (int, int));
#ifdef HAVE_SENDFILE
+#ifdef __FreeBSD__
+DECLARE(sendfile, int, (int, int, off_t, size_t, struct sf_hdtr *, off_t *, int));
+#else
DECLARE(sendfile, ssize_t, (int, int, off_t *, size_t));
#endif
+#endif
static int delay(int, ssize_t *, short);
static struct timeval *getdelay(struct sockdesc *, ssize_t *, short);
@@ -202,15 +207,11 @@
GETADDR(read);
GETADDR(readv);
-#ifndef __FreeBSD__
GETADDR(recv);
-#endif /* !__FreeBSD__ */
GETADDR(recvfrom);
GETADDR(writev);
-#ifndef __FreeBSD__
GETADDR(send);
-#endif /* !__FreeBSD__ */
GETADDR(sendto);
GETADDR(select);
@@ -701,7 +702,6 @@
return (ret);
}
-#ifndef __FreeBSD__
ssize_t
recv(int sock, void *buf, size_t len, int flags)
{
@@ -730,7 +730,6 @@
return (ret);
}
-#endif /* !__FreeBSD__ */
#ifdef __sun__
ssize_t
@@ -832,7 +831,6 @@
return (ret);
}
-#ifndef __FreeBSD__
ssize_t
send(int sock, const void *buf, size_t len, int flags)
{
@@ -862,7 +860,6 @@
return (ret);
}
-#endif /* !__FreeBSD__ */
ssize_t
sendto(int sock, const void *buf, size_t len, int flags, const struct sockaddr *to,
@@ -1004,11 +1001,20 @@
}
#ifdef HAVE_SENDFILE
+#ifdef __FreeBSD__
+int
+sendfile(int out_fd, int in_fd, off_t offset, size_t count, struct sf_hdtr *hdtr, off_t *sbytes, int flags)
+#else
ssize_t
sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
+#endif
{
size_t inbytes = count, outbytes = count, bytes;
+#ifdef __FreeBSD__
+ int ret = 0;
+#else
ssize_t ret = 0;
+#endif
INIT;
@@ -1021,8 +1027,11 @@
/* This is a slightly ugly hack. */
bytes = MIN(inbytes, outbytes);
if (bytes > 0)
+#ifdef __FreeBSD__
+ ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes, hdtr, sbytes, flags);
+#else
ret = (*libc_sendfile)(out_fd, in_fd, offset, bytes);
-
+#endif
return (ret);
}
#endif /* HAVE_SENDFILE */
|
