summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Eitzenberger <heitzenberger@astaro.com>2009-10-21 14:54:51 +0200
committerHarald Welte <laforge@gnumonks.org>2010-10-21 19:15:39 +0200
commit691bb69a25ba7a6e053fd7d63491f6241df786dd (patch)
treef76cfa93d3a991918c889d717438c79a920631cb
parent1e6d15ec3f7dfdf49f2ea00a5b02370c73279271 (diff)
NFLOG: enable logmark again
Signed-off-by: Holger Eitzenberger <heitzenberger@astaro.com>
-rw-r--r--input/packet/ulogd_inppkt_NFLOG.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index 4b01b1b..99bbc24 100644
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -141,11 +141,9 @@ nflog_dump(const char *prefix, const struct nl_object *obj)
if (nfnl_log_test_mark(nflog_obj))
pch += snprintf(pch, AVAIL, "mark=%u ", nfnl_log_get_mark(nflog_obj));
-#if 0
if (nfnl_log_test_logmark(nflog_obj))
pch += snprintf(pch, AVAIL, "logmark=%u ",
nfnl_log_get_logmark(nflog_obj));
-#endif /* 0 */
if (nfnl_log_get_payload(nflog_obj, &len))
pch += snprintf(pch, AVAIL, "payloadlen=%d ", len);
@@ -207,10 +205,8 @@ nflog_handle_msg(struct nl_object *obj, void *arg)
if (nfnl_log_test_seq_global(nflog_obj))
key_set_u32(&out[K_OOB_SEQ_GLOBAL], nfnl_log_get_seq_global(nflog_obj));
-#if 0
- /* Astaro logmark */
- key_set_u32(&out[K_OOB_LOGMARK], nfnl_log_get_logmark(nflog_obj));
-#endif /* 0 */
+ if (nfnl_log_test_logmark(nflog_obj))
+ key_set_u32(&out[K_OOB_LOGMARK], nfnl_log_get_logmark(nflog_obj));
ulogd_propagate_results(upi, &flags);
}