diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 18:20:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 18:20:33 +0200 |
| commit | ac272a5aeb44063f6fbfc8e30c6052166c185b24 (patch) | |
| tree | a552f5a6b3bd7b7ffb127b6f65fa9e3f48c676ee | |
| parent | 46287fa5e8f2e961e9f9cb48df08d171ea510ec8 (diff) | |
| parent | 6ce405a13e6d4722c33cd6dcce618ee3853df6a9 (diff) | |
| download | rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.gz rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.tar.xz rsyslog-ac272a5aeb44063f6fbfc8e30c6052166c185b24.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
plugins/omudpspoof/omudpspoof.c
tools/syslogd.c
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 14 |
2 files changed, 7 insertions, 12 deletions
@@ -681,6 +681,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 Version 5.8.13 [V5-stable] 2012-06-?? - bugfix: "last message repeated n times" message was missing hostname Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting +- bugfix "$PreserveFQDN on" was not honored in some modules + Thanks to bodik for reporting this bug. +- bugfix: randomized IP option header in omudpspoof caused problems + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 + Thanks to Rick Brown for helping to test out the patch. --------------------------------------------------------------------------- Version 5.8.12 [V5-stable] 2012-06-06 - add small delay (50ms) after sending shutdown message diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index fadb2c7b..43b36551 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -24,7 +24,7 @@ * rgerhards, 2009-07-10 * * Copyright 2009 David Lang (spoofing code) - * Copyright 2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2009-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -205,8 +205,6 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len) struct addrinfo *r; int lsent = 0; int bSendSuccess; - int j; - u_char opt[20]; struct sockaddr_in *tempaddr,source_ip; libnet_ptag_t ip, ipo; libnet_ptag_t udp; @@ -244,16 +242,8 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len) DBGPRINTF("Can't build UDP header: %s\n", libnet_geterror(libnet_handle)); } - /* this is not a legal options string */ - for (j = 0; j < 20; j++) { - opt[j] = libnet_get_prand(LIBNET_PR2); - } - ipo = libnet_build_ipv4_options(opt, 20, libnet_handle, ipo); - if (ipo == -1) { - DBGPRINTF("Can't build IP options: %s\n", libnet_geterror(libnet_handle)); - } ip = libnet_build_ipv4( - LIBNET_IPV4_H + 20 + len + LIBNET_UDP_H, /* length */ + LIBNET_IPV4_H + len + LIBNET_UDP_H, /* length */ 0, /* TOS */ 242, /* IP ID */ 0, /* IP Frag */ |