From 84c9d99d1868b9632505a18037ca8ce84e39db97 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 14 May 2005 17:37:07 +0000
Subject: [PATCH] Remove bootp debug code as it uses varargs macros that are
 not supported in all foreign compilers (including preprocessor shipped with
 MacOS X!). Also fix build on platforms not including <stdint.h> by default.

---
 BasiliskII/src/slirp/bootp.c | 14 +-------------
 BasiliskII/src/slirp/slirp.h |  4 ++++
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/BasiliskII/src/slirp/bootp.c b/BasiliskII/src/slirp/bootp.c
index 9f0652fd..5554a30b 100644
--- a/BasiliskII/src/slirp/bootp.c
+++ b/BasiliskII/src/slirp/bootp.c
@@ -40,13 +40,6 @@ BOOTPClient bootp_clients[NB_ADDR];
 
 static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
 
-#ifdef DEBUG
-#define dprintf(fmt, args...) \
-if (slirp_debug & DBG_CALL) { fprintf(dfd, fmt, ## args); fflush(dfd); }
-#else
-#define dprintf(fmt, args...)
-#endif
-
 static BOOTPClient *get_new_addr(struct in_addr *paddr)
 {
     BOOTPClient *bc;
@@ -107,7 +100,6 @@ static void dhcp_decode(const uint8_t *buf, int size,
             if (p >= p_end)
                 break;
             len = *p++;
-            dprintf("dhcp: tag=0x%02x len=%d\n", tag, len);
 
             switch(tag) {
             case RFC2132_MSG_TYPE:
@@ -134,7 +126,6 @@ static void bootp_reply(struct bootp_t *bp)
 
     /* extract exact DHCP msg type */
     dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type);
-    dprintf("bootp packet op=%d msgtype=%d\n", bp->bp_op, dhcp_msg_type);
     
     if (dhcp_msg_type == 0)
         dhcp_msg_type = DHCPREQUEST; /* Force reply for old BOOTP clients */
@@ -155,10 +146,8 @@ static void bootp_reply(struct bootp_t *bp)
     if (dhcp_msg_type == DHCPDISCOVER) {
     new_addr:
         bc = get_new_addr(&daddr.sin_addr);
-        if (!bc) {
-            dprintf("no address left\n");
+        if (!bc)
             return;
-        }
         memcpy(bc->macaddr, client_ethaddr, 6);
     } else {
         bc = find_addr(&daddr.sin_addr, bp->bp_hwaddr);
@@ -168,7 +157,6 @@ static void bootp_reply(struct bootp_t *bp)
             goto new_addr;
         }
     }
-    dprintf("offered addr=%08x\n", ntohl(daddr.sin_addr.s_addr));
 
     saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
     saddr.sin_port = htons(BOOTP_SERVER);
diff --git a/BasiliskII/src/slirp/slirp.h b/BasiliskII/src/slirp/slirp.h
index 1ff68cb0..bb3bb2f5 100644
--- a/BasiliskII/src/slirp/slirp.h
+++ b/BasiliskII/src/slirp/slirp.h
@@ -37,6 +37,10 @@ typedef char *caddr_t;
 # define O_BINARY 0
 #endif
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h>