You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2026/06/09 13:44:25 UTC
(tomcat-connectors) 12/20: Slight cleanup
This is an automated email from the ASF dual-hosted git repository.
ChristopherSchultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
commit 6d69b5485667fd23c987c9f3948c4d187a1897dc
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Mon Jun 8 14:24:33 2026 -0400
Slight cleanup
---
native/common/jk_connect.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/native/common/jk_connect.c b/native/common/jk_connect.c
index 026d1e2e6..120bc9551 100644
--- a/native/common/jk_connect.c
+++ b/native/common/jk_connect.c
@@ -1321,20 +1321,21 @@ char *jk_dump_sinfo(jk_sock_t sd, char *buf, size_t size)
socklen_t salen;
salen = sizeof(lsaddr);
- if (getsockname(sd, &lsaddr, &salen) == 0) {
+ if (getsockname(sd, (struct sockaddr *)&lsaddr, &salen) == 0) {
salen = sizeof(rsaddr);
- if (getpeername(sd, &rsaddr, &salen) == 0) {
+ if (getpeername(sd, (struct sockaddr *)&rsaddr, &salen) == 0) {
char pb[16];
size_t ps;
- struct sockaddr *sa = (struct sockaddr *)&lsaddr;
- if (sa->sa_family == JK_INET) {
- struct sockaddr_in *insa = (struct sockaddr_in *)&lsaddr;
+ struct sockaddr *lsa = (struct sockaddr *)&lsaddr;
+ struct sockaddr *rsa = (struct sockaddr *)&rsaddr;
+ if (lsa->sa_family == JK_INET) {
+ struct sockaddr_in *insa = (struct sockaddr_in *)lsa;
inet_ntop4((unsigned char *)&insa->sin_addr, buf, size);
snprintf(pb, sizeof(pb), ":%u", ntohs(insa->sin_port));
}
#if JK_HAVE_IPV6
- else if (sa->sa_family == JK_INET6) {
- struct sockaddr_in6 *insa = (struct sockaddr_in6 *)&lsaddr;
+ else if (lsa->sa_family == JK_INET6) {
+ struct sockaddr_in6 *insa = (struct sockaddr_in6 *)lsa;
inet_ntop6((unsigned char *)&insa->sin6_addr, buf, size);
snprintf(pb, sizeof(pb), ":%u", ntohs(insa->sin6_port));
}
@@ -1355,15 +1356,14 @@ char *jk_dump_sinfo(jk_sock_t sd, char *buf, size_t size)
ps = strlen(buf);
}
- sa = (struct sockaddr *)&rsaddr;
- if (sa->sa_family == JK_INET) {
- struct sockaddr_in *insa = (struct sockaddr_in *)&rsaddr;
+ if (rsa->sa_family == JK_INET) {
+ struct sockaddr_in *insa = (struct sockaddr_in *)rsa;
inet_ntop4((unsigned char *)&insa->sin_addr, buf + ps, size - ps);
snprintf(pb, sizeof(pb), ":%u", ntohs(insa->sin_port));
}
#if JK_HAVE_IPV6
- else if (sa->sa_family == JK_INET6) {
- struct sockaddr_in6 *insa = (struct sockaddr_in6 *)&rsaddr;
+ else if (rsa->sa_family == JK_INET6) {
+ struct sockaddr_in6 *insa = (struct sockaddr_in6 *)rsa;
inet_ntop6((unsigned char *)&insa->sin6_addr, buf + ps, size - ps);
snprintf(pb, sizeof(pb), ":%u", ntohs(insa->sin6_port));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org