Fix matchcing of NATed ICMP queries (resolving NATed MTU discovery).

MFC after:	1 month
This commit is contained in:
cy 2017-08-05 00:28:42 +00:00
parent 770996ff48
commit 0e6a9a6cef

View File

@ -4100,13 +4100,8 @@ ipf_nat_inlookup(fin, flags, p, src, mapdst)
dport = htons(fin->fin_data[1]);
break;
case IPPROTO_ICMP :
if (flags & IPN_ICMPERR) {
sport = fin->fin_data[1];
dport = 0;
} else {
dport = fin->fin_data[1];
sport = 0;
}
sport = 0;
dport = fin->fin_data[1];
break;
default :
sport = 0;
@ -4426,8 +4421,6 @@ ipf_nat_outlookup(fin, flags, p, src, dst)
ifp = fin->fin_ifp;
sflags = flags & IPN_TCPUDPICMP;
sport = 0;
dport = 0;
switch (p)
{
@ -4437,12 +4430,12 @@ ipf_nat_outlookup(fin, flags, p, src, dst)
dport = htons(fin->fin_data[1]);
break;
case IPPROTO_ICMP :
if (flags & IPN_ICMPERR)
sport = fin->fin_data[1];
else
dport = fin->fin_data[1];
sport = 0;
dport = fin->fin_data[1];
break;
default :
sport = 0;
dport = 0;
break;
}