You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
971 B
32 lines
971 B
From 2a63a2b7e32bba4a33c5f4081647124565929f6a Mon Sep 17 00:00:00 2001
|
|
From: Willy Tarreau <w@1wt.eu>
|
|
Date: Wed, 10 Aug 2016 18:42:17 +0200
|
|
Subject: [PATCH 19/26] BUILD: tcp: do not include netinet/ip.h for IP_TTL
|
|
|
|
On OpenBSD, netinet/ip.h fails unless in_systm.h is included. This
|
|
include was added by the silent-drop feature introduced with commit
|
|
2d392c2 ("MEDIUM: tcp: add new tcp action "silent-drop"") in 1.6-dev6,
|
|
but we don't need it, IP_TTL is defined in netinet/in.h, so let's drop
|
|
this useless include.
|
|
|
|
This fix needs to be backported to 1.6.
|
|
(cherry picked from commit 7f3e3c0159401cdf47575bc82304696b3a98a2ab)
|
|
---
|
|
src/proto_tcp.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
|
|
index 0f20fde..83b862a 100644
|
|
--- a/src/proto_tcp.c
|
|
+++ b/src/proto_tcp.c
|
|
@@ -31,7 +31,6 @@
|
|
|
|
#include <netinet/tcp.h>
|
|
#include <netinet/in.h>
|
|
-#include <netinet/ip.h>
|
|
|
|
#include <common/cfgparse.h>
|
|
#include <common/compat.h>
|
|
--
|
|
2.7.3
|
|
|