[BUILD] compilation of haproxy-1.4-dev2 on FreeBSD
Please consider the following patches. They are required to
compile haproxy-1.4-dev2 on FreeBSD.
Summary:
1) include <sys/types.h> before <netinet/tcp.h>
2) Use IPPROTO_TCP instead of SOL_TCP
(they are both defined as 6, TCP protocol number)
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 6f368da..73a2ba6 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -18,14 +18,14 @@
#include <string.h>
#include <time.h>
-#include <netinet/tcp.h>
-
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/un.h>
+#include <netinet/tcp.h>
+
#include <common/cfgparse.h>
#include <common/compat.h>
#include <common/config.h>
@@ -368,13 +368,13 @@
}
}
-#if defined(TCP_QUICKACK) && defined(SOL_TCP)
+#if defined(TCP_QUICKACK)
/* disabling tcp quick ack now allows the first request to leave the
* machine with the first ACK. We only do this if there are pending
* data in the buffer.
*/
if ((be->options2 & PR_O2_SMARTCON) && si->ob->send_max)
- setsockopt(fd, SOL_TCP, TCP_QUICKACK, (char *) &zero, sizeof(zero));
+ setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, (char *) &zero, sizeof(zero));
#endif
if ((connect(fd, (struct sockaddr *)srv_addr, sizeof(struct sockaddr_in)) == -1) &&
@@ -511,9 +511,9 @@
}
}
#endif
-#if defined(TCP_MAXSEG) && defined(SOL_TCP)
+#if defined(TCP_MAXSEG)
if (listener->maxseg) {
- if (setsockopt(fd, SOL_TCP, TCP_MAXSEG,
+ if (setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG,
&listener->maxseg, sizeof(listener->maxseg)) == -1) {
msg = "cannot set MSS";
err |= ERR_WARN;
@@ -532,9 +532,9 @@
goto tcp_close_return;
}
-#if defined(TCP_QUICKACK) && defined(SOL_TCP)
+#if defined(TCP_QUICKACK)
if (listener->options & LI_O_NOQUICKACK)
- setsockopt(fd, SOL_TCP, TCP_QUICKACK, (char *) &zero, sizeof(zero));
+ setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, (char *) &zero, sizeof(zero));
#endif
/* the socket is ready */