Wed Jan 20 22:11:23 2016 UTC ()

Pass the requisite number of arguments to ip_output from ipf.

Fortunately the last argument, struct socket *so, is used only when
flags includes IP_DF (0x4000), which is not the case here -- we pass
IP_FORWARDING (0x0001).


(riastradh)

diff -r1.11 -r1.12 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c

--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 2014/07/25 08:10:39	1.11
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 2016/01/20 22:11:23	1.12

 @@ -1,24 +1,24 @@
-/*	$NetBSD: ip_fil_netbsd.c,v 1.11 2014/07/25 08:10:39 dholland Exp $	*/
+/*	$NetBSD: ip_fil_netbsd.c,v 1.12 2016/01/20 22:11:23 riastradh Exp $	*/
 /*
  * Copyright (C) 2012 by Darren Reed.
+ *
  * See the IPFILTER.LICENCE file for details on licencing.
  */
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.11 2014/07/25 08:10:39 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.12 2016/01/20 22:11:23 riastradh Exp $");
 #else
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
 #endif
 #endif
 #if defined(KERNEL) || defined(_KERNEL)
 # undef KERNEL
 # undef _KERNEL
 # define        KERNEL	1
 # define        _KERNEL	1
 #endif
 #include <sys/param.h>
 @@ -1925,27 +1925,27 @@ ipf_pullup(mb_t *xmin, fr_info_t *fin, i
 int
 ipf_inject(fr_info_t *fin, mb_t *m)
+{
 	int error;
 	if (fin->fin_out == 0) {
 		if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
 			FREE_MB_T(m);
 			error = ENOBUFS;
 		} else {
 			error = 0;
+		}
 	} else {
-		error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL);
+		error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
+	}
 	return error;
+}
 u_32_t
 ipf_random(void)
+{
 	int number;
 #ifdef _CPRNG_H
 	number = cprng_fast32();
 #else