[libnetfilter_conntrack] fix bug in nfct_cmp() with IPv6 address

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=libnetfilter_conntrack.git;a=commit;h=0ceaca69ad2517e156066203111e153084140a18
commit 0ceaca69ad2517e156066203111e153084140a18
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 21:30:25 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 21:30:25 2008 +0200

    fix bug in nfct_cmp() with IPv6 address

commit 8d951440e518e6292aad1c089a0e336cdd30bc96
Author:     Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Tue May 27 19:45:26 2008 +0200
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Tue May 27 19:45:26 2008 +0200

    define ICMPV6_NI_QUERY and ICMPV6_NI_REPLY if not set
       via  0ceaca69ad2517e156066203111e153084140a18 (commit)
       via  8d951440e518e6292aad1c089a0e336cdd30bc96 (commit)
      from  7e629bad0f752f6fb3e3a435666307992e74bee2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ceaca69ad2517e156066203111e153084140a18
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue May 27 21:30:25 2008 +0200

    fix bug in nfct_cmp() with IPv6 address

commit 8d951440e518e6292aad1c089a0e336cdd30bc96
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date:   Tue May 27 19:45:26 2008 +0200

    define ICMPV6_NI_QUERY and ICMPV6_NI_REPLY if not set

-----------------------------------------------------------------------

 src/conntrack/compare.c |    8 ++++----
 src/conntrack/setter.c  |    8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c
index 53698bf..6ceab46 100644
--- a/src/conntrack/setter.c
+++ b/src/conntrack/setter.c
@@ -20,6 +20,14 @@ static const u_int8_t invmap_icmp[] = {
 	[ICMP_ADDRESSREPLY]	= ICMP_ADDRESS + 1
 };
 
+#ifndef ICMPV6_NI_QUERY
+#define ICMPV6_NI_QUERY 139
+#endif
+
+#ifndef ICMPV6_NI_REPLY
+#define ICMPV6_NI_REPLY 140
+#endif
+
 static u_int8_t invmap_icmpv6[] = {
 	[ICMPV6_ECHO_REQUEST - 128]	= ICMPV6_ECHO_REPLY + 1,
 	[ICMPV6_ECHO_REPLY - 128]	= ICMPV6_ECHO_REQUEST + 1,