diff options
29 files changed, 31 insertions, 33 deletions
diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c index 220bc8d..d0fcdfa 100644 --- 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 3b713a5..2f266fa 100644 --- 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 152c26d..41e556d 100644 --- 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 a8688fe..84fe21b 100644 --- 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 2716fce..1d426a6 100644 --- 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 b9be16d..146c054 100644 --- 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 1a7c2fd..b113f7d 100644 --- 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 1de1ba6..95351f8 100644 --- 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 3313194..de5c468 100644 --- 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 a6cbf94..439a8b3 100644 --- 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 88de3ca..81933f2 100644 --- 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 ba0c51c..0946b4c 100644 --- 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 0eff1f0..7870c31 100644 --- 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 80bbd5f..45ffc8b 100644 --- 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 368df93..e4009f3 100644 --- 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 46767b7..7852b27 100644 --- 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 4b3ec16..d2a9682 100644 --- 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 94c8c9a..e442e5a 100644 --- 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 959919e..7b0ce31 100644 --- 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 57206f4..cd793ca 100644 --- 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 6f371c3..f9f2462 100644 --- 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 6d2a629..6dd8335 100644 --- 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 025faab..e29e346 100644 --- 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 d616cbf..1d0a7e6 100644 --- 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 f5296e8..04c5ab1 100644 --- 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 de82690..fc83d85 100644 --- 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 1812cb0..3bcc637 100644 --- 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 2008772..e9c3974 100644 --- 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 c065c2f..e509eff 100644 --- 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; |