From: Eric Leblond <eric@inl.fr>

Add UID display to PRINTPKT filter.

diff --git a/include/ulogd/printpkt.h b/include/ulogd/printpkt.h
index ae56946445ee77bb790b8eb431dfa1971a31bb21..b524fc27c0d03d0a6e7c97659c9d7e26d438df7f 100644 (file)
--- a/include/ulogd/printpkt.h
+++ b/include/ulogd/printpkt.h
@@ -7,6 +7,7 @@ enum pkt_keys {
        KEY_OOB_PREFIX,
        KEY_OOB_IN,
        KEY_OOB_OUT,
+       KEY_OOB_UID,
        KEY_RAW_MAC,
        KEY_RAW_MACLEN,
        KEY_IP_SADDR,

diff --git a/util/printpkt.c b/util/printpkt.c
index 35d8080aec3398929de47c8e11e43f7427dec642..93d506a185da16414bbc9eaaba3b68fb6d1fcb6c 100644 (file)
--- a/util/printpkt.c
+++ b/util/printpkt.c
@@ -43,6 +43,9 @@ struct ulogd_key printpkt_keys[] = {
        [KEY_OOB_PREFIX]        = { .name = "oob.prefix", },
        [KEY_OOB_IN]            = { .name = "oob.in", },
        [KEY_OOB_OUT]           = { .name = "oob.out", },
+       [KEY_OOB_UID]           = { .name = "oob.uid",
+                                   .flags = ULOGD_KEYF_OPTIONAL
+                                 },
        [KEY_RAW_MAC]           = { .name = "raw.mac", },
        [KEY_RAW_MACLEN]        = { .name = "raw.mac_len", },
        [KEY_IP_SADDR]          = { .name = "ip.saddr.str", },
@@ -365,6 +368,10 @@ int printpkt_print(struct ulogd_key *res, char *buf)
                break;
        }
 
+       if (pp_is_valid(res, KEY_OOB_UID))
+               buf_cur += sprintf(buf_cur, "UID=%d",
+                                  GET_VALUE(res, KEY_OOB_UID).ui32);
+
        strcat(buf_cur, "\n");
 
        return 0;