src: fix version that -V displays

It was wrong, use VERSION constant which uses the version
information available in configure.ac.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c
index 220bc8dd35c8caf8df10e28e1d873cbaee6441a7..d0fcdfab6c84c3285e2b4df06ec4ece78c7dbe44 100644 (file)
--- a/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -992,7 +992,7 @@ static struct ulogd_plugin base_plugin = {
                .type = ULOGD_DTYPE_PACKET,
                },
        .interp = &_interp_pkt,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c
index 3b713a500c127582677d22ec0d2a9320a11d4665..2f266faa5092640dddace6e6687e9d7075842de4 100644 (file)
--- a/filter/ulogd_filter_HWHDR.c
+++ b/filter/ulogd_filter_HWHDR.c
@@ -238,7 +238,7 @@ static struct ulogd_plugin mac2str_pluging = {
                .type = ULOGD_DTYPE_PACKET,
                },
        .interp = &interp_mac2str,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_IFINDEX.c b/filter/ulogd_filter_IFINDEX.c
index 152c26d09d1831f6a39fa4289ed9d159d1fdbf9c..41e556d7faf65fde43364e738b0e22a0089104f8 100644 (file)
--- a/filter/ulogd_filter_IFINDEX.c
+++ b/filter/ulogd_filter_IFINDEX.c
@@ -148,7 +148,7 @@ static struct ulogd_plugin ifindex_plugin = {
 
        .start = &ifindex_start,
        .stop = &ifindex_fini,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_IP2BIN.c b/filter/ulogd_filter_IP2BIN.c
index a8688fe8076a88c738813d69e35b56d18f05daaf..84fe21b396e22a7e56a9e8a2ef22a197ed5c4045 100644 (file)
--- a/filter/ulogd_filter_IP2BIN.c
+++ b/filter/ulogd_filter_IP2BIN.c
@@ -232,7 +232,7 @@ static struct ulogd_plugin ip2bin_pluging = {
                .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW,
                },
        .interp = &interp_ip2bin,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c
index 2716fce6ee46c93a407dd55814c99e5e362b32d2..1d426a6b3849ff580386ed05ab0f86ab5aec95fc 100644 (file)
--- a/filter/ulogd_filter_IP2HBIN.c
+++ b/filter/ulogd_filter_IP2HBIN.c
@@ -188,7 +188,7 @@ static struct ulogd_plugin ip2hbin_pluging = {
                .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW,
                },
        .interp = &interp_ip2hbin,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c
index b9be16d1da23d3952f94ed8b4e9c6339300465e1..146c054e19a4782536fb077fa2af70ca31ed5832 100644 (file)
--- a/filter/ulogd_filter_IP2STR.c
+++ b/filter/ulogd_filter_IP2STR.c
@@ -218,7 +218,7 @@ static struct ulogd_plugin ip2str_pluging = {
                .type = ULOGD_DTYPE_PACKET | ULOGD_DTYPE_FLOW,
                },
        .interp = &interp_ip2str,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c
index 1a7c2fd4839b1654c2845333a566c581144e97ae..b113f7d1596ee86f830aef8d4c870f3ae525cec8 100644 (file)
--- a/filter/ulogd_filter_MARK.c
+++ b/filter/ulogd_filter_MARK.c
@@ -112,7 +112,7 @@ static struct ulogd_plugin mark_pluging = {
        .interp = &interp_mark,
        .config_kset = &libulog_kset,
        .configure = &configure,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_PRINTFLOW.c b/filter/ulogd_filter_PRINTFLOW.c
index 1de1ba6771d200eba0f8a1bb6345246cfde52c8d..95351f881c547bae204a80ec49a5157057bd3b81 100644 (file)
--- a/filter/ulogd_filter_PRINTFLOW.c
+++ b/filter/ulogd_filter_PRINTFLOW.c
@@ -54,7 +54,7 @@ static struct ulogd_plugin printflow_plugin = {
                .type = ULOGD_DTYPE_FLOW,
        },
        .interp = &printflow_interp,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_PRINTPKT.c b/filter/ulogd_filter_PRINTPKT.c
index 33131941d385d878e9e786d125ac26762a864ea5..de5c4688a4f18244ee5b143ca864a6687898b46d 100644 (file)
--- a/filter/ulogd_filter_PRINTPKT.c
+++ b/filter/ulogd_filter_PRINTPKT.c
@@ -54,7 +54,7 @@ static struct ulogd_plugin printpkt_plugin = {
                .type = ULOGD_DTYPE_PACKET,
        },
        .interp = &printpkt_interp,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c
index a6cbf949933a129a3603bfff232e9a89df0cf6d4..439a8b332764d4c5abae13cf0d96239413216122 100644 (file)
--- a/filter/ulogd_filter_PWSNIFF.c
+++ b/filter/ulogd_filter_PWSNIFF.c
@@ -168,7 +168,7 @@ static struct ulogd_plugin pwsniff_plugin = {
                .type = ULOGD_DTYPE_PACKET,
        },
        .interp = &interp_pwsniff,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void)

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 88de3ca6fb0e485fb306570c8445968eb4a606ad..81933f2422dea07c582b44baaf56c8293eb7c380 100644 (file)
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -23,8 +23,6 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-#define ULOGD_VERSION "2.0.0beta"
-
 /* All types with MSB = 1 make use of value.ptr
  * other types use one of the union's member */
 

diff --git a/input/flow/ulogd_inpflow_NFCT.c b/input/flow/ulogd_inpflow_NFCT.c
index ba0c51cec82c4f7a772a9fa1cad55083c5b937ad..0946b4cdae69dce1b46d9a4a6746d4afee6d0285 100644 (file)
--- a/input/flow/ulogd_inpflow_NFCT.c
+++ b/input/flow/ulogd_inpflow_NFCT.c
@@ -1256,7 +1256,7 @@ static struct ulogd_plugin nfct_plugin = {
        .stop           = &destructor_nfct,
        .signal         = &signal_nfct,
        .priv_size      = sizeof(struct nfct_pluginstance),
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c
index 0eff1f0c139f4efab75847ae6cf8f67cb8faa909..7870c3186ea3d0e2f1d5016f96eef62ae69624a7 100644 (file)
--- a/input/packet/ulogd_inppkt_NFLOG.c
+++ b/input/packet/ulogd_inppkt_NFLOG.c
@@ -660,7 +660,7 @@ struct ulogd_plugin libulog_plugin = {
        .start          = &start,
        .stop           = &stop,
        .config_kset    = &libulog_kset,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
index 80bbd5fa02038f36567d2118a4aa80d8da9a9dc2..45ffc8b57ac464e3232f1f0d4927aea2717ad385 100644 (file)
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ b/input/packet/ulogd_inppkt_ULOG.c
@@ -329,7 +329,7 @@ struct ulogd_plugin libulog_plugin = {
        .start = &init,
        .stop = &fini,
        .config_kset = &libulog_kset,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) initializer(void)

diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c
index 368df93532dd7d236c4b97bd16d6269ac70810f4..e4009f33de57703e075bd5673a5981edfa48bb72 100644 (file)
--- a/input/packet/ulogd_inppkt_UNIXSOCK.c
+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c
@@ -817,7 +817,7 @@ struct ulogd_plugin libunixsock_plugin = {
        .start          = &start,
        .stop           = &stop,
        .config_kset    = &libunixsock_kset,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 static void __attribute__ ((constructor)) init(void)

diff --git a/input/sum/ulogd_inpflow_NFACCT.c b/input/sum/ulogd_inpflow_NFACCT.c
index 46767b760a302b92bac579a7e12abc47958d766b..7852b2784022685932766455ae325e7e8f455bd5 100644 (file)
--- a/input/sum/ulogd_inpflow_NFACCT.c
+++ b/input/sum/ulogd_inpflow_NFACCT.c
@@ -272,7 +272,7 @@ static struct ulogd_plugin nfacct_plugin = {
        .stop           = &destructor_nfacct,
        .signal         = &signal_nfacct,
        .priv_size      = sizeof(struct nfacct_pluginstance),
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/dbi/ulogd_output_DBI.c b/output/dbi/ulogd_output_DBI.c
index 4b3ec164cf4f6076783169ee527bec3080521268..d2a9682933142f28741acf3c8fb05cf42bbd0e62 100644 (file)
--- a/output/dbi/ulogd_output_DBI.c
+++ b/output/dbi/ulogd_output_DBI.c
@@ -317,7 +317,7 @@ static struct ulogd_plugin dbi_plugin = {
        .stop           = &ulogd_db_stop,
        .signal         = &ulogd_db_signal,
        .interp         = &ulogd_db_interp,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c
index 94c8c9a7cede3b314c286b673330bc152aa7994d..e442e5a11ebf84e25d93fe3d59a6a465b7f82589 100644 (file)
--- a/output/mysql/ulogd_output_MYSQL.c
+++ b/output/mysql/ulogd_output_MYSQL.c
@@ -279,7 +279,7 @@ static struct ulogd_plugin plugin_mysql = {
        .stop      = &ulogd_db_stop,
        .signal    = &ulogd_db_signal,
        .interp    = &ulogd_db_interp,
-       .version   = ULOGD_VERSION,
+       .version   = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/pcap/ulogd_output_PCAP.c b/output/pcap/ulogd_output_PCAP.c
index 959919e8ae7bc38f314b14b35b69e1aa92c903c8..7b0ce31cbf4a362b583eafd2e862eed8b3b8dbc5 100644 (file)
--- a/output/pcap/ulogd_output_PCAP.c
+++ b/output/pcap/ulogd_output_PCAP.c
@@ -308,7 +308,7 @@ static struct ulogd_plugin pcap_plugin = {
        .stop           = &stop_pcap,
        .signal         = &signal_pcap,
        .interp         = &interp_pcap,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/pgsql/ulogd_output_PGSQL.c b/output/pgsql/ulogd_output_PGSQL.c
index 57206f4b781550e6bcea3a8d3314fce2571231a7..cd793ca3314cc0c464bf7c9090d3b3a13558b904 100644 (file)
--- a/output/pgsql/ulogd_output_PGSQL.c
+++ b/output/pgsql/ulogd_output_PGSQL.c
@@ -337,7 +337,7 @@ static struct ulogd_plugin pgsql_plugin = {
        .stop           = &ulogd_db_stop,
        .signal         = &ulogd_db_signal,
        .interp         = &ulogd_db_interp,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 6f371c3e8568c970a7358769501374c9a38256df..f9f2462c981cd0266cd092615ead021ebeee63e9 100644 (file)
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -448,7 +448,7 @@ static struct ulogd_plugin sqlite3_plugin = {
        .start = sqlite3_start,
        .stop = sqlite3_stop,
        .interp = sqlite3_interp,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 static void init(void) __attribute__((constructor));

diff --git a/output/ulogd_output_GPRINT.c b/output/ulogd_output_GPRINT.c
index 6d2a6291c635e3c0cf1969179bea7f0f2b968b9c..6dd83354d050e9589d941644934469f95cbd781e 100644 (file)
--- a/output/ulogd_output_GPRINT.c
+++ b/output/ulogd_output_GPRINT.c
@@ -259,7 +259,7 @@ static struct ulogd_plugin gprint_plugin = {
        .stop   = &gprint_fini,
        .signal = &sighup_handler_print,
        .config_kset = &gprint_kset,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_IPFIX.c b/output/ulogd_output_IPFIX.c
index 025faab4b5e1221a80ffe9aef42e89bab3071446..e29e34661e02f8e0c695cf1995c02e0884003a9e 100644 (file)
--- a/output/ulogd_output_IPFIX.c
+++ b/output/ulogd_output_IPFIX.c
@@ -536,7 +536,7 @@ static struct ulogd_plugin ipfix_plugin = {
 
        .interp         = &output_ipfix, 
        .signal         = &signal_handler_ipfix,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_LOGEMU.c b/output/ulogd_output_LOGEMU.c
index d616cbfe96a6777a21f2bf7a5c685157b90c398c..1d0a7e6745fd51ba6d915d72e687e293e4e8ce62 100644 (file)
--- a/output/ulogd_output_LOGEMU.c
+++ b/output/ulogd_output_LOGEMU.c
@@ -205,7 +205,7 @@ static struct ulogd_plugin logemu_plugin = {
 
        .interp         = &_output_logemu, 
        .signal         = &signal_handler_logemu,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_NACCT.c b/output/ulogd_output_NACCT.c
index f5296e8e982fce375c88d5472f86a2cd8bc6940a..04c5ab13b6b3e8a8a8156b68454e1b3047ab4191 100644 (file)
--- a/output/ulogd_output_NACCT.c
+++ b/output/ulogd_output_NACCT.c
@@ -249,7 +249,7 @@ static struct ulogd_plugin nacct_plugin = {
        .stop   = &nacct_fini,
        .signal = &sighup_handler_print,
        .config_kset = &nacct_kset,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_OPRINT.c b/output/ulogd_output_OPRINT.c
index de826908dc202624aee22cf1f8dec5dd0d2c7243..fc83d85a758e31a0b482d7e39ca3e97e88db7349 100644 (file)
--- a/output/ulogd_output_OPRINT.c
+++ b/output/ulogd_output_OPRINT.c
@@ -193,7 +193,7 @@ static struct ulogd_plugin oprint_plugin = {
        .stop   = &oprint_fini,
        .signal = &sighup_handler_print,
        .config_kset = &oprint_kset,
-       .version = ULOGD_VERSION,
+       .version = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_SYSLOG.c b/output/ulogd_output_SYSLOG.c
index 1812cb06160a78d4ce60ec57a15c1f2fb09c18f9..3bcc6377e0fb32aa09bd9fe808d60224300b4196 100644 (file)
--- a/output/ulogd_output_SYSLOG.c
+++ b/output/ulogd_output_SYSLOG.c
@@ -182,7 +182,7 @@ static struct ulogd_plugin syslog_plugin = {
        .start          = &syslog_start,
        .stop           = &syslog_fini,
        .interp         = &_output_syslog,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 2008772f8bda7ebb81519a70e8da1ce181bb4ef6..e9c39748168bac762b62f1e277b7889a26a4387c 100644 (file)
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -306,7 +306,7 @@ static struct ulogd_plugin xml_plugin = {
        .stop           = &xml_fini,
        .interp         = &xml_output,
        .signal         = &xml_signal_handler,
-       .version        = ULOGD_VERSION,
+       .version        = VERSION,
 };
 
 void __attribute__ ((constructor)) init(void);

diff --git a/src/ulogd.c b/src/ulogd.c
index c065c2f6d9e2d25021a4ae734a6577e8b5a0b5f0..e509effc6addc904a9c42301184cfd031b649872 100644 (file)
--- a/src/ulogd.c
+++ b/src/ulogd.c
@@ -356,7 +356,7 @@ void get_plugin_infos(struct ulogd_plugin *me)
 /* the function called by all plugins for registering themselves */
 void ulogd_register_plugin(struct ulogd_plugin *me)
 {
-       if (strcmp(me->version, ULOGD_VERSION)) { 
+       if (strcmp(me->version, VERSION)) { 
                ulogd_log(ULOGD_NOTICE, 
                          "plugin `%s' has incompatible version %s\n",
                          me->version);
@@ -936,7 +936,7 @@ static int logfile_open(const char *name)
                        exit(2);
                }
        }
-       ulogd_log(ULOGD_INFO, "ulogd Version %s (re-)starting\n", ULOGD_VERSION);
+       ulogd_log(ULOGD_INFO, "ulogd Version %s (re-)starting\n", VERSION);
        return 0;
 }
 
@@ -1089,7 +1089,7 @@ static void signal_handler(int signal)
 static void print_usage(void)
 {
        /* FIXME */
-       printf("ulogd Version %s\n", ULOGD_VERSION);
+       printf("ulogd Version %s\n", VERSION);
        printf(COPYRIGHT);
        printf("This is free software with ABSOLUTELY NO WARRANTY.\n\n");
        printf("Parameters:\n");
@@ -1145,7 +1145,7 @@ int main(int argc, char* argv[])
                        daemonize = 1;
                        break;
                case 'V':
-                       printf("ulogd Version %s\n", ULOGD_VERSION);
+                       printf("ulogd Version %s\n", VERSION);
                        printf(COPYRIGHT);
                        exit(0);
                        break;