Support for falling back through the list of addresses returned from

[u/mdw/putty] / raw.c

diff --git a/raw.c b/raw.c
index 8619446..31d7490 100644 (file)
--- a/raw.c
+++ b/raw.c
@@ -29,6 +29,22 @@ static void c_write(Raw raw, char *buf, int len)
     sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
 }
 
+static void raw_log(Plug plug, int type, SockAddr addr, int port,
+                   const char *error_msg, int error_code)
+{
+    Raw raw = (Raw) plug;
+    char addrbuf[256], *msg;
+
+    sk_getaddr(addr, addrbuf, lenof(addrbuf));
+
+    if (type == 0)
+       msg = dupprintf("Connecting to %s port %d", addrbuf, port);
+    else
+       msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
+
+    logevent(raw->frontend, msg);
+}
+
 static int raw_closing(Plug plug, const char *error_msg, int error_code,
                       int calling_back)
 {
@@ -74,6 +90,7 @@ static const char *raw_init(void *frontend_handle, void **backend_handle,
                            int keepalive)
 {
     static const struct plug_function_table fn_table = {
+       raw_log,
        raw_closing,
        raw_receive,
        raw_sent
@@ -113,13 +130,6 @@ static const char *raw_init(void *frontend_handle, void **backend_handle,
     /*
      * Open socket.
      */
-    {
-       char *buf, addrbuf[100];
-       sk_getaddr(addr, addrbuf, 100);
-       buf = dupprintf("Connecting to %s port %d", addrbuf, port);
-       logevent(raw->frontend, buf);
-       sfree(buf);
-    }
     raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, keepalive,
                            (Plug) raw, cfg);
     if ((err = sk_socket_error(raw->s)) != NULL)