- djm@cvs.openbsd.org 2008/05/09 04:55:56

     [channels.c channels.h clientloop.c serverloop.c]
     Try additional addresses when connecting to a port forward destination
     whose DNS name resolves to more than one address. The previous behaviour
     was to try the first address and give up.

     Reported by stig AT venaas.com in bz#343

     great feedback and ok markus@

1 files changed, 8 insertions, 11 deletions

diff --git a/serverloop.c b/serverloop.c
index 20991c3ce..2142f3809 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.149 2008/05/08 12:02:23 djm Exp $ */
+/* $OpenBSD: serverloop.c,v 1.150 2008/05/09 04:55:56 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -938,7 +938,6 @@ static Channel *
 server_request_direct_tcpip(void)
 {
         Channel *c;
-        int sock;
         char *target, *originator;
         int target_port, originator_port;
 
@@ -948,18 +947,16 @@ server_request_direct_tcpip(void)
         originator_port = packet_get_int();
         packet_check_eom();
 
-        debug("server_request_direct_tcpip: originator %s port %d, target %s port %d",
-            originator, originator_port, target, target_port);
+        debug("server_request_direct_tcpip: originator %s port %d, target %s "
+            "port %d", originator, originator_port, target, target_port);
 
         /* XXX check permission */
-        sock = channel_connect_to(target, target_port);
-        xfree(target);
+        c = channel_connect_to(target, target_port,
+            "direct-tcpip", "direct-tcpip");
+
         xfree(originator);
-        if (sock < 0)
-                return NULL;
-        c = channel_new("direct-tcpip", SSH_CHANNEL_CONNECTING,
-            sock, sock, -1, CHAN_TCP_WINDOW_DEFAULT,
-            CHAN_TCP_PACKET_DEFAULT, 0, "direct-tcpip", 1);
+        xfree(target);
+
         return c;
 }