From: Dmitry Sivachenko <mitya@cavia.pp.ru>
Date: Mon, 24 Aug 2009 11:11:06 +0000 (+0400)
Subject: [BUILD] compilation of haproxy-1.4-dev2 on FreeBSD
X-Git-Tag: v1.4-dev3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf58986fbb59a0b38bf81170a0a55fefc8c74bf;p=thirdparty%2Fhaproxy.git

[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/backend.c b/src/backend.c
index 7a6b7b8f4a..05ce1ef21b 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -17,6 +17,7 @@
 #include <syslog.h>
 #include <string.h>
 #include <ctype.h>
+#include <sys/types.h>
 
 #include <common/compat.h>
 #include <common/config.h>
diff --git a/src/checks.c b/src/checks.c
index 00751fefd9..99c21224f3 100644
--- a/src/checks.c
+++ b/src/checks.c
@@ -20,6 +20,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
@@ -670,13 +671,13 @@ struct task *process_chk(struct task *t)
 				}
 
 				if (s->result == SRV_CHK_UNKNOWN) {
-#if defined(TCP_QUICKACK) && defined(SOL_TCP)
+#if defined(TCP_QUICKACK)
 					/* disabling tcp quick ack now allows
 					 * the request to leave the machine with
 					 * the first ACK.
 					 */
 					if (s->proxy->options2 & PR_O2_SMARTCON)
-						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 *)&sa, sizeof(sa)) != -1) || (errno == EINPROGRESS)) {
 						/* OK, connection in progress or established */
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 6f368da98f..73a2ba6eb3 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 @@ int tcpv4_connect_server(struct stream_interface *si,
 		}
 	}
 
-#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 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
 		}
 	}
 #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 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
 		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 */
diff --git a/src/stream_sock.c b/src/stream_sock.c
index 79426fb14b..b2bacdcfbd 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -16,12 +16,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <netinet/tcp.h>
-
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <netinet/tcp.h>
+
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>