aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-06-24 14:42:29 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-06-29 08:52:46 -0500
commit9f349498af2194915f37f99b67f709ff27458dd2 (patch)
tree16eabc212e4cdc675b04deba1634a64978834c8d /slirp
parent0fe6a7f28455cd003b2668e77d5bd1e1cf15309e (diff)
downloadqemu-arm-9f349498af2194915f37f99b67f709ff27458dd2.tar.gz
slirp: Cleanup and basic reanimation of debug code
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp')
-rw-r--r--slirp/bootp.c2
-rw-r--r--slirp/debug.c12
-rw-r--r--slirp/debug.h15
-rw-r--r--slirp/misc.c4
-rw-r--r--slirp/slirp.h2
-rw-r--r--slirp/socket.c3
6 files changed, 13 insertions, 25 deletions
diff --git a/slirp/bootp.c b/slirp/bootp.c
index 97c2811fbf..fec52c0a84 100644
--- a/slirp/bootp.c
+++ b/slirp/bootp.c
@@ -42,7 +42,7 @@ static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
#ifdef DEBUG
#define dprintf(fmt, ...) \
-if (slirp_debug & DBG_CALL) { fprintf(dfd, fmt, ## __VA_ARGS__); fflush(dfd); }
+do if (slirp_debug & DBG_CALL) { fprintf(dfd, fmt, ## __VA_ARGS__); fflush(dfd); } while (0)
#else
#define dprintf(fmt, ...)
#endif
diff --git a/slirp/debug.c b/slirp/debug.c
deleted file mode 100644
index ad02df79aa..0000000000
--- a/slirp/debug.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (c) 1995 Danny Gasparovski.
- * Portions copyright (c) 2000 Kelly Price.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
- */
-
-#include <slirp.h>
-
-FILE *dfd = NULL;
-int slirp_debug = 0;
diff --git a/slirp/debug.h b/slirp/debug.h
index 963ffda072..6cfa61edb3 100644
--- a/slirp/debug.h
+++ b/slirp/debug.h
@@ -5,25 +5,24 @@
* terms and conditions of the copyright.
*/
-#define PRN_STDERR 1
-#define PRN_SPRINTF 2
+//#define DEBUG 1
-extern FILE *dfd;
-extern int slirp_debug;
+#ifdef DEBUG
#define DBG_CALL 0x1
#define DBG_MISC 0x2
#define DBG_ERROR 0x4
-#define DEBUG_DEFAULT DBG_CALL|DBG_MISC|DBG_ERROR
-#ifdef DEBUG
+#define dfd stderr
+
+extern int slirp_debug;
+
#define DEBUG_CALL(x) if (slirp_debug & DBG_CALL) { fprintf(dfd, "%s...\n", x); fflush(dfd); }
#define DEBUG_ARG(x, y) if (slirp_debug & DBG_CALL) { fputc(' ', dfd); fprintf(dfd, x, y); fputc('\n', dfd); fflush(dfd); }
#define DEBUG_ARGS(x) if (slirp_debug & DBG_CALL) { fprintf x ; fflush(dfd); }
#define DEBUG_MISC(x) if (slirp_debug & DBG_MISC) { fprintf x ; fflush(dfd); }
#define DEBUG_ERROR(x) if (slirp_debug & DBG_ERROR) {fprintf x ; fflush(dfd); }
-
#else
#define DEBUG_CALL(x)
@@ -33,5 +32,3 @@ extern int slirp_debug;
#define DEBUG_ERROR(x)
#endif
-
-void debug_init _P((char *, int));
diff --git a/slirp/misc.c b/slirp/misc.c
index 958711298e..ae6f211490 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -10,6 +10,10 @@
#include "monitor.h"
+#ifdef DEBUG
+int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
+#endif
+
u_int curtime, time_fasttimo, last_slowtimo;
/*
diff --git a/slirp/slirp.h b/slirp/slirp.h
index c30858275e..1bd7c89b41 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -1,8 +1,6 @@
#ifndef __COMMON_H__
#define __COMMON_H__
-//#define DEBUG 1
-
#include "config-host.h"
#include "slirp_config.h"
diff --git a/slirp/socket.c b/slirp/socket.c
index a911b29d90..f7b212fba8 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -584,7 +584,8 @@ tcp_listen(u_int32_t haddr, u_int hport, u_int32_t laddr, u_int lport, int flags
socklen_t addrlen = sizeof(addr);
DEBUG_CALL("tcp_listen");
- DEBUG_ARG("port = %d", port);
+ DEBUG_ARG("haddr = %x", haddr);
+ DEBUG_ARG("hport = %d", hport);
DEBUG_ARG("laddr = %x", laddr);
DEBUG_ARG("lport = %d", lport);
DEBUG_ARG("flags = %x", flags);