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

[sgt/putty] / raw.c

diff --git a/raw.c b/raw.c
index 8e8f7e0..94ff43f 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -68,6 +68,7 @@ static void raw_sent(Plug plug, int bufsize)
  * freed by the caller.
  */
 static char *raw_init(void *frontend_handle, void **backend_handle,
+                     Config *cfg,
                      char *host, int port, char **realhost, int nodelay)
 {
     static const struct plug_function_table fn_table = {
@@ -95,8 +96,8 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        logevent(raw->frontend, buf);
        sfree(buf);
     }
-    addr = name_lookup(host, port, realhost);
-    if ((err = sk_addr_error(addr)))
+    addr = name_lookup(host, port, realhost, cfg);
+    if ((err = sk_addr_error(addr)) != NULL)
        return err;
 
     if (port < 0)
@@ -112,8 +113,9 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
        logevent(raw->frontend, buf);
        sfree(buf);
     }
-    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, (Plug) raw);
-    if ((err = sk_socket_error(raw->s)))
+    raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay,
+                           (Plug) raw, cfg);
+    if ((err = sk_socket_error(raw->s)) != NULL)
        return err;
 
     sk_addr_free(addr);
@@ -122,6 +124,13 @@ static char *raw_init(void *frontend_handle, void **backend_handle,
 }
 
 /*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void raw_reconfig(void *handle, Config *cfg)
+{
+}
+
+/*
  * Called to send data down the raw connection.
  */
 static int raw_send(void *handle, char *buf, int len)
@@ -205,6 +214,7 @@ static int raw_exitcode(void *handle)
 
 Backend raw_backend = {
     raw_init,
+    raw_reconfig,
     raw_send,
     raw_sendbuffer,
     raw_size,