PATCH: Today's TCP Fix (TM) (2)

[Peter Stephenson <pws@xxxxxxx>]

Two bits for listing with `ztcp' on its own: the size of the address was
wrong, a socket address instead of an internet address --- as it was too
large, some systems might handle it anyway, which is probably how this
escaped detection.  Then the address used if no name was available for
the peer was the local one; again, you wouldn't see this unless the
gethostbyaddr() failed.

We should ideally handle AF_INET6 at this point, too.

Index: Src/Modules/tcp.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/tcp.c,v
retrieving revision 1.28
diff -u -r1.28 tcp.c
--- Src/Modules/tcp.c	16 May 2002 14:05:30 -0000	1.28
+++ Src/Modules/tcp.c	24 May 2002 12:48:09 -0000
@@ -565,16 +565,16 @@
 
 		if (sess->fd != -1)
 		{
-		    zthost = gethostbyaddr((const void *)&(sess->sock.in.sin_addr), sizeof(struct sockaddr_in), AF_INET);
+		    zthost = gethostbyaddr((const void *)&(sess->sock.in.sin_addr), sizeof(sess->sock.in.sin_addr), AF_INET);
 		    if (zthost)
 			localname = zthost->h_name;
 		    else
 			localname = ztrdup(inet_ntoa(sess->sock.in.sin_addr));
-		    ztpeer = gethostbyaddr((const void *)&(sess->peer.in.sin_addr), sizeof(struct sockaddr_in), AF_INET);
+		    ztpeer = gethostbyaddr((const void *)&(sess->peer.in.sin_addr), sizeof(sess->peer.in.sin_addr), AF_INET);
 		    if (ztpeer)
 			remotename = ztpeer->h_name;
 		    else
-			remotename = ztrdup(inet_ntoa(sess->sock.in.sin_addr));
+			remotename = ztrdup(inet_ntoa(sess->peer.in.sin_addr));
 		    fprintf(shout, "%s:%d %s %s:%d is on fd %d%s\n",
 			    localname, ntohs(sess->sock.in.sin_port),
 			    ((sess->flags & ZTCP_LISTEN) ? "-<" :

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 392070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************