slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG
icmp_send_error() doesnt actually log messages when DEBUG is enabled. Let's use a different define that describes better the tweaked behaviour of the function, and avoid uncompiled code. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
parent
7176151874
commit
d0ea546caf
|
@ -34,6 +34,10 @@
|
||||||
#include "slirp.h"
|
#include "slirp.h"
|
||||||
#include "ip_icmp.h"
|
#include "ip_icmp.h"
|
||||||
|
|
||||||
|
#ifndef WITH_ICMP_ERROR_MSG
|
||||||
|
#define WITH_ICMP_ERROR_MSG 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The message sent when emulating PING */
|
/* The message sent when emulating PING */
|
||||||
/* Be nice and tell them it's just a pseudo-ping packet */
|
/* Be nice and tell them it's just a pseudo-ping packet */
|
||||||
static const char icmp_ping_msg[] = "This is a pseudo-PING packet used by Slirp to emulate ICMP ECHO-REQUEST packets.\n";
|
static const char icmp_ping_msg[] = "This is a pseudo-PING packet used by Slirp to emulate ICMP ECHO-REQUEST packets.\n";
|
||||||
|
@ -319,8 +323,7 @@ icmp_send_error(struct mbuf *msrc, u_char type, u_char code, int minsize,
|
||||||
HTONS(icp->icmp_ip.ip_id);
|
HTONS(icp->icmp_ip.ip_id);
|
||||||
HTONS(icp->icmp_ip.ip_off);
|
HTONS(icp->icmp_ip.ip_off);
|
||||||
|
|
||||||
#ifdef DEBUG
|
if (message && WITH_ICMP_ERROR_MSG) { /* append message to ICMP packet */
|
||||||
if(message) { /* DEBUG : append message to ICMP packet */
|
|
||||||
int message_len;
|
int message_len;
|
||||||
char *cpnt;
|
char *cpnt;
|
||||||
message_len=strlen(message);
|
message_len=strlen(message);
|
||||||
|
@ -329,7 +332,6 @@ icmp_send_error(struct mbuf *msrc, u_char type, u_char code, int minsize,
|
||||||
memcpy(cpnt, message, message_len);
|
memcpy(cpnt, message, message_len);
|
||||||
m->m_len+=message_len;
|
m->m_len+=message_len;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
icp->icmp_cksum = 0;
|
icp->icmp_cksum = 0;
|
||||||
icp->icmp_cksum = cksum(m, m->m_len);
|
icp->icmp_cksum = cksum(m, m->m_len);
|
||||||
|
|
Loading…
Reference in New Issue