Revision d0f2c4c6 slirp/bootp.c

b/slirp/bootp.c
30 30
static const uint8_t rfc1533_cookie[] = { RFC1533_COOKIE };
31 31

  
32 32
#ifdef DEBUG
33
#define dprintf(fmt, ...) \
33
#define DPRINTF(fmt, ...) \
34 34
do if (slirp_debug & DBG_CALL) { fprintf(dfd, fmt, ##  __VA_ARGS__); fflush(dfd); } while (0)
35 35
#else
36
#define dprintf(fmt, ...)
36
#define DPRINTF(fmt, ...)
37 37
#endif
38 38

  
39 39
static BOOTPClient *get_new_addr(Slirp *slirp, struct in_addr *paddr,
......
116 116
            if (p >= p_end)
117 117
                break;
118 118
            len = *p++;
119
            dprintf("dhcp: tag=%d len=%d\n", tag, len);
119
            DPRINTF("dhcp: tag=%d len=%d\n", tag, len);
120 120

  
121 121
            switch(tag) {
122 122
            case RFC2132_MSG_TYPE:
......
150 150

  
151 151
    /* extract exact DHCP msg type */
152 152
    dhcp_decode(bp, &dhcp_msg_type, &preq_addr);
153
    dprintf("bootp packet op=%d msgtype=%d", bp->bp_op, dhcp_msg_type);
153
    DPRINTF("bootp packet op=%d msgtype=%d", bp->bp_op, dhcp_msg_type);
154 154
    if (preq_addr)
155
        dprintf(" req_addr=%08x\n", ntohl(preq_addr->s_addr));
155
        DPRINTF(" req_addr=%08x\n", ntohl(preq_addr->s_addr));
156 156
    else
157
        dprintf("\n");
157
        DPRINTF("\n");
158 158

  
159 159
    if (dhcp_msg_type == 0)
160 160
        dhcp_msg_type = DHCPREQUEST; /* Force reply for old BOOTP clients */
......
185 185
         new_addr:
186 186
            bc = get_new_addr(slirp, &daddr.sin_addr, slirp->client_ethaddr);
187 187
            if (!bc) {
188
                dprintf("no address left\n");
188
                DPRINTF("no address left\n");
189 189
                return;
190 190
            }
191 191
        }
......
226 226
    q += 4;
227 227

  
228 228
    if (bc) {
229
        dprintf("%s addr=%08x\n",
229
        DPRINTF("%s addr=%08x\n",
230 230
                (dhcp_msg_type == DHCPDISCOVER) ? "offered" : "ack'ed",
231 231
                ntohl(daddr.sin_addr.s_addr));
232 232

  
......
282 282
    } else {
283 283
        static const char nak_msg[] = "requested address not available";
284 284

  
285
        dprintf("nak'ed addr=%08x\n", ntohl(preq_addr->s_addr));
285
        DPRINTF("nak'ed addr=%08x\n", ntohl(preq_addr->s_addr));
286 286

  
287 287
        *q++ = RFC2132_MSG_TYPE;
288 288
        *q++ = 1;

Also available in: Unified diff