diff options
| author | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-02-09 17:34:00 +0000 |
|---|---|---|
| committer | /C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org> | 2008-02-09 17:34:00 +0000 |
| commit | 7b3858d675615535476ff068d7853afacdd1de55 (patch) | |
| tree | 7b92b2c23dea90d2f63edc6d1a2354117f26872d /util | |
| parent | d33f268c307d783b868125e206a0b13af10261a5 (diff) | |
From: Eric Leblond <eric@inl.fr>
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).
Diffstat (limited to 'util')
| -rw-r--r-- | util/printflow.c | 4 | ||||
| -rw-r--r-- | util/printpkt.c | 4 |
2 files changed, 0 insertions, 8 deletions
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); diff --git a/util/printpkt.c b/util/printpkt.c index 6606824..35d8080 100644 --- a/util/printpkt.c +++ b/util/printpkt.c @@ -89,10 +89,6 @@ struct ulogd_key printpkt_keys[] = { [KEY_AHESP_SPI] = { .name = "ahesp.spi", }, }; -#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) - static int printpkt_proto(struct ulogd_key *res, char *buf, int protocol) { char *buf_cur = buf; |