X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/803f254122dc757db104a4c36cf98b726be004be..39bfc0b25d39979d1ec47b14e69a4f17ea3493ab:/test/server.c?ds=inline diff --git a/test/server.c b/test/server.c index 13f3c873..2c2f5c63 100644 --- a/test/server.c +++ b/test/server.c @@ -25,6 +25,10 @@ static const char *PIDFN = NULL; static void killpidfile(void); static void handleterm(int); +#ifndef EPROTOTYPE +#define EPROTOTYPE 0 +#endif + static int try_bind(int socket, const struct sockaddr *address, socklen_t len) { @@ -116,6 +120,8 @@ serve(const char *pidfn, const char *port) exit(1); } + freeaddrinfo(res); + if (listen(l, 1) == -1) { fprintf(stderr, "Unable to listen on socket: %s\n", strerror(errno)); @@ -215,9 +221,11 @@ putcrlf(int socket, char *data) iov[1].iov_len = 2; /* ECONNRESET just means the client already closed its end */ + /* MacOS X can also return EPROTOTYPE (!) here sometimes */ /* XXX is it useful to log errors here at all? */ - if (writev(socket, iov, 2) < 0 && errno != ECONNRESET) { - perror ("writev"); + if (writev(socket, iov, 2) < 0 && errno != ECONNRESET && + errno != EPROTOTYPE) { + perror ("server writev"); } }