projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More portability fixes.
[u/mdw/putty]
/
unix
/
uxnet.c
diff --git
a/unix/uxnet.c
b/unix/uxnet.c
index
7e5cf6f
..
46b619b
100644
(file)
--- a/
unix/uxnet.c
+++ b/
unix/uxnet.c
@@
-434,6
+434,11
@@
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
else
localport = 0; /* just use port 0 (ie kernel picks) */
else
localport = 0; /* just use port 0 (ie kernel picks) */
+ /* BSD IP stacks need sockaddr_in zeroed before filling in */
+ memset(&a,'\0',sizeof(struct sockaddr_in));
+#ifdef IPV6
+ memset(&a6,'\0',sizeof(struct sockaddr_in6));
+#endif
/* Loop round trying to bind */
while (1) {
int retcode;
/* Loop round trying to bind */
while (1) {
int retcode;
@@
-521,6
+526,8
@@
Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
uxsel_tell(ret);
add234(sktree, ret);
uxsel_tell(ret);
add234(sktree, ret);
+ sk_addr_free(addr);
+
return (Socket) ret;
}
return (Socket) ret;
}
@@
-572,7
+579,12
@@
Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only)
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));
+ /* BSD IP stacks need sockaddr_in zeroed before filling in */
+ memset(&a,'\0',sizeof(struct sockaddr_in));
#ifdef IPV6
#ifdef IPV6
+#if 0
+ memset(&a6,'\0',sizeof(struct sockaddr_in6));
+#endif
hints.ai_flags = AI_NUMERICHOST;
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = 0;
hints.ai_flags = AI_NUMERICHOST;
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = 0;
@@
-869,7
+881,7
@@
static int net_select_result(int fd, int event)
memset(&isa, 0, sizeof(struct sockaddr_in));
err = 0;
memset(&isa, 0, sizeof(struct sockaddr_in));
err = 0;
- t = accept(s->s,(struct sockaddr *)&isa,&addrlen);
+ t = accept(s->s,(struct sockaddr *)&isa,
(socklen_t *)
&addrlen);
if (t < 0) {
break;
}
if (t < 0) {
break;
}