fix off-by-one error in pci_piix3_xen_ide_unplug

[qemu.git] / slirp / slirp.h

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 462292d57748388461301741307955b3eb09a983..6589d7eef0bbc6bd6bde1b066948b1c0ecc8fa37 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -15,12 +15,6 @@ typedef char *caddr_t;
 # include <sys/timeb.h>
 # include <iphlpapi.h>
 
 # include <sys/timeb.h>
 # include <iphlpapi.h>
 

-# define EWOULDBLOCK WSAEWOULDBLOCK
-# define EINPROGRESS WSAEINPROGRESS
-# define ENOTCONN WSAENOTCONN
-# define EHOSTUNREACH WSAEHOSTUNREACH
-# define ENETUNREACH WSAENETUNREACH
-# define ECONNREFUSED WSAECONNREFUSED

 #else
 # define ioctlsocket ioctl
 # define closesocket(s) close(s)
 #else
 # define ioctlsocket ioctl
 # define closesocket(s) close(s)


@@ -88,10 +82,6 @@ void *malloc(size_t arg);
 void free(void *ptr);
 #endif
 
 void free(void *ptr);
 #endif
 

-#ifndef HAVE_INET_ATON
-int inet_aton(const char *cp, struct in_addr *ia);
-#endif
-

 #include <fcntl.h>
 #ifndef NO_UNIX_SOCKETS
 #include <sys/un.h>
 #include <fcntl.h>
 #ifndef NO_UNIX_SOCKETS
 #include <sys/un.h>


@@ -143,7 +133,8 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #include "debug.h"
 
 
 #include "debug.h"
 

-#include "qemu-queue.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"

 
 #include "libslirp.h"
 #include "ip.h"
 
 #include "libslirp.h"
 #include "ip.h"


@@ -152,6 +143,7 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #include "tcp_var.h"
 #include "tcpip.h"
 #include "udp.h"
 #include "tcp_var.h"
 #include "tcpip.h"
 #include "udp.h"

+#include "ip_icmp.h"

 #include "mbuf.h"
 #include "sbuf.h"
 #include "socket.h"
 #include "mbuf.h"
 #include "sbuf.h"
 #include "socket.h"


@@ -166,12 +158,54 @@ int inet_aton(const char *cp, struct in_addr *ia);
 #include "bootp.h"
 #include "tftp.h"
 
 #include "bootp.h"
 #include "tftp.h"
 

-/* osdep.c */
-int qemu_socket(int domain, int type, int protocol);
+#define ETH_ALEN 6
+#define ETH_HLEN 14
+
+#define ETH_P_IP  0x0800        /* Internet Protocol packet  */
+#define ETH_P_ARP 0x0806        /* Address Resolution packet */
+
+#define ARPOP_REQUEST 1         /* ARP request */
+#define ARPOP_REPLY   2         /* ARP reply   */
+
+struct ethhdr {
+    unsigned char  h_dest[ETH_ALEN];   /* destination eth addr */
+    unsigned char  h_source[ETH_ALEN]; /* source ether addr    */
+    unsigned short h_proto;            /* packet type ID field */
+};
+
+struct arphdr {
+    unsigned short ar_hrd;      /* format of hardware address */
+    unsigned short ar_pro;      /* format of protocol address */
+    unsigned char  ar_hln;      /* length of hardware address */
+    unsigned char  ar_pln;      /* length of protocol address */
+    unsigned short ar_op;       /* ARP opcode (command)       */
+
+    /*
+     *  Ethernet looks like this : This bit is variable sized however...
+     */
+    unsigned char ar_sha[ETH_ALEN]; /* sender hardware address */
+    uint32_t      ar_sip;           /* sender IP address       */
+    unsigned char ar_tha[ETH_ALEN]; /* target hardware address */
+    uint32_t      ar_tip;           /* target IP address       */
+} QEMU_PACKED;
+
+#define ARP_TABLE_SIZE 16
+
+typedef struct ArpTable {
+    struct arphdr table[ARP_TABLE_SIZE];
+    int next_victim;
+} ArpTable;
+
+void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]);

 
 

+bool arp_table_search(Slirp *slirp, uint32_t ip_addr,
+                      uint8_t out_ethaddr[ETH_ALEN]);

 
 struct Slirp {
     QTAILQ_ENTRY(Slirp) entry;
 
 struct Slirp {
     QTAILQ_ENTRY(Slirp) entry;

+    u_int time_fasttimo;
+    u_int last_slowtimo;
+    bool do_slowtimo;

 
     /* virtual network configuration */
     struct in_addr vnetwork_addr;
 
     /* virtual network configuration */
     struct in_addr vnetwork_addr;


@@ -180,14 +214,10 @@ struct Slirp {
     struct in_addr vdhcp_startaddr;
     struct in_addr vnameserver_addr;
 
     struct in_addr vdhcp_startaddr;
     struct in_addr vnameserver_addr;
 

-    /* ARP cache for the guest IP addresses (XXX: allow many entries) */
-    uint8_t client_ethaddr[6];
-

     struct in_addr client_ipaddr;
     char client_hostname[33];
 
     int restricted;
     struct in_addr client_ipaddr;
     char client_hostname[33];
 
     int restricted;

-    struct timeval tt;

     struct ex_list *exec_list;
 
     /* mbuf states */
     struct ex_list *exec_list;
 
     /* mbuf states */


@@ -195,10 +225,10 @@ struct Slirp {
     int mbuf_alloced;
 
     /* if states */
     int mbuf_alloced;
 
     /* if states */

-    int if_queued;          /* number of packets queued so far */

     struct mbuf if_fastq;   /* fast queue (for interactive data) */
     struct mbuf if_batchq;  /* queue for non-interactive data */
     struct mbuf *next_m;    /* pointer to next mbuf to output */
     struct mbuf if_fastq;   /* fast queue (for interactive data) */
     struct mbuf if_batchq;  /* queue for non-interactive data */
     struct mbuf *next_m;    /* pointer to next mbuf to output */

+    bool if_start_busy;     /* avoid if_start recursion */

 
     /* ip states */
     struct ipq ipq;         /* ip reass. queue */
 
     /* ip states */
     struct ipq ipq;         /* ip reass. queue */


@@ -207,6 +237,8 @@ struct Slirp {
     /* bootp/dhcp states */
     BOOTPClient bootp_clients[NB_BOOTP_CLIENTS];
     char *bootp_filename;
     /* bootp/dhcp states */
     BOOTPClient bootp_clients[NB_BOOTP_CLIENTS];
     char *bootp_filename;

+    size_t vdnssearch_len;
+    uint8_t *vdnssearch;

 
     /* tcp states */
     struct socket tcb;
 
     /* tcp states */
     struct socket tcb;


@@ -218,10 +250,16 @@ struct Slirp {
     struct socket udb;
     struct socket *udp_last_so;
 
     struct socket udb;
     struct socket *udp_last_so;
 

+    /* icmp states */
+    struct socket icmp;
+    struct socket *icmp_last_so;
+

     /* tftp states */
     char *tftp_prefix;
     struct tftp_session tftp_sessions[TFTP_SESSIONS_MAX];
 
     /* tftp states */
     char *tftp_prefix;
     struct tftp_session tftp_sessions[TFTP_SESSIONS_MAX];
 

+    ArpTable arp_table;
+

     void *opaque;
 };
 
     void *opaque;
 };
 


@@ -237,22 +275,8 @@ void if_start(Slirp *);
 void if_start(struct ttys *);
 #endif
 
 void if_start(struct ttys *);
 #endif
 

-#ifdef BAD_SPRINTF
-# define vsprintf vsprintf_len
-# define sprintf sprintf_len
- extern int vsprintf_len(char *, const char *, va_list);
- extern int sprintf_len(char *, const char *, ...);
-#endif
-
-#ifdef DECLARE_SPRINTF
-# ifndef BAD_SPRINTF
- extern int vsprintf(char *, const char *, va_list);
-# endif
- extern int vfprintf(FILE *, const char *, va_list);
-#endif
-

 #ifndef HAVE_STRERROR
 #ifndef HAVE_STRERROR

- extern char *strerror(int error);
+ char *strerror(int error);

 #endif
 
 #ifndef HAVE_INDEX
 #endif
 
 #ifndef HAVE_INDEX


@@ -263,8 +287,6 @@ void if_start(struct ttys *);
  long gethostid(void);
 #endif
 
  long gethostid(void);
 #endif
 

-void lprint(const char *, ...) GCC_FMT_ATTR(1, 2);
-

 #ifndef _WIN32
 #include <netdb.h>
 #endif
 #ifndef _WIN32
 #include <netdb.h>
 #endif


@@ -274,6 +296,9 @@ void lprint(const char *, ...) GCC_FMT_ATTR(1, 2);
 #define SO_OPTIONS DO_KEEPALIVE
 #define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
 
 #define SO_OPTIONS DO_KEEPALIVE
 #define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
 

+/* dnssearch.c */
+int translate_dnssearch(Slirp *s, const char ** names);
+

 /* cksum.c */
 int cksum(struct mbuf *m, int len);
 
 /* cksum.c */
 int cksum(struct mbuf *m, int len);
 


@@ -283,6 +308,7 @@ void if_output(struct socket *, struct mbuf *);
 
 /* ip_input.c */
 void ip_init(Slirp *);
 
 /* ip_input.c */
 void ip_init(Slirp *);

+void ip_cleanup(Slirp *);

 void ip_input(struct mbuf *);
 void ip_slowtimo(Slirp *);
 void ip_stripoptions(register struct mbuf *, struct mbuf *);
 void ip_input(struct mbuf *);
 void ip_slowtimo(Slirp *);
 void ip_stripoptions(register struct mbuf *, struct mbuf *);


@@ -300,6 +326,7 @@ void tcp_setpersist(register struct tcpcb *);
 
 /* tcp_subr.c */
 void tcp_init(Slirp *);
 
 /* tcp_subr.c */
 void tcp_init(Slirp *);

+void tcp_cleanup(Slirp *);

 void tcp_template(struct tcpcb *);
 void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbuf *, tcp_seq, tcp_seq, int);
 struct tcpcb * tcp_newtcpcb(struct socket *);
 void tcp_template(struct tcpcb *);
 void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbuf *, tcp_seq, tcp_seq, int);
 struct tcpcb * tcp_newtcpcb(struct socket *);