From 7b3858d675615535476ff068d7853afacdd1de55 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org" Date: Sat, 9 Feb 2008 17:34:00 +0000 Subject: From: Eric Leblond Some macros were defined several time. This was the case of GET_VALUE, pp_is_valid. This patch puts the definition in ulogd.h and fixes the definition of pp_is_valid which was wrong (causing segfault by acessing to fields at NULL). --- util/printflow.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'util/printflow.c') diff --git a/util/printflow.c b/util/printflow.c index d803633..92c4f0f 100644 --- a/util/printflow.c +++ b/util/printflow.c @@ -131,10 +131,6 @@ struct ulogd_key printflow_keys[FLOW_IDS] = { }; int printflow_keys_num = sizeof(printflow_keys)/sizeof(*printflow_keys); -#define GET_VALUE(res, x) (res[x].u.source->u.value) -#define GET_FLAGS(res, x) (res[x].u.source->flags) -#define pp_is_valid(res, x) (GET_FLAGS(res, x) & ULOGD_RETF_VALID) - #define pp_print(buf_cur, label, res, x, type) \ if (pp_is_valid(res, x)) \ buf_cur += sprintf(buf_cur, label"=%u ", GET_VALUE(res, x).type); -- cgit v1.2.3