mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Cleanup and basic reanimation of debug code

Browse Source 
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-24 14:42:29 +02:00 committed by Anthony Liguori
parent 0fe6a7f284
commit 9f349498af
7 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -190,7 +190,7 @@ ifdef CONFIG_SLIRP
CPPFLAGS+=-I$(SRC_PATH)/slirp CPPFLAGS+=-I$(SRC_PATH)/slirp
SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \ SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \
slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \ slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \
tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))
endif endif

2
slirp/bootp.c
View File

@ -42,7 +42,7 @@ static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
#ifdef DEBUG #ifdef DEBUG
#define dprintf(fmt, ...) \ #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 #else
#define dprintf(fmt, ...) #define dprintf(fmt, ...)
#endif #endif

12
slirp/debug.c
View File

@ -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;

15
slirp/debug.h
View File

@ -5,25 +5,24 @@
* terms and conditions of the copyright. * terms and conditions of the copyright.
*/ */
#define PRN_STDERR 1 //#define DEBUG 1
#define PRN_SPRINTF 2
extern FILE *dfd; #ifdef DEBUG
extern int slirp_debug;
#define DBG_CALL 0x1 #define DBG_CALL 0x1
#define DBG_MISC 0x2 #define DBG_MISC 0x2
#define DBG_ERROR 0x4 #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_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_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_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_MISC(x) if (slirp_debug & DBG_MISC) { fprintf x ; fflush(dfd); }
#define DEBUG_ERROR(x) if (slirp_debug & DBG_ERROR) {fprintf x ; fflush(dfd); } #define DEBUG_ERROR(x) if (slirp_debug & DBG_ERROR) {fprintf x ; fflush(dfd); }
#else #else
#define DEBUG_CALL(x) #define DEBUG_CALL(x)
@ -33,5 +32,3 @@ extern int slirp_debug;
#define DEBUG_ERROR(x) #define DEBUG_ERROR(x)
#endif #endif
void debug_init _P((char *, int));

4
slirp/misc.c
View File

@ -10,6 +10,10 @@
#include "monitor.h" #include "monitor.h"
#ifdef DEBUG
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
#endif
u_int curtime, time_fasttimo, last_slowtimo; u_int curtime, time_fasttimo, last_slowtimo;
/* /*

2
slirp/slirp.h
View File

@ -1,8 +1,6 @@
#ifndef __COMMON_H__ #ifndef __COMMON_H__
#define __COMMON_H__ #define __COMMON_H__
//#define DEBUG 1
#include "config-host.h" #include "config-host.h"
#include "slirp_config.h" #include "slirp_config.h"

3
slirp/socket.c
View File

@ -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); socklen_t addrlen = sizeof(addr);
DEBUG_CALL("tcp_listen"); 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("laddr = %x", laddr);
DEBUG_ARG("lport = %d", lport); DEBUG_ARG("lport = %d", lport);
DEBUG_ARG("flags = %x", flags); DEBUG_ARG("flags = %x", flags);