diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-17 15:17:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-17 15:17:24 +0100 |
| commit | dee36d595443ea1254d33e10aba950ab1f2ecf00 (patch) | |
| tree | 2d72d030a02751865b908efdeed6d8754e5fe0e4 | |
| parent | a15a74c7a0d5bffc550b3db3bc773d5dd184adb2 (diff) | |
| parent | 283ec2d6e8c4c037ee789759ddf6efecf570fff1 (diff) | |
| download | rsyslog-dee36d595443ea1254d33e10aba950ab1f2ecf00.tar.gz rsyslog-dee36d595443ea1254d33e10aba950ab1f2ecf00.tar.bz2 rsyslog-dee36d595443ea1254d33e10aba950ab1f2ecf00.zip | |
Merge branch 'v6-stable' into v7-stable
Conflicts:
plugins/omudpspoof/omudpspoof.c
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 6 |
2 files changed, 9 insertions, 0 deletions
@@ -988,6 +988,9 @@ Version 5.10.2 [V5-STABLE], 201?-??-?? Thanks to Marius Tomaschewski for the bug report and the patch idea. - bugfix: invalid DST handling under Solaris Thanks to Scott Severtson for the patch. +- bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size) + it now truncates these message, but ensures they are sent. Note that + 7.2.5+ will switch to fragmented UDP messages instead (up to 64K) --------------------------------------------------------------------------- Version 5.10.1 [V5-STABLE], 2012-10-17 - bugfix: imuxsock and imklog truncated head of received message diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index c692acfb..a45d49fa 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -337,6 +337,12 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len) CHKiRet(doTryResume(pData)); } + if(len > 1472) { + DBGPRINTF("omudpspoof: msg with length %d truncated to 1472 bytes: '%.768s'\n", + len, msg); + len = 1472; + } + ip = ipo = udp = 0; if(pData->sourcePort++ >= pData->sourcePortEnd){ pData->sourcePort = pData->sourcePortStart; |