projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[exim.git]
/
test
/
src
/
server.c
diff --git
a/test/src/server.c
b/test/src/server.c
index 1abd3f49a6cd0e204d3499fae5e798e1b2606d5a..4a48965e27142e5f2df0c353a0999045a9ad72ec 100644
(file)
--- a/
test/src/server.c
+++ b/
test/src/server.c
@@
-28,7
+28,7
@@
on all interfaces, unless the option -noipv6 is given. */
#include <netinet/ip.h>
#ifdef HAVE_NETINET_IP_VAR_H
#include <netinet/ip.h>
#ifdef HAVE_NETINET_IP_VAR_H
-#include <netinet/ip_var.h>
+#
include <netinet/ip_var.h>
#endif
#include <netdb.h>
#endif
#include <netdb.h>
@@
-61,6
+61,10
@@
typedef struct line {
char line[1];
} line;
char line[1];
} line;
+typedef unsigned BOOL;
+#define FALSE 0
+#define TRUE 1
+
/*************************************************
* SIGALRM handler - crash out *
/*************************************************
* SIGALRM handler - crash out *
@@
-496,6
+500,11
@@
s = script;
for (count = 0; count < connection_count; count++)
{
for (count = 0; count < connection_count; count++)
{
+ struct {
+ int left;
+ BOOL in_use;
+ } content_length = { 0, FALSE };
+
alarm(timeout);
if (port <= 0)
{
alarm(timeout);
if (port <= 0)
{
@@
-521,8
+530,7
@@
for (count = 0; count < connection_count; count++)
if (listen_socket[i] > max_socket) max_socket = listen_socket[i];
}
if (listen_socket[i] > max_socket) max_socket = listen_socket[i];
}
- lcount = select(max_socket + 1, &select_listen, NULL, NULL, NULL);
- if (lcount < 0)
+ if ((lcount = select(max_socket + 1, &select_listen, NULL, NULL, NULL)) < 0)
{
printf("Select failed\n");
fflush(stdout);
{
printf("Select failed\n");
fflush(stdout);
@@
-531,7
+539,6
@@
for (count = 0; count < connection_count; count++)
accept_socket = -1;
for (i = 0; i < skn; i++)
accept_socket = -1;
for (i = 0; i < skn; i++)
- {
if (listen_socket[i] > 0 && FD_ISSET(listen_socket[i], &select_listen))
{
accept_socket = accept(listen_socket[i],
if (listen_socket[i] > 0 && FD_ISSET(listen_socket[i], &select_listen))
{
accept_socket = accept(listen_socket[i],
@@
-539,7
+546,6
@@
for (count = 0; count < connection_count; count++)
FD_CLR(listen_socket[i], &select_listen);
break;
}
FD_CLR(listen_socket[i], &select_listen);
break;
}
- }
}
alarm(0);
}
alarm(0);
@@
-591,7
+597,7
@@
for (count = 0; count < connection_count; count++)
doesn't work for other tests (e.g. ident tests) so we have explicit '<' and
'>' flags for input and output as well as the defaults. */
doesn't work for other tests (e.g. ident tests) so we have explicit '<' and
'>' flags for input and output as well as the defaults. */
- for (; s
!= NULL
; s = s->next)
+ for (; s; s = s->next)
{
char *ss = s->line;
{
char *ss = s->line;
@@
-709,6
+715,7
@@
for (count = 0; count < connection_count; count++)
alarm(timeout);
n = read(dup_accept_socket, CS buffer+offset, s->len - offset);
alarm(timeout);
n = read(dup_accept_socket, CS buffer+offset, s->len - offset);
+ if (content_length.in_use) content_length.left -= n;
if (n == 0)
{
printf("%sxpected EOF read from client\n",
if (n == 0)
{
printf("%sxpected EOF read from client\n",
@@
-726,8
+733,9
@@
for (count = 0; count < connection_count; count++)
if (data) do
{
n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');
if (data) do
{
n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');
+ if (content_length.in_use) content_length.left--;
while (c != '\n' && read(dup_accept_socket, &c, 1) == 1)
while (c != '\n' && read(dup_accept_socket, &c, 1) == 1)
- ;
+
if (content_length.in_use) content_length.left--
;
} while (!n);
else if (memcmp(ss, buffer, n) != 0)
{
} while (!n);
else if (memcmp(ss, buffer, n) != 0)
{
@@
-750,7
+758,8
@@
for (count = 0; count < connection_count; count++)
goto END_OFF;
}
alarm(0);
goto END_OFF;
}
alarm(0);
- n = (int)strlen(CS buffer);
+ n = strlen(CS buffer);
+ if (content_length.in_use) content_length.left -= (n - offset);
while (n > 0 && isspace(buffer[n-1])) n--;
buffer[n] = 0;
printf("%s\n", buffer);
while (n > 0 && isspace(buffer[n-1])) n--;
buffer[n] = 0;
printf("%s\n", buffer);
@@
-764,6
+773,9
@@
for (count = 0; count < connection_count; count++)
break;
}
}
break;
}
}
+
+ if (sscanf(buffer, "<Content-length: %d", &content_length.left)) content_length.in_use = TRUE;
+ if (content_length.in_use && content_length.left <= 0) shutdown(dup_accept_socket, SHUT_RD);
}
}
}
}
@@
-774,7
+786,7
@@
for (count = 0; count < connection_count; count++)
if (s == NULL) printf("End of script\n");
if (s == NULL) printf("End of script\n");
-if (sockname
!= NULL
) unlink(sockname);
+if (sockname) unlink(sockname);
exit(0);
}
exit(0);
}