summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-02-15 02:08:20 +0000
committerColin Watson <cjwatson@debian.org>2014-02-15 02:08:20 +0000
commit18e1479bf4586a14b88dab082af10a8981b9d48d (patch)
tree0223baabf3467f5836cd4fd963fb654c1df6c2ac
parentbdb60d16baf6d163844fc6f5f8520bc853b6611b (diff)
Skip get_sock_port call for c->sock==-1
Origin: upstream, https://bugzilla.mindrot.org/show_bug.cgi?id=2200 Bug-Debian: http://bugs.debian.org/738693 Last-Update: 2014-02-15 Patch-Name: getsockname-error.patch
-rw-r--r--channels.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels.c b/channels.c
index e741f29b9..8e66265a3 100644
--- a/channels.c
+++ b/channels.c
@@ -1386,7 +1386,7 @@ port_open_helper(Channel *c, char *rtype)
1386 int direct; 1386 int direct;
1387 char buf[1024]; 1387 char buf[1024];
1388 char *local_ipaddr = get_local_ipaddr(c->sock); 1388 char *local_ipaddr = get_local_ipaddr(c->sock);
1389 int local_port = get_sock_port(c->sock, 1); 1389 int local_port = c->sock == -1 ? 65536 : get_sock_port(c->sock, 1);
1390 char *remote_ipaddr = get_peer_ipaddr(c->sock); 1390 char *remote_ipaddr = get_peer_ipaddr(c->sock);
1391 int remote_port = get_peer_port(c->sock); 1391 int remote_port = get_peer_port(c->sock);
1392 1392