From 8f8e2cd66bd7f1e35f7bf0678e25bbdb99d67093 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 8 Apr 2009 12:19:54 +0200
Subject: improved testbench, added tests for tcp-based reception

---
 tests/nettester.c | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 392 insertions(+)
 create mode 100644 tests/nettester.c

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
new file mode 100644
index 00000000..89a784f3
--- /dev/null
+++ b/tests/nettester.c
@@ -0,0 +1,392 @@
+/* Runs a test suite on the rsyslog (and later potentially
+ * other things).
+ *
+ * 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.
+ *
+ * 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
+#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)
+{
+	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 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.
+ */
+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(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:../.libs", NULL };
+	char confFile[1024];
+	char *newenviron[] = { NULL };
+
+
+	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir, configFile);
+	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 (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
+	 * 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);
+
+	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);
+}
+
+/* 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;
+	int ret = 0;
+	FILE *fp;
+	char buf[4096];
+	char testcases[4096];
+
+	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)\n", srcdir, testSuite);
+
+	/* 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);
+
+	/* start to be tested rsyslogd */
+	openPipe(argv[1], &rsyslogdPid, &fd);
+	readLine(fd, buf);
+
+	/* generate filename */
+	sprintf(testcases, "%s/testsuites/*.%s", srcdir, testSuite);
+	if(doTests(fd, testcases) != 0)
+		ret = 1;
+
+	printf("End of nettester run (%d).\n", ret);
+	exit(ret);
+}
-- 
cgit v1.2.3


From 51e690f720b4a53a431e7a536b2fe8c25e866f7d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 16 Mar 2009 18:54:42 +0100
Subject: fixed some portability issues

first noticed on FreeBSD
Also, some cosmetic improvements.
---
 tests/nettester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 89a784f3..37183ac9 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -43,6 +43,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <glob.h>
+#include <signal.h>
 #include <netinet/in.h>
 
 #define EXIT_FAILURE 1
@@ -361,7 +362,8 @@ int main(int argc, char *argv[])
 	if((srcdir = getenv("srcdir")) == NULL)
 		srcdir = ".";
 
-	printf("Start of nettester run ($srcdir=%s, testsuite=%s)\n", srcdir, testSuite);
+	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) {
-- 
cgit v1.2.3


From aba90e82484118f3568ec51c01de5ba845da589a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 22 May 2009 17:06:52 +0200
Subject: added capability to run multiple tcp listeners (on different ports)

Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
---
 tests/nettester.c | 101 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 72 insertions(+), 29 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 37183ac9..566f553b 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -45,16 +45,36 @@
 #include <glob.h>
 #include <signal.h>
 #include <netinet/in.h>
+#include <getopt.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 */
+typedef enum { inputUDP, inputTCP } inputMode_t;
+inputMode_t inputMode = inputTCP; /* 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 */
+static char *testSuite = NULL; /* name of current test suite */
+static int iPort = 12514; /* port which shall be used for sending data */
+static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
+static int verbose = 0;	/* verbose output? -v option */
+
+
+/* provide user-friednly name of input mode
+ */
+static char *inputMode2Str(inputMode_t mode)
+{
+	char *pszMode;
+
+	if(mode == inputUDP)
+		pszMode = "udp";
+	else
+		pszMode = "tcp";
+
+	return pszMode;
+}
 
 
 void readLine(int fd, char *ln)
@@ -94,7 +114,7 @@ tcpSend(char *buf, int lenBuf)
 
 		memset((char *) &addr, 0, sizeof(addr));
 		addr.sin_family = AF_INET;
-		addr.sin_port = htons(13514);
+		addr.sin_port = htons(iPort);
 		if(inet_aton("127.0.0.1", &addr.sin_addr)==0) {
 			fprintf(stderr, "inet_aton() failed\n");
 			return(1);
@@ -139,7 +159,7 @@ udpSend(char *buf, int lenBuf)
 
 	memset((char *) &si_other, 0, sizeof(si_other));
 	si_other.sin_family = AF_INET;
-	si_other.sin_port = htons(12514);
+	si_other.sin_port = htons(iPort);
 	if(inet_aton("127.0.0.1", &si_other.sin_addr)==0) {
 		fprintf(stderr, "inet_aton() failed\n");
 		return(1);
@@ -169,9 +189,14 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 			   "-M../runtime/.libs:../.libs", NULL };
 	char confFile[1024];
 	char *newenviron[] = { NULL };
+	/* debug aide...
+	char *newenviron[] = { "RSYSLOG_DEBUG=debug nostdout",
+				"RSYSLOG_DEBUGLOG=tmp", NULL };
+	*/
 
 
-	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir, configFile);
+	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir,
+		(pszCustomConf == NULL) ? configFile : pszCustomConf);
 	newargv[1] = confFile;
 
 	if (pipe(pipefd) == -1) {
@@ -291,12 +316,12 @@ doTests(int fd, char *files)
 		++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);
+			if(verbose) printf("processing test case '%s' ... ", testFile);
 			ret = processTestFile(fd, testFile);
 			if(ret == 0) {
-				printf("successfully completed\n");
+				if(verbose) printf("successfully completed\n");
 			} else {
-				printf("failed!\n");
+				if(verbose) printf("failed!\n");
 				++iFailed;
 			}
 		}
@@ -334,36 +359,54 @@ void doAtExit(void)
 int main(int argc, char *argv[])
 {
 	int fd;
+	int opt;
 	int ret = 0;
 	FILE *fp;
 	char buf[4096];
 	char testcases[4096];
 
-	if(argc != 3) {
-		printf("Invalid call of nettester\n");
-		printf("Usage: nettester testsuite-name input\n");
-		printf("       input = udp|tcp\n");
-		exit(1);
+	while((opt = getopt(argc, argv, "c:i:p:t:v")) != EOF) {
+		switch((char)opt) {
+                case 'c':
+			pszCustomConf = optarg;
+			break;
+                case 'i':
+			if(!strcmp(optarg, "udp"))
+				inputMode = inputUDP;
+			else if(!strcmp(optarg, "tcp"))
+				inputMode = inputTCP;
+			else {
+				printf("error: unsupported input mode '%s'\n", optarg);
+				exit(1);
+			}
+			break;
+                case 'p':
+			iPort = atoi(optarg);
+			break;
+                case 't':
+			testSuite = optarg;
+			break;
+                case 'v':
+			verbose = 1;
+			break;
+		default:printf("Invalid call of nettester, invalid option '%c'.\n", opt);
+			printf("Usage: nettester -ttestsuite-name -iudp|tcp [-pport] [-ccustomConfFile] \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]);
+	if(testSuite == NULL) {
+		printf("error: no testsuite given, need to specify -t testsuite!\n");
 		exit(1);
 	}
 
+	atexit(doAtExit);
+
 	if((srcdir = getenv("srcdir")) == NULL)
 		srcdir = ".";
 
-	printf("Start of nettester run ($srcdir=%s, testsuite=%s, input=%s)\n",
-		srcdir, testSuite, argv[2]);
+	if(verbose) printf("Start of nettester run ($srcdir=%s, testsuite=%s, input=%s/%d)\n",
+		srcdir, testSuite, inputMode2Str(inputMode), iPort);
 
 	/* create input config file */
 	if((fp = fopen(NETTEST_INPUT_CONF_FILE, "w")) == NULL) {
@@ -373,15 +416,15 @@ int main(int argc, char *argv[])
 	}
 	if(inputMode == inputUDP) {
 		fputs("$ModLoad ../plugins/imudp/.libs/imudp\n", fp);
-		fputs("$UDPServerRun 12514\n", fp);
+		fprintf(fp, "$UDPServerRun %d\n", iPort);
 	} else {
 		fputs("$ModLoad ../plugins/imtcp/.libs/imtcp\n", fp);
-		fputs("$InputTCPServerRun 13514\n", fp);
+		fprintf(fp, "$InputTCPServerRun %d\n", iPort);
 	}
 	fclose(fp);
 
 	/* start to be tested rsyslogd */
-	openPipe(argv[1], &rsyslogdPid, &fd);
+	openPipe(testSuite, &rsyslogdPid, &fd);
 	readLine(fd, buf);
 
 	/* generate filename */
@@ -389,6 +432,6 @@ int main(int argc, char *argv[])
 	if(doTests(fd, testcases) != 0)
 		ret = 1;
 
-	printf("End of nettester run (%d).\n", ret);
+	if(verbose) printf("End of nettester run (%d).\n", ret);
 	exit(ret);
 }
-- 
cgit v1.2.3


From d2d54013aebb756169182ed8716b142d27134a70 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 17 Jun 2009 15:22:13 +0200
Subject: going forward in moving string-handling functions to new interface...

---
 tests/nettester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 566f553b..b7b3f892 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -321,7 +321,9 @@ doTests(int fd, char *files)
 			if(ret == 0) {
 				if(verbose) printf("successfully completed\n");
 			} else {
-				if(verbose) printf("failed!\n");
+				if(!verbose)
+					printf("test '%s' ", testFile);
+				printf("failed!\n");
 				++iFailed;
 			}
 		}
-- 
cgit v1.2.3


From 8628312396b1535c41124e499d292f4d1e77d955 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 18 Jun 2009 13:22:21 +0200
Subject: cleaned up/optimized raw message handling in msg object

---
 tests/nettester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index b7b3f892..e5e6278c 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -191,7 +191,7 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 	char *newenviron[] = { NULL };
 	/* debug aide...
 	char *newenviron[] = { "RSYSLOG_DEBUG=debug nostdout",
-				"RSYSLOG_DEBUGLOG=tmp", NULL };
+				"RSYSLOG_DEBUGLOG=log", NULL };
 	*/
 
 
-- 
cgit v1.2.3


From 77c992e2155420702460e835ce2d561cf2d10fcb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:30:57 +0200
Subject: fully optimized datetime module and enhanced test suite

tests for the various timestamp formats have been added
---
 tests/nettester.c | 70 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 31 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index e5e6278c..b8816b7c 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -61,6 +61,9 @@ static int iPort = 12514; /* port which shall be used for sending data */
 static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
 static int verbose = 0;	/* verbose output? -v option */
 
+/* these two are quick hacks... */
+int iFailed = 0;
+int iTests = 0;
 
 /* provide user-friednly name of input mode
  */
@@ -247,38 +250,47 @@ processTestFile(int fd, char *pszFileName)
 
 	/* skip comments at start of file */
 
-	getline(&testdata, &lenLn, fp);
 	while(!feof(fp)) {
-		if(*testdata == '#')
-			getline(&testdata, &lenLn, fp);
-		else
-			break; /* first non-comment */
-	}
+		getline(&testdata, &lenLn, fp);
+		while(!feof(fp)) {
+			if(*testdata == '#')
+				getline(&testdata, &lenLn, fp);
+			else
+				break; /* first non-comment */
+		}
 
+		/* this is not perfect, but works ;) */
+		if(feof(fp))
+			break;
 
-	testdata[strlen(testdata)-1] = '\0'; /* remove \n */
-	/* 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);
-	}
+		++iTests; /* increment test count, we now do one! */
 
-	/* 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 */
+		testdata[strlen(testdata)-1] = '\0'; /* remove \n */
+		/* 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
+		 * 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)) {
+			++iFailed;
+			printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
+				expected, buf);
+				ret = 1;
+		}
 
-	/* 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);
@@ -297,8 +309,6 @@ processTestFile(int fd, char *pszFileName)
 int
 doTests(int fd, char *files)
 {
-	int iFailed = 0;
-	int iTests = 0;
 	int ret;
 	char *testFile;
 	glob_t testFiles;
@@ -313,7 +323,6 @@ doTests(int fd, char *files)
 		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 */
 			if(verbose) printf("processing test case '%s' ... ", testFile);
@@ -324,7 +333,6 @@ doTests(int fd, char *files)
 				if(!verbose)
 					printf("test '%s' ", testFile);
 				printf("failed!\n");
-				++iFailed;
 			}
 		}
 	}
-- 
cgit v1.2.3


From 4822715a6e1ecc48d50a5450f93f02f785b8745a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 29 Jun 2009 11:37:29 +0200
Subject: updated testbench to new init() behavior

the deferred activation of input modules broke part of the testbench -
but this was a testbench issue, not one of the patch
---
 tests/nettester.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index b8816b7c..c9a978c5 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -107,6 +107,7 @@ tcpSend(char *buf, int lenBuf)
 {
 	static int sock = INVALID_SOCKET;
 	struct sockaddr_in addr;
+	int retries;
 
 	if(sock == INVALID_SOCKET) {
 		/* first time, need to connect to target */
@@ -122,10 +123,19 @@ tcpSend(char *buf, int lenBuf)
 			fprintf(stderr, "inet_aton() failed\n");
 			return(1);
 		}
-		if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) != 0) {
-			fprintf(stderr, "connect() failed\n");
-			return(1);
-		}
+		retries = 0;
+		while(1) { /* loop broken inside */
+			if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
+				break;
+			} else {
+				if(retries++ == 3) {
+					fprintf(stderr, "connect() failed\n");
+					return(1);
+				} else {
+					sleep(1);
+				}
+			}
+		} 
 	}
 
 	/* send test data */
-- 
cgit v1.2.3


From de84a12f8a5f140c0f7b8e00f4cac92ef13cd866 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 29 Jun 2009 16:53:26 +0200
Subject: introduced the idea of detached properties

some things inside the message can be used over a large number of
messages and need to to be allocated and re-written every time. I now
begin to implement this as a "prop_t" object, first use for the inputName.
Some input modules are already converted, some others to go. Will do
a little performance check on the new method before I go further.

Also, this commit has some cleanup and a few bug fixes that prevented
compiliation in debug mode (I overlooked this as I did not compile
for debug, what I normally do, and the automatted test also does not
do that)
---
 tests/nettester.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index c9a978c5..dbfb4db3 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -128,11 +128,12 @@ tcpSend(char *buf, int lenBuf)
 			if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
 				break;
 			} else {
-				if(retries++ == 3) {
+				if(retries++ == 30) {
+					++iFailed;
 					fprintf(stderr, "connect() failed\n");
 					return(1);
 				} else {
-					sleep(1);
+					usleep(100);
 				}
 			}
 		} 
-- 
cgit v1.2.3


From e3040285dbf0854443bc2443e0de5ac59f6f839e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 6 Jul 2009 16:38:09 +0200
Subject: first shot at asynchronous stream writer with timeout capability

... seems to work on quick testing, but needs a far more testing
and improvement. Good milestone commit.
---
 tests/nettester.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index dbfb4db3..73abc46e 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -128,12 +128,13 @@ tcpSend(char *buf, int lenBuf)
 			if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
 				break;
 			} else {
-				if(retries++ == 30) {
+				if(retries++ == 50) {
 					++iFailed;
 					fprintf(stderr, "connect() failed\n");
 					return(1);
 				} else {
-					usleep(100);
+					fprintf(stderr, "connect() failed, retry %d\n", retries);
+					usleep(100000); /* ms = 1000 us! */
 				}
 			}
 		} 
-- 
cgit v1.2.3


From 4b6e93d382a622bffedbbaa6b87f94124987e2fd Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 8 Jul 2009 18:45:23 +0200
Subject: further reduction in code size/complexity due to design change

---
 tests/nettester.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 73abc46e..41b093c5 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -133,7 +133,6 @@ tcpSend(char *buf, int lenBuf)
 					fprintf(stderr, "connect() failed\n");
 					return(1);
 				} else {
-					fprintf(stderr, "connect() failed, retry %d\n", retries);
 					usleep(100000); /* ms = 1000 us! */
 				}
 			}
-- 
cgit v1.2.3


From 9de685929e4c202d470e07ec28fda41a5efc8eaf Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 9 Jul 2009 16:32:14 +0200
Subject: bugfix: message could be truncated after TAG, often when forwarding

This was a result of an internal processing error if maximum field
sizes had been specified in the property replacer.
Also did some testbench improvements, including omstdout.
---
 tests/nettester.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index dbfb4db3..b5da8ee8 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -38,6 +38,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <arpa/inet.h>
 #include <assert.h>
 #include <unistd.h>
@@ -82,14 +83,27 @@ static char *inputMode2Str(inputMode_t mode)
 
 void readLine(int fd, char *ln)
 {
+	char *orig = ln;
 	char c;
 	int lenRead;
+
+	if(verbose)
+		fprintf(stderr, "begin readLine\n");
 	lenRead = read(fd, &c, 1);
 	while(lenRead == 1 && c != '\n') {
+		if(c == '\0') {
+			*ln = c;
+			fprintf(stderr, "Warning: there was a '\\0'-Byte in the read response "
+					"right after this string: '%s'\n", orig);
+			c = '?';
+		}
 		*ln++ = c;
-		 lenRead = read(fd, &c, 1);
+		lenRead = read(fd, &c, 1);
 	}
 	*ln = '\0';
+
+	if(verbose)
+		fprintf(stderr, "end readLine, val read '%s'\n", orig);
 }
 
 
@@ -133,7 +147,7 @@ tcpSend(char *buf, int lenBuf)
 					fprintf(stderr, "connect() failed\n");
 					return(1);
 				} else {
-					usleep(100);
+					usleep(100000); /* 0.1 sec, these are us! */
 				}
 			}
 		} 
@@ -208,7 +222,6 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 				"RSYSLOG_DEBUGLOG=log", NULL };
 	*/
 
-
 	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir,
 		(pszCustomConf == NULL) ? configFile : pszCustomConf);
 	newargv[1] = confFile;
-- 
cgit v1.2.3


From 5625dbd1b6cddb8b84d8a3d8c60f95eaaa49be66 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 7 Oct 2009 18:40:30 +0200
Subject: bugfix and testbench improvements

- bugfix: solved potential (temporary) stall of messages when the queue was
  almost empty and few new data added (caused testbench to sometimes hang!)
- fixed some race condition in testbench
- added more elaborate diagnostics to parts of the testbench
- solved a potential race inside the queue engine
---
 tests/nettester.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 71641745..2838b919 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -47,6 +47,7 @@
 #include <signal.h>
 #include <netinet/in.h>
 #include <getopt.h>
+#include <errno.h>
 
 #define EXIT_FAILURE 1
 #define INVALID_SOCKET -1
@@ -90,6 +91,7 @@ void readLine(int fd, char *ln)
 	if(verbose)
 		fprintf(stderr, "begin readLine\n");
 	lenRead = read(fd, &c, 1);
+
 	while(lenRead == 1 && c != '\n') {
 		if(c == '\0') {
 			*ln = c;
@@ -102,6 +104,11 @@ void readLine(int fd, char *ln)
 	}
 	*ln = '\0';
 
+	if(lenRead < 0) {
+		printf("read from rsyslogd returned with error '%s' - aborting test\n", strerror(errno));
+		exit(1);
+	}
+
 	if(verbose)
 		fprintf(stderr, "end readLine, val read '%s'\n", orig);
 }
@@ -308,6 +315,10 @@ processTestFile(int fd, char *pszFileName)
 
 		/* pull response from server and then check if it meets our expectation */
 		readLine(fd, buf);
+		if(strlen(buf) == 0) {
+			printf("something went wrong - read a zero-length string from rsyslogd");
+			exit(1);
+		}
 		if(strcmp(expected, buf)) {
 			++iFailed;
 			printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
@@ -372,11 +383,24 @@ doTests(int fd, char *files)
 	return(iFailed);
 }
 
+
+/* indicate that our child has died (where it is not permitted to!).
+ */
+void childDied(__attribute__((unused)) int sig)
+{
+	printf("ERROR: child died unexpectedly (maybe a segfault?)!\n");
+	exit(1);
+}
+
+
 /* cleanup */
 void doAtExit(void)
 {
 	int status;
 
+	/* disarm died-child handler */
+	signal(SIGCHLD, SIG_IGN);
+
 	if(rsyslogdPid != 0) {
 		kill(rsyslogdPid, SIGTERM);
 		waitpid(rsyslogdPid, &status, 0);	/* wait until instance terminates */
@@ -457,6 +481,9 @@ int main(int argc, char *argv[])
 	}
 	fclose(fp);
 
+	/* arm died-child handler */
+	signal(SIGCHLD, childDied);
+
 	/* start to be tested rsyslogd */
 	openPipe(testSuite, &rsyslogdPid, &fd);
 	readLine(fd, buf);
@@ -467,5 +494,6 @@ int main(int argc, char *argv[])
 		ret = 1;
 
 	if(verbose) printf("End of nettester run (%d).\n", ret);
+
 	exit(ret);
 }
-- 
cgit v1.2.3


From 2bf008af08cda8bd1b4c712172dd8790f0f8343e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 19 Oct 2009 13:59:42 +0200
Subject: added new testcase; fixed bug in testdriver

---
 tests/nettester.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 2838b919..47e75243 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -326,10 +326,13 @@ processTestFile(int fd, char *pszFileName)
 				ret = 1;
 		}
 
+		/* clean up after the try */
+		free(testdata);
+		testdata = NULL;
+		free(expected);
+		expected = NULL;
 	}
 
-	free(testdata);
-	free(expected);
 	fclose(fp);
 	return(ret);
 }
-- 
cgit v1.2.3


From 07264a78e00766cf15ab379baaeec3cea372a33e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 20 Oct 2009 09:05:48 +0200
Subject: added some tests for IPv4-Only configuration

We are "abusing" the parser tests to test the TCP/UDP reception
handling. Thus we do not run the other tests through to an IPv4
only config. It acutally is not that parser that matters but rather
the hope to find some init issues when running with only a single
listening socket (in IPv6, we usually both have an IPv4 AND an IPv6
listening socket, what - as practice has shown - may hide listener
setup errors).
---
 tests/nettester.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 47e75243..3ab96e62 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -62,6 +62,7 @@ static char *testSuite = NULL; /* name of current test suite */
 static int iPort = 12514; /* port which shall be used for sending data */
 static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
 static int verbose = 0;	/* verbose output? -v option */
+static int IPv4Only = 0;	/* use only IPv4 in rsyslogd call? */
 
 /* these two are quick hacks... */
 int iFailed = 0;
@@ -221,7 +222,7 @@ 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:../.libs", NULL };
+			   "-M../runtime/.libs:../.libs", NULL, NULL};
 	char confFile[1024];
 	char *newenviron[] = { NULL };
 	/* debug aide...
@@ -233,6 +234,9 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 		(pszCustomConf == NULL) ? configFile : pszCustomConf);
 	newargv[1] = confFile;
 
+	if(IPv4Only)
+		newargv[(sizeof(newargv)/sizeof(char*)) - 2] = "-4";
+
 	if (pipe(pipefd) == -1) {
 		perror("pipe");
 		exit(EXIT_FAILURE);
@@ -426,8 +430,11 @@ int main(int argc, char *argv[])
 	char buf[4096];
 	char testcases[4096];
 
-	while((opt = getopt(argc, argv, "c:i:p:t:v")) != EOF) {
+	while((opt = getopt(argc, argv, "4c:i:p:t:v")) != EOF) {
 		switch((char)opt) {
+                case '4':
+			IPv4Only = 1;
+			break;
                 case 'c':
 			pszCustomConf = optarg;
 			break;
-- 
cgit v1.2.3


From e04e1b50025f5fa9c26abd946190dce8f797d08f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 22 Oct 2009 11:33:38 +0200
Subject: enhanced test environment (including testbench)

support for enhancing probability of memory addressing failure by
using non-NULL default value for malloced memory (optional, only if
requested by configure option). This helps to track down some
otherwise undetected issues within the testbench and is expected
to be very useful in the future.
---
 tests/nettester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 3ab96e62..7f1a6b1f 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -320,7 +320,7 @@ processTestFile(int fd, char *pszFileName)
 		/* pull response from server and then check if it meets our expectation */
 		readLine(fd, buf);
 		if(strlen(buf) == 0) {
-			printf("something went wrong - read a zero-length string from rsyslogd");
+			printf("something went wrong - read a zero-length string from rsyslogd\n");
 			exit(1);
 		}
 		if(strcmp(expected, buf)) {
-- 
cgit v1.2.3


From 4f97db43dfbf78f08509a71a0924347d900707b8 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 11 Mar 2010 14:48:44 +0100
Subject: added more parser test cases

also improved testing tools to support new testcase structure
---
 tests/nettester.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 209c2a6f..22b5f16f 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -47,6 +47,7 @@
 #include <signal.h>
 #include <netinet/in.h>
 #include <getopt.h>
+#include <ctype.h>
 
 #define EXIT_FAILURE 1
 #define INVALID_SOCKET -1
@@ -254,6 +255,62 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 }
 
 
+/* This function unescapes a string of testdata. That it, escape sequences
+ * are converted into their one-character equivalent. While doing so, it applies
+ * C-like semantics. This was made necessary for easy integration of control
+ * characters inside test cases.  -- rgerhards, 2009-03-11
+ * Currently supported:
+ * \\	single backslash
+ * \n, \t, \r as in C
+ * \nnn where nnn is a 1 to 3 character octal sequence 
+ * Note that when a problem occurs, the end result is undefined. After all, this
+ * is for a testsuite generatort, it must not be 100% bullet proof (so do not
+ * copy this code into something that must be!). Also note that we do in-memory
+ * unescaping and assume that the string gets shorter but NEVER longer!
+ */
+void unescapeTestdata(char *testdata)
+{
+	char *pDst;
+	char *pSrc;
+	int i;
+	int c;
+
+	pDst = pSrc = testdata;
+	while(*pSrc) {
+		if(*pSrc == '\\') {
+			switch(*++pSrc) {
+			case '\\':	*pDst++ = *pSrc++;
+					break;
+			case 'n':	*pDst++ = '\n';
+					++pSrc;
+					break;
+			case 'r':	*pDst++ = '\r';
+					++pSrc;
+					break;
+			case 't':	*pDst++ = '\t';
+					++pSrc;
+					break;
+			case '0':
+			case '1':
+			case '2':
+			case '3':	c = *pSrc++ - '0';
+					i = 1; /* we already processed one digit! */
+					while(i < 3 && isdigit(*pSrc)) {
+						c = c * 8 + *pSrc++ - '0';
+						++i;
+					}
+					*pDst++ = c;
+					break;
+			default:	break;
+			}
+		} else {
+			*pDst++ = *pSrc++;
+		}
+	}
+	*pDst = '\0';
+}
+
+
 /* Process a specific test case. File name is provided.
  * Needs to return 0 if all is OK, something else otherwise.
  */
@@ -291,6 +348,7 @@ processTestFile(int fd, char *pszFileName)
 
 		testdata[strlen(testdata)-1] = '\0'; /* remove \n */
 		/* now we have the test data to send (we could use function pointers here...) */
+		unescapeTestdata(testdata);
 		if(inputMode == inputUDP) {
 			if(udpSend(testdata, strlen(testdata)) != 0)
 				return(2);
@@ -314,10 +372,13 @@ processTestFile(int fd, char *pszFileName)
 				expected, buf);
 				ret = 1;
 		}
-
+		/* we need to free buffers, as we have potentially modified them! */
+		free(testdata);
+		testdata = NULL;
+		free(expected);
+		expected = NULL;
 	}
 
-	free(testdata);
 	free(expected);
 	fclose(fp);
 	return(ret);
-- 
cgit v1.2.3


From 95cde529cc2d2aab2047f5ab2c52d9cd8ba23f31 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 21 Mar 2010 18:33:14 +0100
Subject: added some more tests for severely ill-formed snare messages

also improved nettester testbench tool a bit
---
 tests/nettester.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 22b5f16f..e1ecbcb5 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -62,6 +62,7 @@ static char *testSuite = NULL; /* name of current test suite */
 static int iPort = 12514; /* port which shall be used for sending data */
 static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
 static int verbose = 0;	/* verbose output? -v option */
+static int useDebugEnv = 0; /* activate debugging environment (for rsyslog debug log)? */
 
 /* these two are quick hacks... */
 int iFailed = 0;
@@ -218,10 +219,8 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 			   "-M../runtime/.libs:../.libs", NULL };
 	char confFile[1024];
 	char *newenviron[] = { NULL };
-	/* debug aide...
-	char *newenviron[] = { "RSYSLOG_DEBUG=debug nostdout",
+	char *newenvironDeb[] = { "RSYSLOG_DEBUG=debug nostdout",
 				"RSYSLOG_DEBUGLOG=log", NULL };
-	*/
 
 	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir,
 		(pszCustomConf == NULL) ? configFile : pszCustomConf);
@@ -244,7 +243,7 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 		close(pipefd[1]);
 		close(pipefd[0]);
 		fclose(stdin);
-		execve("../tools/rsyslogd", newargv, newenviron);
+		execve("../tools/rsyslogd", newargv, (useDebugEnv) ? newenvironDeb : newenviron);
 	} else {            
 		close(pipefd[1]);
 		*pid = cpid;
@@ -460,11 +459,14 @@ int main(int argc, char *argv[])
 	char buf[4096];
 	char testcases[4096];
 
-	while((opt = getopt(argc, argv, "c:i:p:t:v")) != EOF) {
+	while((opt = getopt(argc, argv, "dc:i:p:t:v")) != EOF) {
 		switch((char)opt) {
                 case 'c':
 			pszCustomConf = optarg;
 			break;
+                case 'd': 
+			useDebugEnv = 1;
+			break;
                 case 'i':
 			if(!strcmp(optarg, "udp"))
 				inputMode = inputUDP;
@@ -485,7 +487,7 @@ int main(int argc, char *argv[])
 			verbose = 1;
 			break;
 		default:printf("Invalid call of nettester, invalid option '%c'.\n", opt);
-			printf("Usage: nettester -ttestsuite-name -iudp|tcp [-pport] [-ccustomConfFile] \n");
+			printf("Usage: nettester -d -ttestsuite-name -iudp|tcp [-pport] [-ccustomConfFile] \n");
 			exit(1);
 		}
 	}
-- 
cgit v1.2.3


From 2cd132eebb84dbcffcf0c20b9354c14f797c29cd Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 7 Apr 2010 12:42:41 +0200
Subject: enhanced nettester tool so that it re-uses it's callers environment

this enables us to work with the "usual" environment tweaks (for
debugging and other purposes), without the need for any special
handling in nettester itself
---
 tests/nettester.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index e1ecbcb5..eff5929b 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -62,7 +62,7 @@ static char *testSuite = NULL; /* name of current test suite */
 static int iPort = 12514; /* port which shall be used for sending data */
 static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
 static int verbose = 0;	/* verbose output? -v option */
-static int useDebugEnv = 0; /* activate debugging environment (for rsyslog debug log)? */
+static char **ourEnvp;
 
 /* these two are quick hacks... */
 int iFailed = 0;
@@ -218,9 +218,6 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 	char *newargv[] = {"../tools/rsyslogd", "dummy", "-c4", "-u2", "-n", "-irsyslog.pid",
 			   "-M../runtime/.libs:../.libs", NULL };
 	char confFile[1024];
-	char *newenviron[] = { NULL };
-	char *newenvironDeb[] = { "RSYSLOG_DEBUG=debug nostdout",
-				"RSYSLOG_DEBUGLOG=log", NULL };
 
 	sprintf(confFile, "-f%s/testsuites/%s.conf", srcdir,
 		(pszCustomConf == NULL) ? configFile : pszCustomConf);
@@ -243,7 +240,7 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 		close(pipefd[1]);
 		close(pipefd[0]);
 		fclose(stdin);
-		execve("../tools/rsyslogd", newargv, (useDebugEnv) ? newenvironDeb : newenviron);
+		execve("../tools/rsyslogd", newargv, ourEnvp);
 	} else {            
 		close(pipefd[1]);
 		*pid = cpid;
@@ -450,7 +447,7 @@ void doAtExit(void)
  * of this file.
  * rgerhards, 2009-04-03
  */
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
 	int fd;
 	int opt;
@@ -459,14 +456,12 @@ int main(int argc, char *argv[])
 	char buf[4096];
 	char testcases[4096];
 
+	ourEnvp = envp;
 	while((opt = getopt(argc, argv, "dc:i:p:t:v")) != EOF) {
 		switch((char)opt) {
                 case 'c':
 			pszCustomConf = optarg;
 			break;
-                case 'd': 
-			useDebugEnv = 1;
-			break;
                 case 'i':
 			if(!strcmp(optarg, "udp"))
 				inputMode = inputUDP;
-- 
cgit v1.2.3


From 9eee9d8d3dc8d8254c6d781d11513bbfcb807090 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 12 Apr 2010 12:59:09 +0200
Subject: bugfix/testbench: nettester did not work reliably under Solaris

---
 tests/nettester.c | 70 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 21 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index eff5929b..24e20422 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -117,6 +117,10 @@ void readLine(int fd, char *ln)
  * We use traditional framing '\n' at EOR for this tester. It may be
  * worth considering additional framing modes.
  * rgerhards, 2009-04-08
+ * Note: we re-create the socket within the retry loop, because this
+ * seems to be needed under Solaris. If we do not do that, we run
+ * into troubles (maybe something wrongly initialized then?)
+ * -- rgerhards, 2010-04-12
  */
 int
 tcpSend(char *buf, int lenBuf)
@@ -124,30 +128,34 @@ tcpSend(char *buf, int lenBuf)
 	static int sock = INVALID_SOCKET;
 	struct sockaddr_in addr;
 	int retries;
+	int ret;
+	int iRet = 0; /* 0 OK, anything else error */
 
 	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(iPort);
-		if(inet_aton("127.0.0.1", &addr.sin_addr)==0) {
-			fprintf(stderr, "inet_aton() failed\n");
-			return(1);
-		}
 		retries = 0;
 		while(1) { /* loop broken inside */
-			if(connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == 0) {
+			/* first time, need to connect to target */
+			if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) {
+				perror("socket()");
+				iRet = 1;
+				goto finalize_it;
+			}
+			memset((char *) &addr, 0, sizeof(addr));
+			addr.sin_family = AF_INET;
+			addr.sin_port = htons(iPort);
+			if(inet_aton("127.0.0.1", &addr.sin_addr)==0) {
+				fprintf(stderr, "inet_aton() failed\n");
+				iRet = 1;
+				goto finalize_it;
+			}
+			if((ret = connect(sock, (struct sockaddr*)&addr, sizeof(addr))) == 0) {
 				break;
 			} else {
 				if(retries++ == 50) {
-					++iFailed;
 					fprintf(stderr, "connect() failed\n");
-					return(1);
+					iRet = 1;
+					goto finalize_it;
 				} else {
 					usleep(100000); /* 0.1 sec, these are us! */
 				}
@@ -156,20 +164,32 @@ tcpSend(char *buf, int lenBuf)
 	}
 
 	/* send test data */
-	if(send(sock, buf, lenBuf, 0) != lenBuf) {
+	if((ret = send(sock, buf, lenBuf, 0)) != lenBuf) {
 		perror("send test data");
-		fprintf(stderr, "send() failed\n");
-		return(1);
+		fprintf(stderr, "send() failed, sock=%d, ret=%d\n", sock, ret);
+		iRet = 1;
+		goto finalize_it;
 	}
 
 	/* send record terminator */
 	if(send(sock, "\n", 1, 0) != 1) {
 		perror("send record terminator");
 		fprintf(stderr, "send() failed\n");
-		return(1);
+		iRet = 1;
+		goto finalize_it;
 	}
 
-	return 0;
+finalize_it:
+	if(iRet != 0) {
+		/* need to do some (common) cleanup */
+		if(sock != INVALID_SOCKET) {
+			close(sock);
+			sock = INVALID_SOCKET;
+		}
+		++iFailed;
+	}
+
+	return iRet;
 }
 
 
@@ -242,6 +262,7 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 		fclose(stdin);
 		execve("../tools/rsyslogd", newargv, ourEnvp);
 	} else {            
+		usleep(10000);
 		close(pipefd[1]);
 		*pid = cpid;
 		*pfd = pipefd[0];
@@ -361,6 +382,7 @@ processTestFile(int fd, char *pszFileName)
 		expected[strlen(expected)-1] = '\0'; /* remove \n */
 
 		/* pull response from server and then check if it meets our expectation */
+//printf("try pull pipe...\n");
 		readLine(fd, buf);
 		if(strcmp(expected, buf)) {
 			++iFailed;
@@ -423,7 +445,8 @@ doTests(int fd, char *files)
 		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);
+		printf("Number of tests run: %3d, number of failures: %d, test: %s/%s\n",
+		       iTests, iFailed, testSuite, inputMode2Str(inputMode));
 	}
 
 	return(iFailed);
@@ -515,6 +538,11 @@ int main(int argc, char *argv[], char *envp[])
 	}
 	fclose(fp);
 
+	/* make sure we do not abort if there is an issue with pipes.
+	 * our code does the necessary error handling.
+	 */
+	sigset(SIGPIPE, SIG_IGN);
+
 	/* start to be tested rsyslogd */
 	openPipe(testSuite, &rsyslogdPid, &fd);
 	readLine(fd, buf);
-- 
cgit v1.2.3


From 7cdc7cbaa055c84b463d5fba4457036e249828a1 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 22 Oct 2010 14:28:31 +0200
Subject: better error messages in testbench

---
 tests/nettester.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index e1ecbcb5..07a1c052 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -367,8 +367,8 @@ processTestFile(int fd, char *pszFileName)
 		readLine(fd, buf);
 		if(strcmp(expected, buf)) {
 			++iFailed;
-			printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
-				expected, buf);
+			printf("\nFile %s:\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
+				pszFileName, expected, buf);
 				ret = 1;
 		}
 		/* we need to free buffers, as we have potentially modified them! */
-- 
cgit v1.2.3


From ad05e7b0e4f1c043859e6f1f6284c5452b1f05c7 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 24 Jan 2013 06:58:18 +0100
Subject: testbench: remove warnings from nettester

the no-longer-existing -c option was still used when calling
rsyslogd
---
 tests/nettester.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/nettester.c')

diff --git a/tests/nettester.c b/tests/nettester.c
index 9e68ebcc..4e4fe55a 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -243,7 +243,7 @@ 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",
+	char *newargv[] = {"../tools/rsyslogd", "dummy", "-u2", "-n", "-irsyslog.pid",
 			   "-M../runtime/.libs:../.libs", NULL, NULL};
 	char confFile[1024];
 
-- 
cgit v1.2.3