From: Willy Tarreau <w@1wt.eu>
Date: Fri, 30 Aug 2024 16:52:33 +0000 (+0200)
Subject: BUILD: quic: fix build errors on FreeBSD since recent GSO changes
X-Git-Tag: v3.1-dev7~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc513dd31afb8b5a4e172d3efdb30bfdb87db0c;p=thirdparty%2Fhaproxy.git

BUILD: quic: fix build errors on FreeBSD since recent GSO changes

The following commits broke the build on FreeBSD when QUIC is enabled:

  35470d518 ("MINOR: quic: activate UDP GSO for QUIC if supported")
  448d3d388 ("MINOR: quic: add GSO parameter on quic_sock send API")

Indeed, it turns out that netinet/udp.h requires sys/types.h to be
included before. Let's just change the includes order to fix the build.
No backport is needed.
---

diff --git a/src/cfgparse-quic.c b/src/cfgparse-quic.c
index 7924281bad..fe4e356825 100644
--- a/src/cfgparse-quic.c
+++ b/src/cfgparse-quic.c
@@ -1,5 +1,7 @@
 #include <errno.h>
 #include <string.h>
+
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
 
diff --git a/src/quic_sock.c b/src/quic_sock.c
index a894396497..327deb492f 100644
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <netinet/in.h>
-#include <netinet/udp.h>
 #include <sys/socket.h>
 #include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>