Import IP-Filter 5.1.2 into vendor branches using the existing license that

the current version of IP-Filter in FreeBSD is under as per email received
from Darren Reed on Mon, 08 Jul 2013 23:54:16 +1000.

Approved by:	glebius (Mentor), Darren Reed <darrenr@reed.wattle.id.au>

1 files changed, 18 insertions, 29 deletions

diff --git a/lib/load_hash.c b/lib/load_hash.c
index 84abca03c166..7a4c232b4605 100644
--- a/lib/load_hash.c
+++ b/lib/load_hash.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2002-2005 by Darren Reed.
+ * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
- * $Id: load_hash.c,v 1.11.2.5 2006/07/14 06:12:25 darrenr Exp $
+ * $Id$
  */
 
 #include <fcntl.h>
@@ -12,13 +12,12 @@
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_htable.h"
 
-static int hashfd = -1;
 
-
-int load_hash(iphp, list, iocfunc)
-iphtable_t *iphp;
-iphtent_t *list;
-ioctlfunc_t iocfunc;
+int
+load_hash(iphp, list, iocfunc)
+	iphtable_t *iphp;
+	iphtent_t *list;
+	ioctlfunc_t iocfunc;
 {
 	iplookupop_t op;
 	iphtable_t iph;
@@ -26,14 +25,13 @@ ioctlfunc_t iocfunc;
 	size_t size;
 	int n;
 
-	if ((hashfd == -1) && ((opts & OPT_DONOTHING) == 0))
-		hashfd = open(IPLOOKUP_NAME, O_RDWR);
-	if ((hashfd == -1) && ((opts & OPT_DONOTHING) == 0))
+	if (pool_open() == -1)
 		return -1;
 
 	for (n = 0, a = list; a != NULL; a = a->ipe_next)
 		n++;
 
+	bzero((char *)&iph, sizeof(iph));
 	op.iplo_arg = 0;
 	op.iplo_type = IPLT_HASH;
 	op.iplo_unit = iphp->iph_unit;
@@ -42,10 +40,7 @@ ioctlfunc_t iocfunc;
 		op.iplo_arg = IPHASH_ANON;
 	op.iplo_size = sizeof(iph);
 	op.iplo_struct = &iph;
-	iph.iph_unit = iphp->iph_unit;
-	iph.iph_type = iphp->iph_type;
-	strncpy(iph.iph_name, iphp->iph_name, sizeof(iph.iph_name));
-	iph.iph_flags = iphp->iph_flags;
+	iph = *iphp;
 	if (n <= 0)
 		n = 1;
 	if (iphp->iph_size == 0)
@@ -58,16 +53,15 @@ ioctlfunc_t iocfunc;
 			iphp->iph_name, "size to match expected use");
 	}
 	iph.iph_size = size;
-	iph.iph_seed = iphp->iph_seed;
 	iph.iph_table = NULL;
 	iph.iph_list = NULL;
 	iph.iph_ref = 0;
 
 	if ((opts & OPT_REMOVE) == 0) {
-		if ((*iocfunc)(hashfd, SIOCLOOKUPADDTABLE, &op))
+		if (pool_ioctl(iocfunc, SIOCLOOKUPADDTABLE, &op))
 			if ((opts & OPT_DONOTHING) == 0) {
-				perror("load_hash:SIOCLOOKUPADDTABLE");
-				return -1;
+				return ipf_perror_fd(pool_fd(), iocfunc,
+					"add lookup hash table");
 			}
 	}
 
@@ -75,19 +69,14 @@ ioctlfunc_t iocfunc;
 	strncpy(iphp->iph_name, op.iplo_name, sizeof(op.iplo_name));
 
 	if (opts & OPT_VERBOSE) {
-		for (a = list; a != NULL; a = a->ipe_next) {
-			a->ipe_addr.in4_addr = ntohl(a->ipe_addr.in4_addr);
-			a->ipe_mask.in4_addr = ntohl(a->ipe_mask.in4_addr);
-		}
 		iph.iph_table = calloc(size, sizeof(*iph.iph_table));
 		if (iph.iph_table == NULL) {
 			perror("calloc(size, sizeof(*iph.iph_table))");
 			return -1;
 		}
 		iph.iph_list = list;
-		printhash(&iph, bcopywrap, iph.iph_name, opts);
+		printhash(&iph, bcopywrap, iph.iph_name, opts, NULL);
 		free(iph.iph_table);
-		iph.iph_list = NULL;
 
 		for (a = list; a != NULL; a = a->ipe_next) {
 			a->ipe_addr.in4_addr = htonl(a->ipe_addr.in4_addr);
@@ -99,13 +88,13 @@ ioctlfunc_t iocfunc;
 		printf("Hash %s:\n", iph.iph_name);
 
 	for (a = list; a != NULL; a = a->ipe_next)
-		load_hashnode(iphp->iph_unit, iph.iph_name, a, iocfunc);
+		load_hashnode(iphp->iph_unit, iph.iph_name, a, 0, iocfunc);
 
 	if ((opts & OPT_REMOVE) != 0) {
-		if ((*iocfunc)(hashfd, SIOCLOOKUPDELTABLE, &op))
+		if (pool_ioctl(iocfunc, SIOCLOOKUPDELTABLE, &op))
 			if ((opts & OPT_DONOTHING) == 0) {
-				perror("load_hash:SIOCLOOKUPDELTABLE");
-				return -1;
+				return ipf_perror_fd(pool_fd(), iocfunc,
+					"delete lookup hash table");
 			}
 	}
 	return 0;