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

  1. From 2a63a2b7e32bba4a33c5f4081647124565929f6a Mon Sep 17 00:00:00 2001
  2. From: Willy Tarreau <w@1wt.eu>
  3. Date: Wed, 10 Aug 2016 18:42:17 +0200
  4. Subject: [PATCH 19/26] BUILD: tcp: do not include netinet/ip.h for IP_TTL
  5. On OpenBSD, netinet/ip.h fails unless in_systm.h is included. This
  6. include was added by the silent-drop feature introduced with commit
  7. 2d392c2 ("MEDIUM: tcp: add new tcp action "silent-drop"") in 1.6-dev6,
  8. but we don't need it, IP_TTL is defined in netinet/in.h, so let's drop
  9. this useless include.
  10. This fix needs to be backported to 1.6.
  11. (cherry picked from commit 7f3e3c0159401cdf47575bc82304696b3a98a2ab)
  12. ---
  13. src/proto_tcp.c | 1 -
  14. 1 file changed, 1 deletion(-)
  15. diff --git a/src/proto_tcp.c b/src/proto_tcp.c
  16. index 0f20fde..83b862a 100644
  17. --- a/src/proto_tcp.c
  18. +++ b/src/proto_tcp.c
  19. @@ -31,7 +31,6 @@
  20. #include <netinet/tcp.h>
  21. #include <netinet/in.h>
  22. -#include <netinet/ip.h>
  23. #include <common/cfgparse.h>
  24. #include <common/compat.h>
  25. --
  26. 2.7.3