Skip to content

Fix IPFilter IPv6 detection, especially on NetBSD #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sborrill wants to merge 2 commits into from
Closed

Fix IPFilter IPv6 detection, especially on NetBSD #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4bbce5
Fix detection of IPFilter IPv6 support
sborrill Apr 9, 2020
e115030
All trailing white space in AC_CHECK_MEMBERS will be converted to und…
sborrill Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions acinclude/os-deps.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,11 +925,13 @@ AC_DEFUN([SQUID_CHECK_BROKEN_SOLARIS_IPFILTER],[
## Solaris 10+ backported IPv6 NAT to their IPFilter v4.1 instead of using v5
AC_CHECK_MEMBERS([
struct natlookup.nl_inipaddr.in6,
struct natlookup.nl_realipaddr.in6
],,,[
struct natlookup.nl_realipaddr.in6],,,[
#if USE_SOLARIS_IPFILTER_MINOR_T_HACK
#define minor_t fubar
#endif
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
Expand All @@ -955,7 +957,11 @@ AC_DEFUN([SQUID_CHECK_BROKEN_SOLARIS_IPFILTER],[
#elif HAVE_NETINET_IP_FIL_H
#include <netinet/ip_fil.h>
#endif
#if HAVE_IP_NAT_H
#include <ip_nat.h>
#elif HAVE_NETINET_IP_NAT_H
#include <netinet/ip_nat.h>
#endif
])

])
4 changes: 2 additions & 2 deletions src/ip/Intercept.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn, int silen
memset(&natLookup, 0, sizeof(natLookup));
// for NAT lookup set local and remote IP:port's
if (newConn->remote.isIPv6()) {
#if HAVE_NATLOOKUP_NL_INIPADDR_IN6
#if HAVE_STRUCT_NATLOOKUP_NL_INIPADDR_IN6
natLookup.nl_v = 6;
newConn->local.getInAddr(natLookup.nl_inipaddr.in6);
newConn->remote.getInAddr(natLookup.nl_outipaddr.in6);
Expand Down Expand Up @@ -292,7 +292,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn, int silen
debugs(89, 9, HERE << "address: " << newConn);
return false;
} else {
#if HAVE_NATLOOKUP_NL_REALIPADDR_IN6
#if HAVE_STRUCT_NATLOOKUP_NL_REALIPADDR_IN6
if (newConn->remote.isIPv6())
newConn->local = natLookup.nl_realipaddr.in6;
else
Expand Down