View | Details | Raw Unified | Return to bug 207087 | Differences between
and this patch

Collapse All | Expand All

(-)ip_input.c (-2 / +2 lines)
Lines 530-536 Link Here
530
#ifdef IPSEC
530
#ifdef IPSEC
531
	/* For now we do not handle IPSEC in tryforward. */
531
	/* For now we do not handle IPSEC in tryforward. */
532
	if (!key_havesp(IPSEC_DIR_INBOUND) && !key_havesp(IPSEC_DIR_OUTBOUND) &&
532
	if (!key_havesp(IPSEC_DIR_INBOUND) && !key_havesp(IPSEC_DIR_OUTBOUND) &&
533
	    (V_ipforwarding == 1))
533
	    (V_ipforwarding == 1) && !PFIL_HOOKED(&V_inet_pfil_hook))
534
		if (ip_tryforward(m) == NULL)
534
		if (ip_tryforward(m) == NULL)
535
			return;
535
			return;
536
	/*
536
	/*
Lines 539-545 Link Here
539
	if (ip_ipsec_filtertunnel(m))
539
	if (ip_ipsec_filtertunnel(m))
540
		goto passin;
540
		goto passin;
541
#else
541
#else
542
	if (V_ipforwarding == 1)
542
	if ((V_ipforwarding == 1) && (!PFIL_HOOKED(&V_inet_pfil_hook)))
543
		if (ip_tryforward(m) == NULL)
543
		if (ip_tryforward(m) == NULL)
544
			return;
544
			return;
545
#endif /* IPSEC */
545
#endif /* IPSEC */

Return to bug 207087