Commit ecc804ca authored by Stefan Weil's avatar Stefan Weil Committed by Jason Wang
Browse files

slirp: Fix type casts and format strings in debug code 



Casting pointers to long won't work on 64 bit Windows.
It is not needed with the right format strings.

Signed-off-by: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 31e49ac1

slirp/bootp.c

+9 −3
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ 
 */

#include <slirp.h>



#if defined(_WIN32)

/* Windows ntohl() returns an u_long value.

 * Add a type cast to match the format strings. */

# define ntohl(n) ((uint32_t)ntohl(n))

#endif



/* XXX: only DHCP is supported */



#define LEASE_TIME (24 * 3600)
@@ -155,7 +161,7 @@ static void bootp_reply(Slirp *slirp, const struct bootp_t *bp) 
    dhcp_decode(bp, &dhcp_msg_type, &preq_addr);

    DPRINTF("bootp packet op=%d msgtype=%d", bp->bp_op, dhcp_msg_type);

    if (preq_addr.s_addr != htonl(0L))

        DPRINTF(" req_addr=%08x\n", ntohl(preq_addr.s_addr));

        DPRINTF(" req_addr=%08" PRIx32 "\n", ntohl(preq_addr.s_addr));

    else

        DPRINTF("\n");
@@ -234,7 +240,7 @@ static void bootp_reply(Slirp *slirp, const struct bootp_t *bp) 
    q += 4;



    if (bc) {

        DPRINTF("%s addr=%08x\n",

        DPRINTF("%s addr=%08" PRIx32 "\n",

                (dhcp_msg_type == DHCPDISCOVER) ? "offered" : "ack'ed",

                ntohl(daddr.sin_addr.s_addr));
@@ -302,7 +308,7 @@ static void bootp_reply(Slirp *slirp, const struct bootp_t *bp) 
    } else {

        static const char nak_msg[] = "requested address not available";



        DPRINTF("nak'ed addr=%08x\n", ntohl(preq_addr.s_addr));

        DPRINTF("nak'ed addr=%08" PRIx32 "\n", ntohl(preq_addr.s_addr));



        *q++ = RFC2132_MSG_TYPE;

        *q++ = 1;

slirp/if.c

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ if_output(struct socket *so, struct mbuf *ifm) 
	int on_fastq = 1;



	DEBUG_CALL("if_output");

	DEBUG_ARG("so = %lx", (long)so);

	DEBUG_ARG("ifm = %lx", (long)ifm);

	DEBUG_ARG("so = %p", so);

	DEBUG_ARG("ifm = %p", ifm);



	/*

	 * First remove the mbuf from m_usedlist,

slirp/ip_icmp.c

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ icmp_input(struct mbuf *m, int hlen) 
  Slirp *slirp = m->slirp;



  DEBUG_CALL("icmp_input");

  DEBUG_ARG("m = %lx", (long )m);

  DEBUG_ARG("m = %p", m);

  DEBUG_ARG("m_len = %d", m->m_len);



  /*
@@ -252,7 +252,7 @@ icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, 
  register struct mbuf *m;



  DEBUG_CALL("icmp_error");

  DEBUG_ARG("msrc = %lx", (long )msrc);

  DEBUG_ARG("msrc = %p", msrc);

  DEBUG_ARG("msrc_len = %d", msrc->m_len);



  if(type!=ICMP_UNREACH && type!=ICMP_TIMXCEED) goto end_error;

slirp/ip_input.c

+5 −5
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ ip_input(struct mbuf *m) 
	int hlen;



	DEBUG_CALL("ip_input");

	DEBUG_ARG("m = %lx", (long)m);

	DEBUG_ARG("m = %p", m);

	DEBUG_ARG("m_len = %d", m->m_len);



	if (m->m_len < sizeof (struct ip)) {
@@ -232,9 +232,9 @@ ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp) 
	int i, next;



	DEBUG_CALL("ip_reass");

	DEBUG_ARG("ip = %lx", (long)ip);

	DEBUG_ARG("fp = %lx", (long)fp);

	DEBUG_ARG("m = %lx", (long)m);

	DEBUG_ARG("ip = %p", ip);

	DEBUG_ARG("fp = %p", fp);

	DEBUG_ARG("m = %p", m);



	/*

	 * Presence of header sizes in mbufs
@@ -400,7 +400,7 @@ static void 
ip_enq(register struct ipasfrag *p, register struct ipasfrag *prev)

{

	DEBUG_CALL("ip_enq");

	DEBUG_ARG("prev = %lx", (long)prev);

	DEBUG_ARG("prev = %p", prev);

	p->ipf_prev =  prev;

	p->ipf_next = prev->ipf_next;

	((struct ipasfrag *)(prev->ipf_next))->ipf_prev = p;

slirp/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ ip_output(struct socket *so, struct mbuf *m0) 
	int len, off, error = 0;



	DEBUG_CALL("ip_output");

	DEBUG_ARG("so = %lx", (long)so);

	DEBUG_ARG("m0 = %lx", (long)m0);

	DEBUG_ARG("so = %p", so);

	DEBUG_ARG("m0 = %p", m0);



	ip = mtod(m, struct ip *);

	/*