slirp: remove remaining DEBUG blocks
Instead, rely on slirp_debug flags, or compile unconditionally (the substraction in cksum is unlikely to affect any benchmark result). 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
3402618c3a
commit
eb0b159614
|
@ -70,9 +70,7 @@ int cksum(struct mbuf *m, int len)
|
|||
|
||||
if (len < mlen)
|
||||
mlen = len;
|
||||
#ifdef DEBUG
|
||||
len -= mlen;
|
||||
#endif
|
||||
/*
|
||||
* Force to even boundary.
|
||||
*/
|
||||
|
@ -122,12 +120,10 @@ int cksum(struct mbuf *m, int len)
|
|||
s_util.c[0] = *(uint8_t *)w;
|
||||
|
||||
cont:
|
||||
#ifdef DEBUG
|
||||
if (len) {
|
||||
DEBUG_ERROR("cksum: out of data\n");
|
||||
DEBUG_ERROR(" len = %d\n", len);
|
||||
}
|
||||
#endif
|
||||
if (mlen == -1) {
|
||||
/* The last mbuf has odd # of bytes. Follow the
|
||||
standard (the odd byte may be shifted left by 8 bits
|
||||
|
|
|
@ -257,13 +257,12 @@ icmp_send_error(struct mbuf *msrc, u_char type, u_char code, int minsize,
|
|||
/* check msrc */
|
||||
if(!msrc) goto end_error;
|
||||
ip = mtod(msrc, struct ip *);
|
||||
#ifdef DEBUG
|
||||
{ char bufa[20], bufb[20];
|
||||
if (slirp_debug & DBG_MISC) {
|
||||
char bufa[20], bufb[20];
|
||||
strcpy(bufa, inet_ntoa(ip->ip_src));
|
||||
strcpy(bufb, inet_ntoa(ip->ip_dst));
|
||||
DEBUG_MISC(" %.16s to %.16s\n", bufa, bufb);
|
||||
}
|
||||
#endif
|
||||
if(ip->ip_off & IP_OFFMASK) goto end_error; /* Only reply to fragment 0 */
|
||||
|
||||
/* Do not reply to source-only IPs */
|
||||
|
|
|
@ -195,9 +195,7 @@ static int get_dns_addr_resolv_conf(int af, void *pdns_addr, void *cached_addr,
|
|||
if (++found > 3) {
|
||||
DEBUG_MISC("(more)");
|
||||
break;
|
||||
}
|
||||
#ifdef DEBUG
|
||||
else {
|
||||
} else if (slirp_debug & DBG_MISC) {
|
||||
char s[INET6_ADDRSTRLEN];
|
||||
const char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
|
||||
if (!res) {
|
||||
|
@ -205,7 +203,6 @@ static int get_dns_addr_resolv_conf(int af, void *pdns_addr, void *cached_addr,
|
|||
}
|
||||
DEBUG_MISC("%s", res);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
|
|
Loading…
Reference in a new issue