From 0d32c5c070f817229110f92d7b31df9a3e4eeec5 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Sun, 24 Oct 2010 21:42:48 +0200
Subject: Fixes, cleanups, comments

- More comments added to the code
- ICMP and ICMPv6 support added to the hash:ip,port, hash:ip,port,ip
  and hash:ip,port,net types
- hash:net and hash:ip,port,net types are reworked
- hash:net,port type added
- Wrong direction parameters fixed in hash:ip,port
- Helps and manpage are updated
- More tests added
- Ugly macros are rewritten to functions in parse.c
  (Holger Eitzenberger)
- resize related bug in hash types fixed (Holger Eitzenberger)
- autoreconf patches by Jan Engelhardt applied
- netlink patch minimalized: dumping can be initialized by a second
  parsing of the message (thanks to David and Patrick for the suggestion)
- IPv4/IPv6 address attributes are introduced in order to fix the context
  (suggested by David)
---
 src/ui.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/ui.c')

diff --git a/src/ui.c b/src/ui.c
index d8face5..ce90532 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -9,6 +9,8 @@
 #include <string.h>				/* memcmp, str* */
 
 #include <libipset/linux_ip_set.h>		/* IPSET_CMD_* */
+#include <libipset/icmp.h>			/* id_to_icmp */
+#include <libipset/icmpv6.h>			/* id_to_icmpv6 */
 #include <libipset/types.h>			/* IPSET_*_ARG */
 #include <libipset/session.h>			/* ipset_envopt_parse */
 #include <libipset/parse.h>			/* ipset_parse_family */
@@ -141,7 +143,7 @@ ipset_match_cmd(const char *arg, const char * const name[])
 
 	if (len > strlen(name[0]) || !len)
 		return false;
-	else if (memcmp(arg, name[0], len) == 0)
+	else if (strcmp(arg, name[0]) == 0)
 		return true;
 	else if (len != 1)
 		return false;
@@ -242,3 +244,33 @@ ipset_shift_argv(int *argc, char *argv[], int from)
 	return;
 }
 
+/**
+ * ipset_port_usage - prints the usage for the port parameter
+ * 
+ * Print the usage for the port parameter to stdout.
+ */
+void
+ipset_port_usage(void)
+{
+	int i;
+	const char *name;
+
+	printf("      [PROTO:]PORT is a valid pattern of the following:\n"
+	       "           PORTNAME         port name from /etc/services\n"
+	       "           PORTNUMBER       port number identifier\n"
+	       "           tcp|udp:PORTNAME|PORTNUMBER\n"
+	       "           icmp:CODENAME    supported ICMP codename\n"
+	       "           icmp:TYPE/CODE   ICMP type/code value\n"
+	       "           icmpv6:CODENAME  supported ICMPv6 codename\n"
+	       "           icmpv6:TYPE/CODE ICMPv6 type/code value\n"
+	       "           PROTO:0          all other protocols\n\n");
+
+	printf("           Supported ICMP codenames:\n");
+	i = 0;
+	while ((name = id_to_icmp(i++)) != NULL)
+		printf("               %s\n", name);
+	printf("           Supported ICMPv6 codenames:\n");
+	i = 0;
+	while ((name = id_to_icmpv6(i++)) != NULL)
+		printf("               %s\n", name);
+}
-- 
cgit v1.2.3