Merge branch 'develop' into 'develop'

Correctly set TCP_NODELAY in open-{client,server}-stream

See merge request !73
This commit is contained in:
Daniel Kochmański 2017-06-26 06:16:49 +00:00
commit c66fe1ea59

View file

@ -28,6 +28,7 @@ extern int errno;
#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <unistd.h>
@ -132,11 +133,11 @@ int connect_to_server(char *host, int port)
#ifdef TCP_NODELAY
/* make sure to turn off TCP coalescence */
#if defined(ECL_MS_WINDOWS_HOST)
{ char mi;
{ char mi = 1;
setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &mi, sizeof (char));
}
#else
{ int mi;
{ int mi = 1;
setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &mi, sizeof (int));
}
#endif
@ -195,11 +196,11 @@ create_server_port(int port)
#ifdef TCP_NODELAY
/* make sure to turn off TCP coalescence */
#if defined(ECL_MS_WINDOWS_HOST)
{ char mi;
{ char mi = 1;
setsockopt(request, IPPROTO_TCP, TCP_NODELAY, &mi, sizeof (char));
}
#else
{ int mi;
{ int mi = 1;
setsockopt(request, IPPROTO_TCP, TCP_NODELAY, &mi, sizeof (int));
}
#endif