From e57d6caa8ddbe268adea991bcf6e58dc6ca43389 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 5 Jan 2012 21:30:20 +0100
Subject: Set types moved into libipset library

The libipset library is complete by this step, and "ipset" just
a CLI interface based on the lib.
---
 src/ipset_hash_netiface.c | 120 ----------------------------------------------
 1 file changed, 120 deletions(-)
 delete mode 100644 src/ipset_hash_netiface.c

(limited to 'src/ipset_hash_netiface.c')

diff --git a/src/ipset_hash_netiface.c b/src/ipset_hash_netiface.c
deleted file mode 100644
index 51d9cad..0000000
--- a/src/ipset_hash_netiface.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright 2011 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <libipset/data.h>			/* IPSET_OPT_* */
-#include <libipset/parse.h>			/* parser functions */
-#include <libipset/print.h>			/* printing functions */
-#include <libipset/ui.h>			/* ipset_port_usage */
-#include <libipset/types.h>			/* prototypes */
-
-/* Parse commandline arguments */
-static const struct ipset_arg hash_netiface_create_args[] = {
-	{ .name = { "family", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,		.print = ipset_print_family,
-	},
-	/* Alias: family inet */
-	{ .name = { "-4", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	/* Alias: family inet6 */
-	{ .name = { "-6", NULL },
-	  .has_arg = IPSET_NO_ARG,		.opt = IPSET_OPT_FAMILY,
-	  .parse = ipset_parse_family,
-	},
-	{ .name = { "hashsize", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_HASHSIZE,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "maxelem", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_MAXELEM,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const struct ipset_arg hash_netiface_add_args[] = {
-	{ .name = { "timeout", NULL },
-	  .has_arg = IPSET_MANDATORY_ARG,	.opt = IPSET_OPT_TIMEOUT,
-	  .parse = ipset_parse_uint32,		.print = ipset_print_number,
-	},
-	{ },
-};
-
-static const char hash_netiface_usage[] =
-"create SETNAME hash:net,iface\n"
-"		[family inet|inet6]\n"
-"               [hashsize VALUE] [maxelem VALUE]\n"
-"               [timeout VALUE]\n"
-"add    SETNAME IP[/CIDR]|FROM-TO,[physdev:]IFACE [timeout VALUE]\n"
-"del    SETNAME IP[/CIDR]|FROM-TO,[physdev:]IFACE\n"
-"test   SETNAME IP[/CIDR],[physdev:]IFACE\n\n"
-"where depending on the INET family\n"
-"      IP is a valid IPv4 or IPv6 address (or hostname),\n"
-"      CIDR is a valid IPv4 or IPv6 CIDR prefix.\n"
-"      Adding/deleting multiple elements with IPv4 is supported.\n";
-
-struct ipset_type ipset_hash_netiface0 = {
-	.name = "hash:net,iface",
-	.alias = { "netifacehash", NULL },
-	.revision = 0,
-	.family = NFPROTO_IPSET_IPV46,
-	.dimension = IPSET_DIM_TWO,
-	.elem = {
-		[IPSET_DIM_ONE - 1] = {
-			.parse = ipset_parse_ip4_net6,
-			.print = ipset_print_ip,
-			.opt = IPSET_OPT_IP
-		},
-		[IPSET_DIM_TWO - 1] = {
-			.parse = ipset_parse_iface,
-			.print = ipset_print_iface,
-			.opt = IPSET_OPT_IFACE
-		},
-	},
-	.args = {
-		[IPSET_CREATE] = hash_netiface_create_args,
-		[IPSET_ADD] = hash_netiface_add_args,
-	},
-	.mandatory = {
-		[IPSET_CREATE] = 0,
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IFACE),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IFACE),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_IFACE),
-	},
-	.full = {
-		[IPSET_CREATE] = IPSET_FLAG(IPSET_OPT_HASHSIZE)
-			| IPSET_FLAG(IPSET_OPT_MAXELEM)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_ADD] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_IFACE)
-			| IPSET_FLAG(IPSET_OPT_PHYSDEV)
-			| IPSET_FLAG(IPSET_OPT_TIMEOUT),
-		[IPSET_DEL] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_IFACE)
-			| IPSET_FLAG(IPSET_OPT_PHYSDEV),
-		[IPSET_TEST] = IPSET_FLAG(IPSET_OPT_IP)
-			| IPSET_FLAG(IPSET_OPT_CIDR)
-			| IPSET_FLAG(IPSET_OPT_IP_TO)
-			| IPSET_FLAG(IPSET_OPT_IFACE)
-			| IPSET_FLAG(IPSET_OPT_PHYSDEV),
-	},
-
-	.usage = hash_netiface_usage,
-};
-
-- 
cgit v1.2.3