[PATCH v2] src: datatype: Modify symbol table for icmpv6 packet types

[PATCH v2] src: datatype: Modify symbol table for icmpv6 packet types

[Shivani Bhardwaj]

Add the missing symbols and correct the macros corresponding to the
existing symbols.

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
Changes in v2:
	Remove unneeded symbol and corresponding macro

 src/datatype.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/datatype.c b/src/datatype.c
index f56763b..40e14c9 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -17,6 +17,7 @@
 #include <arpa/inet.h>
 #include <linux/types.h>
 #include <linux/netfilter.h>
+#include <linux/icmpv6.h>
 
 #include <nftables.h>
 #include <datatype.h>
@@ -26,7 +27,6 @@
 #include <netlink.h>
 
 #include <netinet/ip_icmp.h>
-#include <netinet/icmp6.h>
 
 static const struct datatype *datatypes[TYPE_MAX + 1] = {
 	[TYPE_INVALID]		= &invalid_type,
@@ -731,10 +731,12 @@ const struct datatype icmp_code_type = {
 
 static const struct symbol_table icmpv6_code_tbl = {
 	.symbols	= {
-		SYMBOL("no-route",		ICMP6_DST_UNREACH_NOROUTE),
-		SYMBOL("admin-prohibited",	ICMP6_DST_UNREACH_ADMIN),
-		SYMBOL("addr-unreachable",	ICMP6_DST_UNREACH_ADDR),
-		SYMBOL("port-unreachable",	ICMP6_DST_UNREACH_NOPORT),
+		SYMBOL("no-route",		ICMPV6_NOROUTE),
+		SYMBOL("admin-prohibited",	ICMPV6_ADM_PROHIBITED),
+		SYMBOL("addr-unreachable",	ICMPV6_ADDR_UNREACH),
+		SYMBOL("port-unreachable",	ICMPV6_PORT_UNREACH),
+		SYMBOL("policy-fail",		ICMPV6_POLICY_FAIL),
+		SYMBOL("reject-route",		ICMPV6_REJECT_ROUTE),
 		SYMBOL_LIST_END
 	},
 };
-- 
1.9.1

Re: [PATCH v2] src: datatype: Modify symbol table for icmpv6 packet types

[Pablo Neira Ayuso]

On Tue, Jan 05, 2016 at 05:50:23PM +0530, Shivani Bhardwaj wrote:
> Add the missing symbols and correct the macros corresponding to the
> existing symbols.

Also applied, thanks.