diff options
| author | Eric Leblond <eric@inl.fr> | 2008-06-12 11:15:14 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-06-12 11:15:14 +0200 |
| commit | 2ea1541ce5bd9ca035d13a5ec778c555b9cb2069 (patch) | |
| tree | 24017f7fb59c5643167c71727488518aff9ca8a5 /output | |
| parent | 015849995f7f99f344ece11748a6e7b36ce07dd7 (diff) | |
Use ULOGD_IRET_* as return for all interpreters
This patch modifies plugins to use the already defined but not used
define. This also fixes some weird behaviours in error treatment (like
not stopping after OOM).
Signed-off-by: Eric Leblond <eric@inl.fr>
Diffstat (limited to 'output')
| -rw-r--r-- | output/pcap/ulogd_output_PCAP.c | 6 | ||||
| -rw-r--r-- | output/ulogd_output_IPFIX.c | 4 | ||||
| -rw-r--r-- | output/ulogd_output_LOGEMU.c | 2 | ||||
| -rw-r--r-- | output/ulogd_output_NACCT.c | 2 | ||||
| -rw-r--r-- | output/ulogd_output_OPRINT.c | 2 | ||||
| -rw-r--r-- | output/ulogd_output_SYSLOG.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c index 69656b1..0a714e6 100644 --- a/output/pcap/ulogd_output_PCAP.c +++ b/output/pcap/ulogd_output_PCAP.c @@ -154,18 +154,18 @@ static int interp_pcap(struct ulogd_pluginstance *upi) if (fwrite(&pchdr, sizeof(pchdr), 1, pi->of) != 1) { ulogd_log(ULOGD_ERROR, "Error during write: %s\n", strerror(errno)); - return 1; + return ULOGD_IRET_ERR; } if (fwrite(GET_VALUE(res, 0).ptr, pchdr.caplen, 1, pi->of) != 1) { ulogd_log(ULOGD_ERROR, "Error during write: %s\n", strerror(errno)); - return 1; + return ULOGD_IRET_ERR; } if (upi->config_kset->ces[1].u.value) fflush(pi->of); - return 0; + return ULOGD_IRET_OK; } /* stolen from libpcap savefile.c */ diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c index 71913eb..9004e4d 100644 --- a/output/ulogd_output_IPFIX.c +++ b/output/ulogd_output_IPFIX.c @@ -328,7 +328,7 @@ static int output_ipfix(struct ulogd_pluginstance *upi) template = build_template_for_bitmask(upi, ii->valid_bitmask); if (!template) { ulogd_log(ULOGD_ERROR, "can't build new template!\n"); - return -1; + return ULOGD_IRET_ERR; } /* FIXME: prepend? */ list_add(&ii->template_list, &template->list); @@ -344,7 +344,7 @@ static int output_ipfix(struct ulogd_pluginstance *upi) total_size += sizeof(template->tmpl); } - return 0; + return ULOGD_IRET_OK; } static int open_connect_socket(struct ulogd_pluginstance *pi) diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c index b8d3903..cab3b0c 100644 --- a/output/ulogd_output_LOGEMU.c +++ b/output/ulogd_output_LOGEMU.c @@ -108,7 +108,7 @@ static int _output_logemu(struct ulogd_pluginstance *upi) fflush(li->of); } - return 0; + return ULOGD_IRET_OK; } static void signal_handler_logemu(struct ulogd_pluginstance *pi, int signal) diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c index 278df36..4897959 100644 --- a/output/ulogd_output_NACCT.c +++ b/output/ulogd_output_NACCT.c @@ -154,7 +154,7 @@ nacct_interp(struct ulogd_pluginstance *pi) if (NACCT_CFG_SYNC(pi) != 0) fflush(priv->of); - return 0; + return ULOGD_IRET_OK; } static struct config_keyset nacct_kset = { diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c index 6990f8c..c2fce38 100644 --- a/output/ulogd_output_OPRINT.c +++ b/output/ulogd_output_OPRINT.c @@ -94,7 +94,7 @@ static int oprint_interp(struct ulogd_pluginstance *upi) if (upi->config_kset->ces[1].u.value != 0) fflush(opi->of); - return 0; + return ULOGD_IRET_OK; } static struct config_keyset oprint_kset = { diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c index e6c05bd..8982e7e 100644 --- a/output/ulogd_output_SYSLOG.c +++ b/output/ulogd_output_SYSLOG.c @@ -79,7 +79,7 @@ static int _output_syslog(struct ulogd_pluginstance *upi) syslog(li->syslog_level | li->syslog_facility, "%s", res[0].u.source->u.value.ptr); - return 0; + return ULOGD_IRET_OK; } static int syslog_configure(struct ulogd_pluginstance *pi, |