Fixes, cleanups, commentsv5.0-pre8

- 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)

1 files changed, 32 insertions, 26 deletions

diff --git a/include/libipset/print.h b/include/libipset/print.h
index 1fc5abc..963b42e 100644
--- a/include/libipset/print.h
+++ b/include/libipset/print.h
@@ -10,50 +10,56 @@
 #include <libipset/data.h>			/* enum ipset_opt */
 
 typedef int (*ipset_printfn)(char *buf, unsigned int len,
-			     const struct ipset_data *data, enum ipset_opt opt,
-			     uint8_t env);
+			     const struct ipset_data *data,
+			     enum ipset_opt opt, uint8_t env);
 
 extern int ipset_print_ether(char *buf, unsigned int len,
-			     const struct ipset_data *data, enum ipset_opt opt,
-			     uint8_t env);
+			     const struct ipset_data *data,
+			     enum ipset_opt opt, uint8_t env);
 extern int ipset_print_family(char *buf, unsigned int len,
-			      const struct ipset_data *data, enum ipset_opt opt,
-			      uint8_t env);
+			      const struct ipset_data *data,
+			      enum ipset_opt opt, uint8_t env);
 extern int ipset_print_type(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 extern int ipset_print_ip(char *buf, unsigned int len,
-			  const struct ipset_data *data, enum ipset_opt opt,
-			  uint8_t env);
+			  const struct ipset_data *data,
+			  enum ipset_opt opt, uint8_t env);
 extern int ipset_print_ipaddr(char *buf, unsigned int len,
-			      const struct ipset_data *data, enum ipset_opt opt,
-			      uint8_t env);
+			      const struct ipset_data *data,
+			      enum ipset_opt opt, uint8_t env);
 extern int ipset_print_number(char *buf, unsigned int len,
-			      const struct ipset_data *data, enum ipset_opt opt,
-			      uint8_t env);
+			      const struct ipset_data *data,
+			      enum ipset_opt opt, uint8_t env);
 extern int ipset_print_name(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 extern int ipset_print_port(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 extern int ipset_print_proto(char *buf, unsigned int len,
-			     const struct ipset_data *data, enum ipset_opt opt,
-			     uint8_t env);
+			     const struct ipset_data *data,
+			     enum ipset_opt opt, uint8_t env);
+extern int ipset_print_icmp(char *buf, unsigned int len,
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
+extern int ipset_print_icmpv6(char *buf, unsigned int len,
+			      const struct ipset_data *data,
+			      enum ipset_opt opt, uint8_t env);
 extern int ipset_print_proto_port(char *buf, unsigned int len,
 				  const struct ipset_data *data,
 				  enum ipset_opt opt, uint8_t env);
 extern int ipset_print_flag(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 extern int ipset_print_elem(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 
 #define ipset_print_portnum	ipset_print_number
 
 extern int ipset_print_data(char *buf, unsigned int len,
-			    const struct ipset_data *data, enum ipset_opt opt,
-			    uint8_t env);
+			    const struct ipset_data *data,
+			    enum ipset_opt opt, uint8_t env);
 
 #endif /* LIBIPSET_PRINT_H */