26 files changed, 623 insertions, 37 deletions

diff --git a/tests/3.rstest b/tests/3.rstest
index 93cb941a..e75d9754 100644
--- a/tests/3.rstest
+++ b/tests/3.rstest
@@ -7,10 +7,10 @@ out:
 00000000: push_msgvar	msg[cstr]
 00000001: push_const	abc[cstr]
 00000002: push_const	1[nbr]
-00000003: func_call	strlen[cstr]
+00000003: func_call	strlen
 00000004: strconcat	
 00000005: push_const	1[nbr]
-00000006: func_call	strlen[cstr]
+00000006: func_call	strlen
 00000007: push_const	20[nbr]
 00000008: push_const	30[nbr]
 00000009: add	
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 09d1a0b6..87dca985 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
-TESTRUNS = rt_init rscript parsertest
-check_PROGRAMS = $(TESTRUNS) ourtail
-TESTS = $(TESTRUNS) cfg.sh
+TESTRUNS = rt_init rscript
+check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq
+TESTS = $(TESTRUNS) cfg.sh parsertest.sh omod-if-array.sh manytcp.sh
 TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
 DISTCLEANFILES=rsyslog.pid
 test_files = testbench.h runtime-dummy.c
@@ -17,19 +17,29 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   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 \
+	   testsuites/parse1.conf \
+	   testsuites/1.parse1 \
+   	   testsuites/rfc3164.parse1 \
+	   testsuites/rfc5424-1.parse1 \
+	   testsuites/rfc5424-2.parse1 \
+	   testsuites/rfc5424-3.parse1 \
+	   testsuites/rfc5424-4.parse1 \
+	   testsuites/omod-if-array.conf \
+	   testsuites/1.omod-if-array \
+	   parsertest.sh \
+	   manytcp.sh \
+	   testsuites/manytcp.conf \
+	   omod-if-array.sh \
 	   cfg.sh
 
 ourtail_SOURCES = ourtail.c
+chkseq_SOURCES = chkseq.c
 
-parsertest_SOURCES = parsertest.c getline.c
-parsertest_LDADD = $(SOL_LIBS)
+tcpflood_SOURCES = tcpflood.c
+tcpflood_LDADD = $(SOL_LIBS)
+
+nettester_SOURCES = nettester.c getline.c
+nettester_LDADD = $(SOL_LIBS)
 
 rt_init_SOURCES = rt-init.c $(test_files)
 rt_init_CPPFLAGS =  -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
diff --git a/tests/chkseq.c b/tests/chkseq.c
new file mode 100644
index 00000000..3203c250
--- /dev/null
+++ b/tests/chkseq.c
@@ -0,0 +1,76 @@
+/* Checks if a file consists of line of strictly monotonically
+ * increasing numbers. An expected start and end number may
+ * be set.
+ *
+ * Params
+ * argv[1]	file to check
+ * argv[2]	start number
+ * argv[3]	end number
+ *
+ * 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>
+
+int main(int argc, char *argv[])
+{
+	FILE *fp;
+	int val;
+	int i;
+	int ret = 0;
+	int start, end;
+
+	if(argc != 4) {
+		printf("Invalid call of chkseq\n");
+		printf("Usage: chkseq file start end\n");
+		exit(1);
+	}
+	
+	start = atoi(argv[2]);
+	end = atoi(argv[3]);
+
+	if(start > end) {
+		printf("start must be less than or equal end!\n");
+		exit(1);
+	}
+
+	/* read file */
+	fp = fopen(argv[1], "r");
+	if(fp == NULL) {
+		perror(argv[1]);
+		exit(1);
+	}
+
+	for(i = start ; i < end ; ++i) {
+		if(fscanf(fp, "%d\n", &val) != 1) {
+			printf("scanf error in index i=%d\n", i);
+			exit(1);
+		}
+		if(val != i) {
+			printf("read value %d, but expected value %d\n", val, i);
+			exit(1);
+		}
+	}
+
+	exit(ret);
+}
diff --git a/tests/getline.c b/tests/getline.c
index 10de2ffe..617d1b0e 100644
--- a/tests/getline.c
+++ b/tests/getline.c
@@ -23,7 +23,8 @@
  */
 #include "config.h"
 #include <stdio.h>
-#include <malloc.h>
+#include <sys/types.h>
+#include <stdlib.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.
diff --git a/tests/manytcp.sh b/tests/manytcp.sh
new file mode 100755
index 00000000..d9b2e9a0
--- /dev/null
+++ b/tests/manytcp.sh
@@ -0,0 +1,21 @@
+rm -f work rsyslog.out.log rsyslog.out.log.save # work files
+../tools/rsyslogd -c4 -u2 -n -irsyslog.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/manytcp.conf &
+sleep 1
+echo "rsyslogd started with pid " `cat rsyslog.pid`
+# the config file specifies exactly 1100 connections
+./tcpflood 127.0.0.1 13514 1000 40000
+if [ "$?" -ne "0" ]; then
+  echo "error during tcpflood! see rsyslog.out.log.save for what was written"
+  cp rsyslog.out.log rsyslog.out.log.save
+fi
+sleep 5 # we need this so that rsyslogd can receive all outstanding messages
+kill `cat rsyslog.pid`
+rm -f work
+sort < rsyslog.out.log > work
+./chkseq work 0 39999
+if [ "$?" -ne "0" ]; then
+  rm -f work rsyslog.out.log
+  echo "sequence error detected"
+  exit 1
+fi
+rm -f work rsyslog.out.log
diff --git a/tests/parsertest.c b/tests/nettester.c
index 6c2221e8..37183ac9 100644
--- a/tests/parsertest.c
+++ b/tests/nettester.c
@@ -1,11 +1,14 @@
-/* Runs a test suite on the rsyslog parser (and later potentially
+/* Runs a test suite on the rsyslog (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.
+ * The name of the test suite must be given as argv[1]. In this config,
+ * rsyslogd is loaded with config ./testsuites/<name>.conf and then
+ * test cases ./testsuites/ *.<name> are executed on it. This test driver is
+ * suitable for testing cases where a message sent (via UDP) results in
+ * exactly one response. It can not be used in cases where no response
+ * is expected (that would result in a hang of the test driver).
+ * Note: each test suite can contain many tests, but they all need to work
+ * with the same rsyslog configuration.
  *
  * Part of the testbench for rsyslog.
  *
@@ -40,9 +43,18 @@
 #include <unistd.h>
 #include <string.h>
 #include <glob.h>
+#include <signal.h>
 #include <netinet/in.h>
 
 #define EXIT_FAILURE 1
+#define INVALID_SOCKET -1
+/* Name of input file, must match $IncludeConfig in test suite .conf files */
+#define NETTEST_INPUT_CONF_FILE "nettest.input.conf" /* name of input file, must match $IncludeConfig in .conf files */
+
+static enum { inputUDP, inputTCP } inputMode;	/* input for which tests are to be run */
+static pid_t rsyslogdPid = 0;	/* pid of rsyslog instance being tested */
+static char *srcdir;	/* global $srcdir, set so that we can run outside of "make check" */
+static char *testSuite; /* name of current test suite */
 
 
 void readLine(int fd, char *ln)
@@ -58,6 +70,59 @@ void readLine(int fd, char *ln)
 }
 
 
+/* send a message via TCP
+ * We open the connection on the initial send, and never close it
+ * (let the OS do that). If a conneciton breaks, we do NOT try to
+ * recover, so all test after that one will fail (and the test
+ * driver probably hang. returns 0 if ok, something else otherwise.
+ * We use traditional framing '\n' at EOR for this tester. It may be
+ * worth considering additional framing modes.
+ * rgerhards, 2009-04-08
+ */
+int
+tcpSend(char *buf, int lenBuf)
+{
+	static int sock = INVALID_SOCKET;
+	struct sockaddr_in addr;
+
+	if(sock == INVALID_SOCKET) {
+		/* first time, need to connect to target */
+		if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
+			perror("socket()");
+			return(1);
+		}
+
+		memset((char *) &addr, 0, sizeof(addr));
+		addr.sin_family = AF_INET;
+		addr.sin_port = htons(13514);
+		if(inet_aton("127.0.0.1", &addr.sin_addr)==0) {
+			fprintf(stderr, "inet_aton() failed\n");
+			return(1);
+		}
+		if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) != 0) {
+			fprintf(stderr, "connect() failed\n");
+			return(1);
+		}
+	}
+
+	/* send test data */
+	if(send(sock, buf, lenBuf, 0) != lenBuf) {
+		perror("send test data");
+		fprintf(stderr, "send() failed\n");
+		return(1);
+	}
+
+	/* send record terminator */
+	if(send(sock, "\n", 1, 0) != 1) {
+		perror("send record terminator");
+		fprintf(stderr, "send() failed\n");
+		return(1);
+	}
+
+	return 0;
+}
+
+
 /* send a message via UDP
  * returns 0 if ok, something else otherwise.
  */
@@ -90,22 +155,23 @@ udpSend(char *buf, int lenBuf)
 	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 openPipe(char *configFile, 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 };
+			   "-M../runtime/.libs:../.libs", NULL };
 	char confFile[1024];
 	char *newenviron[] = { NULL };
 
 
-	sprintf(confFile, "-f%s/testruns/parser.conf", getenv("srcdir"));
+	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir, configFile);
 	newargv[1] = confFile;
 
 	if (pipe(pipefd) == -1) {
@@ -166,9 +232,14 @@ processTestFile(int fd, char *pszFileName)
 
 
 	testdata[strlen(testdata)-1] = '\0'; /* remove \n */
-	/* now we have the test data to send */
-	if(udpSend(testdata, strlen(testdata)) != 0)
-		return(2);
+	/* now we have the test data to send (we could use function pointers here...) */
+	if(inputMode == inputUDP) {
+		if(udpSend(testdata, strlen(testdata)) != 0)
+			return(2);
+	} else {
+		if(tcpSend(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
@@ -242,28 +313,82 @@ doTests(int fd, char *files)
 	return(iFailed);
 }
 
+/* cleanup */
+void doAtExit(void)
+{
+	int status;
+
+	if(rsyslogdPid != 0) {
+		kill(rsyslogdPid, SIGTERM);
+		waitpid(rsyslogdPid, &status, 0);	/* wait until instance terminates */
+	}
 
-/* */
+	unlink(NETTEST_INPUT_CONF_FILE);
+}
+
+/* Run the test suite. This must be called with exactly one parameter, the
+ * name of the test suite. For details, see file header comment at the top
+ * of this file.
+ * rgerhards, 2009-04-03
+ */
 int main(int argc, char *argv[])
 {
 	int fd;
-	pid_t pid;
 	int ret = 0;
+	FILE *fp;
 	char buf[4096];
 	char testcases[4096];
 
-	printf("running rsyslog parser tests ($srcdir=%s)\n", getenv("srcdir"));
+	if(argc != 3) {
+		printf("Invalid call of nettester\n");
+		printf("Usage: nettester testsuite-name input\n");
+		printf("       input = udp|tcp\n");
+		exit(1);
+	}
+	
+	atexit(doAtExit);
+
+	testSuite = argv[1];
+
+	if(!strcmp(argv[2], "udp"))
+		inputMode = inputUDP;
+	else if(!strcmp(argv[2], "tcp"))
+		inputMode = inputTCP;
+	else {
+		printf("error: unsupported input mode '%s'\n", argv[2]);
+		exit(1);
+	}
+
+	if((srcdir = getenv("srcdir")) == NULL)
+		srcdir = ".";
+
+	printf("Start of nettester run ($srcdir=%s, testsuite=%s, input=%s)\n",
+		srcdir, testSuite, argv[2]);
+
+	/* create input config file */
+	if((fp = fopen(NETTEST_INPUT_CONF_FILE, "w")) == NULL) {
+		perror(NETTEST_INPUT_CONF_FILE);
+		printf("error opening input configuration file\n");
+		exit(1);
+	}
+	if(inputMode == inputUDP) {
+		fputs("$ModLoad ../plugins/imudp/.libs/imudp\n", fp);
+		fputs("$UDPServerRun 12514\n", fp);
+	} else {
+		fputs("$ModLoad ../plugins/imtcp/.libs/imtcp\n", fp);
+		fputs("$InputTCPServerRun 13514\n", fp);
+	}
+	fclose(fp);
 
-	openPipe(&pid, &fd);
+	/* start to be tested rsyslogd */
+	openPipe(argv[1], &rsyslogdPid, &fd);
 	readLine(fd, buf);
 
 	/* generate filename */
-	sprintf(testcases, "%s/testruns/*.parse1", getenv("srcdir"));
+	sprintf(testcases, "%s/testsuites/*.%s", srcdir, testSuite);
 	if(doTests(fd, testcases) != 0)
 		ret = 1;
 
-	/* cleanup */
-	kill(pid, SIGTERM);
-	printf("End of parser tests.\n");
+	printf("End of nettester run (%d).\n", ret);
 	exit(ret);
 }
diff --git a/tests/omod-if-array.sh b/tests/omod-if-array.sh
new file mode 100755
index 00000000..fd845b4d
--- /dev/null
+++ b/tests/omod-if-array.sh
@@ -0,0 +1,12 @@
+echo test omod-if-array via udp
+./nettester omod-if-array udp
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
+
+echo test omod-if-array via tcp
+./nettester omod-if-array tcp
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
+
diff --git a/tests/parsertest.sh b/tests/parsertest.sh
new file mode 100755
index 00000000..a6b7d45c
--- /dev/null
+++ b/tests/parsertest.sh
@@ -0,0 +1,11 @@
+echo test parsertest via udp
+./nettester parse1 udp
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
+
+echo test parsertest via tcp
+./nettester parse1 tcp
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
new file mode 100644
index 00000000..254e9fd6
--- /dev/null
+++ b/tests/tcpflood.c
@@ -0,0 +1,282 @@
+/* Opens a large number of tcp connections and sends
+ * messages over them. This is used for stress-testing.
+ *
+ * Params
+ * argv[1]	target address
+ * argv[2]	target port
+ * argv[3]	number of connections
+ * argv[4]	number of messages to send (connection is random)
+ *
+ * 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 <time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <unistd.h>
+#include <string.h>
+#include <netinet/in.h>
+
+#define EXIT_FAILURE 1
+#define INVALID_SOCKET -1
+/* Name of input file, must match $IncludeConfig in test suite .conf files */
+#define NETTEST_INPUT_CONF_FILE "nettest.input.conf" /* name of input file, must match $IncludeConfig in .conf files */
+
+static char *targetIP;
+static int targetPort;
+static int numMsgsToSend; /* number of messages to send */
+static int numConnections; /* number of connections to create */
+static int *sockArray;  /* array of sockets to use */
+
+
+/* open a single tcp connection
+ */
+int openConn(int *fd)
+{
+	int sock;
+	struct sockaddr_in addr;
+
+	if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
+		perror("socket()");
+		return(1);
+	}
+
+	memset((char *) &addr, 0, sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_port = htons(targetPort);
+	if(inet_aton(targetIP, &addr.sin_addr)==0) {
+		fprintf(stderr, "inet_aton() failed\n");
+		return(1);
+	}
+	if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) != 0) {
+		perror("connect()");
+		fprintf(stderr, "connect() failed\n");
+		return(1);
+	}
+
+	*fd = sock;
+	return 0;
+}
+
+
+/* open all requested tcp connections
+ * this includes allocating the connection array
+ */
+int openConnections(void)
+{
+	int i;
+	char msgBuf[128];
+	size_t lenMsg;
+
+	write(1, "      open connections", sizeof("      open connections")-1);
+	sockArray = calloc(numConnections, sizeof(int));
+	for(i = 0 ; i < numConnections ; ++i) {
+		if(i % 10 == 0) {
+			printf("\r%5.5d", i);
+			//lenMsg = sprintf(msgBuf, "\r%5.5d", i);
+			//write(1, msgBuf, lenMsg);
+		}
+		if(openConn(&(sockArray[i])) != 0) {
+			printf("error in trying to open connection i=%d\n", i);
+			return 1;
+		}
+	}
+	lenMsg = sprintf(msgBuf, "\r%5.5d open connections\n", i);
+	write(1, msgBuf, lenMsg);
+
+	return 0;
+}
+
+
+/* we also close all connections because otherwise we may get very bad
+ * timing for the syslogd - it may not be able to process all incoming
+ * messages fast enough if we immediately shut down.
+ * TODO: it may be an interesting excercise to handle that situation
+ * at the syslogd level, too
+ * rgerhards, 2009-04-14
+ */
+void closeConnections(void)
+{
+	int i;
+	char msgBuf[128];
+	size_t lenMsg;
+
+	write(1, "      close connections", sizeof("      close connections")-1);
+	for(i = 0 ; i < numConnections ; ++i) {
+		if(i % 10 == 0) {
+			lenMsg = sprintf(msgBuf, "\r%5.5d", i);
+			write(1, msgBuf, lenMsg);
+		}
+		close(sockArray[i]);
+	}
+	lenMsg = sprintf(msgBuf, "\r%5.5d close connections\n", i);
+	write(1, msgBuf, lenMsg);
+
+}
+
+
+/* send messages to the tcp connections we keep open. We use
+ * a very basic format that helps identify the message
+ * (via msgnum:<number>: e.g. msgnum:00000001:). This format is suitable
+ * for extracton to field-based properties.
+ * The first numConnection messages are sent sequentially, as are the
+ * last. All messages in between are sent over random connections.
+ * Note that message numbers start at 0.
+ */
+int sendMessages(void)
+{
+	int i;
+	int socknum;
+	int lenBuf;
+	int lenSend;
+	char buf[2048];
+	char msgBuf[128];
+	size_t lenMsg;
+
+	srand(time(NULL));	/* seed is good enough for our needs */
+
+	printf("Sending %d messages.\n", numMsgsToSend);
+	printf("\r%5.5d messages sent", 0);
+	lenMsg = sprintf(msgBuf, "\r%5.5d/%5.5d messages sent", 0, numMsgsToSend);
+	write(1, msgBuf, lenMsg);
+	for(i = 0 ; i < numMsgsToSend ; ++i) {
+		if(i < numConnections)
+			socknum = i;
+		else if(i >= numMsgsToSend - numConnections)
+			socknum = i - (numMsgsToSend - numConnections);
+		else
+			socknum = rand() % numConnections;
+		lenBuf = sprintf(buf, "<167>Mar  1 01:00:00 172.20.245.8 tag msgnum:%8.8d:\n", i);
+		lenSend = send(sockArray[socknum], buf, lenBuf, MSG_NOSIGNAL);
+		if(lenSend != lenBuf) {
+			printf("\r%5.5d\n", i);
+			fflush(stdout);
+			perror("send test data");
+			printf("send() failed at socket %d, index %d\n", socknum, i);
+			fflush(stderr);
+			return(1);
+		}
+		if(i % 100 == 0) {
+			printf("\r%5.5d", i);
+		}
+	}
+	printf("\r%5.5d messages sent\n", i);
+
+	return 0;
+}
+
+
+/* send a message via TCP
+ * We open the connection on the initial send, and never close it
+ * (let the OS do that). If a conneciton breaks, we do NOT try to
+ * recover, so all test after that one will fail (and the test
+ * driver probably hang. returns 0 if ok, something else otherwise.
+ * We use traditional framing '\n' at EOR for this tester. It may be
+ * worth considering additional framing modes.
+ * rgerhards, 2009-04-08
+ */
+int
+tcpSend(char *buf, int lenBuf)
+{
+	static int sock = INVALID_SOCKET;
+	struct sockaddr_in addr;
+
+	if(sock == INVALID_SOCKET) {
+		/* first time, need to connect to target */
+		if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
+			perror("socket()");
+			return(1);
+		}
+
+		memset((char *) &addr, 0, sizeof(addr));
+		addr.sin_family = AF_INET;
+		addr.sin_port = htons(13514);
+		if(inet_aton("127.0.0.1", &addr.sin_addr)==0) {
+			fprintf(stderr, "inet_aton() failed\n");
+			return(1);
+		}
+		if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) != 0) {
+			fprintf(stderr, "connect() failed\n");
+			return(1);
+		}
+	}
+
+	/* send test data */
+	if(send(sock, buf, lenBuf, 0) != lenBuf) {
+		perror("send test data");
+		fprintf(stderr, "send() failed\n");
+		return(1);
+	}
+
+	/* send record terminator */
+	if(send(sock, "\n", 1, 0) != 1) {
+		perror("send record terminator");
+		fprintf(stderr, "send() failed\n");
+		return(1);
+	}
+
+	return 0;
+}
+
+
+/* Run the test suite. This must be called with exactly one parameter, the
+ * name of the test suite. For details, see file header comment at the top
+ * of this file.
+ * rgerhards, 2009-04-03
+ */
+int main(int argc, char *argv[])
+{
+	int ret = 0;
+	static char buf[1024];
+
+	setvbuf(stdout, buf, _IONBF, 48);
+
+	if(argc != 5) {
+		printf("Invalid call of tcpflood\n");
+		printf("Usage: tcpflood target-host target-port num-connections num-messages\n");
+		exit(1);
+	}
+	
+	targetIP = argv[1];
+	targetPort = atoi(argv[2]);
+	numConnections = atoi(argv[3]);
+	numMsgsToSend = atoi(argv[4]);
+
+	if(openConnections() != 0) {
+		printf("error opening connections\n");
+		exit(1);
+	}
+
+	if(sendMessages() != 0) {
+		printf("error sending messages\n");
+		exit(1);
+	}
+
+	//closeConnections();
+	printf("End of tcpflood Run\n");
+
+	exit(ret);
+}
diff --git a/tests/testsuites/1.omod-if-array b/tests/testsuites/1.omod-if-array
new file mode 100644
index 00000000..c464b19c
--- /dev/null
+++ b/tests/testsuites/1.omod-if-array
@@ -0,0 +1,2 @@
+<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,Mar  6 16:57:54,172.20.245.8,%PIX-7-710005,%PIX-7-710005:,
diff --git a/tests/testruns/1.parse1 b/tests/testsuites/1.parse1
index 5ae655e6..5ae655e6 100644
--- a/tests/testruns/1.parse1
+++ b/tests/testsuites/1.parse1
diff --git a/tests/testsuites/2.parse1 b/tests/testsuites/2.parse1
new file mode 100644
index 00000000..628e06df
--- /dev/null
+++ b/tests/testsuites/2.parse1
@@ -0,0 +1,3 @@
+<38>Mar 27 19:06:53 source_server sshd(pam_unix)[12750]: session opened for user foo by (uid=0)
+38,auth,info,Mar 27 19:06:53,source_server,sshd(pam_unix),sshd(pam_unix)[12750]:, session opened for user foo by (uid=0)
+# yet another real-life sample where we had some issues with
diff --git a/tests/testsuites/3.parse1 b/tests/testsuites/3.parse1
new file mode 100644
index 00000000..a6b4e884
--- /dev/null
+++ b/tests/testsuites/3.parse1
@@ -0,0 +1,3 @@
+<38>Apr  6 15:07:10 lxcvs07 sshd(pam_unix)[31738]: session closed for user cvsadmin
+38,auth,info,Apr  6 15:07:10,lxcvs07,sshd(pam_unix),sshd(pam_unix)[31738]:, session closed for user cvsadmin
+# yet another real-life sample where we had some issues with
diff --git a/tests/testsuites/date1.parse1 b/tests/testsuites/date1.parse1
new file mode 100644
index 00000000..ffc7c373
--- /dev/null
+++ b/tests/testsuites/date1.parse1
@@ -0,0 +1,3 @@
+<38> Mar  7 19:06:53 example tag: testmessage (only date actually tested)
+38,auth,info,Mar  7 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# one space in front of the date
diff --git a/tests/testsuites/date2.parse1 b/tests/testsuites/date2.parse1
new file mode 100644
index 00000000..8d587d9d
--- /dev/null
+++ b/tests/testsuites/date2.parse1
@@ -0,0 +1,3 @@
+<38>Mar 7 19:06:53 example tag: testmessage (only date actually tested)
+38,auth,info,Mar  7 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# only one space between "Mar" and "7"
diff --git a/tests/testsuites/date3.parse1 b/tests/testsuites/date3.parse1
new file mode 100644
index 00000000..940d261e
--- /dev/null
+++ b/tests/testsuites/date3.parse1
@@ -0,0 +1,3 @@
+<38>Mar 7 2008 19:06:53: example tag: testmessage (only date actually tested)
+38,auth,info,Mar  7 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# the year should not be there, nor the colon after the date, but we accept it...
diff --git a/tests/testsuites/date4.parse1 b/tests/testsuites/date4.parse1
new file mode 100644
index 00000000..eee5fb09
--- /dev/null
+++ b/tests/testsuites/date4.parse1
@@ -0,0 +1,3 @@
+<38>Mar 7 2008 19:06:53 example tag: testmessage (only date actually tested)
+38,auth,info,Mar  7 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# the year should not be there, but we accept it...
diff --git a/tests/testsuites/date5.parse1 b/tests/testsuites/date5.parse1
new file mode 100644
index 00000000..be32e605
--- /dev/null
+++ b/tests/testsuites/date5.parse1
@@ -0,0 +1,3 @@
+<38>Mar 7 19:06:53: example tag: testmessage (only date actually tested)
+38,auth,info,Mar  7 19:06:53,example,tag,tag:, testmessage (only date actually tested)
+# colon after timestamp is strictly not ok, but we accept it
diff --git a/tests/testsuites/manytcp.conf b/tests/testsuites/manytcp.conf
new file mode 100644
index 00000000..8175732e
--- /dev/null
+++ b/tests/testsuites/manytcp.conf
@@ -0,0 +1,13 @@
+# Test for tcp "flood" testing
+# rgerhards, 2009-04-08
+$ModLoad ../plugins/imtcp/.libs/imtcp
+$MainMsgQueueTimeoutShutdown 10000
+$MaxOpenFiles 2000
+$InputTCPMaxSessions 1100
+$InputTCPServerRun 13514
+
+$ErrorMessagesToStderr off
+
+$template outfmt,"%msg:F,58:2%\n"
+$template dynfile,"rsyslog.out.log" # trick to use relative path names!
+:msg, contains, "msgnum:" ?dynfile;outfmt
diff --git a/tests/testsuites/omod-if-array.conf b/tests/testsuites/omod-if-array.conf
new file mode 100644
index 00000000..d88db166
--- /dev/null
+++ b/tests/testsuites/omod-if-array.conf
@@ -0,0 +1,13 @@
+# Test config for array-passing output module interface
+# (stanard string passing is already tested via the other test inside
+# the testbench, so we do not need to focus on that)
+# rgerhards, 2009-04-03
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ActionOMStdoutArrayInterface on 
+$ErrorMessagesToStderr off
+
+# do NOT remove \n, that would hang the test driver!
+$template expect,"%PRI%%timestamp%%hostname%%programname%%syslogtag%\n"
+*.* :omstdout:;expect
diff --git a/tests/testruns/parser.conf b/tests/testsuites/parse1.conf
index 0fb7d16d..947a05a8 100644
--- a/tests/testruns/parser.conf
+++ b/tests/testsuites/parse1.conf
@@ -1,6 +1,5 @@
 $ModLoad ../plugins/omstdout/.libs/omstdout
-$ModLoad ../plugins/imudp/.libs/imudp
-$UDPServerRun 12514
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
 
 $ErrorMessagesToStderr off
 
diff --git a/tests/testruns/rfc3164.parse1 b/tests/testsuites/rfc3164.parse1
index e7a5fa18..e7a5fa18 100644
--- a/tests/testruns/rfc3164.parse1
+++ b/tests/testsuites/rfc3164.parse1
diff --git a/tests/testruns/rfc5424-1.parse1 b/tests/testsuites/rfc5424-1.parse1
index 23836c9f..23836c9f 100644
--- a/tests/testruns/rfc5424-1.parse1
+++ b/tests/testsuites/rfc5424-1.parse1
diff --git a/tests/testruns/rfc5424-2.parse1 b/tests/testsuites/rfc5424-2.parse1
index a86fbc35..a86fbc35 100644
--- a/tests/testruns/rfc5424-2.parse1
+++ b/tests/testsuites/rfc5424-2.parse1
diff --git a/tests/testruns/rfc5424-3.parse1 b/tests/testsuites/rfc5424-3.parse1
index 6ad4073d..6ad4073d 100644
--- a/tests/testruns/rfc5424-3.parse1
+++ b/tests/testsuites/rfc5424-3.parse1
diff --git a/tests/testruns/rfc5424-4.parse1 b/tests/testsuites/rfc5424-4.parse1
index ecf27e14..ecf27e14 100644
--- a/tests/testruns/rfc5424-4.parse1
+++ b/tests/testsuites/rfc5424-4.parse1