This patch adds oob.hook to the list of output key sof ULOG input plugin.

Signed-off-by: Eric Leblond <eric@inl.fr>

diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index d30c07ed05eda0e3a29de87a21eaf55765403a9c..51122810fd73fa7cedb9b278a2635a18eb5ceb43 100644 (file)
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -67,6 +67,7 @@ enum ulog_keys {
        ULOG_KEY_OOB_MARK,
        ULOG_KEY_OOB_IN,
        ULOG_KEY_OOB_OUT,
+       ULOG_KEY_OOB_HOOK,
        ULOG_KEY_RAW_MAC_LEN,
        ULOG_KEY_OOB_FAMILY,
        ULOG_KEY_OOB_PROTOCOL,
@@ -142,6 +143,15 @@ static struct ulogd_key output_keys[] = {
                .flags = ULOGD_RETF_NONE,
                .name = "oob.out", 
        },
+       {
+               .type = ULOGD_RET_UINT8,
+               .flags = ULOGD_RETF_NONE,
+               .name = "oob.hook",
+               .ipfix = {
+                       .vendor = IPFIX_VENDOR_NETFILTER,
+                       .field_id = IPFIX_NF_hook,
+               },
+       },
        { 
                .type = ULOGD_RET_UINT16, 
                .flags = ULOGD_RETF_NONE, 
@@ -201,6 +211,9 @@ static int interp_packet(struct ulogd_pluginstance *ip, ulog_packet_msg_t *pkt)
        ret[ULOG_KEY_OOB_OUT].u.value.ptr = pkt->outdev_name;
        ret[ULOG_KEY_OOB_OUT].flags |= ULOGD_RETF_VALID;
 
+       ret[ULOG_KEY_OOB_HOOK].u.value.ui8 = pkt->hook;
+       ret[ULOG_KEY_OOB_HOOK].flags |= ULOGD_RETF_VALID;
+
        /* ULOG is IPv4 only */
        ret[ULOG_KEY_OOB_FAMILY].u.value.ui8 = AF_INET;
        ret[ULOG_KEY_OOB_FAMILY].flags |= ULOGD_RETF_VALID;