From: Eric leblond <eric@inl.fr>

- This patch suppress key relative to IPv6 address because IPv4 and IPv6 can be stored in the same key.
- Add missing IP2STR line to ulogd.conf.in

diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c
index 4420507b3e887e4a4a3fba9f9e75a83b2b0c1725..e837c62f51e0019543401ad7fda958f77e546ca3 100644 (file)
--- a/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -54,8 +54,6 @@ enum output_keys {
        KEY_IP_CSUM,
        KEY_IP_ID,
        KEY_IP_FRAGOFF,
-       KEY_IP6_SADDR,
-       KEY_IP6_DADDR,
        KEY_IP6_PAYLOAD_LEN,
        KEY_IP6_PRIORITY,
        KEY_IP6_FLOWLABEL,
@@ -186,24 +184,6 @@ static struct ulogd_key iphdr_rets[] = {
                        .field_id = IPFIX_fragmentOffsetIPv4,
                },
        },
-       [KEY_IP6_SADDR] = {
-               .type = ULOGD_RET_RAW,
-               .flags = ULOGD_RETF_NONE,
-               .name = "ip6.saddr",
-               .ipfix = {
-                       .vendor = IPFIX_VENDOR_IETF,
-                       .field_id = IPFIX_sourceIPv6Address,
-               },
-       },
-       [KEY_IP6_DADDR] = {
-               .type = ULOGD_RET_RAW,
-               .flags = ULOGD_RETF_NONE,
-               .name = "ip6.daddr",
-               .ipfix = {
-                       .vendor = IPFIX_VENDOR_IETF,
-                       .field_id = IPFIX_destinationIPv6Address,
-               },
-       },
        [KEY_IP6_PAYLOAD_LEN] = {
                .type = ULOGD_RET_UINT16,
                .flags = ULOGD_RETF_NONE,
@@ -730,10 +710,10 @@ static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len)
        if (len < sizeof(struct ip6_hdr))
                return 0;
 
-       ret[KEY_IP6_SADDR].u.value.ptr = &ipv6h->ip6_src;
-       ret[KEY_IP6_SADDR].flags |= ULOGD_RETF_VALID;
-       ret[KEY_IP6_DADDR].u.value.ptr = &ipv6h->ip6_dst;
-       ret[KEY_IP6_DADDR].flags |= ULOGD_RETF_VALID;
+       ret[KEY_IP_SADDR].u.value.ptr = &ipv6h->ip6_src;
+       ret[KEY_IP_SADDR].flags |= ULOGD_RETF_VALID;
+       ret[KEY_IP_DADDR].u.value.ptr = &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;
        ret[KEY_IP6_PRIORITY].u.value.ui8 = ntohl(ipv6h->ip6_flow & 0x0ff00000) >> 20;

diff --git a/include/ulogd/printpkt.h b/include/ulogd/printpkt.h
index 3db2862436bd2f2582045d772e7a90ad425c6925..ae56946445ee77bb790b8eb431dfa1971a31bb21 100644 (file)
--- a/include/ulogd/printpkt.h
+++ b/include/ulogd/printpkt.h
@@ -17,8 +17,6 @@ enum pkt_keys {
        KEY_IP_ID,
        KEY_IP_FRAGOFF,
        KEY_IP_PROTOCOL,
-       KEY_IP6_SADDR,
-       KEY_IP6_DADDR,
        KEY_IP6_PAYLOAD_LEN,
        KEY_IP6_PRIORITY,
        KEY_IP6_HOPLIMIT,

diff --git a/ulogd.conf.in b/ulogd.conf.in
index d43f1fd187688a6a633518c0fc5bb1c7a5fedf9d..465b224cf97a6b416b5fd5a12af8923b69f653ee 100644 (file)
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -35,6 +35,7 @@ bufsize=150000
 plugin="@libdir@/ulogd/ulogd_inppkt_NFLOG.so"
 plugin="@libdir@/ulogd/ulogd_inpflow_NFCT.so"
 plugin="@libdir@/ulogd/ulogd_filter_IFINDEX.so"
+plugin="@libdir@/ulogd/ulogd_filter_IP2STR.so"
 plugin="@libdir@/ulogd/ulogd_filter_PRINTPKT.so"
 plugin="@libdir@/ulogd/ulogd_filter_PRINTFLOW.so"
 plugin="@libdir@/ulogd/ulogd_output_LOGEMU.so"
@@ -42,7 +43,10 @@ plugin="@libdir@/ulogd/ulogd_output_OPRINT.so"
 plugin="@libdir@/ulogd/ulogd_raw2packet_BASE.so"
 
 # this is a stack for packet-based logging via LOGEMU
-#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,print1:PRINTPKT,emu1:LOGEMU
+#stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+
+# this is a stack for IPv6 packet-based logging via LOGEMU
+#stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 # this is a stack for ULOG packet-based logging via LOGEMU
 #stack=ulog1:ULOG,base1:BASE,print1:PRINTPKT,emu1:LOGEMU
@@ -59,6 +63,10 @@ plugin="@libdir@/ulogd/ulogd_raw2packet_BASE.so"
 # netlink multicast group (the same as the iptables --ulog-nlgroup param)
 group=0
 
+[log2]
+group=1
+addressfamily=10
+
 [ulog1]
 nlgroup=1
 

diff --git a/util/printpkt.c b/util/printpkt.c
index 7719cae14426dfe27e44915b3a94e6c4875c3aa6..66068243635bbd6481dea089f8e33274ab3f99df 100644 (file)
--- a/util/printpkt.c
+++ b/util/printpkt.c
@@ -45,16 +45,14 @@ struct ulogd_key printpkt_keys[] = {
        [KEY_OOB_OUT]           = { .name = "oob.out", },
        [KEY_RAW_MAC]           = { .name = "raw.mac", },
        [KEY_RAW_MACLEN]        = { .name = "raw.mac_len", },
-       [KEY_IP_SADDR]          = { .name = "ip.saddr", },
-       [KEY_IP_DADDR]          = { .name = "ip.daddr", },
+       [KEY_IP_SADDR]          = { .name = "ip.saddr.str", },
+       [KEY_IP_DADDR]          = { .name = "ip.daddr.str", },
        [KEY_IP_TOTLEN]         = { .name = "ip.totlen", },
        [KEY_IP_TOS]            = { .name = "ip.tos", },
        [KEY_IP_TTL]            = { .name = "ip.ttl", },
        [KEY_IP_ID]             = { .name = "ip.id", },
        [KEY_IP_FRAGOFF]        = { .name = "ip.fragoff", },
        [KEY_IP_PROTOCOL]       = { .name = "ip.protocol", },
-       [KEY_IP6_SADDR]         = { .name = "ip6.saddr", },
-       [KEY_IP6_DADDR]         = { .name = "ip6.daddr", },
        [KEY_IP6_PAYLOAD_LEN]   = { .name = "ip6.payload_len" },
        [KEY_IP6_PRIORITY]      = { .name = "ip6.priority" },
        [KEY_IP6_HOPLIMIT]      = { .name = "ip6.hoplimit" },
@@ -182,15 +180,11 @@ static int printpkt_ipv4(struct ulogd_key *res, char *buf)
 
        if (pp_is_valid(res, KEY_IP_SADDR))
                buf_cur += sprintf(buf_cur, "SRC=%s ",
-                                  inet_ntop(AF_INET,
-                                            &GET_VALUE(res, KEY_IP_SADDR).ui32,
-                                            tmp, sizeof(tmp)));
+                                  GET_VALUE(res, KEY_IP_SADDR).ptr);
 
        if (pp_is_valid(res, KEY_IP_DADDR))
                buf_cur += sprintf(buf_cur, "DST=%s ",
-                                  inet_ntop(AF_INET,
-                                            &GET_VALUE(res, KEY_IP_DADDR).ui32,
-                                            tmp, sizeof(tmp)));
+                                  GET_VALUE(res, KEY_IP_DADDR).ptr);
 
        /* FIXME: add pp_is_valid calls to remainder of file */
        buf_cur += sprintf(buf_cur,"LEN=%u TOS=%02X PREC=0x%02X TTL=%u ID=%u ", 
@@ -271,17 +265,13 @@ static int printpkt_ipv6(struct ulogd_key *res, char *buf)
        char *buf_cur = buf;
        char tmp[INET6_ADDRSTRLEN];
 
-       if (pp_is_valid(res, KEY_IP6_SADDR))
+       if (pp_is_valid(res, KEY_IP_SADDR))
                buf_cur += sprintf(buf_cur, "SRC=%s ",
-                                  inet_ntop(AF_INET6,
-                                            GET_VALUE(res, KEY_IP6_SADDR).ptr,
-                                            tmp, sizeof(tmp)));
+                                  GET_VALUE(res, KEY_IP_SADDR).ptr);
 
-       if (pp_is_valid(res, KEY_IP6_DADDR))
+       if (pp_is_valid(res, KEY_IP_DADDR))
                buf_cur += sprintf(buf_cur, "DST=%s ",
-                                  inet_ntop(AF_INET6,
-                                            GET_VALUE(res, KEY_IP6_DADDR).ptr,
-                                            tmp, sizeof(tmp)));
+                                  GET_VALUE(res, KEY_IP_DADDR).ptr);
 
        if (pp_is_valid(res, KEY_IP6_PAYLOAD_LEN))
                buf_cur += sprintf(buf_cur, "LEN=%Zu ",