oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(doit_{passive,active}): use kc->thataddr directly

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12058 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2003-04-16 17:33:02 +00:00
parent c10c3f4d5e
commit 3e0f008990
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
appl/kx/kx.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995-2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1995-2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -286,16 +286,14 @@ doit_passive (kx_context *kc)
warn("fork"); warn("fork");
continue; continue;
} else if (child == 0) { } else if (child == 0) {
struct sockaddr *addr;
int fd; int fd;
int xserver; int xserver;
addr = (struct sockaddr *)&kc->thataddr;
close (otherside); close (otherside);
socket_set_port(addr, htons(tmp)); socket_set_port(kc->thataddr, htons(tmp));
fd = socket (addr->sa_family, SOCK_STREAM, 0); fd = socket (kc->thataddr->sa_family, SOCK_STREAM, 0);
if (fd < 0) if (fd < 0)
err(1, "socket"); err(1, "socket");
#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT) #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
@@ -315,7 +313,7 @@ doit_passive (kx_context *kc)
} }
#endif #endif
if (connect (fd, addr, kc->thataddr_len) < 0) if (connect (fd, kc->thataddr, kc->thataddr_len) < 0)
err(1, "connect(%s)", host); err(1, "connect(%s)", host);
{ {
int d = 0; int d = 0;
@@ -499,17 +497,15 @@ doit_active (kx_context *kc)
continue; continue;
} else if (child == 0) { } else if (child == 0) {
int s; int s;
struct sockaddr *addr;
for (i = 0; i < nsockets; ++i) for (i = 0; i < nsockets; ++i)
close (sockets[i].fd); close (sockets[i].fd);
addr = (struct sockaddr *)&kc->thataddr;
close (otherside); close (otherside);
socket_set_port(addr, htons(tmp)); socket_set_port(kc->thataddr, htons(tmp));
s = socket (addr->sa_family, SOCK_STREAM, 0); s = socket (kc->thataddr->sa_family, SOCK_STREAM, 0);
if (s < 0) if (s < 0)
err(1, "socket"); err(1, "socket");
#if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT) #if defined(TCP_NODELAY) && defined(HAVE_SETSOCKOPT)
@@ -529,7 +525,7 @@ doit_active (kx_context *kc)
} }
#endif #endif
if (connect (s, addr, kc->thataddr_len) < 0) if (connect (s, kc->thataddr, kc->thataddr_len) < 0)
err(1, "connect"); err(1, "connect");
return active_session (fd, s, kc); return active_session (fd, s, kc);