diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2000-09-01 09:32:44 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2000-09-01 09:32:44 +0000 |
| commit | 816fa7febcac15288bf85369618285a52caedde4 (patch) | |
| tree | d71974dc5b411819c8b0401de78af91bb5fd6803 /sys | |
| parent | 06f748444a83e812da06e13ecdf618e650893d45 (diff) | |
| download | src-816fa7febcac15288bf85369618285a52caedde4.tar.gz src-816fa7febcac15288bf85369618285a52caedde4.zip | |
Changed the way we handle outgoing ICMP error messages -- do
not alias `ip_src' unless it comes from the host an original
datagram that triggered this error message was destined for.
PR: 20712
Reviewed by: brian, Charles Mott <cmott@scientech.com>
Notes
Notes:
svn path=/head/; revision=65317
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/libalias/alias.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c index e0e5e7c38bb2..7689e90b6ea1 100644 --- a/sys/netinet/libalias/alias.c +++ b/sys/netinet/libalias/alias.c @@ -539,12 +539,17 @@ IcmpAliasOut2(struct ip *pip) accumulate -= alias_port; ADJUST_CHECKSUM(accumulate, ic->icmp_cksum) -/* Alias address in IP header */ - DifferentialChecksum(&pip->ip_sum, - (u_short *) &alias_address, - (u_short *) &pip->ip_src, - 2); - pip->ip_src = alias_address; +/* + * Alias address in IP header if it comes from the host + * the original TCP/UDP packet was destined for. + */ + if (pip->ip_src.s_addr == ip->ip_dst.s_addr) { + DifferentialChecksum(&pip->ip_sum, + (u_short *) &alias_address, + (u_short *) &pip->ip_src, + 2); + pip->ip_src = alias_address; + } /* Alias address and port number of original IP packet fragment contained in ICMP data section */ @@ -572,12 +577,17 @@ fragment contained in ICMP data section */ accumulate -= alias_id; ADJUST_CHECKSUM(accumulate, ic->icmp_cksum) -/* Alias address in IP header */ - DifferentialChecksum(&pip->ip_sum, - (u_short *) &alias_address, - (u_short *) &pip->ip_src, - 2); - pip->ip_src = alias_address; +/* + * Alias address in IP header if it comes from the host + * the original ICMP message was destined for. + */ + if (pip->ip_src.s_addr == ip->ip_dst.s_addr) { + DifferentialChecksum(&pip->ip_sum, + (u_short *) &alias_address, + (u_short *) &pip->ip_src, + 2); + pip->ip_src = alias_address; + } /* Alias address of original IP packet and sequence number of embedded ICMP datagram */ |