abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-06 22:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed compiling icmp.c (variable has to be declared at the beginning of a scope)

Browse Source
This commit is contained in:
goldsimon 2015-04-22 11:29:35 +02:00
parent a6c3bb4c6d
commit a81c7bf04b
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/ipv4/icmp.c
View File

@ -189,35 +189,35 @@ icmp_input(struct pbuf *p, struct netif *inp)
if(pbuf_header(p, hlen)) { if(pbuf_header(p, hlen)) {
LWIP_ASSERT("Can't move over header in packet", 0); LWIP_ASSERT("Can't move over header in packet", 0);
} else { } else {
iphdr = (struct ip_hdr*)p->payload; err_t ret;
ip4_addr_copy(iphdr->src, inp->ip_addr); iphdr = (struct ip_hdr*)p->payload;
ip4_addr_copy(iphdr->dest, *ip4_current_src_addr()); ip4_addr_copy(iphdr->src, inp->ip_addr);
ICMPH_TYPE_SET(iecho, ICMP_ER); ip4_addr_copy(iphdr->dest, *ip4_current_src_addr());
ICMPH_TYPE_SET(iecho, ICMP_ER);
#if CHECKSUM_GEN_ICMP #if CHECKSUM_GEN_ICMP
/* adjust the checksum */ /* adjust the checksum */
if (iecho->chksum >= PP_HTONS(0xffffU - (ICMP_ECHO << 8))) { if (iecho->chksum >= PP_HTONS(0xffffU - (ICMP_ECHO << 8))) {
iecho->chksum += PP_HTONS(ICMP_ECHO << 8) + 1; iecho->chksum += PP_HTONS(ICMP_ECHO << 8) + 1;
} else { } else {
iecho->chksum += PP_HTONS(ICMP_ECHO << 8); iecho->chksum += PP_HTONS(ICMP_ECHO << 8);
} }
#else /* CHECKSUM_GEN_ICMP */ #else /* CHECKSUM_GEN_ICMP */
iecho->chksum = 0; iecho->chksum = 0;
#endif /* CHECKSUM_GEN_ICMP */ #endif /* CHECKSUM_GEN_ICMP */
/* Set the correct TTL and recalculate the header checksum. */ /* Set the correct TTL and recalculate the header checksum. */
IPH_TTL_SET(iphdr, ICMP_TTL); IPH_TTL_SET(iphdr, ICMP_TTL);
IPH_CHKSUM_SET(iphdr, 0); IPH_CHKSUM_SET(iphdr, 0);
#if CHECKSUM_GEN_IP #if CHECKSUM_GEN_IP
IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN)); IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
#endif /* CHECKSUM_GEN_IP */ #endif /* CHECKSUM_GEN_IP */
ICMP_STATS_INC(icmp.xmit); ICMP_STATS_INC(icmp.xmit);
/* increase number of messages attempted to send */ /* increase number of messages attempted to send */
snmp_inc_icmpoutmsgs(); snmp_inc_icmpoutmsgs();
/* increase number of echo replies attempted to send */ /* increase number of echo replies attempted to send */
snmp_inc_icmpoutechoreps(); snmp_inc_icmpoutechoreps();
err_t ret;
/* send an ICMP packet, src addr is the dest addr of the current packet */ /* send an ICMP packet, src addr is the dest addr of the current packet */
ret = ip4_output_if(p, ip4_current_dest_addr(), IP_HDRINCL, ret = ip4_output_if(p, ip4_current_dest_addr(), IP_HDRINCL,
ICMP_TTL, 0, IP_PROTO_ICMP, inp); ICMP_TTL, 0, IP_PROTO_ICMP, inp);