proxy.c now no longer refers to `cfg'. Instead, each of the three

[u/mdw/putty] / network.h

diff --git a/network.h b/network.h
index 3ec9eb7..657bdcb 100644 (file)
--- a/network.h
+++ b/network.h
@@ -13,6 +13,13 @@
 #ifndef PUTTY_NETWORK_H
 #define PUTTY_NETWORK_H
 
+#ifndef DONE_TYPEDEFS
+#define DONE_TYPEDEFS
+typedef struct config_tag Config;
+typedef struct backend_tag Backend;
+typedef struct terminal_tag Terminal;
+#endif
+
 typedef struct SockAddr_tag *SockAddr;
 /* pay attention to levels of indirection */
 typedef struct socket_function_table **Socket;
@@ -24,9 +31,12 @@ struct socket_function_table {
     /* if p is NULL, it doesn't change the plug */
     /* but it does return the one it's using */
     void (*close) (Socket s);
-    int (*write) (Socket s, char *data, int len);
-    int (*write_oob) (Socket s, char *data, int len);
+    int (*write) (Socket s, const char *data, int len);
+    int (*write_oob) (Socket s, const char *data, int len);
     void (*flush) (Socket s);
+    void (*set_private_ptr) (Socket s, void *ptr);
+    void *(*get_private_ptr) (Socket s);
+    void (*set_frozen) (Socket s, int is_frozen);
     /* ignored by tcp, but vital for ssl */
     char *(*socket_error) (Socket s);
 };
@@ -60,17 +70,35 @@ struct plug_function_table {
      */
 };
 
+/* proxy indirection layer */
+Socket new_connection(SockAddr addr, char *hostname,
+                     int port, int privport,
+                     int oobinline, int nodelay, Plug plug,
+                     const Config *cfg);
+Socket new_listener(char *srcaddr, int port, Plug plug, int local_host_only,
+                   const Config *cfg);
+SockAddr name_lookup(char *host, int port, char **canonicalname,
+                    const Config *cfg);
+
+/* socket functions */
 
 void sk_init(void);                   /* called once at program startup */
+void sk_cleanup(void);                /* called just before program exit */
 
-SockAddr sk_namelookup(char *host, char **canonicalname);
+SockAddr sk_namelookup(const char *host, char **canonicalname);
+SockAddr sk_nonamelookup(const char *host);
 void sk_getaddr(SockAddr addr, char *buf, int buflen);
+int sk_hostname_is_local(char *name);
+int sk_address_is_local(SockAddr addr);
+enum { ADDRTYPE_IPV4, ADDRTYPE_IPV6, ADDRTYPE_NAME };
+int sk_addrtype(SockAddr addr);
+void sk_addrcopy(SockAddr addr, char *buf);
 void sk_addr_free(SockAddr addr);
 
 Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
              int nodelay, Plug p);
 
-Socket sk_newlistener(int port, Plug plug, int local_host_only);
+Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only);
 
 Socket sk_register(void *sock, Plug plug);
 
@@ -94,8 +122,8 @@ Socket sk_register(void *sock, Plug plug);
  * This is perhaps unnecessary now that we have the notion of a plug,
  * but there is some existing code that uses it, so it stays.
  */
-void sk_set_private_ptr(Socket s, void *ptr);
-void *sk_get_private_ptr(Socket s);
+#define sk_set_private_ptr(s, ptr) (((*s)->set_private_ptr) (s, ptr))
+#define sk_get_private_ptr(s) (((*s)->get_private_ptr) (s))
 
 /*
  * Special error values are returned from sk_namelookup and sk_new
@@ -122,7 +150,7 @@ char *sk_addr_error(SockAddr addr);
  *    associated local socket in order to avoid unbounded buffer
  *    growth.
  */
-void sk_set_frozen(Socket sock, int is_frozen);
+#define sk_set_frozen(s, is_frozen) (((*s)->set_frozen) (s, is_frozen))
 
 /*
  * Call this after an operation that might have tried to send on a
@@ -130,6 +158,15 @@ void sk_set_frozen(Socket sock, int is_frozen);
  */
 void net_pending_errors(void);
 
+/*
+ * Simple wrapper on getservbyname(), needed by ssh.c. Returns the
+ * port number, in host byte order (suitable for printf and so on).
+ * Returns 0 on failure. Any platform not supporting getservbyname
+ * can just return 0 - this function is not required to handle
+ * numeric port specifications.
+ */
+int net_service_lookup(char *service);
+
 /********** SSL stuff **********/
 
 /*