Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/ipf/netinet Pass the requisite number of ar...



details:   https://anonhg.NetBSD.org/src/rev/41b69c22eaa9
branches:  trunk
changeset: 813198:41b69c22eaa9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jan 20 22:11:23 2016 +0000

description:
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).

diffstat:

 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r bdda7497d7c8 -r 41b69c22eaa9 sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
--- a/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Wed Jan 20 22:02:54 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c      Wed Jan 20 22:11:23 2016 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -8,7 +8,7 @@
 #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";
@@ -1935,7 +1935,7 @@
                        error = 0;
                }
        } else {
-               error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL);
+               error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
        }
        return error;
 }



Home | Main Index | Thread Index | Old Index