1 files changed, 25 insertions, 68 deletions

diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c
index 00996a0..f171d15 100644
--- a/extensions/libxt_mac.c
+++ b/extensions/libxt_mac.c
@@ -1,9 +1,4 @@
-/* Shared library add-on to iptables to add MAC address support. */
 #include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
 #if defined(__GLIBC__) && __GLIBC__ == 2
 #include <net/ethernet.h>
 #else
@@ -12,6 +7,10 @@
 #include <xtables.h>
 #include <linux/netfilter/xt_mac.h>
 
+enum {
+	O_MAC = 0,
+};
+
 static void mac_help(void)
 {
 	printf(
@@ -20,82 +19,41 @@ static void mac_help(void)
 "				Match source MAC address\n");
 }
 
-static const struct option mac_opts[] = {
-	{ "mac-source", 1, NULL, '1' },
-	{ .name = NULL }
+#define s struct xt_mac_info
+static const struct xt_option_entry mac_opts[] = {
+	{.name = "mac-source", .id = O_MAC, .type = XTTYPE_ETHERMAC,
+	 .flags = XTOPT_MAND | XTOPT_INVERT | XTOPT_PUT,
+	 XTOPT_POINTER(s, srcaddr)},
+	XTOPT_TABLEEND,
 };
+#undef s
 
-static void
-parse_mac(const char *mac, struct xt_mac_info *info)
+static void mac_parse(struct xt_option_call *cb)
 {
-	unsigned int i = 0;
-
-	if (strlen(mac) != ETH_ALEN*3-1)
-		xtables_error(PARAMETER_PROBLEM, "Bad mac address \"%s\"", mac);
+	struct xt_mac_info *macinfo = cb->data;
 
-	for (i = 0; i < ETH_ALEN; i++) {
-		long number;
-		char *end;
-
-		number = strtol(mac + i*3, &end, 16);
-
-		if (end == mac + i*3 + 2
-		    && number >= 0
-		    && number <= 255)
-			info->srcaddr[i] = number;
-		else
-			xtables_error(PARAMETER_PROBLEM,
-				   "Bad mac address `%s'", mac);
-	}
+	xtables_option_parse(cb);
+	if (cb->invert)
+		macinfo->invert = 1;
 }
 
-static int
-mac_parse(int c, char **argv, int invert, unsigned int *flags,
-          const void *entry, struct xt_entry_match **match)
-{
-	struct xt_mac_info *macinfo = (struct xt_mac_info *)(*match)->data;
-
-	switch (c) {
-	case '1':
-		xtables_check_inverse(optarg, &invert, &optind, 0, argv);
-		parse_mac(optarg, macinfo);
-		if (invert)
-			macinfo->invert = 1;
-		*flags = 1;
-		break;
-
-	default:
-		return 0;
-	}
-
-	return 1;
-}
-
-static void print_mac(const unsigned char macaddress[ETH_ALEN])
+static void print_mac(const unsigned char *macaddress)
 {
 	unsigned int i;
 
-	printf("%02X", macaddress[0]);
-	for (i = 1; i < ETH_ALEN; i++)
+	printf(" %02X", macaddress[0]);
+	for (i = 1; i < ETH_ALEN; ++i)
 		printf(":%02X", macaddress[i]);
-	printf(" ");
-}
-
-static void mac_check(unsigned int flags)
-{
-	if (!flags)
-		xtables_error(PARAMETER_PROBLEM,
-			   "You must specify `--mac-source'");
 }
 
 static void
 mac_print(const void *ip, const struct xt_entry_match *match, int numeric)
 {
 	const struct xt_mac_info *info = (void *)match->data;
-	printf("MAC ");
+	printf(" MAC");
 
 	if (info->invert)
-		printf("! ");
+		printf(" !");
 	
 	print_mac(info->srcaddr);
 }
@@ -105,9 +63,9 @@ static void mac_save(const void *ip, const struct xt_entry_match *match)
 	const struct xt_mac_info *info = (void *)match->data;
 
 	if (info->invert)
-		printf("! ");
+		printf(" !");
 
-	printf("--mac-source ");
+	printf(" --mac-source");
 	print_mac(info->srcaddr);
 }
 
@@ -118,11 +76,10 @@ static struct xtables_match mac_match = {
 	.size		= XT_ALIGN(sizeof(struct xt_mac_info)),
 	.userspacesize	= XT_ALIGN(sizeof(struct xt_mac_info)),
 	.help		= mac_help,
-	.parse		= mac_parse,
-	.final_check	= mac_check,
+	.x6_parse	= mac_parse,
 	.print		= mac_print,
 	.save		= mac_save,
-	.extra_opts	= mac_opts,
+	.x6_options	= mac_opts,
 };
 
 void _init(void)