Diff for /qemu/slirp/socket.h between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2018/04/24 16:54:50 version 1.1.1.4, 2018/04/24 17:25:55
Line 5 Line 5
  * terms and conditions of the copyright.   * terms and conditions of the copyright.
  */   */
   
 /* MINE */  
   
 #ifndef _SLIRP_SOCKET_H_  #ifndef _SLIRP_SOCKET_H_
 #define _SLIRP_SOCKET_H_  #define _SLIRP_SOCKET_H_
   
Line 22  struct socket { Line 20  struct socket {
   
   int s;                           /* The actual socket */    int s;                           /* The actual socket */
   
     Slirp *slirp;                    /* managing slirp instance */
   
                         /* XXX union these with not-yet-used sbuf params */                          /* XXX union these with not-yet-used sbuf params */
   struct mbuf *so_m;               /* Pointer to the original SYN packet,    struct mbuf *so_m;               /* Pointer to the original SYN packet,
                                     * for non-blocking connect()'s, and                                      * for non-blocking connect()'s, and
Line 64  struct socket { Line 64  struct socket {
 #define SS_ISFCONNECTED         0x004   /* Socket is connected to peer */  #define SS_ISFCONNECTED         0x004   /* Socket is connected to peer */
 #define SS_FCANTRCVMORE         0x008   /* Socket can't receive more from peer (for half-closes) */  #define SS_FCANTRCVMORE         0x008   /* Socket can't receive more from peer (for half-closes) */
 #define SS_FCANTSENDMORE        0x010   /* Socket can't send more to peer (for half-closes) */  #define SS_FCANTSENDMORE        0x010   /* Socket can't send more to peer (for half-closes) */
 /* #define SS_ISFDISCONNECTED   0x020*/ /* Socket has disconnected from peer, in 2MSL state */  
 #define SS_FWDRAIN              0x040   /* We received a FIN, drain data and set SS_FCANTSENDMORE */  #define SS_FWDRAIN              0x040   /* We received a FIN, drain data and set SS_FCANTSENDMORE */
   
 #define SS_CTL                  0x080  #define SS_CTL                  0x080
 #define SS_FACCEPTCONN          0x100   /* Socket is accepting connections from a host on the internet */  #define SS_FACCEPTCONN          0x100   /* Socket is accepting connections from a host on the internet */
 #define SS_FACCEPTONCE          0x200   /* If set, the SS_FACCEPTCONN socket will die after one accept */  #define SS_FACCEPTONCE          0x200   /* If set, the SS_FACCEPTCONN socket will die after one accept */
   
 extern struct socket tcb;  #define SS_PERSISTENT_MASK      0xf000  /* Unremovable state bits */
   #define SS_HOSTFWD              0x1000  /* Socket describes host->guest forwarding */
 struct socket * solookup _P((struct socket *, struct in_addr, u_int, struct in_addr, u_int));  #define SS_INCOMING             0x2000  /* Connection was initiated by a host on the internet */
 struct socket * socreate _P((void));  
 void sofree _P((struct socket *));  struct socket * solookup(struct socket *, struct in_addr, u_int, struct in_addr, u_int);
 int soread _P((struct socket *));  struct socket * socreate(Slirp *);
 void sorecvoob _P((struct socket *));  void sofree(struct socket *);
 int sosendoob _P((struct socket *));  int soread(struct socket *);
 int sowrite _P((struct socket *));  void sorecvoob(struct socket *);
 void sorecvfrom _P((struct socket *));  int sosendoob(struct socket *);
 int sosendto _P((struct socket *, struct mbuf *));  int sowrite(struct socket *);
 struct socket * solisten _P((u_int, u_int32_t, u_int, int));  void sorecvfrom(struct socket *);
 void soisfconnecting _P((register struct socket *));  int sosendto(struct socket *, struct mbuf *);
 void soisfconnected _P((register struct socket *));  struct socket * tcp_listen(Slirp *, u_int32_t, u_int, u_int32_t, u_int,
 void soisfdisconnected _P((struct socket *));                                 int);
 void sofwdrain _P((struct socket *));  void soisfconnecting(register struct socket *);
   void soisfconnected(register struct socket *);
   void sofwdrain(struct socket *);
   struct iovec; /* For win32 */
 size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np);  size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np);
 int soreadbuf(struct socket *so, const char *buf, int size);  int soreadbuf(struct socket *so, const char *buf, int size);
   

Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com