Module Name:    src
Committed By:   martin
Date:           Mon Nov 11 19:52:08 UTC 2019

Modified Files:
        src/sys/external/bsd/ipf/netinet [netbsd-9]: ip_fil.h

Log Message:
Pull up following revision(s) (requested by chs in ticket #418):

        sys/external/bsd/ipf/netinet/ip_fil.h: revision 1.8

revert rev 1.7 (which removed the fd_local field from frdest_t).
this structure is part of the kernel/user ABI and so we would need to
version the ioctl ABI again in order to remove this field.  but that's
a big pain so let's just leave the field there.  the problem that
was being fixed in FreeBSD related to this was a failure to locate
filter rules in certain situations, but having an unused always-zero
field there won't cause that problem.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/external/bsd/ipf/netinet/ip_fil.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/ipf/netinet/ip_fil.h
diff -u src/sys/external/bsd/ipf/netinet/ip_fil.h:1.7 src/sys/external/bsd/ipf/netinet/ip_fil.h:1.7.2.1
--- src/sys/external/bsd/ipf/netinet/ip_fil.h:1.7	Wed Jun 26 15:26:57 2019
+++ src/sys/external/bsd/ipf/netinet/ip_fil.h	Mon Nov 11 19:52:08 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_fil.h,v 1.7 2019/06/26 15:26:57 christos Exp $	*/
+/*	$NetBSD: ip_fil.h,v 1.7.2.1 2019/11/11 19:52:08 martin Exp $	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -576,6 +576,7 @@ typedef	struct	frdest	{
 	addrfamily_t	fd_addr;
 	fr_dtypes_t	fd_type;
 	int		fd_name;
+	int		fd_unused; /* part of the kernel/user ABI */
 } frdest_t;
 
 #define	fd_ip6	fd_addr.adf_addr

Reply via email to