david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: remove remaining DEBUG blocks

Browse Source 
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:
Marc-André Lureau 2018-11-22 02:06:39 +04:00 committed by Samuel Thibault
parent 3402618c3a
commit eb0b159614
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slirp/cksum.c
View File

@ -70,9 +70,7 @@ int cksum(struct mbuf *m, int len)
if (len < mlen) if (len < mlen)
mlen = len; mlen = len;
#ifdef DEBUG
len -= mlen; len -= mlen;
#endif
/* /*
* Force to even boundary. * Force to even boundary.
*/ */
@ -122,12 +120,10 @@ int cksum(struct mbuf *m, int len)
s_util.c[0] = *(uint8_t *)w; s_util.c[0] = *(uint8_t *)w;
cont: cont:
#ifdef DEBUG
if (len) { if (len) {
DEBUG_ERROR("cksum: out of data\n"); DEBUG_ERROR("cksum: out of data\n");
DEBUG_ERROR(" len = %d\n", len); DEBUG_ERROR(" len = %d\n", len);
} }
#endif
if (mlen == -1) { if (mlen == -1) {
/* The last mbuf has odd # of bytes. Follow the /* The last mbuf has odd # of bytes. Follow the
standard (the odd byte may be shifted left by 8 bits standard (the odd byte may be shifted left by 8 bits

5
slirp/ip_icmp.c
View File

@ -257,13 +257,12 @@ icmp_send_error(struct mbuf *msrc, u_char type, u_char code, int minsize,
/* check msrc */ /* check msrc */
if(!msrc) goto end_error; if(!msrc) goto end_error;
ip = mtod(msrc, struct ip *); ip = mtod(msrc, struct ip *);
#ifdef DEBUG if (slirp_debug & DBG_MISC) {
{ char bufa[20], bufb[20]; char bufa[20], bufb[20];
strcpy(bufa, inet_ntoa(ip->ip_src)); strcpy(bufa, inet_ntoa(ip->ip_src));
strcpy(bufb, inet_ntoa(ip->ip_dst)); strcpy(bufb, inet_ntoa(ip->ip_dst));
DEBUG_MISC(" %.16s to %.16s\n", bufa, bufb); DEBUG_MISC(" %.16s to %.16s\n", bufa, bufb);
} }
#endif
if(ip->ip_off & IP_OFFMASK) goto end_error; /* Only reply to fragment 0 */ if(ip->ip_off & IP_OFFMASK) goto end_error; /* Only reply to fragment 0 */
/* Do not reply to source-only IPs */ /* Do not reply to source-only IPs */

5
slirp/slirp.c
View File

@ -195,9 +195,7 @@ static int get_dns_addr_resolv_conf(int af, void *pdns_addr, void *cached_addr,
if (++found > 3) { if (++found > 3) {
DEBUG_MISC("(more)"); DEBUG_MISC("(more)");
break; break;
} } else if (slirp_debug & DBG_MISC) {
#ifdef DEBUG
else {
char s[INET6_ADDRSTRLEN]; char s[INET6_ADDRSTRLEN];
const char *res = inet_ntop(af, tmp_addr, s, sizeof(s)); const char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
if (!res) { 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); DEBUG_MISC("%s", res);
} }
#endif
} }
} }
fclose(f); fclose(f);