Update for 0.12.4 release

[qemu.git] / slirp / misc.h

diff --git a/slirp/misc.h b/slirp/misc.h
index 8e2819b99c75476f1e9ff36dddcfaf4ef672a08a..da68d099501a8c127b3484f28bf1dbab7165b483 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- * 
- * Please read the file COPYRIGHT for the 
+ *
+ * Please read the file COPYRIGHT for the
  * terms and conditions of the copyright.
  */
 
@@ -10,24 +10,17 @@
 
 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 */
-       char *ex_exec;                  /* Command line of what to exec */
+       const char *ex_exec;            /* Command line of what to exec */
        struct ex_list *ex_next;
 };
 
-extern struct ex_list *exec_list;
-extern u_int curtime, time_fasttimo, last_slowtimo, detach_time, detach_wait;
-
-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 *));
+char *strdup(const char *);
 #endif
 
-void do_wait _P((int));
+void do_wait(int);
 
 #define EMU_NONE 0x0
 
@@ -43,11 +36,6 @@ 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;
@@ -63,25 +51,22 @@ struct emu_t {
        struct emu_t *next;
 };
 
-extern struct emu_t *tcpemu;
-
 extern int x_port, x_server, x_display;
 
-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 openpty _P((int *, int *));
-int fork_exec _P((struct socket *, char *, int));
-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 *));
+int show_x(char *, struct socket *);
+void redir_x(u_int32_t, int, int, int);
+void slirp_insque(void *, void *);
+void slirp_remque(void *);
+int add_exec(struct ex_list **, int, char *, struct in_addr, int);
+int slirp_openpty(int *, int *);
+int fork_exec(struct socket *so, const char *ex, int do_pty);
+void snooze_hup(int);
+void snooze(void);
+void relay(int);
+void add_emu(char *);
+void u_sleep(int);
+void fd_nonblock(int);
+void fd_block(int);
+int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
 
 #endif