diff options
| author | Andrey Borzenkov <bor@users.sourceforge.net> | 2001-06-15 13:01:42 +0000 |
|---|---|---|
| committer | Andrey Borzenkov <bor@users.sourceforge.net> | 2001-06-15 13:01:42 +0000 |
| commit | 12e1cf567d239495cf238f44456ab19daab327c8 (patch) | |
| tree | ed060795e1751e2b69d0e809d5a57cbeeb51b986 /Src/Modules/tcp.c | |
| parent | 87db19092061d3489ea2550ba1f54376d165b07a (diff) | |
| download | zsh-12e1cf567d239495cf238f44456ab19daab327c8.tar.gz zsh-12e1cf567d239495cf238f44456ab19daab327c8.tar.xz zsh-12e1cf567d239495cf238f44456ab19daab327c8.zip | |
14931: fix socket/address length calculation
Diffstat (limited to 'Src/Modules/tcp.c')
| -rw-r--r-- | Src/Modules/tcp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Src/Modules/tcp.c b/Src/Modules/tcp.c index 6f7a05cb2..7bd59fcce 100644 --- a/Src/Modules/tcp.c +++ b/Src/Modules/tcp.c @@ -255,6 +255,7 @@ tcp_close(Tcp_session sess) mod_export int tcp_connect(Tcp_session sess, char *addrp, struct hostent *zhost, int d_port) { + int salen; #ifdef SUPPORT_IPV6 if(zhost->h_addrtype==AF_INET6) { memcpy(&(sess->peer.in6.sin6_addr), addrp, zhost->h_length); @@ -263,14 +264,16 @@ tcp_connect(Tcp_session sess, char *addrp, struct hostent *zhost, int d_port) # ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID sess->peer.in6.sin6_scope_id = 0; # endif + salen = sizeof(struct sockaddr_in6); } else #endif /* SUPPORT_IPV6 */ { memcpy(&(sess->peer.in.sin_addr), addrp, zhost->h_length); sess->peer.in.sin_port = d_port; + salen = sizeof(struct sockaddr_in); } - return connect(sess->fd, (struct sockaddr *)&(sess->peer), zhost->h_length); + return connect(sess->fd, (struct sockaddr *)&(sess->peer), salen); } /* The load/unload routines required by the zsh library interface */ |