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

[u/mdw/putty] / ssh.h

diff --git a/ssh.h b/ssh.h
index 9f9f1e6..41cc503 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -195,13 +195,16 @@ struct ssh_signkey {
 
 struct ssh_compress {
     char *name;
-    void (*compress_init) (void);
-    int (*compress) (unsigned char *block, int len,
+    void *(*compress_init) (void);
+    void (*compress_cleanup) (void *);
+    int (*compress) (void *, unsigned char *block, int len,
                     unsigned char **outblock, int *outlen);
-    void (*decompress_init) (void);
-    int (*decompress) (unsigned char *block, int len,
+    void *(*decompress_init) (void);
+    void (*decompress_cleanup) (void *);
+    int (*decompress) (void *, unsigned char *block, int len,
                       unsigned char **outblock, int *outlen);
-    int (*disable_compression) (void);
+    int (*disable_compression) (void *);
+    char *text_name;
 };
 
 struct ssh2_userkey {
@@ -245,12 +248,30 @@ int random_byte(void);
 void random_add_noise(void *noise, int length);
 void random_add_heavynoise(void *noise, int length);
 
-void logevent(char *);
+void logevent(void *, char *);
 
 /* Allocate and register a new channel for port forwarding */
 void *new_sock_channel(void *handle, Socket s);
-void ssh_send_port_open(void *handle, void *channel,
-                       char *hostname, int port, char *org);
+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);
@@ -359,11 +380,13 @@ Bignum primegen(int bits, int modulus, int residue, Bignum factor,
 /*
  * zlib compression.
  */
-void zlib_compress_init(void);
-void zlib_decompress_init(void);
-int zlib_compress_block(unsigned char *block, int len,
+void *zlib_compress_init(void);
+void zlib_compress_cleanup(void *);
+void *zlib_decompress_init(void);
+void zlib_decompress_cleanup(void *);
+int zlib_compress_block(void *, unsigned char *block, int len,
                        unsigned char **outblock, int *outlen);
-int zlib_decompress_block(unsigned char *block, int len,
+int zlib_decompress_block(void *, unsigned char *block, int len,
                          unsigned char **outblock, int *outlen);
 
 /*