[ULOGD PATCH] Fix IPv6 packet parsing.

[ULOGD PATCH] Fix IPv6 packet parsing.

[Eric Leblond]

Source and destination addresses were put in ptr field of the target structure
instead of being put in the new type ui128. The result was an improper value
of the IPv6 source add destination addresses.

Signed-off-by: Eric Leblond <eric@inl.fr>
---
 filter/raw2packet/ulogd_raw2packet_BASE.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c
index b1f4113..a5312e4 100644
--- a/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -769,9 +769,11 @@ static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len)
 	if (len < sizeof(struct ip6_hdr))
 		return 0;
 
-	ret[KEY_IP_SADDR].u.value.ptr = &ipv6h->ip6_src;
+	memcpy(ret[KEY_IP_SADDR].u.value.ui128, &ipv6h->ip6_src,
+	       sizeof(ipv6h->ip6_src));
 	ret[KEY_IP_SADDR].flags |= ULOGD_RETF_VALID;
-	ret[KEY_IP_DADDR].u.value.ptr = &ipv6h->ip6_dst;
+	memcpy(ret[KEY_IP_DADDR].u.value.ui128, &ipv6h->ip6_dst,
+	       sizeof(ipv6h->ip6_dst));
 	ret[KEY_IP_DADDR].flags |= ULOGD_RETF_VALID;
 	ret[KEY_IP6_PAYLOAD_LEN].u.value.ui16 = ntohs(ipv6h->ip6_plen);
 	ret[KEY_IP6_PAYLOAD_LEN].flags |= ULOGD_RETF_VALID;
-- 
1.5.4.3

Re: [ULOGD PATCH] Fix IPv6 packet parsing.

[Pablo Neira Ayuso]

Eric Leblond wrote:
> Source and destination addresses were put in ptr field of the target structure
> instead of being put in the new type ui128. The result was an improper value
> of the IPv6 source add destination addresses.

Applied. Thanks.

I'll test this a bit along this week, any help appreciated. We can
prepare the first release of 2.0.0-rc series soon. If my mind serves
well, configuration file reload is still pending.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [ULOGD PATCH] Fix IPv6 packet parsing.

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

Hello,

On Monday, 2008 June  2 at  2:04:14 +0200, Pablo Neira Ayuso wrote:
> Eric Leblond wrote:
> > Source and destination addresses were put in ptr field of the target structure
> > instead of being put in the new type ui128. The result was an improper value
> > of the IPv6 source add destination addresses.
> 
> Applied. Thanks.
> 
> I'll test this a bit along this week, any help appreciated. We can
> prepare the first release of 2.0.0-rc series soon. If my mind serves
> well, configuration file reload is still pending.

Yes, reload is still missing.

By the way, a new libnetfilter_conntrack release will be needed before
ulogd2 rc. Latest libnetfilter_conntrack git is needed to have ulogd2
compile.

BR,
-- 
Eric Leblond
INL: http://www.inl.fr/
NuFW: http://www.nufw.org/

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [ULOGD PATCH] Fix IPv6 packet parsing.

[Pablo Neira Ayuso]

Eric Leblond wrote:
>> I'll test this a bit along this week, any help appreciated. We can
>> prepare the first release of 2.0.0-rc series soon. If my mind serves
>> well, configuration file reload is still pending.
> 
> Yes, reload is still missing.
> 
> By the way, a new libnetfilter_conntrack release will be needed before
> ulogd2 rc. Latest libnetfilter_conntrack git is needed to have ulogd2
> compile.

I think that you have missed the release that I have done two days ago
[1] ? :-)

http://marc.info/?l=netfilter-devel&m=121225147116142&w=2

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers