diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-12 11:32:53 +0100 |
| commit | 07e296703b1f018a847496269432ea778d97b752 (patch) | |
| tree | cbfe47deb0f4fdaa75634ed9fa869a04ba9d6495 /tests/tcpflood.c | |
| parent | 283ec2d6e8c4c037ee789759ddf6efecf570fff1 (diff) | |
| parent | bb74c4485a5fcb938645ca513f7b592aceff1c7f (diff) | |
| download | rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.gz rsyslog-07e296703b1f018a847496269432ea778d97b752.tar.bz2 rsyslog-07e296703b1f018a847496269432ea778d97b752.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
action.c
queue.c (some code moved from action.c --> queue.c)
Diffstat (limited to 'tests/tcpflood.c')
| -rw-r--r-- | tests/tcpflood.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/tcpflood.c b/tests/tcpflood.c index 8fd347f1..4a3199c8 100644 --- a/tests/tcpflood.c +++ b/tests/tcpflood.c @@ -429,6 +429,8 @@ int sendMessages(struct instdata *inst) } } genMsg(buf, sizeof(buf), &lenBuf, inst); /* generate the message to send according to params */ + if(lenBuf == 0) + break; /* terminate when no message could be generated */ if(transport == TP_TCP) { if(sockArray[socknum] == -1) { /* connection was dropped, need to re-establish */ |