Move x11fwd and portfwd prototypes from ssh.c into ssh.h so they can be seen

by (and checked against) the definitions.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2474 cda61777-01e9-0310-a592-d414129be87e

diff --git a/portfwd.c b/portfwd.c
index 7684b18..94aec6e 100644 (file)
--- a/portfwd.c
+++ b/portfwd.c
@@ -70,8 +70,6 @@ struct PFwdPrivate {
     struct pfwd_queue *waiting;
 };
 
-void pfd_close(Socket s);
-
 
 static int pfd_closing(Plug plug, char *error_msg, int error_code,
                       int calling_back)

diff --git a/ssh.c b/ssh.c
index 442d35a..4da6505 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -291,23 +291,6 @@ enum { PKT_END, PKT_INT, PKT_CHAR, PKT_DATA, PKT_STR, PKT_BIGNUM };
 
 typedef struct ssh_tag *Ssh;
 
-extern char *x11_init(Socket *, char *, void *, void *);
-extern void x11_close(Socket);
-extern int x11_send(Socket, char *, int);
-extern void *x11_invent_auth(char *, int, char *, int);
-extern void x11_unthrottle(Socket s);
-extern void x11_override_throttle(Socket s, int enable);
-extern int x11_get_screen_number(char *display);
-
-extern char *pfd_newconnect(Socket * s, char *hostname, int port, void *c);
-extern char *pfd_addforward(char *desthost, int destport, char *srcaddr,
-                           int port, void *backhandle);
-extern void pfd_close(Socket s);
-extern int pfd_send(Socket s, char *data, int len);
-extern void pfd_confirm(Socket s);
-extern void pfd_unthrottle(Socket s);
-extern void pfd_override_throttle(Socket s, int enable);
-
 static void ssh2_pkt_init(Ssh, int pkt_type);
 static void ssh2_pkt_addbool(Ssh, unsigned char value);
 static void ssh2_pkt_adduint32(Ssh, unsigned long value);

diff --git a/ssh.h b/ssh.h
index e3423cc..41cc503 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -254,6 +254,25 @@ void logevent(void *, char *);
 void *new_sock_channel(void *handle, Socket s);
 void ssh_send_port_open(void *channel, char *hostname, int port, char *org);
 
+/* Exports from portfwd.c */
+extern char *pfd_newconnect(Socket * s, char *hostname, int port, void *c);
+extern char *pfd_addforward(char *desthost, int destport, char *srcaddr,
+                           int port, void *backhandle);
+extern void pfd_close(Socket s);
+extern int pfd_send(Socket s, char *data, int len);
+extern void pfd_confirm(Socket s);
+extern void pfd_unthrottle(Socket s);
+extern void pfd_override_throttle(Socket s, int enable);
+
+/* Exports from x11fwd.c */
+extern char *x11_init(Socket *, char *, void *, void *);
+extern void x11_close(Socket);
+extern int x11_send(Socket, char *, int);
+extern void *x11_invent_auth(char *, int, char *, int);
+extern void x11_unthrottle(Socket s);
+extern void x11_override_throttle(Socket s, int enable);
+extern int x11_get_screen_number(char *display);
+
 Bignum copybn(Bignum b);
 Bignum bn_power_2(int n);
 void bn_restore_invariant(Bignum b);

diff --git a/x11fwd.c b/x11fwd.c
index 5a83db2..80e0eb5 100644 (file)
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -69,8 +69,6 @@ struct X11Private {
     Socket s;
 };
 
-void x11_close(Socket s);
-
 void *x11_invent_auth(char *proto, int protomaxlen,
                     char *data, int datamaxlen)
 {