linux-user/syscall.c: malloc()/calloc() to g_malloc()/g_try_malloc()/g_new0()

[qemu.git] / slirp / socket.h

diff --git a/slirp/socket.h b/slirp/socket.h
index 6e85d03588a9c23f8fd01d4e7b3f985ea68696c1..57e0407ebcf8acd69644dd4e2249597b4b7af926 100644 (file)
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -20,6 +20,8 @@ struct socket {
 
   int s;                           /* The actual socket */
 
+  int pollfds_idx;                 /* GPollFD GArray index */
+
   Slirp *slirp;                           /* managing slirp instance */
 
                        /* XXX union these with not-yet-used sbuf params */
@@ -31,11 +33,11 @@ struct socket {
   int so_urgc;
   struct in_addr so_faddr;        /* foreign host table entry */
   struct in_addr so_laddr;        /* local host table entry */
-  u_int16_t so_fport;             /* foreign port */
-  u_int16_t so_lport;             /* local port */
+  uint16_t so_fport;              /* foreign port */
+  uint16_t so_lport;              /* local port */
 
-  u_int8_t     so_iptos;       /* Type of service */
-  u_int8_t     so_emu;         /* Is the socket emulated? */
+  uint8_t      so_iptos;       /* Type of service */
+  uint8_t      so_emu;         /* Is the socket emulated? */
 
   u_char       so_type;                /* Type of socket, UDP or TCP */
   int  so_state;               /* internal state flags SS_*, below */
@@ -83,7 +85,7 @@ int sosendoob(struct socket *);
 int sowrite(struct socket *);
 void sorecvfrom(struct socket *);
 int sosendto(struct socket *, struct mbuf *);
-struct socket * tcp_listen(Slirp *, u_int32_t, u_int, u_int32_t, u_int,
+struct socket * tcp_listen(Slirp *, uint32_t, u_int, uint32_t, u_int,
                                int);
 void soisfconnecting(register struct socket *);
 void soisfconnected(register struct socket *);