Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging

[mirror_qemu.git] / slirp / misc.h

diff --git a/slirp/misc.h b/slirp/misc.h
index f6a4cb090e23575b7de52d67abd335f1e1d1cdaf..0d0c059e6b9c87676e43e41e2bb726df139e63aa 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -10,25 +10,12 @@
 
 struct ex_list {
        int ex_pty;                     /* Do we want a pty? */
-       int ex_addr;                    /* The last byte of the address */
+       struct in_addr ex_addr;         /* Server address */
        int ex_fport;                   /* Port to telnet to */
        const char *ex_exec;            /* Command line of what to exec */
        struct ex_list *ex_next;
 };
 
-extern struct ex_list *exec_list;
-extern u_int time_fasttimo, last_slowtimo;
-
-extern int (*lprint_print) _P((void *, const char *, va_list));
-extern char *lprint_ptr, *lprint_ptr2, **lprint_arg;
-extern struct sbuf *lprint_sb;
-
-#ifndef HAVE_STRDUP
-char *strdup _P((const char *));
-#endif
-
-void do_wait _P((int));
-
 #define EMU_NONE 0x0
 
 /* TCP emulations */
@@ -43,47 +30,29 @@ void do_wait _P((int));
 
 #define EMU_NOCONNECT 0x10     /* Don't connect */
 
-/* UDP emulations */
-#define EMU_TALK       0x1
-#define EMU_NTALK      0x2
-#define EMU_CUSEEME    0x3
-
 struct tos_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
 };
 
 struct emu_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
-       struct emu_t *next;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
+    struct emu_t *next;
 };
 
-#ifndef CONFIG_QEMU
-extern struct emu_t *tcpemu;
-#endif
-
-extern int x_port, x_server, x_display;
+struct slirp_quehead {
+    struct slirp_quehead *qh_link;
+    struct slirp_quehead *qh_rlink;
+};
 
-int show_x _P((char *, struct socket *));
-void redir_x _P((u_int32_t, int, int, int));
-void getouraddr _P((void));
-inline  void slirp_insque  _P((void *, void *));
-inline  void slirp_remque  _P((void *));
-int add_exec _P((struct ex_list **, int, char *, int, int));
-int slirp_openpty _P((int *, int *));
+void slirp_insque(void *, void *);
+void slirp_remque(void *);
+int add_exec(struct ex_list **, int, char *, struct in_addr, int);
 int fork_exec(struct socket *so, const char *ex, int do_pty);
-void snooze_hup _P((int));
-void snooze _P((void));
-void relay _P((int));
-void add_emu _P((char *));
-void u_sleep _P((int));
-void fd_nonblock _P((int));
-void fd_block _P((int));
-int rsh_exec _P((struct socket *, struct socket *, char *, char *, char *));
 
 #endif