From bbfa04fbe63f1bbb47f5cdc683045cf2775b3977 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 19 Mar 2009 17:50:07 +0100
Subject: improved testing support

worked on ways to provide a better test suite:
- added -T rsyslogd command line option, enables to specify a directory
  where to chroot() into on startup. This is NOT a security feature but
  introduced to support testing. Thus, -T does not make sure chroot()
  is used in a secure way. (may be removed later)
- added omstdout module for testing purposes. Spits out all messages to
  stdout - no config option, no other features
- modified $ModLoad statement so that for modules whom's name starts with
  a dot, no path is prepended (this enables relative-pathes and should
  not break any valid current config)
---
 ChangeLog                    |   9 ++++
 Makefile.am                  |   8 +--
 configure.ac                 |  21 +++++++-
 plugins/omstdout/Makefile.am |   8 +++
 plugins/omstdout/omstdout.c  | 125 +++++++++++++++++++++++++++++++++++++++++++
 runtime/modules.c            |   2 +-
 tests/Makefile.am            |   3 ++
 tools/syslogd.c              |  17 +++++-
 8 files changed, 187 insertions(+), 6 deletions(-)
 create mode 100644 plugins/omstdout/Makefile.am
 create mode 100644 plugins/omstdout/omstdout.c

diff --git a/ChangeLog b/ChangeLog
index 8c8442e2..1cfb3c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@ Version 4.1.6  [DEVEL] (rgerhards), 2009-03-??
   issue with the function call VM instruction set design.
 - implemented the strlen() RainerScript function
 - added a template output module
+- added -T rsyslogd command line option, enables to specify a directory
+  where to chroot() into on startup. This is NOT a security feature but
+  introduced to support testing. Thus, -T does not make sure chroot()
+  is used in a secure way. (may be removed later)
+- added omstdout module for testing purposes. Spits out all messages to
+  stdout - no config option, no other features
+- modified $ModLoad statement so that for modules whom's name starts with
+  a dot, no path is prepended (this enables relative-pathes and should
+  not break any valid current config)
 ---------------------------------------------------------------------------
 Version 4.1.5  [DEVEL] (rgerhards), 2009-03-11
 - bugfix: parser did not correctly parse fields in UDP-received messages
diff --git a/Makefile.am b/Makefile.am
index 87e378ee..97f4aed3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS=dejagnu
-
 sbin_PROGRAMS =
 pkglib_LTLIBRARIES = 
 
@@ -90,6 +88,10 @@ if ENABLE_IMTEMPLATE
 SUBDIRS += plugins/imtemplate
 endif
 
+if ENABLE_OMSTDOUT
+SUBDIRS += plugins/omstdout
+endif
+
 if ENABLE_OMTEMPLATE
 SUBDIRS += plugins/omtemplate
 endif
@@ -120,5 +122,5 @@ SUBDIRS += tests
 # temporarily be removed below. The intent behind forcing everthing to compile
 # in a make distcheck is so that we detect code that accidently was not updated
 # when some global update happened.
-DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog  --enable-diagtools --enable-gnutls
+DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog  --enable-diagtools --enable-gnutls --enable-omstdout
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 0c9483ca..fcd935e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -688,6 +688,23 @@ AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes)
 # end of copy template - be sure to serach for omtemplate to find everything!
 
 
+# settings for omstdout
+AC_ARG_ENABLE(omstdout,
+        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_omstdout="yes" ;;
+          no) enable_omstdout="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-omstdout) ;;
+         esac],
+        [enable_omstdout=no]
+)
+#
+# you may want to do some library checks here - see snmp, mysql, pgsql modules
+# for samples
+#
+AM_CONDITIONAL(ENABLE_OMSTDOUT, test x$enable_omstdout = xyes)
+
+
 AC_CONFIG_FILES([Makefile \
 		runtime/Makefile \
 		tools/Makefile \
@@ -701,6 +718,7 @@ AC_CONFIG_FILES([Makefile \
 		plugins/imklog/Makefile \
 		plugins/imtemplate/Makefile \
 		plugins/omtemplate/Makefile \
+		plugins/omstdout/Makefile \
 		plugins/imfile/Makefile \
 		plugins/imrelp/Makefile \
 		plugins/imdiag/Makefile \
@@ -731,7 +749,8 @@ echo "RELP support enabled:                     $enable_relp"
 echo "imdiag enabled:                           $enable_imdiag"
 echo "file input module enabled:                $enable_imfile"
 echo "input template module will be compiled:   $enable_imtemplate"
-echo "output template module will be compiled:   $enable_omtemplate"
+echo "output template module will be compiled:  $enable_omtemplate"
+echo "omstdout module will be compiled:         $enable_omstdout"
 echo "Large file support enabled:               $enable_largefile"
 echo "Networking support enabled:               $enable_inet"
 echo "GnuTLS network stream driver enabled:     $enable_gnutls"
diff --git a/plugins/omstdout/Makefile.am b/plugins/omstdout/Makefile.am
new file mode 100644
index 00000000..9f5d497f
--- /dev/null
+++ b/plugins/omstdout/Makefile.am
@@ -0,0 +1,8 @@
+pkglib_LTLIBRARIES = omstdout.la
+
+omstdout_la_SOURCES = omstdout.c
+omstdout_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
+omstdout_la_LDFLAGS = -module -avoid-version
+omstdout_la_LIBADD = 
+
+EXTRA_DIST = 
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c
new file mode 100644
index 00000000..6e227ba9
--- /dev/null
+++ b/plugins/omstdout/omstdout.c
@@ -0,0 +1,125 @@
+/* omstdout.c
+ * send all output to stdout - this is primarily a test driver (but may
+ * be used for weired use cases). Not tested for robustness!
+ *
+ * NOTE: read comments in module-template.h for more specifics!
+ *
+ * File begun on 2009-03-19 by RGerhards
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include "rsyslog.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include "dirty.h"
+#include "syslogd-types.h"
+#include "srUtils.h"
+#include "template.h"
+#include "module-template.h"
+#include "errmsg.h"
+#include "cfsysline.h"
+
+MODULE_TYPE_OUTPUT
+
+/* internal structures
+ */
+DEF_OMOD_STATIC_DATA
+
+typedef struct _instanceData {
+} instanceData;
+
+BEGINcreateInstance
+CODESTARTcreateInstance
+ENDcreateInstance
+
+
+BEGINisCompatibleWithFeature
+CODESTARTisCompatibleWithFeature
+	if(eFeat == sFEATURERepeatedMsgReduction)
+		iRet = RS_RET_OK;
+ENDisCompatibleWithFeature
+
+
+BEGINfreeInstance
+CODESTARTfreeInstance
+ENDfreeInstance
+
+
+BEGINdbgPrintInstInfo
+CODESTARTdbgPrintInstInfo
+ENDdbgPrintInstInfo
+
+
+BEGINtryResume
+CODESTARTtryResume
+ENDtryResume
+
+BEGINdoAction
+CODESTARTdoAction
+	write(1, (char*)ppString[0], strlen((char*)ppString[0]));
+ENDdoAction
+
+
+BEGINparseSelectorAct
+CODESTARTparseSelectorAct
+CODE_STD_STRING_REQUESTparseSelectorAct(1)
+	/* first check if this config line is actually for us */
+	if(strncmp((char*) p, ":omstdout:", sizeof(":omstdout:") - 1)) {
+		ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED);
+	}
+
+	/* ok, if we reach this point, we have something for us */
+	p += sizeof(":omstdout:") - 1; /* eat indicator sequence  (-1 because of '\0'!) */
+	CHKiRet(createInstance(&pData));
+
+	/* check if a non-standard template is to be applied */
+	if(*(p-1) == ';')
+		--p;
+	CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, 0, (uchar*) "RSYSLOG_FileFormat"));
+CODE_STD_FINALIZERparseSelectorAct
+ENDparseSelectorAct
+
+
+BEGINmodExit
+CODESTARTmodExit
+ENDmodExit
+
+
+BEGINqueryEtryPt
+CODESTARTqueryEtryPt
+CODEqueryEtryPt_STD_OMOD_QUERIES
+ENDqueryEtryPt
+
+
+BEGINmodInit()
+CODESTARTmodInit
+	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
+CODEmodInit_QueryRegCFSLineHdlr
+ENDmodInit
+
+/* vi:set ai:
+ */
diff --git a/runtime/modules.c b/runtime/modules.c
index d548a949..cef4eac6 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -608,7 +608,7 @@ Load(uchar *pModName)
 	iLoadCnt    = 0;
 	do {
 		/* now build our load module name */
-		if(*pModName == '/') {
+		if(*pModName == '/' || *pModName == '.') {
 			*szPath = '\0';	/* we do not need to append the path - its already in the module name */
 			iPathLen = 0;
 		} else {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7a31be45..384afd4e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,6 @@
+#AUTOMAKE_OPTIONS=dejagnu
+#DEJATOOL=Rainer
+
 check_PROGRAMS = rt_init rscript
 TESTS = $(check_PROGRAMS) cfg.sh
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 235bc52e..9f962899 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -3324,7 +3324,7 @@ int realMain(int argc, char **argv)
 	 * only when actually neeeded. 
 	 * rgerhards, 2008-04-04
 	 */
-	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:u:vwx")) != EOF) {
+	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:T:u:vwx")) != EOF) {
 		switch((char)ch) {
                 case '4':
                 case '6':
@@ -3342,6 +3342,7 @@ int realMain(int argc, char **argv)
 		case 'q': /* add hostname if DNS resolving has failed */
 		case 'Q': /* dont resolve hostnames in ACL to IPs */
 		case 's':
+		case 'T': /* chroot on startup (primarily for testing) */
 		case 'u': /* misc user settings */
 		case 'w': /* disable disallowed host warnings */
 		case 'x': /* disable dns for remote messages */
@@ -3586,6 +3587,20 @@ int realMain(int argc, char **argv)
 			} else
 				fprintf(stderr,	"-t option only supported in compatibility modes 0 to 2 - ignored\n");
 			break;
+		case 'T':/* chroot() immediately at program startup, but only for testing, NOT security yet */
+{
+char buf[1024];
+getcwd(buf, 1024);
+printf("pwd: '%s'\n", buf);
+printf("chroot to '%s'\n", arg);
+			if(chroot(arg) != 0) {
+				perror("chroot");
+				exit(1);
+			}
+getcwd(buf, 1024);
+printf("pwd: '%s'\n", buf);
+}
+			break;
 		case 'u':		/* misc user settings */
 			iHelperUOpt = atoi(arg);
 			if(iHelperUOpt & 0x01)
-- 
cgit v1.2.3


From c11b7ec7d6e6216481f28447b94e59e524dd824c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 23 Mar 2009 11:27:38 +0100
Subject: some text scripts added (experimental)

---
 tests/test.tcl             | 41 +++++++++++++++++++++++++++++++++++++++++
 tests/testruns/parser.conf | 10 ++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 tests/test.tcl
 create mode 100644 tests/testruns/parser.conf

diff --git a/tests/test.tcl b/tests/test.tcl
new file mode 100644
index 00000000..7f1b7a6b
--- /dev/null
+++ b/tests/test.tcl
@@ -0,0 +1,41 @@
+# rsyslog parser tests
+package require Expect
+package require udp 1.0
+
+set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
+#interact;
+#puts "pid: $rsyslogdPID";
+#sleep 1;
+#expect "\n";
+expect "}}"; # eat startup message
+set udpSock [udp_open];
+udp_conf $udpSock 127.0.0.1 514
+set files [glob *.parse1]
+puts "done init\n";
+
+
+foreach testcase $files {
+	puts "File $testcase";
+	set fp [open "$testcase" r];
+	fconfigure $fp -buffering line
+	#set data [read $fp];
+	#set data [split $data "\n"];
+	gets $fp input
+	puts "Line 1: $input\n";
+
+	puts $udpSock $input;
+	flush $udpSock;
+
+
+	set i 1
+	expect -re "{{.*}}";
+	set result $expect_out(buffer);
+
+	#puts "MSG $i: '$expect_out(buffer)'";
+	puts "MSG $i: '$result'\n";
+	set i [expr {$i + 1}];
+	
+}
+
+exec kill $rsyslogdPID;
+close $udpSock;
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
new file mode 100644
index 00000000..a515ff6c
--- /dev/null
+++ b/tests/testruns/parser.conf
@@ -0,0 +1,10 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$ModLoad ../plugins/imuxsock/.libs/imuxsock
+$ModLoad ../plugins/imudp/.libs/imudp
+$UDPServerRun 514
+
+$ErrorMessagesToStderr off
+
+# use a special format that we can easily parse in expect
+$template expect,"{{%PRI%,%syslogtag%,%hostname%}}"
+*.* :omstdout:;expect
-- 
cgit v1.2.3


From 67e00c063122de13dd6c6354fa095978aa1773de Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 25 Mar 2009 17:59:35 +0100
Subject: bugfix: fixed some segaults on Solaris

where vsprintf() does not check for NULL pointers
---
 ChangeLog       | 2 ++
 tools/omfwd.c   | 1 -
 tools/syslogd.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cbe7bba..1dbd69e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Version 4.1.6  [DEVEL] (rgerhards), 2009-03-??
 - improved omfile so that it properly suspends itself if there is an
   i/o or file name generation error. This enables it to be used with
   the full high availability features of rsyslog's engine
+- bugfix: fixed some segaults on Solaris, where vsprintf() does not
+  check for NULL pointers
 ---------------------------------------------------------------------------
 Version 4.1.5  [DEVEL] (rgerhards), 2009-03-11
 - bugfix: parser did not correctly parse fields in UDP-received messages
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 1dd184ef..7a945ce0 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -615,7 +615,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
 	} else {
 		CHKmalloc(pData->f_hname = strdup((char*) q));
 	}
-dbgprintf("hostname '%s', port '%s'\n", pData->f_hname, pData->port);
 
 	/* process template */
 	CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS,
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 235bc52e..a2aead9a 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -3475,7 +3475,7 @@ int realMain(int argc, char **argv)
 	/* END core initializations - we now come back to carrying out command line options*/
 
 	while((iRet = bufOptRemove(&ch, &arg)) == RS_RET_OK) {
-		dbgprintf("deque option %c, optarg '%s'\n", ch, arg);
+		dbgprintf("deque option %c, optarg '%s'\n", ch, (arg == NULL) ? "" : arg);
 		switch((char)ch) {
                 case '4':
 	                glbl.SetDefPFFamily(PF_INET);
-- 
cgit v1.2.3


From 5103c912eeb8c0d410f641a971d3687a02c8c02b Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 26 Mar 2009 15:30:46 +0100
Subject: parser test script created

more or less complete now, with some minor nits left for later
but is usable.
---
 tests/parser.tcl           | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/test.tcl             | 41 -------------------------
 tests/testruns/parser.conf |  3 +-
 3 files changed, 78 insertions(+), 42 deletions(-)
 create mode 100644 tests/parser.tcl
 delete mode 100644 tests/test.tcl

diff --git a/tests/parser.tcl b/tests/parser.tcl
new file mode 100644
index 00000000..274c08a3
--- /dev/null
+++ b/tests/parser.tcl
@@ -0,0 +1,76 @@
+# rsyslog parser tests
+# This is a first version, and can be extended and improved for
+# sure. But it is far better than nothing. Please note that this
+# script works together with the config file AND easily extensible
+# test case files (*.parse1) to run a number of checks. All test
+# cases are executed, even if there is a failure early in the
+# process. When finished, the numberof failed tests will be given.
+#
+# Note: a lot of things are not elegant, but at least they work...
+# Even simple things seem to be somewhat non-simple if you are
+# not sufficiently involved with tcl/expect ;) -- rgerhards
+# 
+# Copyright (C) 2009 by Rainer Gerhards and Adiscon GmbH
+#
+# This file is part of rsyslog.
+
+
+
+# HELP   HELP   HELP   HELP   HELP   HELP   HELP   HELP
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# If you happen to know how to disable rsyslog's
+# stdout from appearing on the "real" stdout, please
+# let me know. This is annouying, but I have no more
+# time left to invest finding a solution (as the
+# rest basically works well...).
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+package require Expect
+package require udp 1.0
+
+set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
+#interact;
+expect "}}"; # eat startup message
+set udpSock [udp_open];
+udp_conf $udpSock 127.0.0.1 514
+set files [glob "testruns/*.parse1"]
+set failed 0;
+puts "\n";
+
+set i 1;
+
+foreach testcase $files {
+	puts "testing $testcase ...";
+	set fp [open "$testcase" r];
+	fconfigure $fp -buffering line
+	gets $fp input
+	gets $fp expected
+	# assemble "expected" to match the template we use
+	close $fp;
+
+	# send to daemon
+	puts $udpSock $input;
+	flush $udpSock;
+
+	# get response and compare
+	expect -re "{{.*}}";
+	puts "\n"; # at least we make the output readbale...
+
+	set result $expect_out(buffer);
+	set result [string trimleft $result "\{\{"];
+	set result [string trimright $result "\}\}"];
+
+	if { $result != $expected } {
+		puts "test $i failed!\n";
+		puts "expected: '$expected'\n";
+		puts "returned: '$result'\n";
+		puts "\n";
+		set failed [expr {$failed + 1}];
+	};
+	set i [expr {$i + 1}];
+}
+
+exec kill $rsyslogdPID;
+close $udpSock;
+
+puts "Number of failed test: $failed.\n";
diff --git a/tests/test.tcl b/tests/test.tcl
deleted file mode 100644
index 7f1b7a6b..00000000
--- a/tests/test.tcl
+++ /dev/null
@@ -1,41 +0,0 @@
-# rsyslog parser tests
-package require Expect
-package require udp 1.0
-
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
-#interact;
-#puts "pid: $rsyslogdPID";
-#sleep 1;
-#expect "\n";
-expect "}}"; # eat startup message
-set udpSock [udp_open];
-udp_conf $udpSock 127.0.0.1 514
-set files [glob *.parse1]
-puts "done init\n";
-
-
-foreach testcase $files {
-	puts "File $testcase";
-	set fp [open "$testcase" r];
-	fconfigure $fp -buffering line
-	#set data [read $fp];
-	#set data [split $data "\n"];
-	gets $fp input
-	puts "Line 1: $input\n";
-
-	puts $udpSock $input;
-	flush $udpSock;
-
-
-	set i 1
-	expect -re "{{.*}}";
-	set result $expect_out(buffer);
-
-	#puts "MSG $i: '$expect_out(buffer)'";
-	puts "MSG $i: '$result'\n";
-	set i [expr {$i + 1}];
-	
-}
-
-exec kill $rsyslogdPID;
-close $udpSock;
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
index a515ff6c..3558f143 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testruns/parser.conf
@@ -6,5 +6,6 @@ $UDPServerRun 514
 $ErrorMessagesToStderr off
 
 # use a special format that we can easily parse in expect
-$template expect,"{{%PRI%,%syslogtag%,%hostname%}}"
+#$template expect,"{{%PRI%,%syslogtag%,%hostname%}}"
+$template expect,"{{%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%}}"
 *.* :omstdout:;expect
-- 
cgit v1.2.3


From 0be199af6cc2cd9a9acb96e97e1cd061affaa6d9 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 26 Mar 2009 17:48:59 +0100
Subject: initial parser testing suite added

integrated tcl test script into autotools make check, created
a few test cases based a real-world sample and samples from
RFC3164 and 5424.
---
 ChangeLog                       |  2 ++
 tests/Makefile.am               | 10 +++++-----
 tests/parser.tcl                |  3 ++-
 tests/parsertest                |  2 ++
 tests/testruns/1.parse1         |  3 +++
 tests/testruns/rfc3164.parse1   |  4 ++++
 tests/testruns/rfc5424-1.parse1 |  4 ++++
 tests/testruns/rfc5424-2.parse1 |  4 ++++
 tests/testruns/rfc5424-3.parse1 |  4 ++++
 tests/testruns/rfc5424-4.parse1 |  4 ++++
 10 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100755 tests/parsertest
 create mode 100644 tests/testruns/1.parse1
 create mode 100644 tests/testruns/rfc3164.parse1
 create mode 100644 tests/testruns/rfc5424-1.parse1
 create mode 100644 tests/testruns/rfc5424-2.parse1
 create mode 100644 tests/testruns/rfc5424-3.parse1
 create mode 100644 tests/testruns/rfc5424-4.parse1

diff --git a/ChangeLog b/ChangeLog
index 1cfb3c3a..e74c7209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ Version 4.1.6  [DEVEL] (rgerhards), 2009-03-??
   is used in a secure way. (may be removed later)
 - added omstdout module for testing purposes. Spits out all messages to
   stdout - no config option, no other features
+- added a parser testing suite (still needs to be extended, but a good
+  start)
 - modified $ModLoad statement so that for modules whom's name starts with
   a dot, no path is prepended (this enables relative-pathes and should
   not break any valid current config)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 384afd4e..225f087f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,5 @@
-#AUTOMAKE_OPTIONS=dejagnu
-#DEJATOOL=Rainer
-
 check_PROGRAMS = rt_init rscript
-TESTS = $(check_PROGRAMS) cfg.sh
+TESTS = $(check_PROGRAMS) cfg.sh parsertest
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
 #TESTS = $(check_PROGRAMS)
 
@@ -19,7 +16,10 @@ EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
 	   cfg4.testin \
 	   DevNull.cfgtest \
 	   err1.rstest \
-	   NoExistFile.cfgtest
+	   NoExistFile.cfgtest \
+	   parsertest
+	   parser.tcl
+	   testruns/*.parser1
 
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
diff --git a/tests/parser.tcl b/tests/parser.tcl
index 274c08a3..6b08717b 100644
--- a/tests/parser.tcl
+++ b/tests/parser.tcl
@@ -73,4 +73,5 @@ foreach testcase $files {
 exec kill $rsyslogdPID;
 close $udpSock;
 
-puts "Number of failed test: $failed.\n";
+puts "Number of failed tests: $failed.\n";
+if { $failed != 0 } { exit 1 };
diff --git a/tests/parsertest b/tests/parsertest
new file mode 100755
index 00000000..78c42c07
--- /dev/null
+++ b/tests/parsertest
@@ -0,0 +1,2 @@
+# run parser test suite
+tclsh parser.tcl
diff --git a/tests/testruns/1.parse1 b/tests/testruns/1.parse1
new file mode 100644
index 00000000..5ae655e6
--- /dev/null
+++ b/tests/testruns/1.parse1
@@ -0,0 +1,3 @@
+<167>Mar  6 16:57:54 172.20.245.8 %PIX-7-710005: UDP request discarded from SERVER1/2741 to test_app:255.255.255.255/61601
+167,local4,debug,Mar  6 16:57:54,172.20.245.8,%PIX-7-710005,%PIX-7-710005:, UDP request discarded from SERVER1/2741 to test_app:255.255.255.255/61601
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testruns/rfc3164.parse1 b/tests/testruns/rfc3164.parse1
new file mode 100644
index 00000000..e7a5fa18
--- /dev/null
+++ b/tests/testruns/rfc3164.parse1
@@ -0,0 +1,4 @@
+<34>Oct 11 22:14:15 mymachine su: 'su root' failed for lonvick on /dev/pts/8
+34,auth,crit,Oct 11 22:14:15,mymachine,su,su:, 'su root' failed for lonvick on /dev/pts/8
+#Example from RFC3164, section 5.4
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testruns/rfc5424-1.parse1 b/tests/testruns/rfc5424-1.parse1
new file mode 100644
index 00000000..90236c7f
--- /dev/null
+++ b/tests/testruns/rfc5424-1.parse1
@@ -0,0 +1,4 @@
+<34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - BOM'su root' failed for lonvick on /dev/pts/8
+34,auth,crit,Oct 11 22:14:15,mymachine.example.com,,su,- BOM'su root' failed for lonvick on /dev/pts/8
+#Example from RFC5424, section 6.5 / sample 1
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testruns/rfc5424-2.parse1 b/tests/testruns/rfc5424-2.parse1
new file mode 100644
index 00000000..a86fbc35
--- /dev/null
+++ b/tests/testruns/rfc5424-2.parse1
@@ -0,0 +1,4 @@
+<165>1 2003-08-24T05:14:15.000003-07:00 192.0.2.1 myproc 8710 - - %% It's time to make the do-nuts.
+165,local4,notice,Aug 24 05:14:15,192.0.2.1,,myproc[8710],- %% It's time to make the do-nuts.
+#Example from RFC5424, section 6.5 / sample 2
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testruns/rfc5424-3.parse1 b/tests/testruns/rfc5424-3.parse1
new file mode 100644
index 00000000..6ad4073d
--- /dev/null
+++ b/tests/testruns/rfc5424-3.parse1
@@ -0,0 +1,4 @@
+<165>1 2003-10-11T22:14:15.003Z mymachine.example.com evntslog - ID47 [exampleSDID@32473 iut="3" eventSource= "Application" eventID="1011"][examplePriority@32473 class="high"]
+165,local4,notice,Oct 11 22:14:15,mymachine.example.com,,evntslog,
+#Example from RFC5424, section 6.5 / sample 4
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testruns/rfc5424-4.parse1 b/tests/testruns/rfc5424-4.parse1
new file mode 100644
index 00000000..ecf27e14
--- /dev/null
+++ b/tests/testruns/rfc5424-4.parse1
@@ -0,0 +1,4 @@
+<165>1 2003-10-11T22:14:15.003Z mymachine.example.com evntslog - ID47 [exampleSDID@32473 iut="3" eventSource= "Application" eventID="1011"] BOMAn application event log entry...
+165,local4,notice,Oct 11 22:14:15,mymachine.example.com,,evntslog,BOMAn application event log entry...
+#Example from RFC5424, section 6.5 / sample 3
+#Only the first two lines are important, you may place anything behind them!
-- 
cgit v1.2.3


From 47fb9cb807d9c646cb07e56e380f3c553176955c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 26 Mar 2009 18:42:49 +0100
Subject: added some missing files in tests Makefile.am

---
 tests/Makefile.am | 12 ++++++++----
 tests/parser.tcl  | 23 ++++++-----------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 225f087f..5b579017 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,10 @@
 check_PROGRAMS = rt_init rscript
 TESTS = $(check_PROGRAMS) cfg.sh parsertest
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
-#TESTS = $(check_PROGRAMS)
 
 test_files = testbench.h runtime-dummy.c
-EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
+EXTRA_DIST=parser.tcl \
+	   1.rstest 2.rstest 3.rstest err1.rstest \
 	   cfg.sh \
 	   cfg1.cfgtest \
 	   cfg1.testin \
@@ -17,9 +17,13 @@ EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
 	   DevNull.cfgtest \
 	   err1.rstest \
 	   NoExistFile.cfgtest \
+	   testruns/1.parse1 \
+   	   testruns/rfc3164.parse1 \
+	   testruns/rfc5424-1.parse1 \
+	   testruns/rfc5424-2.parse1 \
+	   testruns/rfc5424-3.parse1 \
+	   testruns/rfc5424-4.parse1 \
 	   parsertest
-	   parser.tcl
-	   testruns/*.parser1
 
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
diff --git a/tests/parser.tcl b/tests/parser.tcl
index 6b08717b..5872fa3c 100644
--- a/tests/parser.tcl
+++ b/tests/parser.tcl
@@ -14,19 +14,9 @@
 #
 # This file is part of rsyslog.
 
-
-
-# HELP   HELP   HELP   HELP   HELP   HELP   HELP   HELP
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# If you happen to know how to disable rsyslog's
-# stdout from appearing on the "real" stdout, please
-# let me know. This is annouying, but I have no more
-# time left to invest finding a solution (as the
-# rest basically works well...).
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 package require Expect
 package require udp 1.0
+log_user 0; # comment this out if you would like to see rsyslog output for testing
 
 set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
 #interact;
@@ -35,12 +25,12 @@ set udpSock [udp_open];
 udp_conf $udpSock 127.0.0.1 514
 set files [glob "testruns/*.parse1"]
 set failed 0;
-puts "\n";
+puts "\nExecuting parser test suite...";
 
-set i 1;
+set i 0;
 
 foreach testcase $files {
-	puts "testing $testcase ...";
+	puts "testing $testcase";
 	set fp [open "$testcase" r];
 	fconfigure $fp -buffering line
 	gets $fp input
@@ -54,14 +44,13 @@ foreach testcase $files {
 
 	# get response and compare
 	expect -re "{{.*}}";
-	puts "\n"; # at least we make the output readbale...
 
 	set result $expect_out(buffer);
 	set result [string trimleft $result "\{\{"];
 	set result [string trimright $result "\}\}"];
 
 	if { $result != $expected } {
-		puts "test $i failed!\n";
+		puts "failed!";
 		puts "expected: '$expected'\n";
 		puts "returned: '$result'\n";
 		puts "\n";
@@ -73,5 +62,5 @@ foreach testcase $files {
 exec kill $rsyslogdPID;
 close $udpSock;
 
-puts "Number of failed tests: $failed.\n";
+puts "Total number of tests: $i, number of failed tests: $failed.\n";
 if { $failed != 0 } { exit 1 };
-- 
cgit v1.2.3


From 581361121524bf66744e023b0a0c8ab448cfaa4a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 27 Mar 2009 16:09:45 +0100
Subject: fixed a couple of nits with "make [dist]check"

---
 tests/Makefile.am          |  2 ++
 tests/parser.tcl           | 16 ++++++++++++++--
 tests/parsertest           |  2 +-
 tests/testruns/parser.conf |  2 --
 tests/work/dummy           |  3 +++
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 tests/work/dummy

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b579017..0de5a2f1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,12 +17,14 @@ EXTRA_DIST=parser.tcl \
 	   DevNull.cfgtest \
 	   err1.rstest \
 	   NoExistFile.cfgtest \
+	   testruns/parser.conf \
 	   testruns/1.parse1 \
    	   testruns/rfc3164.parse1 \
 	   testruns/rfc5424-1.parse1 \
 	   testruns/rfc5424-2.parse1 \
 	   testruns/rfc5424-3.parse1 \
 	   testruns/rfc5424-4.parse1 \
+	   work/dummy \
 	   parsertest
 
 rt_init_SOURCES = rt-init.c $(test_files)
diff --git a/tests/parser.tcl b/tests/parser.tcl
index 5872fa3c..047607c6 100644
--- a/tests/parser.tcl
+++ b/tests/parser.tcl
@@ -9,6 +9,8 @@
 # Note: a lot of things are not elegant, but at least they work...
 # Even simple things seem to be somewhat non-simple if you are
 # not sufficiently involved with tcl/expect ;) -- rgerhards
+#
+# call: tclsh parser.tcl /director/with/testcases
 # 
 # Copyright (C) 2009 by Rainer Gerhards and Adiscon GmbH
 #
@@ -18,12 +20,22 @@ package require Expect
 package require udp 1.0
 log_user 0; # comment this out if you would like to see rsyslog output for testing
 
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
+if {$argc > 1} {
+	puts "invalid number of parameters, usage: tclsh parser.tcl /directory/with/testcases";
+	exit 1;
+}
+if {$argc == 0 } {
+	set srcdir ".";
+} else {
+	set srcdir "$argv";
+}
+
+set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-i$srcdir/work/rsyslog.pid" "-M../runtime/.libs"];
 #interact;
 expect "}}"; # eat startup message
 set udpSock [udp_open];
 udp_conf $udpSock 127.0.0.1 514
-set files [glob "testruns/*.parse1"]
+set files [glob "$srcdir/testruns/*.parse1"]
 set failed 0;
 puts "\nExecuting parser test suite...";
 
diff --git a/tests/parsertest b/tests/parsertest
index 78c42c07..c7efa631 100755
--- a/tests/parsertest
+++ b/tests/parsertest
@@ -1,2 +1,2 @@
 # run parser test suite
-tclsh parser.tcl
+tclsh $srcdir/parser.tcl $srcdir
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
index 3558f143..7b4b4aed 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testruns/parser.conf
@@ -1,11 +1,9 @@
 $ModLoad ../plugins/omstdout/.libs/omstdout
-$ModLoad ../plugins/imuxsock/.libs/imuxsock
 $ModLoad ../plugins/imudp/.libs/imudp
 $UDPServerRun 514
 
 $ErrorMessagesToStderr off
 
 # use a special format that we can easily parse in expect
-#$template expect,"{{%PRI%,%syslogtag%,%hostname%}}"
 $template expect,"{{%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%}}"
 *.* :omstdout:;expect
diff --git a/tests/work/dummy b/tests/work/dummy
new file mode 100644
index 00000000..93c5babb
--- /dev/null
+++ b/tests/work/dummy
@@ -0,0 +1,3 @@
+This is a dummy file. It's only purpose is to ensure
+that ./test/work is created so that "make distcheck"
+and "make check" can operate properly.
-- 
cgit v1.2.3


From 8e29c1fc47523c894b78894d6fdeb43f2d97811d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 27 Mar 2009 17:13:28 +0100
Subject: solved some more issues with "make [dist]check"

especially when executed as non-root
---
 tests/Makefile.am          | 2 +-
 tests/parser.tcl           | 4 ++--
 tests/testruns/parser.conf | 2 +-
 tests/work/dummy           | 3 ---
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 tests/work/dummy

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0de5a2f1..f22ca139 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
 check_PROGRAMS = rt_init rscript
 TESTS = $(check_PROGRAMS) cfg.sh parsertest
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
+DISTCLEANFILES=rsyslog.pid
 
 test_files = testbench.h runtime-dummy.c
 EXTRA_DIST=parser.tcl \
@@ -24,7 +25,6 @@ EXTRA_DIST=parser.tcl \
 	   testruns/rfc5424-2.parse1 \
 	   testruns/rfc5424-3.parse1 \
 	   testruns/rfc5424-4.parse1 \
-	   work/dummy \
 	   parsertest
 
 rt_init_SOURCES = rt-init.c $(test_files)
diff --git a/tests/parser.tcl b/tests/parser.tcl
index 047607c6..1adeac25 100644
--- a/tests/parser.tcl
+++ b/tests/parser.tcl
@@ -30,11 +30,11 @@ if {$argc == 0 } {
 	set srcdir "$argv";
 }
 
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-i$srcdir/work/rsyslog.pid" "-M../runtime/.libs"];
+set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-irsyslog.pid" "-M../runtime/.libs"];
 #interact;
 expect "}}"; # eat startup message
 set udpSock [udp_open];
-udp_conf $udpSock 127.0.0.1 514
+udp_conf $udpSock 127.0.0.1 12514
 set files [glob "$srcdir/testruns/*.parse1"]
 set failed 0;
 puts "\nExecuting parser test suite...";
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
index 7b4b4aed..8d32746c 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testruns/parser.conf
@@ -1,6 +1,6 @@
 $ModLoad ../plugins/omstdout/.libs/omstdout
 $ModLoad ../plugins/imudp/.libs/imudp
-$UDPServerRun 514
+$UDPServerRun 12514
 
 $ErrorMessagesToStderr off
 
diff --git a/tests/work/dummy b/tests/work/dummy
deleted file mode 100644
index 93c5babb..00000000
--- a/tests/work/dummy
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a dummy file. It's only purpose is to ensure
-that ./test/work is created so that "make distcheck"
-and "make check" can operate properly.
-- 
cgit v1.2.3


From 3e3a9bc9982331e44cf397fef131e75553f2ab2c Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 31 Mar 2009 12:00:40 +0200
Subject: ported non-tcl based test suite to Solaris

---
 configure.ac      |  2 +-
 tests/Makefile.am | 12 +++++++-----
 tests/cfg.sh      | 12 ++++++------
 tests/ourtail.c   | 43 +++++++++++++++++++++++++++++++++++++++++++
 tests/rscript.c   | 41 +++++++++++++++++++++++++++++++++++++----
 5 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 tests/ourtail.c

diff --git a/configure.ac b/configure.ac
index 0c9483ca..7289d74e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STAT
 AC_FUNC_STRERROR_R
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r epoll_wait])
+AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r epoll_wait getline])
 
 # Check for MAXHOSTNAMELEN
 AC_MSG_CHECKING(for MAXHOSTNAMELEN)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7a31be45..65a294ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
-check_PROGRAMS = rt_init rscript
-TESTS = $(check_PROGRAMS) cfg.sh
+testruns = rt_init rscript
+check_PROGRAMS = $(testruns) ourtail
+TESTS = $(testruns) cfg.sh
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
-#TESTS = $(check_PROGRAMS)
 
 test_files = testbench.h runtime-dummy.c
 EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
@@ -18,12 +18,14 @@ EXTRA_DIST=1.rstest 2.rstest 3.rstest err1.rstest \
 	   err1.rstest \
 	   NoExistFile.cfgtest
 
+ourtail_SOURCES = ourtail.c
+
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS)
+rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
 rt_init_LDFLAGS = -export-dynamic
 
 rscript_SOURCES = rscript.c $(test_files)
 rscript_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS)
+rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
 rscript_LDFLAGS = -export-dynamic
diff --git a/tests/cfg.sh b/tests/cfg.sh
index fb22fbf3..8acbf342 100755
--- a/tests/cfg.sh
+++ b/tests/cfg.sh
@@ -36,7 +36,7 @@ echo "local directory"
 #
 # check empty config file
 #
-../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/DevNull.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "DevNull.cfgtest failed"
@@ -51,7 +51,7 @@ fi;
 #
 # check missing config file
 #
-../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/NoExistFile.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "NoExistFile.cfgtest failed"
@@ -74,7 +74,7 @@ exit 0
 #
 # check config with invalid directive
 #
-../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg1.testin 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg1.testin 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/cfg1.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "cfg1.cfgtest failed"
@@ -91,7 +91,7 @@ fi;
 # the one with the invalid config directive, so that we may see
 # an effect of the included config ;)
 #
-../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg2.testin 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg2.testin 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/cfg2.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "cfg2.cfgtest failed"
@@ -106,7 +106,7 @@ fi;
 #
 # check included config file, where included file does not exist
 #
-../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg3.testin 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg3.testin 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/cfg3.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "cfg3.cfgtest failed"
@@ -121,7 +121,7 @@ fi;
 #
 # check a reasonable complex, but correct, log file
 #
-../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg4.testin 2>&1 |tail --lines=+2 > tmp
+../tools/rsyslogd -c4 -u2 -N1 -f$srcdir/cfg4.testin 2>&1 |./ourtail > tmp
 cmp tmp $srcdir/cfg4.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "cfg4.cfgtest failed"
diff --git a/tests/ourtail.c b/tests/ourtail.c
new file mode 100644
index 00000000..f2751c72
--- /dev/null
+++ b/tests/ourtail.c
@@ -0,0 +1,43 @@
+/* This is a quick and dirty "tail implementation", one which always
+ * skips the first line, but nothing else. I have done this to prevent
+ * the various incompatible options of tail come into my way. One could
+ * probably work around this by using autoconf magic, but for me it
+ * was much quicker writing this small C program, which really should
+ * be portable across all platforms.
+ *
+ * Part of the testbench for rsyslog.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+	int c;
+
+	for(c = getchar() ; c != EOF && c != '\n' ; c = getchar())
+		/*skip to newline*/;
+
+	if(c == '\n')
+		c = getchar();
+
+	for( ; c != EOF ; c = getchar())
+		putchar(c);
+}
diff --git a/tests/rscript.c b/tests/rscript.c
index 3eec9c3c..4906f91a 100644
--- a/tests/rscript.c
+++ b/tests/rscript.c
@@ -39,6 +39,38 @@ DEFobjCurrIf(ctok)
 DEFobjCurrIf(ctok_token)
 DEFobjCurrIf(vmprg)
 
+
+/* we emulate getline (the dirty way) if we do not have it
+ * We do not try very hard, as this is just a test driver.
+ * rgerhards, 2009-03-31
+ */
+#ifndef HAVE_GETLINE
+ssize_t getline(char **lineptr, size_t *n, FILE *fp)
+{
+	int c;
+	int len = 0;
+
+	if(*lineptr == NULL)
+		*lineptr = malloc(1024); /* quick and dirty! */
+
+	c = fgetc(fp);
+	while(c != EOF && c != '\n') {
+		(*lineptr)[len++] = c;
+		c = fgetc(fp);
+	}
+	if(c != EOF) /* need to add NL? */
+		(*lineptr)[len++] = c;
+	
+	(*lineptr)[len] = '\0';
+
+	*n = len;
+	//printf("getline returns: '%s'\n", *lineptr);
+
+	return (len > 0) ? len : -1;
+}
+#endif /* #ifndef HAVE_GETLINE */
+
+
 BEGINInit
 CODESTARTInit
 	pErrObj = "expr"; CHKiRet(objUse(expr, CORE_COMPONENT));
@@ -101,10 +133,9 @@ PerformTest(cstr_t *pstrIn, rsRetVal iRetExpected, cstr_t *pstrOut)
 	CHKiRet(vmprg.Obj2Str(pExpr->pVmprg, pstrPrg));
 
 	if(strcmp((char*)rsCStrGetSzStr(pstrPrg), (char*)rsCStrGetSzStr(pstrOut))) {
-		int iLen;
 		printf("error: compiled program different from expected result!\n");
-		printf("generated vmprg (%d bytes):\n%s\n", strlen(rsCStrGetSzStr(pstrPrg)), rsCStrGetSzStr(pstrPrg));
-		printf("expected (%d bytes):\n%s\n", strlen(rsCStrGetSzStr(pstrOut)), rsCStrGetSzStr(pstrOut));
+		printf("generated vmprg (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrPrg)), rsCStrGetSzStr(pstrPrg));
+		printf("expected (%d bytes):\n%s\n", strlen((char*)rsCStrGetSzStr(pstrOut)), rsCStrGetSzStr(pstrOut));
 		ABORT_FINALIZE(RS_RET_ERR);
 	}
 
@@ -139,6 +170,7 @@ ProcessTestFile(uchar *pszFileName)
 	size_t lenLn;
 	cstr_t *pstrIn = NULL;
 	cstr_t *pstrOut = NULL;
+	int iParse;
 	rsRetVal iRetExpected;
 	DEFiRet;
 
@@ -161,10 +193,11 @@ ProcessTestFile(uchar *pszFileName)
 	/* once we had a comment, the next line MUST be "result: <nbr>". Anything
 	 * after nbr is simply ignored.
 	 */
-	if(sscanf(lnptr, "result: %d", &iRetExpected) != 1) {
+	if(sscanf(lnptr, "result: %d", &iParse) != 1) {
 		printf("error in result line, scanf failed, line: '%s'\n", lnptr);
 		ABORT_FINALIZE(RS_RET_ERR);
 	}
+	iRetExpected = iParse;
 	getline(&lnptr, &lenLn, fp); CHKEOF;
 
 	/* and now we look for "in:" (and again ignore the rest...) */
-- 
cgit v1.2.3


From ec9e031599016b9eb6f9ac3fd8298ee4fcb0364f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 31 Mar 2009 19:00:16 +0200
Subject: changed parser test suite to be c-program based

I finally removed the tcl script because tcl costs a lot of
time if you do not invest the full learning cycle, plus I have
not everything avaible I need on Solaris. With C, I am quicker and
I also can create a superior solution. So I finally switched. Took
much less time than the initial tcl script...
---
 tests/Makefile.am               |  10 +-
 tests/parser.tcl                |  78 ------------
 tests/parsertest                |   2 -
 tests/parsertest.c              | 265 ++++++++++++++++++++++++++++++++++++++++
 tests/testruns/rfc5424-1.parse1 |   3 +-
 5 files changed, 270 insertions(+), 88 deletions(-)
 delete mode 100644 tests/parser.tcl
 delete mode 100755 tests/parsertest
 create mode 100644 tests/parsertest.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f22ca139..f941f3a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,10 @@
-check_PROGRAMS = rt_init rscript
-TESTS = $(check_PROGRAMS) cfg.sh parsertest
+check_PROGRAMS = rt_init rscript parsertest
+TESTS = $(check_PROGRAMS) cfg.sh
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
 DISTCLEANFILES=rsyslog.pid
 
 test_files = testbench.h runtime-dummy.c
-EXTRA_DIST=parser.tcl \
-	   1.rstest 2.rstest 3.rstest err1.rstest \
-	   cfg.sh \
+EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   cfg1.cfgtest \
 	   cfg1.testin \
       	   cfg2.cfgtest \
@@ -25,7 +23,7 @@ EXTRA_DIST=parser.tcl \
 	   testruns/rfc5424-2.parse1 \
 	   testruns/rfc5424-3.parse1 \
 	   testruns/rfc5424-4.parse1 \
-	   parsertest
+	   cfg.sh
 
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
diff --git a/tests/parser.tcl b/tests/parser.tcl
deleted file mode 100644
index 1adeac25..00000000
--- a/tests/parser.tcl
+++ /dev/null
@@ -1,78 +0,0 @@
-# rsyslog parser tests
-# This is a first version, and can be extended and improved for
-# sure. But it is far better than nothing. Please note that this
-# script works together with the config file AND easily extensible
-# test case files (*.parse1) to run a number of checks. All test
-# cases are executed, even if there is a failure early in the
-# process. When finished, the numberof failed tests will be given.
-#
-# Note: a lot of things are not elegant, but at least they work...
-# Even simple things seem to be somewhat non-simple if you are
-# not sufficiently involved with tcl/expect ;) -- rgerhards
-#
-# call: tclsh parser.tcl /director/with/testcases
-# 
-# Copyright (C) 2009 by Rainer Gerhards and Adiscon GmbH
-#
-# This file is part of rsyslog.
-
-package require Expect
-package require udp 1.0
-log_user 0; # comment this out if you would like to see rsyslog output for testing
-
-if {$argc > 1} {
-	puts "invalid number of parameters, usage: tclsh parser.tcl /directory/with/testcases";
-	exit 1;
-}
-if {$argc == 0 } {
-	set srcdir ".";
-} else {
-	set srcdir "$argv";
-}
-
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-irsyslog.pid" "-M../runtime/.libs"];
-#interact;
-expect "}}"; # eat startup message
-set udpSock [udp_open];
-udp_conf $udpSock 127.0.0.1 12514
-set files [glob "$srcdir/testruns/*.parse1"]
-set failed 0;
-puts "\nExecuting parser test suite...";
-
-set i 0;
-
-foreach testcase $files {
-	puts "testing $testcase";
-	set fp [open "$testcase" r];
-	fconfigure $fp -buffering line
-	gets $fp input
-	gets $fp expected
-	# assemble "expected" to match the template we use
-	close $fp;
-
-	# send to daemon
-	puts $udpSock $input;
-	flush $udpSock;
-
-	# get response and compare
-	expect -re "{{.*}}";
-
-	set result $expect_out(buffer);
-	set result [string trimleft $result "\{\{"];
-	set result [string trimright $result "\}\}"];
-
-	if { $result != $expected } {
-		puts "failed!";
-		puts "expected: '$expected'\n";
-		puts "returned: '$result'\n";
-		puts "\n";
-		set failed [expr {$failed + 1}];
-	};
-	set i [expr {$i + 1}];
-}
-
-exec kill $rsyslogdPID;
-close $udpSock;
-
-puts "Total number of tests: $i, number of failed tests: $failed.\n";
-if { $failed != 0 } { exit 1 };
diff --git a/tests/parsertest b/tests/parsertest
deleted file mode 100755
index c7efa631..00000000
--- a/tests/parsertest
+++ /dev/null
@@ -1,2 +0,0 @@
-# run parser test suite
-tclsh $srcdir/parser.tcl $srcdir
diff --git a/tests/parsertest.c b/tests/parsertest.c
new file mode 100644
index 00000000..3ccae3d6
--- /dev/null
+++ b/tests/parsertest.c
@@ -0,0 +1,265 @@
+/* Runs a test suite on the rsyslog parser (and later potentially
+ * other things).
+ *
+ * Please note that this
+ * program works together with the config file AND easily extensible
+ * test case files (*.parse1) to run a number of checks. All test
+ * cases are executed, even if there is a failure early in the
+ * process. When finished, the numberof failed tests will be given.
+ *
+ * Part of the testbench for rsyslog.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <unistd.h>
+#include <string.h>
+#include <glob.h>
+#include <netinet/in.h>
+
+#define EXIT_FAILURE 1
+
+
+void readLine(int fd, char *ln)
+{
+	char c;
+	int lenRead;
+	lenRead = read(fd, &c, 1);
+	while(lenRead == 1 && c != '\n') {
+		*ln++ = c;
+		 lenRead = read(fd, &c, 1);
+	}
+	*ln = '\0';
+}
+
+
+/* send a message via UDP
+ * returns 0 if ok, something else otherwise.
+ */
+int
+udpSend(char *buf, int lenBuf)
+{
+	struct sockaddr_in si_other;
+	int s, slen=sizeof(si_other);
+
+	if((s=socket(AF_INET, SOCK_DGRAM, 0))==-1) {
+		perror("socket()");
+		return(1);
+	}
+
+	memset((char *) &si_other, 0, sizeof(si_other));
+	si_other.sin_family = AF_INET;
+	si_other.sin_port = htons(12514);
+	if(inet_aton("127.0.0.1", &si_other.sin_addr)==0) {
+		fprintf(stderr, "inet_aton() failed\n");
+		return(1);
+	}
+
+	if(sendto(s, buf, lenBuf, 0, (struct sockaddr*) &si_other, slen)==-1) {
+		perror("sendto");
+		fprintf(stderr, "sendto() failed\n");
+		return(1);
+	}
+
+	close(s);
+	return 0;
+}
+
+/* open pipe to test candidate - so far, this is
+ * always rsyslogd and with a fixed config. Later, we may
+ * change this. Returns 0 if ok, something else otherwise.
+ * rgerhards, 2009-03-31
+ */
+int openPipe(pid_t *pid, int *pfd)
+{
+	int pipefd[2];
+	pid_t cpid;
+	char *newargv[] = {"../tools/rsyslogd", "dummy", "-c4", "-u2", "-n", "-irsyslog.pid",
+			   "-M../runtime//.libs", NULL };
+	char confFile[1024];
+	char *newenviron[] = { NULL };
+
+
+	sprintf(confFile, "-f%s/testruns/parser2.conf", getenv("srcdir"));
+	newargv[1] = confFile;
+
+	if (pipe(pipefd) == -1) {
+		perror("pipe");
+		exit(EXIT_FAILURE);
+	}
+
+	cpid = fork();
+	if (cpid == -1) {
+		perror("fork");
+		exit(EXIT_FAILURE);
+	}
+
+	if(cpid == 0) {    /* Child reads from pipe */
+		fclose(stdout);
+		dup(pipefd[1]);
+		close(pipefd[1]);
+		close(pipefd[0]);
+		fclose(stdin);
+		execve("../tools/rsyslogd", newargv, newenviron);
+	} else {            
+		close(pipefd[1]);
+		*pid = cpid;
+		*pfd = pipefd[0];
+	}
+
+	return(0);
+}
+
+
+/* Process a specific test case. File name is provided.
+ * Needs to return 0 if all is OK, something else otherwise.
+ */
+int
+processTestFile(int fd, char *pszFileName)
+{
+	FILE *fp;
+	char *testdata = NULL;
+	char *expected = NULL;
+	int ret = 0;
+	size_t lenLn;
+	char buf[4096];
+
+	if((fp = fopen((char*)pszFileName, "r")) == NULL) {
+		perror((char*)pszFileName);
+		return(2);
+	}
+
+	/* skip comments at start of file */
+
+	getline(&testdata, &lenLn, fp);
+	while(!feof(fp)) {
+		if(*testdata == '#')
+			getline(&testdata, &lenLn, fp);
+		else
+			break; /* first non-comment */
+	}
+
+
+	testdata[strlen(testdata)-1] = '\0'; /* remove \n */
+	/* now we have the test data to send */
+	if(udpSend(testdata, strlen(testdata)) != 0)
+		return(2);
+
+	/* next line is expected output 
+	 * we do not care about EOF here, this will lead to a failure and thus
+	 * draw enough attention. -- rgerhards, 2009-03-31
+	 */
+	getline(&expected, &lenLn, fp);
+	expected[strlen(expected)-1] = '\0'; /* remove \n */
+
+	/* pull response from server and then check if it meets our expectation */
+	readLine(fd, buf);
+	if(strcmp(expected, buf)) {
+		printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
+			expected, buf);
+			ret = 1;
+	}
+
+	free(testdata);
+	free(expected);
+	fclose(fp);
+	return(ret);
+}
+
+
+/* carry out all tests. Tests are specified via a file name
+ * wildcard. Each of the files is read and the test carried
+ * out.
+ * Returns the number of tests that failed. Zero means all
+ * success.
+ */
+int
+doTests(int fd, char *files)
+{
+	int iFailed = 0;
+	int iTests = 0;
+	int ret;
+	char *testFile;
+	glob_t testFiles;
+	size_t i = 0;
+	struct stat fileInfo;
+
+	glob(files, GLOB_MARK, NULL, &testFiles);
+
+	for(i = 0; i < testFiles.gl_pathc; i++) {
+		testFile = testFiles.gl_pathv[i];
+
+		if(stat((char*) testFile, &fileInfo) != 0) 
+			continue; /* continue with the next file if we can't stat() the file */
+
+		++iTests;
+		/* all regular files are run through the test logic. Symlinks don't work. */
+		if(S_ISREG(fileInfo.st_mode)) { /* config file */
+			printf("processing test case '%s' ... ", testFile);
+			ret = processTestFile(fd, testFile);
+			if(ret == 0) {
+				printf("successfully completed\n");
+			} else {
+				printf("failed!\n");
+				++iFailed;
+			}
+		}
+	}
+	globfree(&testFiles);
+
+	printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
+	return(iFailed);
+}
+
+
+/* */
+int main(int argc, char *argv[])
+{
+	int fd;
+	pid_t pid;
+	int ret = 0;
+	char buf[4096];
+	char testcases[4096];
+
+	printf("running rsyslog parser tests ($srcdir=%s)\n", getenv("srcdir"));
+
+	openPipe(&pid, &fd);
+	readLine(fd, buf);
+
+	/* generate filename */
+	sprintf(testcases, "%s/testruns/*.parse1", getenv("srcdir"));
+	if(doTests(fd, testcases) != 0)
+		ret = 1;
+
+	/* cleanup */
+	kill(pid, SIGTERM);
+	printf("End of parser tests.\n");
+	exit(ret);
+}
+
+
diff --git a/tests/testruns/rfc5424-1.parse1 b/tests/testruns/rfc5424-1.parse1
index 90236c7f..23836c9f 100644
--- a/tests/testruns/rfc5424-1.parse1
+++ b/tests/testruns/rfc5424-1.parse1
@@ -1,4 +1,3 @@
+#Example from RFC5424, section 6.5 / sample 1
 <34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - BOM'su root' failed for lonvick on /dev/pts/8
 34,auth,crit,Oct 11 22:14:15,mymachine.example.com,,su,- BOM'su root' failed for lonvick on /dev/pts/8
-#Example from RFC5424, section 6.5 / sample 1
-#Only the first two lines are important, you may place anything behind them!
-- 
cgit v1.2.3


From 91d6888a8afe562bf4d2ef53be94c41898e1a2ec Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 31 Mar 2009 22:03:02 +0200
Subject: bugfix: "make distcheck" did not work

---
 tests/parsertest.c         | 12 ++++++++----
 tests/testruns/parser.conf |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/parsertest.c b/tests/parsertest.c
index 3ccae3d6..6c2221e8 100644
--- a/tests/parsertest.c
+++ b/tests/parsertest.c
@@ -105,7 +105,7 @@ int openPipe(pid_t *pid, int *pfd)
 	char *newenviron[] = { NULL };
 
 
-	sprintf(confFile, "-f%s/testruns/parser2.conf", getenv("srcdir"));
+	sprintf(confFile, "-f%s/testruns/parser.conf", getenv("srcdir"));
 	newargv[1] = confFile;
 
 	if (pipe(pipefd) == -1) {
@@ -232,7 +232,13 @@ doTests(int fd, char *files)
 	}
 	globfree(&testFiles);
 
-	printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
+	if(iTests == 0) {
+		printf("Error: no test cases found, no tests executed.\n");
+		iFailed = 1;
+	} else {
+		printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
+	}
+
 	return(iFailed);
 }
 
@@ -261,5 +267,3 @@ int main(int argc, char *argv[])
 	printf("End of parser tests.\n");
 	exit(ret);
 }
-
-
diff --git a/tests/testruns/parser.conf b/tests/testruns/parser.conf
index 8d32746c..0fb7d16d 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testruns/parser.conf
@@ -5,5 +5,5 @@ $UDPServerRun 12514
 $ErrorMessagesToStderr off
 
 # use a special format that we can easily parse in expect
-$template expect,"{{%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%}}"
+$template expect,"%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%\n"
 *.* :omstdout:;expect
-- 
cgit v1.2.3


From d27edc7587dba7b850759d151d90cdad1cb34a35 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 31 Mar 2009 20:35:15 +0200
Subject: porting parser tests to solaris

---
 tests/Makefile.am | 12 ++++++++----
 tests/getline.c   | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/rscript.c   | 31 ------------------------------
 3 files changed, 64 insertions(+), 35 deletions(-)
 create mode 100644 tests/getline.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 093742db..09d1a0b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
-check_PROGRAMS = rt_init rscript ourtail parsertest
-TESTS = $(check_PROGRAMS) cfg.sh
+TESTRUNS = rt_init rscript parsertest
+check_PROGRAMS = $(TESTRUNS) ourtail
+TESTS = $(TESTRUNS) cfg.sh
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
 DISTCLEANFILES=rsyslog.pid
-
 test_files = testbench.h runtime-dummy.c
+
 EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   cfg1.cfgtest \
 	   cfg1.testin \
@@ -27,12 +28,15 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 
 ourtail_SOURCES = ourtail.c
 
+parsertest_SOURCES = parsertest.c getline.c
+parsertest_LDADD = $(SOL_LIBS)
+
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
 rt_init_LDFLAGS = -export-dynamic
 
-rscript_SOURCES = rscript.c $(test_files)
+rscript_SOURCES = rscript.c getline.c $(test_files)
 rscript_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
 rscript_LDFLAGS = -export-dynamic
diff --git a/tests/getline.c b/tests/getline.c
new file mode 100644
index 00000000..10de2ffe
--- /dev/null
+++ b/tests/getline.c
@@ -0,0 +1,56 @@
+/* getline() replacement for platforms that do not have it.
+ *
+ * Part of the testbench for rsyslog.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include <stdio.h>
+#include <malloc.h>
+
+/* we emulate getline (the dirty way) if we do not have it
+ * We do not try very hard, as this is just a test driver.
+ * rgerhards, 2009-03-31
+ */
+#ifndef HAVE_GETLINE
+ssize_t getline(char **lineptr, size_t *n, FILE *fp)
+{
+	int c;
+	int len = 0;
+
+	if(*lineptr == NULL)
+		*lineptr = malloc(4096); /* quick and dirty! */
+
+	c = fgetc(fp);
+	while(c != EOF && c != '\n') {
+		(*lineptr)[len++] = c;
+		c = fgetc(fp);
+	}
+	if(c != EOF) /* need to add NL? */
+		(*lineptr)[len++] = c;
+	
+	(*lineptr)[len] = '\0';
+
+	*n = len;
+	//printf("getline returns: '%s'\n", *lineptr);
+
+	return (len > 0) ? len : -1;
+}
+#endif /* #ifndef HAVE_GETLINE */
diff --git a/tests/rscript.c b/tests/rscript.c
index 4906f91a..6b232f5f 100644
--- a/tests/rscript.c
+++ b/tests/rscript.c
@@ -40,37 +40,6 @@ DEFobjCurrIf(ctok_token)
 DEFobjCurrIf(vmprg)
 
 
-/* we emulate getline (the dirty way) if we do not have it
- * We do not try very hard, as this is just a test driver.
- * rgerhards, 2009-03-31
- */
-#ifndef HAVE_GETLINE
-ssize_t getline(char **lineptr, size_t *n, FILE *fp)
-{
-	int c;
-	int len = 0;
-
-	if(*lineptr == NULL)
-		*lineptr = malloc(1024); /* quick and dirty! */
-
-	c = fgetc(fp);
-	while(c != EOF && c != '\n') {
-		(*lineptr)[len++] = c;
-		c = fgetc(fp);
-	}
-	if(c != EOF) /* need to add NL? */
-		(*lineptr)[len++] = c;
-	
-	(*lineptr)[len] = '\0';
-
-	*n = len;
-	//printf("getline returns: '%s'\n", *lineptr);
-
-	return (len > 0) ? len : -1;
-}
-#endif /* #ifndef HAVE_GETLINE */
-
-
 BEGINInit
 CODESTARTInit
 	pErrObj = "expr"; CHKiRet(objUse(expr, CORE_COMPONENT));
-- 
cgit v1.2.3


From e3f21521cd6ae237fd9b362281fe188380210fb5 Mon Sep 17 00:00:00 2001
From: Demo <rger@debian5-demo.demo.example.net>
Date: Tue, 31 Mar 2009 22:10:37 +0200
Subject: fixed some problems with "make check"

interestingly, they manifested on Debian, only, but potentially
existed on other platforms, too.
---
 configure.ac              | 4 +++-
 tests/DevNull.cfgtest     | 1 -
 tests/NoExistFile.cfgtest | 1 -
 tests/cfg.sh              | 4 ++--
 tools/omfile.c            | 3 +--
 tools/omfwd.c             | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2db856cd..de328f83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -689,8 +689,10 @@ AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes)
 
 
 # settings for omstdout
+# note that "make check" fails, if omstdout is not enabled (thus we enable
+# it by default).
 AC_ARG_ENABLE(omstdout,
-        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=no@:>@])],
+        [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=yes@:>@])],
         [case "${enableval}" in
          yes) enable_omstdout="yes" ;;
           no) enable_omstdout="no" ;;
diff --git a/tests/DevNull.cfgtest b/tests/DevNull.cfgtest
index d30d936b..7822b6df 100644
--- a/tests/DevNull.cfgtest
+++ b/tests/DevNull.cfgtest
@@ -1,3 +1,2 @@
 rsyslogd: CONFIG ERROR: there are no active actions configured. Inputs will run, but no output whatsoever is created. [try http://www.rsyslog.com/e/2103 ]
 rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/NoExistFile.cfgtest b/tests/NoExistFile.cfgtest
index 4cbcc029..88d3123f 100644
--- a/tests/NoExistFile.cfgtest
+++ b/tests/NoExistFile.cfgtest
@@ -1,3 +1,2 @@
 rsyslogd: CONFIG ERROR: could not interpret master config file '/This/does/not/exist'. [try http://www.rsyslog.com/e/2013 ]
 rsyslogd: EMERGENCY CONFIGURATION ACTIVATED - fix rsyslog config file!
-rsyslogd: End of config validation run. Bye.
diff --git a/tests/cfg.sh b/tests/cfg.sh
index 8acbf342..cb838354 100755
--- a/tests/cfg.sh
+++ b/tests/cfg.sh
@@ -36,7 +36,7 @@ echo "local directory"
 #
 # check empty config file
 #
-../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/dev/null 2>&1 |./ourtail |head -2 > tmp
 cmp tmp $srcdir/DevNull.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "DevNull.cfgtest failed"
@@ -51,7 +51,7 @@ fi;
 #
 # check missing config file
 #
-../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail > tmp
+../tools/rsyslogd -c4 -N1 -f/This/does/not/exist 2>&1 |./ourtail |head -2 > tmp
 cmp tmp $srcdir/NoExistFile.cfgtest
 if [ ! $? -eq 0 ]; then
 echo "NoExistFile.cfgtest failed"
diff --git a/tools/omfile.c b/tools/omfile.c
index 65306846..5141b4da 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -725,7 +725,6 @@ CODESTARTparseSelectorAct
 	} else {
 		pData->bSyncFile = bEnableSync ? 1 : 0;
 	}
-
 	pData->f_sizeLimit = 0; /* default value, use outchannels to configure! */
 
 	switch (*p)
@@ -822,7 +821,7 @@ CODESTARTparseSelectorAct
 	  	if(pData->fd < 0 ) {
 			pData->fd = -1;
 			DBGPRINTF("Error opening log file: %s\n", pData->f_fname);
-			errmsg.LogError(0, NO_ERRCODE, "%s", pData->f_fname);
+			errmsg.LogError(0, RS_RET_NO_FILE_ACCESS, "Could no open output file '%s'", pData->f_fname);
 			break;
 		}
 		if(strcmp((char*) p, _PATH_CONSOLE) == 0)
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 7a945ce0..88a382e0 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -177,7 +177,7 @@ ENDfreeInstance
 
 BEGINdbgPrintInstInfo
 CODESTARTdbgPrintInstInfo
-	printf("%s", pData->f_hname);
+	dbgprintf("%s", pData->f_hname);
 ENDdbgPrintInstInfo
 
 
-- 
cgit v1.2.3


From a66b69533e38fdc40a7832b99c36e4d25bba80b2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 1 Apr 2009 14:41:32 +0200
Subject: begining touches for putting rsyslog on spaceships

---
 doc/features.html         |   1 +
 plugins/omdtn/Makefile.am |   8 +++
 plugins/omdtn/omdtn.c     | 130 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 139 insertions(+)
 create mode 100644 plugins/omdtn/Makefile.am
 create mode 100644 plugins/omdtn/omdtn.c

diff --git a/doc/features.html b/doc/features.html
index 336b31cc..501f3304 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -124,6 +124,7 @@ community. Plus, it can be financially attractive: just think about how much les
 be to sponsor a feature instead of purchasing a commercial implementation. Also, the benefit
 of being recognised as a sponsor may even drive new customers to your business!</b>
 <ul>
+<li>Finalize the DTN "planetary Internet" space ship mode output plugin
 <li>port it to more *nix variants (eg AIX and HP UX) - this
 needs volunteers with access to those machines and knowledge </li>
 <li>pcre filtering - maybe (depending on feedback)&nbsp; -
diff --git a/plugins/omdtn/Makefile.am b/plugins/omdtn/Makefile.am
new file mode 100644
index 00000000..afb57476
--- /dev/null
+++ b/plugins/omdtn/Makefile.am
@@ -0,0 +1,8 @@
+pkglib_LTLIBRARIES = omdtn.la
+
+omdtn_la_SOURCES = omdtn.c
+omdtn_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
+omdtn_la_LDFLAGS = -module -avoid-version
+omdtn_la_LIBADD = 
+
+EXTRA_DIST = 
diff --git a/plugins/omdtn/omdtn.c b/plugins/omdtn/omdtn.c
new file mode 100644
index 00000000..761bde79
--- /dev/null
+++ b/plugins/omdtn/omdtn.c
@@ -0,0 +1,130 @@
+/* omdtn.c
+ * This is the plugin for rsyslog use in the interplanetary Internet,
+ * especially useful for rsyslog in space ships of all kinds.
+ * The core idea was introduced in early 2009 and considered
+ * doable.
+ *
+ * Note that this has not yet been tested for robustness but needs
+ * to prior to placing it on top of a rocket.
+ *
+ * NOTE: read comments in module-template.h for more specifics!
+ *
+ * File begun on 2009-04-01 by RGerhards
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include "rsyslog.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include "dirty.h"
+#include "syslogd-types.h"
+#include "srUtils.h"
+#include "template.h"
+#include "module-template.h"
+#include "errmsg.h"
+#include "cfsysline.h"
+
+MODULE_TYPE_OUTPUT
+
+/* internal structures
+ */
+DEF_OMOD_STATIC_DATA
+
+typedef struct _instanceData {
+} instanceData;
+
+BEGINcreateInstance
+CODESTARTcreateInstance
+ENDcreateInstance
+
+
+BEGINisCompatibleWithFeature
+CODESTARTisCompatibleWithFeature
+	if(eFeat == sFEATURERepeatedMsgReduction)
+		iRet = RS_RET_OK;
+ENDisCompatibleWithFeature
+
+
+BEGINfreeInstance
+CODESTARTfreeInstance
+ENDfreeInstance
+
+
+BEGINdbgPrintInstInfo
+CODESTARTdbgPrintInstInfo
+ENDdbgPrintInstInfo
+
+
+BEGINtryResume
+CODESTARTtryResume
+ENDtryResume
+
+BEGINdoAction
+CODESTARTdoAction
+	write(1, (char*)ppString[0], strlen((char*)ppString[0]));
+ENDdoAction
+
+
+BEGINparseSelectorAct
+CODESTARTparseSelectorAct
+CODE_STD_STRING_REQUESTparseSelectorAct(1)
+	/* first check if this config line is actually for us */
+	if(strncmp((char*) p, ":omstdout:", sizeof(":omstdout:") - 1)) {
+		ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED);
+	}
+
+	/* ok, if we reach this point, we have something for us */
+	p += sizeof(":omstdout:") - 1; /* eat indicator sequence  (-1 because of '\0'!) */
+	CHKiRet(createInstance(&pData));
+
+	/* check if a non-standard template is to be applied */
+	if(*(p-1) == ';')
+		--p;
+	CHKiRet(cflineParseTemplateName(&p, *ppOMSR, 0, 0, (uchar*) "RSYSLOG_FileFormat"));
+CODE_STD_FINALIZERparseSelectorAct
+ENDparseSelectorAct
+
+
+BEGINmodExit
+CODESTARTmodExit
+ENDmodExit
+
+
+BEGINqueryEtryPt
+CODESTARTqueryEtryPt
+CODEqueryEtryPt_STD_OMOD_QUERIES
+ENDqueryEtryPt
+
+
+BEGINmodInit()
+CODESTARTmodInit
+	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
+CODEmodInit_QueryRegCFSLineHdlr
+ENDmodInit
+
+/* vi:set ai:
+ */
-- 
cgit v1.2.3