Re: [Qemu-devel] [PATCH v2 for-3.2 v2 01/30] fixup! net: do not depend on slirp internals

[Marc-André Lureau]

Hi

On Thu, Nov 22, 2018 at 2:41 AM Samuel Thibault <address@hidden> wrote:
>
> Marc-André Lureau, le jeu. 22 nov. 2018 02:06:18 +0400, a ecrit:
> > Somehow, I broke the build and failed to detect it. Please squash!
>
> > +#include "qemu/osdep.h"
> > +
> > +typedef uint32_t tcp_seq;
>
> I preferred to just use uint32_t instead of tcp_seq in the couple of
> places where this showed up.
>
> >  /*
> >   * Structure of an internet header, naked of options.
> > @@ -50,6 +53,29 @@ struct ip {
> >      struct in_addr ip_src, ip_dst;  /* source and dest address */
> >  } QEMU_PACKED;
> >
> > +/*
> > + * TCP header.
> > + * Per RFC 793, September, 1981.
> > + */
> > +#define tcphdr slirp_tcphdr
> > +struct tcphdr {
> > +    uint16_t th_sport;      /* source port */
> > +    uint16_t th_dport;      /* destination port */
> > +    tcp_seq th_seq;         /* sequence number */
> > +    tcp_seq th_ack;         /* acknowledgement number */
> > +#ifdef HOST_WORDS_BIGENDIAN
> > +    uint8_t th_off:4,       /* data offset */
> > +            th_x2:4;        /* (unused) */
> > +#else
> > +    uint8_t th_x2:4,        /* (unused) */
> > +            th_off:4;       /* data offset */
> > +#endif
> > +    uint8_t th_flags;
> > +    uint16_t th_win;        /* window */
> > +    uint16_t th_sum;        /* checksum */
> > +    uint16_t th_urp;        /* urgent pointer */
> > +};
> > +
>
> We already have struct tcp_hdr, in include/net/eth.h, so I used that
> instead.
>
> Too bad I have worked on that just a few minutes ago :)

Great, thank you! and I prefer your solution :)


-- 
Marc-André Lureau