git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: PIPELINING under OpenSSL
[exim.git]
/
src
/
src
/
dkim_transport.c
diff --git
a/src/src/dkim_transport.c
b/src/src/dkim_transport.c
index a654c251661e298d8ccdc521f21f5aef7e39f078..4d26f9291dba78cc3a75fa93e4eb8610257a5cd8 100644
(file)
--- a/
src/src/dkim_transport.c
+++ b/
src/src/dkim_transport.c
@@
-12,10
+12,6
@@
#ifndef DISABLE_DKIM /* rest of file */
#ifndef DISABLE_DKIM /* rest of file */
-#ifdef HAVE_LINUX_SENDFILE
-# include <sys/sendfile.h>
-#endif
-
static BOOL
dkt_sign_fail(struct ob_dkim * dkim, int * errp)
static BOOL
dkt_sign_fail(struct ob_dkim * dkim, int * errp)
@@
-43,11
+39,11
@@
return TRUE;
static BOOL
dkt_send_file(int out_fd, int in_fd, off_t off, size_t size)
{
static BOOL
dkt_send_file(int out_fd, int in_fd, off_t off, size_t size)
{
-DEBUG(D_transport) debug_printf("send file fd=%d size=%
l\n", out_fd, size - off
);
+DEBUG(D_transport) debug_printf("send file fd=%d size=%
u\n", out_fd, (unsigned)(size - off)
);
/*XXX should implement timeout, like transport_write_block_fd() ? */
/*XXX should implement timeout, like transport_write_block_fd() ? */
-#ifdef
HAVE_LINUX
_SENDFILE
+#ifdef
OS
_SENDFILE
/* We can use sendfile() to shove the file contents
to the socket. However only if we don't use TLS,
as then there's another layer of indirection
/* We can use sendfile() to shove the file contents
to the socket. However only if we don't use TLS,
as then there's another layer of indirection
@@
-57,7
+53,7
@@
if (tls_out.active != out_fd)
ssize_t copied = 0;
while(copied >= 0 && off < size)
ssize_t copied = 0;
while(copied >= 0 && off < size)
- copied = sendfile(out_fd, in_fd, &off, size - off);
+ copied =
os_
sendfile(out_fd, in_fd, &off, size - off);
if (copied < 0)
return FALSE;
}
if (copied < 0)
return FALSE;
}
@@
-81,7
+77,7
@@
else
{
#ifdef SUPPORT_TLS
wwritten = tls_out.active == out_fd
{
#ifdef SUPPORT_TLS
wwritten = tls_out.active == out_fd
- ? tls_write(FALSE, p, sread)
+ ? tls_write(FALSE, p, sread
, FALSE
)
: write(out_fd, CS p, sread);
#else
wwritten = write(out_fd, CS p, sread);
: write(out_fd, CS p, sread);
#else
wwritten = write(out_fd, CS p, sread);
@@
-204,7
+200,7
@@
int dkim_fd;
int save_errno = 0;
BOOL rc;
uschar * dkim_spool_name, * dkim_signature;
int save_errno = 0;
BOOL rc;
uschar * dkim_spool_name, * dkim_signature;
-int sread = 0, wwritten = 0, siglen, options;
+int sread = 0, wwritten = 0, siglen
= 0
, options;
off_t k_file_size;
const uschar * errstr;
off_t k_file_size;
const uschar * errstr;
@@
-255,7
+251,7
@@
else if (!(rc = dkt_sign_fail(dkim, &save_errno)))
goto CLEANUP;
}
goto CLEANUP;
}
-#ifndef
HAVE_LINUX
_SENDFILE
+#ifndef
OS
_SENDFILE
if (options & topt_use_bdat)
#endif
if ((k_file_size = lseek(dkim_fd, 0, SEEK_END)) < 0)
if (options & topt_use_bdat)
#endif
if ((k_file_size = lseek(dkim_fd, 0, SEEK_END)) < 0)