← Back to branch summary

~pmdj/ubuntu/trusty/qemu/2.9+applesmc+fadtv3

« back to all changes in this revision

Viewing changes to slirp/slirp.c

  • Committer: Phil Dennis-Jordan
  • Date: 2017-07-21 08:03:43 UTC
  • mfrom: (1.1.1)
  • Revision ID: phil@philjordan.eu-20170721080343-2yr2vdj7713czahv
New upstream release 2.9.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
slirp/slirp.c
198
198
#ifdef DEBUG
199
199
            else {
200
200
                char s[INET6_ADDRSTRLEN];
201
 
                char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
 
201
                const char *res = inet_ntop(af, tmp_addr, s, sizeof(s));
202
202
                if (!res) {
203
203
                    res = "(string conversion error)";
204
204
                }
774
774
static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len)
775
775
{
776
776
    struct slirp_arphdr *ah = (struct slirp_arphdr *)(pkt + ETH_HLEN);
777
 
    uint8_t arp_reply[max(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];
 
777
    uint8_t arp_reply[MAX(ETH_HLEN + sizeof(struct slirp_arphdr), 64)];
778
778
    struct ethhdr *reh = (struct ethhdr *)arp_reply;
779
779
    struct slirp_arphdr *rah = (struct slirp_arphdr *)(arp_reply + ETH_HLEN);
780
780
    int ar_op;