summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ipf/lib/common/load_poolnode.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/ipf/lib/common/load_poolnode.c')
-rw-r--r--usr/src/cmd/ipf/lib/common/load_poolnode.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/cmd/ipf/lib/common/load_poolnode.c b/usr/src/cmd/ipf/lib/common/load_poolnode.c
index 50c06b538d..e992a80281 100644
--- a/usr/src/cmd/ipf/lib/common/load_poolnode.c
+++ b/usr/src/cmd/ipf/lib/common/load_poolnode.c
@@ -3,20 +3,14 @@
*
* See the IPFILTER.LICENCE file for details on licencing.
*
- * $Id: load_poolnode.c,v 1.2 2003/04/26 04:55:11 darrenr Exp $
+ * $Id: load_poolnode.c,v 1.3.2.1 2004/03/06 14:33:29 darrenr Exp $
*/
#include <fcntl.h>
#include <sys/ioctl.h>
#include "ipf.h"
-
-#if SOLARIS2 >= 10
-#include "ip_lookup.h"
-#include "ip_pool.h"
-#else
#include "netinet/ip_lookup.h"
#include "netinet/ip_pool.h"
-#endif
static int poolfd = -1;
@@ -29,6 +23,7 @@ ioctlfunc_t iocfunc;
{
ip_pool_node_t pn;
iplookupop_t op;
+ int err;
if ((poolfd == -1) && ((opts & OPT_DONOTHING) == 0))
poolfd = open(IPLOOKUP_NAME, O_RDWR);
@@ -50,9 +45,14 @@ ioctlfunc_t iocfunc;
pn.ipn_info = node->ipn_info;
strncpy(pn.ipn_name, node->ipn_name, sizeof(pn.ipn_name));
- if ((*iocfunc)(poolfd, SIOCLOOKUPADDNODE, &op)) {
+ if ((opts & OPT_REMOVE) == 0)
+ err = (*iocfunc)(poolfd, SIOCLOOKUPADDNODE, &op);
+ else
+ err = (*iocfunc)(poolfd, SIOCLOOKUPDELNODE, &op);
+
+ if (err != 0) {
if ((opts & OPT_DONOTHING) == 0) {
- perror("load_pool:SIOCLOOKUPADDNODE");
+ perror("load_pool:SIOCLOOKUP*NODE");
return -1;
}
}