diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-11-23 23:59:44 +0100 |
|---|---|---|
| committer | Eric Leblond <eric@inl.fr> | 2008-12-09 01:19:25 +0100 |
| commit | d4cf078cb71a943af0dcaa51ed5f950df0fdeca3 (patch) | |
| tree | 7a732b2f7526343f76ab71092bd6b7dccc233497 /filter/ulogd_filter_IP2BIN.c | |
| parent | 8aa47fcd3c013913b5e553053e0098b6765e5544 (diff) | |
add ukey_* function for key assignation
This patch cleans up the current key assignation by introducing a
set of functions ukey_* to set the key value as Eric Leblond and
we discussed during the latest Netfilter Workshop. This patch is
based on an idea from Holger Eitzenberger.
Signed-off-by: Eric Leblond <eric@inl.fr>
Diffstat (limited to 'filter/ulogd_filter_IP2BIN.c')
| -rw-r--r-- | filter/ulogd_filter_IP2BIN.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c index 2d9fc16..1d2865e 100644 --- a/filter/ulogd_filter_IP2BIN.c +++ b/filter/ulogd_filter_IP2BIN.c @@ -137,12 +137,12 @@ static char *ip2bin(struct ulogd_key* inp, int index, char family) switch (family) { case AF_INET6: - addr = (struct in6_addr *) GET_VALUE(inp, index).ui128; + addr = (struct in6_addr *)ikey_get_u128(&inp[index]); break; case AF_INET: /* Convert IPv4 to IPv4 in IPv6 */ addr = &ip4_addr; - uint32_to_ipv6(GET_VALUE(inp, index).ui32, addr); + uint32_to_ipv6(ikey_get_u32(&inp[index]), addr); break; default: /* TODO handle error */ @@ -176,13 +176,12 @@ static int interp_ip2bin(struct ulogd_pluginstance *pi) struct ulogd_key *ret = pi->output.keys; struct ulogd_key *inp = pi->input.keys; int i; - int oob_family = GET_VALUE(inp, KEY_OOB_FAMILY).ui8; + int oob_family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); /* Iter on all addr fields */ for(i = START_KEY; i < MAX_KEY; i++) { if (pp_is_valid(inp, i)) { - ret[i-1].u.value.ptr = ip2bin(inp, i, oob_family); - ret[i-1].flags |= ULOGD_RETF_VALID; + okey_set_ptr(&ret[i-1], ip2bin(inp, i, oob_family)); } } |