From 748ba22a1912e3be42e0ef9e01d06b80226c9a2a Mon Sep 17 00:00:00 2001
From: jifl <jifl>
Date: Thu, 12 Apr 2007 18:55:44 +0000
Subject: [PATCH]  * icmp.c: Reset IP header TTL in ICMP ECHO responses (bug
 #19580).

---
 CHANGELOG            | 3 +++
 src/core/ipv4/icmp.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fcc89da7..d1d44884 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -117,6 +117,9 @@ HISTORY
 
   ++ Bug fixes:
 
+  2007-04-12 Jonathan Larmour
+  * icmp.c: Reset IP header TTL in ICMP ECHO responses (bug #19580).
+
   2007-04-11 Simon Goldschmidt
   * etharp.c, pbuf.c, pbuf.h: 3rd fix for bug #11400 (arp-queuing): More pbufs than
     previously thought need to be copied (everything but PBUF_ROM!). Cleaned up
diff --git a/src/core/ipv4/icmp.c b/src/core/ipv4/icmp.c
index 80e92c44..76d25dab 100644
--- a/src/core/ipv4/icmp.c
+++ b/src/core/ipv4/icmp.c
@@ -115,7 +115,7 @@ icmp_input(struct pbuf *p, struct netif *inp)
       LWIP_ASSERT("Can't move over header in packet", 0);
     else
       ip_output_if(p, &(iphdr->src), IP_HDRINCL,
-                   IPH_TTL(iphdr), 0, IP_PROTO_ICMP, inp);
+                   ICMP_TTL, 0, IP_PROTO_ICMP, inp);
     break;
   default:
     LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n", (s16_t)type, (s16_t)code));