all: use config_parse_file function in all plugins

Replace all usages of `config_parse_file()` in plugins with the new
`ulogd_parse_configfile()` function, adding error handling where it was
missing. I used the same codestyle as the surrounding code, which varies
between plugins.

Signed-off-by: Corubba Smith <corubba@gmx.de>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c
index 149725d9257467d10d1a4d1d193f9654e4da5de9..d5a818114e87d0b9746bfc2f63f0cad11f955f6c 100644 (file)
--- a/filter/ulogd_filter_MARK.c
+++ b/filter/ulogd_filter_MARK.c
@@ -94,8 +94,7 @@ static int configure(struct ulogd_pluginstance *upi,
        ulogd_log(ULOGD_DEBUG, "parsing config file section `%s', "
                  "plugin `%s'\n", upi->id, upi->plugin->name);
 
-       config_parse_file(upi->id, upi->config_kset);
-       return 0;
+       return ulogd_parse_configfile(upi->id, upi->config_kset);
 }
 
 static struct ulogd_plugin mark_pluging = {

diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index fe827a7aa68e0f940e519a0a39b0d78c630fcca9..5213cc32f3dc8ac2e7198c1439fca0b3a8c0114c 100644 (file)
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -1054,7 +1054,7 @@ static int configure_nfct(struct ulogd_pluginstance *upi,
 {
        int ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index 4fdeb12886ccefa5e6344d18bbf3071fd34f233d..f71613688178200bbaac1a4c51dc4de8fd71dccf 100644 (file)
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -557,8 +557,7 @@ static int configure(struct ulogd_pluginstance *upi,
        ulogd_log(ULOGD_DEBUG, "parsing config file section `%s', "
                  "plugin `%s'\n", upi->id, upi->plugin->name);
 
-       config_parse_file(upi->id, upi->config_kset);
-       return 0;
+       return ulogd_parse_configfile(upi->id, upi->config_kset);
 }
 
 static int become_system_logging(struct ulogd_pluginstance *upi, uint8_t pf)

diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index 45ffc8b57ac464e3232f1f0d4927aea2717ad385..44bc71d38aea039a27f903826637173db76618d5 100644 (file)
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -269,7 +269,7 @@ static int ulog_read_cb(int fd, unsigned int what, void *param)
 static int configure(struct ulogd_pluginstance *upi,
                     struct ulogd_pluginstance_stack *stack)
 {
-       return config_parse_file(upi->id, upi->config_kset);
+       return ulogd_parse_configfile(upi->id, upi->config_kset);
 }
 static int init(struct ulogd_pluginstance *upi)
 {

diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c
index f1d15348ccb334f0232f104ac96dacb71d8b7866..b328500d656b1f6e03f8aebc332f7eac90eb5f2a 100644 (file)
--- a/input/packet/ulogd_inppkt_UNIXSOCK.c
+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c
@@ -719,8 +719,7 @@ static int configure(struct ulogd_pluginstance *upi,
        ulogd_log(ULOGD_DEBUG, "parsing config file section `%s', "
                  "plugin `%s'\n", upi->id, upi->plugin->name);
 
-       config_parse_file(upi->id, upi->config_kset);
-       return 0;
+       return ulogd_parse_configfile(upi->id, upi->config_kset);
 }
 
 static int start(struct ulogd_pluginstance *upi)

diff --git a/input/sum/ulogd_inpflow_NFACCT.c b/input/sum/ulogd_inpflow_NFACCT.c
index b022e6373406424ac2cfac94a2c2864569758e9d..bd45df4145b3cd383a2e9072a7e8bf84e9f65fcd 100644 (file)
--- a/input/sum/ulogd_inpflow_NFACCT.c
+++ b/input/sum/ulogd_inpflow_NFACCT.c
@@ -221,7 +221,7 @@ static int configure_nfacct(struct ulogd_pluginstance *upi,
 {
        int ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/output/ipfix/ulogd_output_IPFIX.c b/output/ipfix/ulogd_output_IPFIX.c
index 88e0035fcd8ebf1a8a8d403d1ade6346af6fb245..8c8fd9db717c366b9d43291e66d043836227bb46 100644 (file)
--- a/output/ipfix/ulogd_output_IPFIX.c
+++ b/output/ipfix/ulogd_output_IPFIX.c
@@ -272,7 +272,7 @@ static int ipfix_configure(struct ulogd_pluginstance *pi, struct ulogd_pluginsta
        int oid, port, mtu, ret;
        char addr[16];
 
-       ret = config_parse_file(pi->id, pi->config_kset);
+       ret = ulogd_parse_configfile(pi->id, pi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index 19ce47f9ae7c5db4201a73cb013c7c9e6224b6d7..474992efd6d9a23dca66a21b0c35f6497277a521 100644 (file)
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -260,7 +260,7 @@ static void signal_pcap(struct ulogd_pluginstance *upi, int signal)
 static int configure_pcap(struct ulogd_pluginstance *upi,
                          struct ulogd_pluginstance_stack *stack)
 {
-       return config_parse_file(upi->id, upi->config_kset);
+       return ulogd_parse_configfile(upi->id, upi->config_kset);
 }
 
 static int start_pcap(struct ulogd_pluginstance *upi)

diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 6aeb7a3865e1b66d91e8ca4e632c4aae40a7e423..51c0fc8176c26112ff6077aa808e74e6941a0a77 100644 (file)
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -363,7 +363,8 @@ sqlite3_configure(struct ulogd_pluginstance *pi,
 {
        /* struct sqlite_priv *priv = (void *)pi->private; */
 
-       config_parse_file(pi->id, pi->config_kset);
+       if (ulogd_parse_configfile(pi->id, pi->config_kset) < 0)
+               return -1;
 
        if (ulogd_wildcard_inputkeys(pi) < 0)
                return -1;

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 20dd30807a328529c407a4cb103feff19bfceb3d..dfebfe2b21817fcfbbedd09c17b894c0b38e2c29 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -233,7 +233,7 @@ static int gprint_configure(struct ulogd_pluginstance *upi,
        if (ret < 0)
                return ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/output/ulogd_output_GRAPHITE.c b/output/ulogd_output_GRAPHITE.c
index 5328f8e95572a8c48f399267fb3df2b390ddc1fa..e54b24d9975261495ec4622ecbc10c6f1affddd7 100644 (file)
--- a/output/ulogd_output_GRAPHITE.c
+++ b/output/ulogd_output_GRAPHITE.c
@@ -214,7 +214,7 @@ static int configure_graphite(struct ulogd_pluginstance *pi,
                            struct ulogd_pluginstance_stack *stack)
 {
        ulogd_log(ULOGD_DEBUG, "parsing config file section %s\n", pi->id);
-       return config_parse_file(pi->id, pi->config_kset);
+       return ulogd_parse_configfile(pi->id, pi->config_kset);
 }
 
 static struct ulogd_plugin graphite_plugin = {

diff --git a/output/ulogd_output_JSON.c b/output/ulogd_output_JSON.c
index f80d0e2921aacbd14651cd8a372b0d0764ce0d0d..2e7211aabcaa61cb676cb248a48ff0fd5004ad45 100644 (file)
--- a/output/ulogd_output_JSON.c
+++ b/output/ulogd_output_JSON.c
@@ -494,7 +494,7 @@ static int json_configure(struct ulogd_pluginstance *upi,
        if (ret < 0)
                return ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index cfcfab734746477bb169739c70e835d51d5ca5d8..f5d1defa2b329396046be452fbd69092a8d3774f 100644 (file)
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -178,7 +178,7 @@ static int configure_logemu(struct ulogd_pluginstance *pi,
                            struct ulogd_pluginstance_stack *stack)
 {
        ulogd_log(ULOGD_DEBUG, "parsing config file section %s\n", pi->id);
-       return config_parse_file(pi->id, pi->config_kset);
+       return ulogd_parse_configfile(pi->id, pi->config_kset);
 }
 
 static struct ulogd_plugin logemu_plugin = { 

diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c
index d369c7a873156390fd6351666017035bfa609f66..080a576c973bf54dcb0392738b2246c507083529 100644 (file)
--- a/output/ulogd_output_NACCT.c
+++ b/output/ulogd_output_NACCT.c
@@ -203,7 +203,7 @@ nacct_conf(struct ulogd_pluginstance *pi,
 {
        int ret;
 
-       if ((ret = config_parse_file(pi->id, pi->config_kset)) < 0)
+       if ((ret = ulogd_parse_configfile(pi->id, pi->config_kset)) < 0)
                return ret;
 
        return 0;

diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index 13934ff19efbc38e4473d780e7016f5cf8f8fa74..1137be14295895a168f4dafdad3864cef4820322 100644 (file)
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -161,7 +161,7 @@ static int oprint_configure(struct ulogd_pluginstance *upi,
        if (ret < 0)
                return ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c
index 9777f0fe91853abecd1cbcbb6fd25c26e66be708..9ee6a616a2a1073f4b9cc5e04649751a83982925 100644 (file)
--- a/output/ulogd_output_SYSLOG.c
+++ b/output/ulogd_output_SYSLOG.c
@@ -83,12 +83,13 @@ static int _output_syslog(struct ulogd_pluginstance *upi)
 static int syslog_configure(struct ulogd_pluginstance *pi,
                            struct ulogd_pluginstance_stack *stack)
 {
-       int syslog_facility, syslog_level;
+       int syslog_facility, syslog_level, ret;
        char *facility, *level;
        struct syslog_instance *li = (struct syslog_instance *) &pi->private;
 
-       /* FIXME: error handling */
-       config_parse_file(pi->id, pi->config_kset);
+       ret = ulogd_parse_configfile(pi->id, pi->config_kset);
+       if (ret < 0)
+               return ret;
 
        facility = pi->config_kset->ces[0].u.string;
        level = pi->config_kset->ces[1].u.string;

diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 44af596dc2bc9e6896451a5bec688bf61797f4c6..55c7a7c454ccc5a5f36a80523ab5145377dd7318 100644 (file)
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -190,7 +190,7 @@ static int xml_configure(struct ulogd_pluginstance *upi,
 {
        int ret;
 
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0)
                return ret;
 

diff --git a/util/db.c b/util/db.c
index 749a45ff5cd5316c7fdde5511ce9c918d8db607a..11c3e6ad8454a30b47b89f86872145200ee86744 100644 (file)
--- a/util/db.c
+++ b/util/db.c
@@ -153,7 +153,7 @@ int ulogd_db_configure(struct ulogd_pluginstance *upi,
        ulogd_log(ULOGD_NOTICE, "(re)configuring\n");
 
        /* First: Parse configuration file section for this instance */
-       ret = config_parse_file(upi->id, upi->config_kset);
+       ret = ulogd_parse_configfile(upi->id, upi->config_kset);
        if (ret < 0) {
                ulogd_log(ULOGD_ERROR, "error parsing config file\n");
                return ret;