File proxy-suite-1.9.2.4-socklen.dif of Package proxy-suite
--- common/com-socket.c
+++ common/com-socket.c
@@ -311,7 +311,8 @@
char peer[PEER_LEN] = {0};
char dest[PEER_LEN] = {0};
struct sockaddr_in saddr;
- int nsock, len;
+ int nsock;
+ socklen_t len;
/*
** Let the show begin ...
@@ -1014,10 +1015,11 @@
** connection (e.g. FTP passive client or active server).
*/
if (hls->peer[0] == '\0') {
- memset(&saddr, 0, sizeof(saddr));
- len = sizeof(saddr);
+ socklen_t slen = sizeof(saddr);
+
+ memset(&saddr, 0, slen);
nsock = accept(hls->sock,
- (struct sockaddr *) &saddr, &len);
+ (struct sockaddr *) &saddr, &slen);
if (nsock < 0) {
hls->ernr = errno;
syslog_error("can't accept %s", hls->ctyp);
@@ -1836,7 +1838,8 @@
u_int32_t socket_sck2addr(int sock, int peer, u_int16_t *port)
{
struct sockaddr_in saddr;
- int len, r;
+ socklen_t len;
+ int r;
char *s;
/*