Factor out ssh_hostport_setup().

This is the part of ssh.c's connect_to_host() which figures out the
host name and port number that logically identify the connection -
i.e. not necessarily where we physically connected to, but what we'll
use to look up the saved session cache, put in the window title bar,
and give to the connection sharing code to identify other connections
to share with.

I'm about to want to use it for another purpose, so it needs to be
moved out into a separate function.

diff --git a/ssh.c b/ssh.c
index d53b392601db8bc1794b46e4f7ae13cc0de458c3..c93942361e9224658dc355b35ba70d6dcd27abdf 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -3549,35 +3549,20 @@ static void ssh_sent(Plug plug, int bufsize)
        ssh_throttle_all(ssh, 0, bufsize);
 }
 
-/*
- * Connect to specified host and port.
- * Returns an error message, or NULL on success.
- * Also places the canonical host name into `realhost'. It must be
- * freed by the caller.
- */
-static const char *connect_to_host(Ssh ssh, const char *host, int port,
-                                  char **realhost, int nodelay, int keepalive)
+static void ssh_hostport_setup(const char *host, int port, Conf *conf,
+                               char **savedhost, int *savedport,
+                               char **loghost_ret)
 {
-    static const struct plug_function_table fn_table = {
-       ssh_socket_log,
-       ssh_closing,
-       ssh_receive,
-       ssh_sent,
-       NULL
-    };
+    char *loghost = conf_get_str(conf, CONF_loghost);
+    if (loghost_ret)
+        *loghost_ret = loghost;
 
-    SockAddr addr;
-    const char *err;
-    char *loghost;
-    int addressfamily, sshprot;
-    
-    loghost = conf_get_str(ssh->conf, CONF_loghost);
     if (*loghost) {
        char *tmphost;
         char *colon;
 
         tmphost = dupstr(loghost);
-       ssh->savedport = 22;           /* default ssh port */
+       *savedport = 22;               /* default ssh port */
 
        /*
         * A colon suffix on the hostname string also lets us affect
@@ -3588,17 +3573,43 @@ static const char *connect_to_host(Ssh ssh, const char *host, int port,
        if (colon && colon == host_strchr(tmphost, ':')) {
            *colon++ = '\0';
            if (*colon)
-               ssh->savedport = atoi(colon);
+               *savedport = atoi(colon);
        }
 
-        ssh->savedhost = host_strduptrim(tmphost);
+        *savedhost = host_strduptrim(tmphost);
         sfree(tmphost);
     } else {
-       ssh->savedhost = host_strduptrim(host);
+       *savedhost = host_strduptrim(host);
        if (port < 0)
            port = 22;                 /* default ssh port */
-       ssh->savedport = port;
+       *savedport = port;
     }
+}
+
+/*
+ * Connect to specified host and port.
+ * Returns an error message, or NULL on success.
+ * Also places the canonical host name into `realhost'. It must be
+ * freed by the caller.
+ */
+static const char *connect_to_host(Ssh ssh, const char *host, int port,
+                                  char **realhost, int nodelay, int keepalive)
+{
+    static const struct plug_function_table fn_table = {
+       ssh_socket_log,
+       ssh_closing,
+       ssh_receive,
+       ssh_sent,
+       NULL
+    };
+
+    SockAddr addr;
+    const char *err;
+    char *loghost;
+    int addressfamily, sshprot;
+
+    ssh_hostport_setup(host, port, ssh->conf,
+                       &ssh->savedhost, &ssh->savedport, &loghost);
 
     ssh->fn = &fn_table;               /* make 'ssh' usable as a Plug */