Module Name: src
Committed By: christos
Date: Sat Dec 10 21:04:12 UTC 2016
Modified Files:
src/lib/libnpf: npf.c npf.h
Log Message:
use array notation
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libnpf/npf.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libnpf/npf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libnpf/npf.c
diff -u src/lib/libnpf/npf.c:1.38 src/lib/libnpf/npf.c:1.39
--- src/lib/libnpf/npf.c:1.38 Sat Dec 10 14:07:22 2016
+++ src/lib/libnpf/npf.c Sat Dec 10 16:04:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.38 2016/12/10 19:07:22 christos Exp $ */
+/* $NetBSD: npf.c,v 1.39 2016/12/10 21:04:12 christos Exp $ */
/*-
* Copyright (c) 2010-2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.38 2016/12/10 19:07:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.39 2016/12/10 21:04:12 christos Exp $");
#include <sys/types.h>
#include <netinet/in_systm.h>
@@ -1249,9 +1249,8 @@ _npf_debug_addif(nl_config_t *ncf, const
prop_object_release(ifdict);
}
-
int
-npf_nat_lookup(int fd, int af, npf_addr_t **addr, in_port_t *port,
+npf_nat_lookup(int fd, int af, npf_addr_t *addr[2], in_port_t port[2],
int proto, int dir)
{
prop_dictionary_t conn_dict, conn_res = NULL;
Index: src/lib/libnpf/npf.h
diff -u src/lib/libnpf/npf.h:1.29 src/lib/libnpf/npf.h:1.30
--- src/lib/libnpf/npf.h:1.29 Sat Dec 10 00:37:55 2016
+++ src/lib/libnpf/npf.h Sat Dec 10 16:04:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.29 2016/12/10 05:37:55 christos Exp $ */
+/* $NetBSD: npf.h,v 1.30 2016/12/10 21:04:12 christos Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ int npf_rproc_insert(nl_config_t *, nl_
nl_nat_t * npf_nat_create(int, u_int, const char *,
int, npf_addr_t *, npf_netmask_t, in_port_t);
int npf_nat_insert(nl_config_t *, nl_nat_t *, pri_t);
-int npf_nat_lookup(int, int, npf_addr_t **, in_port_t *, int, int);
+int npf_nat_lookup(int, int, npf_addr_t *[2], in_port_t [2], int, int);
nl_table_t * npf_table_create(const char *, u_int, int);
int npf_table_add_entry(nl_table_t *, int,
