March 2012 - syslog-ng - lists.balabit.hu

On FreeBSd: syslog-ng: I/O error occurred while writing; fd='xx', error='No buffer space available (yy)'
by Traiano Welcome 02 Apr '12

02 Apr '12

Hi List I've been seeing the following in the messages log of my freebsd syslog server for quite some time now: --- Mar 20 12:19:12 syslog2 syslog-ng[35313]: I/O error occurred while writing; fd='12', error='No buffer space available (55)' Mar 20 12:19:12 syslog2 syslog-ng[35313]: Connection broken; time_reopen='60' Mar 20 12:19:12 syslog2 syslog-ng[35313]: I/O error occurred while writing; fd='13', error='No buffer space available (55)' Mar 20 12:19:12 syslog2 syslog-ng[35313]: Connection broken; time_reopen='60' --- These happen at a frequency of about 7 per minute on average. See attached trend graphs for an idea of the volume of traffic we're doing, as well as the memory and cpu utilisation trends on this server during this period. As can be seen from the graphs, load does not seem to be the issue. Occasionally during the week, the system freezes and requires a reboot, I think it's related to the above message, though I'm not sure. My question is: What does this error mean, and how can I resolve it? I have tried to frame this as an operating system kernel resource issue, and experimented with increasing the freebsd kernel sysctls for UDP performance: --- [root@syslog2 <mailto:root@syslog2.ops.mtnbusiness.co.za> /var/log]# sysctl kern.ipc.nmbclusters=102400 kern.ipc.nmbclusters: 25600 -> 102400 [root@syslog2 <mailto:root@syslog2.ops.mtnbusiness.co.za> /var/log]# sysctl kern.ipc.maxsockbuf=201326592 kern.ipc.maxsockbuf: 100663296 -> 201326592 [root@syslog2 <mailto:root@syslog2.ops.mtnbusiness.co.za> /var/log]# sysctl net.inet.udp.recvspace=33554432 net.inet.udp.recvspace: 16777216 -> 33554432 --- This has reduced the frequency of the errors a little, but in general the problem still remains. Syslog version: -- [root@syslog2]# syslog-ng -V syslog-ng 2.0.10 -- FreeBSD version: -- FreeBSD 7.2-STABLE #0 -- Any help would be much appreciated! Traiano

3 4

Building syslog-ng on OpenBSD v5 with SQL support
by Richard Brooks 01 Apr '12

01 Apr '12

I'm having a really hard time trying to find out how to tweak the make file supplied on the ports for syslog-ng v3.1.4, so that I get a binary that supports SQL on OpenBSD. Any tips would be gratefully received. Regards Richard

2 2

Known memory leak issues in 3.3.4?
by Marvin Nipper 01 Apr '12

01 Apr '12

After considerable effort, I managed to get 3.3.4 built (using gcc 4.4.2, along with glib 2.29.92 and the requisite eventlog 0.2.12). The problem is that the resulting syslog-ng component grows continuously (at an alarming rate). Whereas my 3.0.5 syslog-ng process starts out running in just under 3MB, and then stabilizes at about 3.3MB, the 3.3.4 version starts out small, and then at the point where I killed it (about 2 hours after starting it), it had already grown to 277MB. I'm doing nothing fancy here (config shown below). No data transformations, no use of time normalization features, no DB components. In short, I'm not trying to use any of the many new/elaborate features that have been added over the past few years. I'm just "eating log input", writing it to handful of files and pipes, just like I've been doing since the syslog-ng 2.x days. As one of the regular problems that I see mentioned in various threads is "some new fix for a memory leak", I'm just trying to see if there's some known problem in the virgin 3.3.4 code, that might be causing my problems. (I.E. should I wait for 3.3.5, and try again?) FYI, my environment is Solaris 10 x86. Aside from having moved to the newer gcc compiler (in order to even attempt to compile the latest syslog-ng version), the only other major component change was the newer version of glib, which as I recall, was also necessary to resolve compilation issues with the new syslog-ng versions. Anyway... before I beat my head against the wall trying to figure out what to do next, I figured that I'd ask the easy question (about "known bugs") first, so that I don't spend any time chasing a problem that may already be fixed. (I did dig thru the mailing list, and saw at least one mention of a memory leak in 3.3.4, but it seemed to be related to a specific bit of functionality, that I didn't think applied in my situation.) (And just a side-comment, FWIW, I noticed that when I swapped the 3.3.4 version, for the 3.0.5 version, the host system immediately incurred what I estimate to be at least a 20% high CPU load that had been required by the 3.0.5 version. And when I reverted back to 3.0.5 a few hours later, I saw that happen in reverse. I'm not sure why the newest version requires more resources, again, when I'm not asking it to do anything new, but it definitely seems that it does.) Thanks for your time and input. Existing config file shown below. Note that other than the version change, the only other modification (from the file that I was using in 3.0.5) relates to the threading changes, which I made based upon Bazsi's recommendations in an email on 3/18, about how to avoid potential data loss on inbound UDP packets. Again, thanks for any help/input: @version:3.3 options { dir_perm(0755); perm(0640); group(wheel); chain_hostnames(no); keep_hostname(yes); log_fifo_size(41000); threaded(no); dns_cache_size(5000); dns_cache_expire(86400); dns_cache_expire_failed(86400); }; source any_udp { udp(flags(store-legacy-msghdr)); }; source any_tcp { tcp(port(601) max-connections(40) flags("store-legacy-msghdr", "threaded") use_dns(no)); }; destination SEC {pipe("/tmp/sec"); }; destination WIN-PIPE {pipe("/tmp/windows"); }; destination routers_log { file("/var/adm/log/routers.log" create_dirs(yes) flags("threaded")); }; destination ravlin_log { file("/var/adm/log/ravlin.log" create_dirs(yes) flags("threaded")); }; destination windows_log { file("/var/adm/log/windows.log" create_dirs(yes) flags("threaded")); }; destination workstation_log { file("/var/adm/log/workstation.log" create_dirs(yes) flags("threaded")); }; destination catch-all_log { file("/var/adm/log/catch-all.log" create_dirs(yes) flags("threaded")); }; destination test { file("/var/adm/log/test.log" create_dirs(yes) flags("threaded")); }; destination dev_null {}; destination secdevedc01 { udp("10.132.193.245" spoof_source(yes) flags("threaded")); }; destination engedc01 { udp("10.132.192.199" spoof_source(yes) flags("threaded")); }; destination egssiem { udp("10.10.36.157" spoof_source(yes) flags("threaded")); }; log { source(any_udp); destination(SEC); }; log { source(any_udp); destination(egssiem); }; filter f_4 { facility(syslog) and level(info..emerg); }; log { source(any_udp); filter(f_4); destination(WIN-PIPE); }; log { source(any_udp); filter(f_4); destination(windows_log); flags(final); }; filter f_1_acl { facility(local5) and level(debug..emerg) and match("SEC-6-IPACCESSLOG" value("MESSAGE")) ; }; filter f_1 { facility(local5) and level(debug..emerg); }; log { source(any_udp); filter(f_1_acl); destination(routers_log); flags(final); }; log { source(any_udp); filter(f_1); destination(engedc01); }; log { source(any_udp); filter(f_1); destination(routers_log); flags(final); }; filter SonicWallNoise { match("id=firewall" value("MESSAGE")) and filter(SonicWallMsgs); }; filter SonicWallMsgs { match("m=97" value("MESSAGE")) or match("m=98" value("MESSAGE")) or match("m=537" value("MESSAGE")); }; log { source(any_udp); filter(SonicWallNoise); destination(dev_null); flags(final); }; filter f_3 { facility(local0) and level(debug..emerg); }; log { source(any_udp); filter(f_3); destination(ravlin_log); flags(final); }; log { source(any_tcp); destination(workstation_log); flags(final); }; log { source(any_udp); destination(catch-all_log); flags(final); }; Marvin Nipper Director of Security Stream Global Services mailto:marvin.nipper@stream.com ph: (303) 670-2705 PGP Key ID: 0x8EE28551 (DSS/DH) 8C5D 403A D107 0A95 672B B637 BCF1 919A 8EE2 8551 This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.

5 10

[Bug 166] New: syslog-ng abort when using pgsql
by bugzilla＠bugzilla.balabit.com 31 Mar '12

31 Mar '12

https://bugzilla.balabit.com/show_bug.cgi?id=166 Summary: syslog-ng abort when using pgsql Product: syslog-ng Version: 3.4.x Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: unspecified Component: syslog-ng AssignedTo: bazsi(a)balabit.hu ReportedBy: whille(a)163.com Type of the Report: --- Estimated Hours: 0.0 syslog-ng aborted after running a while, several minutes or within a hour. service syslog-ng will restart process, so i'm using just process to debug: /usr/local/sbin/syslog-ng -d -F > syslogdbg.log 2>&1 last log of syslog-ng itself: Incoming log entry; line='<118>1 2012-03-02T18:54:00+08:00 signal signalingd - - [meta sequenceId="287054"] {"device_ext_ip":"172.18.195.218","to":"407edfb0-cbd5-4b5b-be63-2b3b632b0cc1","app":"d160fca0-3793-11e1-b86c-0800200c9a66","event_id":771,"chunk_type":"conf","chunk_number":1,"event_src_ip":"110.132.142.102","event_dst_ip":"110.132.142.100","devicemac":"222DB98C1600","devicename":"DCS-940","from":"F07D68078020"}\x0a' Rewrite expression evaluation result; value='.SDATA.meta.sequenceId', new_value='4' Filter rule evaluation begins; filter_rule='f_prg' Filter node evaluation result; filter_result='match' Filter rule evaluation result; filter_result='match', filter_rule='f_prg' Filter rule evaluation begins; filter_rule='f_oq0' Filter node evaluation result; filter_result='not-match', filter_type='CMP' Filter rule evaluation result; filter_result='not-match', filter_rule='f_oq0' Filter rule evaluation begins; filter_rule='f_oq1' Filter node evaluation result; filter_result='not-match', filter_type='CMP' Filter rule evaluation result; filter_result='not-match', filter_rule='f_oq1' file logqueue-fifo.c: line 388 (log_queue_fifo_ack_backlog): assertion failed: (s->parallel_push_notify == NULL) syslog-ng -V syslog-ng 3.3.4 Installer-Version: 3.3.4 Revision: ssh+git://bazsi@git.balabit//var/scm/git/syslog-ng/syslog-ng-ose--mainline--3.3#master#5e44eb46b0d7b86b62f17698e2b6de875ac8d7c6 Compile-Date: Mar 5 2012 21:18:10 Default-Modules: affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat,afsql Available-Modules: afmongodb,dbparser,afsocket-tls,affile,basicfuncs,csvparser,syslogformat,dummy,afsocket,convertfuncs,afprog,afuser,afsql,confgen Enable-Debug: off Enable-GProf: off Enable-Memtrace: off Enable-IPv6: on Enable-Spoof-Source: off Enable-TCP-Wrapper: on Enable-Linux-Caps: off Enable-Pcre: off -- Configure bugmail: https://bugzilla.balabit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching all bug changes.

1 4

[PATCH] json-parser: Change the way arrays are formatted
by Gergely Nagy 31 Mar '12

31 Mar '12

Instead of parsing an array into key-value pairs where the key has a suffix of a dot, followed by the array index, make the key resemble the javascript array syntax: array[index]. This makes it more intuitive to reach into arrays, and also makes it easier to discover arrays when formatting back to JSON. Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> --- modules/jsonparser/jsonparser.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/jsonparser/jsonparser.c b/modules/jsonparser/jsonparser.c index b362f49..44406da 100644 --- a/modules/jsonparser/jsonparser.c +++ b/modules/jsonparser/jsonparser.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2011 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 2011 Gergely Nagy <algernon(a)balabit.hu> + * Copyright (c) 2011-2012 BalaBit IT Ltd, Budapest, Hungary + * Copyright (c) 2011-2012 Gergely Nagy <algernon(a)balabit.hu> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -96,14 +96,13 @@ log_json_parser_process_single (struct json_object *jso, gint i, plen; g_string_assign (sb_string (key), obj_key); - g_string_append_c (sb_string (key), '.'); plen = sb_string (key)->len; for (i = 0; i < json_object_array_length (jso); i++) { g_string_truncate (sb_string (key), plen); - g_string_append_printf (sb_string (key), "%d", i); + g_string_append_printf (sb_string (key), "[%d]", i); log_json_parser_process_single (json_object_array_get_idx (jso, i), prefix, sb_string (key)->str, msg); -- 1.7.9

2 2

syslog-ng large NVTable patch
by Peter Eisenlohr 31 Mar '12

31 Mar '12

Hi, as requested by bazsi in the forums http://www.syslog.org/forum/index.php?topic=1218.0 here's a patch against syslog-ng enabling it to handle log messages larger than the current 256k limit. This is done by extending NVTable's data structures from 16 to 32 bit. The patch also contains simple code for automatic resizing of the receive buffer. 'log_msg_size' is still honoured, though. I have been using this to regularly receive multi-MB XML messages and process them into log files. I developed the patch against 3.3.1, but also tested it with 3.3.3 and on x64 as well. 'make check' runs fine, too -- but still, use at your own risk. Peter

3 6

Use multiple templates for a single file?
by Mikkel Leth Carlsen 31 Mar '12

31 Mar '12

Hi Is it somehow possible to apply multiple templates to a single destination/file? My current setup is something along the lines of: destination dst_foo_1 { file("foo_1.log" template(template_foo_1)); }; destination dst_foo_2 { file("foo_2.log" template(template_foo_2)); }; template template_foo_1 { template("$A $B $C"); }; template template_foo_2 { template("$D $E $F"); }; log { source(src_udp); filter(filter_condition_1); parser(parser_foo); destination(dst_foo_1); flags(final); }; log { source(src_udp); filter(filter_condition_2); parser(parser_foo); destination(dst_foo_2); flags(final); }; However, I would really like to write log into a single file - but with two different templates depending on the matched filter. Is that possible? I don't suppose pointing both destinations to the same file would be wise? /Mikkel

3 2

[PATCH 1/2] cfg-lexer: Split cfg_lexer_include_file() into two functions
by Gergely Nagy 31 Mar '12

31 Mar '12

To be able to keep the code simple in the future, split cfg_lexer_include_file() into two: the intent is that we'll check if the file exists, and if not, try the same thing as a glob, otherwise continue as we did before. This would nest too deep, so split out the current bulk into a separate function. Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> --- lib/cfg-lexer.c | 59 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/lib/cfg-lexer.c b/lib/cfg-lexer.c index 6143a27..cfe229f 100644 --- a/lib/cfg-lexer.c +++ b/lib/cfg-lexer.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler + * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary + * Copyright (c) 1998-2012 Balázs Scheidler * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -379,32 +379,18 @@ cfg_lexer_start_next_include(CfgLexer *self) return TRUE; } -gboolean -cfg_lexer_include_file(CfgLexer *self, const gchar *filename_) +static gboolean +cfg_lexer_include_file_simple(CfgLexer *self, gchar *filename) { - struct stat st; CfgIncludeLevel *level; - gchar *filename; + struct stat st; - if (self->include_depth >= MAX_INCLUDE_DEPTH - 1) + if (stat(filename, &st) < 0) { - msg_error("Include file depth is too deep, increase MAX_INCLUDE_DEPTH and recompile", - evt_tag_str("filename", filename_), - evt_tag_int("depth", self->include_depth), - NULL); + g_free(filename); return FALSE; } - filename = find_file_in_path(cfg_args_get(self->globals, "include-path"), filename_, G_FILE_TEST_EXISTS); - if (!filename || stat(filename, &st) < 0) - { - msg_error("Include file/directory not found", - evt_tag_str("filename", filename_), - evt_tag_str("include-path", cfg_args_get(self->globals, "include-path")), - evt_tag_errno("error", errno), - NULL); - return FALSE; - } self->include_depth++; level = &self->include_stack[self->include_depth]; level->include_type = CFGI_FILE; @@ -488,10 +474,41 @@ cfg_lexer_include_file(CfgLexer *self, const gchar *filename_) g_slist_foreach(level->file.files, (GFunc) g_free, NULL); g_slist_free(level->file.files); level->file.files = NULL; + return FALSE; } gboolean +cfg_lexer_include_file(CfgLexer *self, const gchar *filename_) +{ + struct stat st; + CfgIncludeLevel *level; + gchar *filename; + + if (self->include_depth >= MAX_INCLUDE_DEPTH - 1) + { + msg_error("Include file depth is too deep, increase MAX_INCLUDE_DEPTH and recompile", + evt_tag_str("filename", filename_), + evt_tag_int("depth", self->include_depth), + NULL); + return FALSE; + } + + filename = find_file_in_path(cfg_args_get(self->globals, "include-path"), filename_, G_FILE_TEST_EXISTS); + if (!filename || stat(filename, &st) < 0) + { + msg_error("Include file/directory not found", + evt_tag_str("filename", filename_), + evt_tag_str("include-path", cfg_args_get(self->globals, "include-path")), + evt_tag_errno("error", errno), + NULL); + return FALSE; + } + else + return cfg_lexer_include_file_simple(self, filename); +} + +gboolean cfg_lexer_include_buffer(CfgLexer *self, const gchar *name, gchar *buffer, gsize length) { CfgIncludeLevel *level; -- 1.7.9

2 3

[PATCH] afmongodb: Restore compatibility with syslog-ng 3.3
by Gergely Nagy 31 Mar '12

31 Mar '12

In syslog-ng 3.3, we had the host() and port() options for the mongodb driver, these were removed in 3.4 in favour of servers(). This patch re-adds this two. Using host() and port() will now prepend the specified combination to the server list. Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> --- modules/afmongodb/afmongodb-grammar.ym | 2 ++ modules/afmongodb/afmongodb-parser.c | 2 ++ modules/afmongodb/afmongodb.c | 25 +++++++++++++++++++++++++ modules/afmongodb/afmongodb.h | 2 ++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/modules/afmongodb/afmongodb-grammar.ym b/modules/afmongodb/afmongodb-grammar.ym index a21e23c..71dd46d 100644 --- a/modules/afmongodb/afmongodb-grammar.ym +++ b/modules/afmongodb/afmongodb-grammar.ym @@ -75,6 +75,8 @@ afmongodb_option | KW_USERNAME '(' string ')' { afmongodb_dd_set_user(last_driver, $3); free($3); } | KW_PASSWORD '(' string ')' { afmongodb_dd_set_password(last_driver, $3); free($3); } | KW_SAFE_MODE '(' yesno ')' { afmongodb_dd_set_safe_mode(last_driver, $3); } + | KW_HOST '(' string ')' { afmongodb_dd_set_host(last_driver, $3); free($3); } + | KW_PORT '(' LL_NUMBER ')' { afmongodb_dd_set_port(last_driver, $3); } | value_pair_option { afmongodb_dd_set_value_pairs(last_driver, $1); } | dest_driver_option ; diff --git a/modules/afmongodb/afmongodb-parser.c b/modules/afmongodb/afmongodb-parser.c index b8c9ead..9d72878 100644 --- a/modules/afmongodb/afmongodb-parser.c +++ b/modules/afmongodb/afmongodb-parser.c @@ -36,6 +36,8 @@ static CfgLexerKeyword afmongodb_keywords[] = { { "username", KW_USERNAME }, { "password", KW_PASSWORD }, { "safe_mode", KW_SAFE_MODE }, + { "host", KW_HOST }, + { "port", KW_PORT }, { NULL } }; diff --git a/modules/afmongodb/afmongodb.c b/modules/afmongodb/afmongodb.c index de78b23..9d75799 100644 --- a/modules/afmongodb/afmongodb.c +++ b/modules/afmongodb/afmongodb.c @@ -112,6 +112,23 @@ afmongodb_dd_set_password(LogDriver *d, const gchar *password) } void +afmongodb_dd_set_host(LogDriver *d, const gchar *host) +{ + MongoDBDestDriver *self = (MongoDBDestDriver *)d; + + g_free(self->host); + self->host = g_strdup(host); +} + +void +afmongodb_dd_set_port(LogDriver *d, gint port) +{ + MongoDBDestDriver *self = (MongoDBDestDriver *)d; + + self->port = port; +} + +void afmongodb_dd_set_servers(LogDriver *d, GList *servers) { MongoDBDestDriver *self = (MongoDBDestDriver *)d; @@ -450,6 +467,14 @@ afmongodb_dd_init(LogPipe *s) value_pairs_add_scope(self->vp, "nv-pairs"); } + if (self->host) + { + gchar *srv = g_strdup_printf ("%s:%d", self->host, + (self->port) ? self->port : 27017); + self->servers = g_list_prepend (self->servers, srv); + g_free (self->host); + } + self->host = NULL; self->port = 27017; if (!mongo_util_parse_addr(g_list_nth_data(self->servers, 0), &self->host, diff --git a/modules/afmongodb/afmongodb.h b/modules/afmongodb/afmongodb.h index 9950d26..e1f4b57 100644 --- a/modules/afmongodb/afmongodb.h +++ b/modules/afmongodb/afmongodb.h @@ -30,6 +30,8 @@ LogDriver *afmongodb_dd_new(void); void afmongodb_dd_set_servers(LogDriver *d, GList *servers); +void afmongodb_dd_set_host(LogDriver *d, const gchar *host); +void afmongodb_dd_set_port(LogDriver *d, gint port); void afmongodb_dd_set_database(LogDriver *d, const gchar *database); void afmongodb_dd_set_collection(LogDriver *d, const gchar *collection); void afmongodb_dd_set_user(LogDriver *d, const gchar *user); -- 1.7.9

2 1

[PATCH] dummy: Remove this module.
by Gergely Nagy 31 Mar '12

31 Mar '12

The dummy module does nothing, yet, is installed by default. It's not a terribly great example of a simple module, either. For these reasons and more, lets bid it a tearful farewell. Signed-off-by: Gergely Nagy <algernon(a)balabit.hu> --- configure.in | 1 - modules/Makefile.am | 2 +- modules/dummy/Makefile.am | 14 ------- modules/dummy/dummy-grammar.ym | 75 --------------------------------------- modules/dummy/dummy-parser.c | 48 ------------------------- modules/dummy/dummy-parser.h | 35 ------------------ modules/dummy/dummy.c | 76 ---------------------------------------- modules/dummy/dummy.h | 37 ------------------- 8 files changed, 1 insertions(+), 287 deletions(-) delete mode 100644 modules/dummy/Makefile.am delete mode 100644 modules/dummy/dummy-grammar.ym delete mode 100644 modules/dummy/dummy-parser.c delete mode 100644 modules/dummy/dummy-parser.h delete mode 100644 modules/dummy/dummy.c delete mode 100644 modules/dummy/dummy.h diff --git a/configure.in b/configure.in index 995c202..d9b50bc 100644 --- a/configure.in +++ b/configure.in @@ -1160,7 +1160,6 @@ AC_OUTPUT(dist.conf lib/Makefile syslog-ng/Makefile modules/Makefile - modules/dummy/Makefile modules/afsocket/Makefile modules/afsql/Makefile modules/afstreams/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index bbb3b1a..983f67a 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1 +1 @@ -SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser dummy +SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser diff --git a/modules/dummy/Makefile.am b/modules/dummy/Makefile.am deleted file mode 100644 index 5e90ff6..0000000 --- a/modules/dummy/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -moduledir = @moduledir@ -AM_CPPFLAGS = -I$(top_srcdir)/lib -I../../lib -module_LTLIBRARIES = libdummy.la - -export top_srcdir - -libdummy_la_SOURCES = dummy-grammar.y dummy.c dummy.h dummy-parser.c dummy-parser.h -libdummy_la_LIBADD = $(MODULE_DEPS_LIBS) -libdummy_la_LDFLAGS = $(MODULE_LDFLAGS) - -BUILT_SOURCES = dummy-grammar.y dummy-grammar.c dummy-grammar.h -EXTRA_DIST = $(BUILT_SOURCES) dummy-grammar.ym - -include $(top_srcdir)/build/lex-rules.am diff --git a/modules/dummy/dummy-grammar.ym b/modules/dummy/dummy-grammar.ym deleted file mode 100644 index 3179e11..0000000 --- a/modules/dummy/dummy-grammar.ym +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -%code requires { - -#include "dummy-parser.h" - -} - -%code { - -#include "cfg-parser.h" -#include "dummy-grammar.h" -#include "plugin.h" - -extern LogDriver *last_driver; - -} - -%name-prefix "dummy_" -%lex-param {CfgLexer *lexer} -%parse-param {CfgLexer *lexer} -%parse-param {LogDriver **instance} -%parse-param {gpointer arg} - - -/* INCLUDE_DECLS */ - -%token KW_DUMMY -%token KW_DUMMY_OPT - -%% - -start - : LL_CONTEXT_DESTINATION KW_DUMMY - { - last_driver = *instance = dummy_dd_new(); - } - '(' dummy_options ')' { YYACCEPT; } - ; - -dummy_options - : dummy_option dummy_options - | - ; - -dummy_option - : KW_DUMMY_OPT '(' yesno ')' { ((DummyDestDriver *)last_driver)->opt = $3; }; - | dest_driver_option - ; - - -/* INCLUDE_RULES */ - -%% diff --git a/modules/dummy/dummy-parser.c b/modules/dummy/dummy-parser.c deleted file mode 100644 index 2951563..0000000 --- a/modules/dummy/dummy-parser.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -#include "dummy.h" -#include "cfg-parser.h" -#include "dummy-grammar.h" - -extern int dummy_debug; -int dummy_parse(CfgLexer *lexer, DummyDestDriver **instance, gpointer arg); - -static CfgLexerKeyword dummy_keywords[] = { - { "dummy", KW_DUMMY }, - { "dummy_opt", KW_DUMMY_OPT }, - { NULL } -}; - -CfgParser dummy_parser = -{ -#if ENABLE_DEBUG - .debug_flag = &dummy_debug, -#endif - .name = "dummy", - .keywords = dummy_keywords, - .parse = (int (*)(CfgLexer *lexer, gpointer *instance, gpointer arg)) dummy_parse, - .cleanup = (void (*)(gpointer)) log_pipe_unref, -}; - -CFG_PARSER_IMPLEMENT_LEXER_BINDING(dummy_, LogDriver **) diff --git a/modules/dummy/dummy-parser.h b/modules/dummy/dummy-parser.h deleted file mode 100644 index 37a9e8f..0000000 --- a/modules/dummy/dummy-parser.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -#ifndef DUMMY_PARSER_H_INCLUDED -#define DUMMY_PARSER_H_INCLUDED - -#include "cfg-parser.h" -#include "cfg-lexer.h" -#include "dummy.h" - -extern CfgParser dummy_parser; - -CFG_PARSER_DECLARE_LEXER_BINDING(dummy_, LogDriver **) - -#endif diff --git a/modules/dummy/dummy.c b/modules/dummy/dummy.c deleted file mode 100644 index f27667b..0000000 --- a/modules/dummy/dummy.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -#include "dummy.h" -#include "dummy-parser.h" -#include "plugin.h" -#include "messages.h" - -static void -dummy_dd_queue(LogPipe *s, LogMessage *msg, const LogPathOptions *path_options, gpointer user_data) -{ - DummyDestDriver *self = (DummyDestDriver *) s; - msg_notice("Dummy plugin received a message", - evt_tag_str("msg", log_msg_get_value(msg, LM_V_MESSAGE, NULL)), - evt_tag_int("opt", self->opt), - NULL); - - log_dest_driver_queue_method(s, msg, path_options, user_data); -} - -LogDriver * -dummy_dd_new(void) -{ - DummyDestDriver *self = g_new0(DummyDestDriver, 1); - - log_dest_driver_init_instance(&self->super); - self->super.super.super.queue = dummy_dd_queue; - - return &self->super.super; -} - -extern CfgParser dummy_dd_parser; - -static Plugin dummy_plugin = -{ - .type = LL_CONTEXT_DESTINATION, - .name = "dummy", - .parser = &dummy_parser, -}; - -gboolean -dummy_module_init(GlobalConfig *cfg, CfgArgs *args) -{ - plugin_register(cfg, &dummy_plugin, 1); - return TRUE; -} - -const ModuleInfo module_info = -{ - .canonical_name = "dummy", - .version = VERSION, - .description = "The dummy module is a sample destination driver not really doing any kind of useful work.", - .core_revision = SOURCE_REVISION, - .plugins = &dummy_plugin, - .plugins_len = 1, -}; diff --git a/modules/dummy/dummy.h b/modules/dummy/dummy.h deleted file mode 100644 index d99c7bf..0000000 --- a/modules/dummy/dummy.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2002-2010 BalaBit IT Ltd, Budapest, Hungary - * Copyright (c) 1998-2010 Balázs Scheidler - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As an additional exemption you are allowed to compile & link against the - * OpenSSL libraries as published by the OpenSSL project. See the file - * COPYING for details. - * - */ - -#ifndef DUMMY_H_INCLUDED -#define DUMMY_H_INCLUDED - -#include "driver.h" - -typedef struct -{ - LogDestDriver super; - gint opt; -} DummyDestDriver; - -LogDriver *dummy_dd_new(void); - -#endif -- 1.7.9

2 1