Module Name: src
Committed By: christos
Date: Sat Dec 10 05:37:55 UTC 2016
Modified Files:
src/lib/libnpf: npf.c npf.h shlib_version
Log Message:
add npf_nat_lookup()
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libnpf/npf.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libnpf/npf.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libnpf/shlib_version
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.35 src/lib/libnpf/npf.c:1.36
--- src/lib/libnpf/npf.c:1.35 Sun Feb 1 19:55:28 2015
+++ src/lib/libnpf/npf.c Sat Dec 10 00:37:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.c,v 1.35 2015/02/02 00:55:28 rmind Exp $ */
+/* $NetBSD: npf.c,v 1.36 2016/12/10 05:37:55 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.35 2015/02/02 00:55:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf.c,v 1.36 2016/12/10 05:37:55 christos Exp $");
#include <sys/types.h>
#include <netinet/in_systm.h>
@@ -102,6 +102,48 @@ struct nl_config {
static prop_array_t _npf_ruleset_transform(prop_array_t);
+static bool
+_npf_add_addr(prop_dictionary_t dict, const char *name, int af,
+ const npf_addr_t *addr)
+{
+ size_t sz;
+
+ if (af == AF_INET) {
+ sz = sizeof(struct in_addr);
+ } else if (af == AF_INET6) {
+ sz = sizeof(struct in6_addr);
+ } else {
+ return false;
+ }
+ prop_data_t addrdat = prop_data_create_data(addr, sz);
+ if (addrdat == NULL) {
+ return false;
+ }
+ prop_dictionary_set(dict, name, addrdat);
+ prop_object_release(addrdat);
+ return true;
+}
+
+static bool
+_npf_get_addr(prop_dictionary_t dict, const char *name, npf_addr_t *addr)
+{
+ prop_object_t obj = prop_dictionary_get(dict, name);
+ const void *d = prop_data_data_nocopy(obj);
+
+ if (d == NULL)
+ return false;
+
+ size_t sz = prop_data_size(obj);
+ switch (sz) {
+ case sizeof(struct in_addr):
+ case sizeof(struct in6_addr):
+ memcpy(addr, d, sz);
+ return true;
+ default:
+ return false;
+ }
+}
+
/*
* CONFIGURATION INTERFACE.
*/
@@ -530,7 +572,7 @@ npf_rule_setcode(nl_rule_t *rl, int type
default:
return ENOTSUP;
}
- prop_dictionary_set_uint32(rldict, "code-type", type);
+ prop_dictionary_set_uint32(rldict, "code-type", (uint32_t)type);
if ((cdata = prop_data_create_data(code, len)) == NULL) {
return ENOMEM;
}
@@ -881,17 +923,7 @@ npf_nat_create(int type, u_int flags, co
{
nl_rule_t *rl;
prop_dictionary_t rldict;
- prop_data_t addrdat;
uint32_t attr;
- size_t sz;
-
- if (af == AF_INET) {
- sz = sizeof(struct in_addr);
- } else if (af == AF_INET6) {
- sz = sizeof(struct in6_addr);
- } else {
- return NULL;
- }
attr = NPF_RULE_PASS | NPF_RULE_FINAL |
(type == NPF_NATOUT ? NPF_RULE_OUT : NPF_RULE_IN);
@@ -908,14 +940,11 @@ npf_nat_create(int type, u_int flags, co
prop_dictionary_set_uint32(rldict, "flags", flags);
/* Translation IP and mask. */
- addrdat = prop_data_create_data(addr, sz);
- if (addrdat == NULL) {
+ if (!_npf_add_addr(rldict, "nat-ip", af, addr)) {
npf_rule_destroy(rl);
return NULL;
}
- prop_dictionary_set(rldict, "nat-ip", addrdat);
- prop_dictionary_set_uint32(rldict, "nat-mask", mask);
- prop_object_release(addrdat);
+ prop_dictionary_set_uint32(rldict, "nat-mask", (uint32_t)mask);
/* Translation port (for redirect case). */
prop_dictionary_set_uint16(rldict, "nat-port", port);
@@ -1037,8 +1066,6 @@ npf_table_add_entry(nl_table_t *tl, int
{
prop_dictionary_t tldict = tl->ntl_dict, entdict;
prop_array_t tblents;
- prop_data_t addrdata;
- unsigned alen;
/* Create the table entry. */
entdict = prop_dictionary_create();
@@ -1046,21 +1073,10 @@ npf_table_add_entry(nl_table_t *tl, int
return ENOMEM;
}
- switch (af) {
- case AF_INET:
- alen = sizeof(struct in_addr);
- break;
- case AF_INET6:
- alen = sizeof(struct in6_addr);
- break;
- default:
+ if (!_npf_add_addr(entdict, "addr", af, addr)) {
return EINVAL;
}
-
- addrdata = prop_data_create_data(addr, alen);
- prop_dictionary_set(entdict, "addr", addrdata);
prop_dictionary_set_uint8(entdict, "mask", mask);
- prop_object_release(addrdata);
tblents = prop_dictionary_get(tldict, "entries");
prop_array_add(tblents, entdict);
@@ -1232,3 +1248,52 @@ _npf_debug_addif(nl_config_t *ncf, const
prop_array_add(iflist, ifdict);
prop_object_release(ifdict);
}
+
+
+int
+npf_nat_lookup(int fd, int af, npf_addr_t **addr, in_port_t *port,
+ int proto, int dir)
+{
+ prop_dictionary_t conn_dict, conn_res;
+ int error = EINVAL;
+
+ conn_dict = prop_dictionary_create();
+ if (conn_dict == NULL) {
+ return ENOMEM;
+ }
+ if (!_npf_add_addr(conn_dict, "saddr", af, addr[0]))
+ goto out;
+
+ if (!_npf_add_addr(conn_dict, "daddr", af, addr[1]))
+ goto out;
+
+ prop_dictionary_set_uint16(conn_dict, "sport", port[0]);
+ prop_dictionary_set_uint16(conn_dict, "dport", port[1]);
+ prop_dictionary_set_uint16(conn_dict, "proto", proto);
+ prop_dictionary_set_uint16(conn_dict, "direction", dir);
+
+ prop_dictionary_externalize_to_file(conn_dict, "/tmp/in");
+ error = prop_dictionary_sendrecv_ioctl(conn_dict, fd,
+ IOC_NPF_CONN_LOOKUP, &conn_res);
+ if (error != 0)
+ goto out;
+
+ prop_dictionary_externalize_to_file(conn_res, "/tmp/out");
+ prop_dictionary_t nat = prop_dictionary_get(conn_res, "nat");
+ if (nat == NULL) {
+ errno = ENOENT;
+ goto out;
+ }
+ if (!_npf_get_addr(nat, "oaddr", addr[0])) {
+ prop_object_release(nat);
+ error = EINVAL;
+ goto out;
+ }
+ prop_dictionary_get_uint16(nat, "oport", &port[0]);
+ prop_dictionary_get_uint16(nat, "tport", &port[1]);
+ ntohs(port[1]));
+ prop_object_release(conn_res);
+out:
+ prop_object_release(conn_dict);
+ return error;
+}
Index: src/lib/libnpf/npf.h
diff -u src/lib/libnpf/npf.h:1.28 src/lib/libnpf/npf.h:1.29
--- src/lib/libnpf/npf.h:1.28 Sun Feb 1 19:55:28 2015
+++ src/lib/libnpf/npf.h Sat Dec 10 00:37:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.28 2015/02/02 00:55:28 rmind Exp $ */
+/* $NetBSD: npf.h,v 1.29 2016/12/10 05:37:55 christos Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -111,6 +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);
nl_table_t * npf_table_create(const char *, u_int, int);
int npf_table_add_entry(nl_table_t *, int,
Index: src/lib/libnpf/shlib_version
diff -u src/lib/libnpf/shlib_version:1.1 src/lib/libnpf/shlib_version:1.2
--- src/lib/libnpf/shlib_version:1.1 Tue Feb 1 21:20:25 2011
+++ src/lib/libnpf/shlib_version Sat Dec 10 00:37:55 2016
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.1 2011/02/02 02:20:25 rmind Exp $
+# $NetBSD: shlib_version,v 1.2 2016/12/10 05:37:55 christos Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
major=0
-minor=0
+minor=1
