Author: wrowe
Date: Tue Sep 14 10:44:35 2010
New Revision: 996829
URL: http://svn.apache.org/viewvc?rev=996829&view=rev
Log:
s_addr is actually a macro in some levels of the win32 sdk, so improve
this logic with simple var names rsaddr/lsaddr elts and generically, salen.
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=996829&r1=996828&r2=996829&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Tue Sep 14 10:44:35 2010
@@ -939,18 +939,18 @@ char *jk_dump_hinfo(struct sockaddr_in *
char *jk_dump_sinfo(jk_sock_t sd, char *buf)
{
- struct sockaddr_in s_addr;
- struct sockaddr_in r_addr;
- socklen_t s_alen;
-
- s_alen = sizeof(struct sockaddr);
- if (getsockname(sd, (struct sockaddr *)&s_addr, &s_alen) == 0) {
- s_alen = sizeof(struct sockaddr);
- if (getpeername(sd, (struct sockaddr *)&r_addr, &s_alen) == 0) {
- unsigned long laddr = (unsigned
long)htonl(s_addr.sin_addr.s_addr);
- unsigned short lport = (unsigned short)htons(s_addr.sin_port);
- unsigned long raddr = (unsigned
long)htonl(r_addr.sin_addr.s_addr);
- unsigned short rport = (unsigned short)htons(r_addr.sin_port);
+ struct sockaddr_in rsaddr;
+ struct sockaddr_in lsaddr;
+ socklen_t salen;
+
+ salen = sizeof(struct sockaddr);
+ if (getsockname(sd, (struct sockaddr *)&lsaddr, &salen) == 0) {
+ salen = sizeof(struct sockaddr);
+ if (getpeername(sd, (struct sockaddr *)&rsaddr, &salen) == 0) {
+ unsigned long laddr = (unsigned
long)htonl(lsaddr.sin_addr.s_addr);
+ unsigned short lport = (unsigned short)htons(lsaddr.sin_port);
+ unsigned long raddr = (unsigned
long)htonl(rsaddr.sin_addr.s_addr);
+ unsigned short rport = (unsigned short)htons(rsaddr.sin_port);
sprintf(buf, "%d.%d.%d.%d:%d -> %d.%d.%d.%d:%d",
(int)(laddr >> 24), (int)((laddr >> 16) & 0xff),
(int)((laddr >> 8) & 0xff), (int)(laddr & 0xff),
(int)lport,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
