diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:03:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:03:22 +0200 |
| commit | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (patch) | |
| tree | cd31af636b8e548d85e9da56234a2ddb48473798 | |
| parent | af968e6ef9f146987a858743df3d9f64d3bb0661 (diff) | |
| download | rsyslog-d86a212255d9fd1ef3e4b0e99db1f4bfd0625260.tar.gz rsyslog-d86a212255d9fd1ef3e4b0e99db1f4bfd0625260.tar.xz rsyslog-d86a212255d9fd1ef3e4b0e99db1f4bfd0625260.zip | |
bugfix/tcpflood: sending small test files did not work correctly
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | tests/tcpflood.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 5.8.12 [V5-stable] 2012-05-03 +- bugfix/tcpflood: sending small test files did not work correctly +--------------------------------------------------------------------------- Version 5.8.11 [V5-stable] 2012-05-03 - bugfix: ommysql did not properly init/exit the mysql runtime library this could lead to segfaults. Triggering condition: multiple action diff --git a/tests/tcpflood.c b/tests/tcpflood.c index 8485acbb..64d95abd 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -346,7 +346,7 @@ genMsg(char *buf, size_t maxBuf, int *pLenBuf, struct instdata *inst) do { done = 1; *pLenBuf = fread(buf, 1, 1024, dataFP); - if(feof(dataFP)) { + if(*pLenBuf == 0) { if(--numFileIterations > 0) { rewind(dataFP); done = 0; /* need new iteration */ @@ -660,7 +660,7 @@ runTests(void) int run; stats.totalRuntime = 0; - stats.minRuntime = (unsigned long long) 0xffffffffffffffffll; + stats.minRuntime = 0xffffffffllu; stats.maxRuntime = 0; stats.numRuns = numRuns; run = 1; |