git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Docs: remove extraneous options from variables index
[users/jgh/exim.git]
/
test
/
src
/
server.c
diff --git
a/test/src/server.c
b/test/src/server.c
index 9d00300f13790fbbc4353086b6ae15a81d8eb006..d433ebe0e0331f1f0cbd4fb04027eb99d9249568 100644
(file)
--- a/
test/src/server.c
+++ b/
test/src/server.c
@@
-26,6
+26,7
@@
on all interfaces, unless the option -noipv6 is given. */
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
+#include <netinet/tcp.h>
#ifdef HAVE_NETINET_IP_VAR_H
# include <netinet/ip_var.h>
#ifdef HAVE_NETINET_IP_VAR_H
# include <netinet/ip_var.h>
@@
-169,7
+170,7
@@
int connection_count = 1;
int count;
int on = 1;
int timeout = 5;
int count;
int on = 1;
int timeout = 5;
-int initial_pause = 0;
+int initial_pause = 0
, tfo = 0
;
int use_ipv4 = 1;
int use_ipv6 = 1;
int debug = 0;
int use_ipv4 = 1;
int use_ipv6 = 1;
int debug = 0;
@@
-214,6
+215,7
@@
if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
"\n\t-noipv6 disable ipv6"
"\n\t-oP file write PID to file"
"\n\t-t n n seconds timeout"
"\n\t-noipv6 disable ipv6"
"\n\t-oP file write PID to file"
"\n\t-t n n seconds timeout"
+ "\n\t-tfo enable TCP Fast Open"
);
exit(0);
}
);
exit(0);
}
@@
-221,6
+223,7
@@
if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
while (na < argc && argv[na][0] == '-')
{
if (strcmp(argv[na], "-d") == 0) debug = 1;
while (na < argc && argv[na][0] == '-')
{
if (strcmp(argv[na], "-d") == 0) debug = 1;
+ else if (strcmp(argv[na], "-tfo") == 0) tfo = 1;
else if (strcmp(argv[na], "-t") == 0)
{
if (tmo_noerror = ((timeout = atoi(argv[++na])) < 0)) timeout = -timeout;
else if (strcmp(argv[na], "-t") == 0)
{
if (tmo_noerror = ((timeout = atoi(argv[++na])) < 0)) timeout = -timeout;
@@
-295,7
+298,15
@@
else
printf("IPv6 socket creation failed: %s\n", strerror(errno));
exit(1);
}
printf("IPv6 socket creation failed: %s\n", strerror(errno));
exit(1);
}
-
+#ifdef TCP_FASTOPEN
+ if (tfo)
+ {
+ int backlog = 5;
+ if (setsockopt(listen_socket[v6n], IPPROTO_TCP, TCP_FASTOPEN,
+ &backlog, sizeof(backlog)))
+ if (debug) printf("setsockopt TCP_FASTOPEN: %s\n", strerror(errno));
+ }
+#endif
/* If this is an IPv6 wildcard socket, set IPV6_V6ONLY if that option is
available. */
/* If this is an IPv6 wildcard socket, set IPV6_V6ONLY if that option is
available. */
@@
-319,6
+330,15
@@
else
printf("IPv4 socket creation failed: %s\n", strerror(errno));
exit(1);
}
printf("IPv4 socket creation failed: %s\n", strerror(errno));
exit(1);
}
+#ifdef TCP_FASTOPEN
+ if (tfo)
+ {
+ int backlog = 5;
+ if (setsockopt(listen_socket[v4n], IPPROTO_TCP, TCP_FASTOPEN,
+ &backlog, sizeof(backlog)))
+ if (debug) printf("setsockopt TCP_FASTOPEN: %s\n", strerror(errno));
+ }
+#endif
}
}
}
}
@@
-381,7
+401,7
@@
else
sin6.sin6_addr = anyaddr6;
if (bind(listen_socket[i], (struct sockaddr *)&sin6, sizeof(sin6)) < 0)
{
sin6.sin6_addr = anyaddr6;
if (bind(listen_socket[i], (struct sockaddr *)&sin6, sizeof(sin6)) < 0)
{
- printf("IPv6 socket bind(
) failed: %s\n"
, strerror(errno));
+ printf("IPv6 socket bind(
port %d) failed: %s\n", port
, strerror(errno));
exit(1);
}
}
exit(1);
}
}
@@
-400,7
+420,7
@@
else
if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
{
if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
{
- printf("IPv4 socket bind(
) failed: %s\n"
, strerror(errno));
+ printf("IPv4 socket bind(
port %d) failed: %s\n", port
, strerror(errno));
exit(1);
}
else
exit(1);
}
else
@@
-661,7
+681,7
@@
for (count = 0; count < connection_count; count++)
n = dlen < sizeof(buffer) ? dlen : sizeof(buffer);
if ((n = read(dup_accept_socket, CS buffer, n)) == 0)
{
n = dlen < sizeof(buffer) ? dlen : sizeof(buffer);
if ((n = read(dup_accept_socket, CS buffer, n)) == 0)
{
- printf("Unxpected EOF read from client\n");
+ printf("Un
e
xpected EOF read from client\n");
s = s->next;
goto END_OFF;
}
s = s->next;
goto END_OFF;
}
@@
-671,7
+691,7
@@
for (count = 0; count < connection_count; count++)
while (dlen-- > 0)
if (fgetc(in) == EOF)
{
while (dlen-- > 0)
if (fgetc(in) == EOF)
{
- printf("Unxpected EOF read from client\n");
+ printf("Un
e
xpected EOF read from client\n");
s = s->next;
goto END_OFF;
}
s = s->next;
goto END_OFF;
}