Module Name: src
Committed By: christos
Date: Sun Feb 25 19:22:42 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
Log Message:
zero out socket structures before bind.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.14
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.13 Wed Jan 17 01:10:27 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Sun Feb 25 14:22:41 2018
@@ -745,6 +745,10 @@ mDNSlocal int SetupSocket(struct sockadd
// And start listening for packets
if (err == 0)
{
+ mDNSPlatformMemZero(&bindAddr, sizeof(bindAddr));
+#ifndef NOT_HAVE_SA_LEN
+ bindAddr.sin_len = sizeof(bindAddr);
+#endif
bindAddr.sin_family = AF_INET;
bindAddr.sin_port = port.NotAnInteger;
bindAddr.sin_addr.s_addr = INADDR_ANY; // Want to receive multicasts AND unicasts on this socket
@@ -1054,6 +1058,9 @@ mDNSlocal mStatus OpenIfNotifySocket(int
/* Subscribe the socket to Link & IP addr notifications. */
mDNSPlatformMemZero(&snl, sizeof snl);
+#ifndef NOT_HAVE_SA_LEN
+ snl.nl_len = sizeof(snl);
+#endif
snl.nl_family = AF_NETLINK;
snl.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR;
ret = bind(sock, (struct sockaddr *) &snl, sizeof snl);
@@ -1266,6 +1273,11 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR
int err;
int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
struct sockaddr_in s5353;
+
+ mDNSPlatformMemZero(&s5353, sizeof(s5353));
+#ifndef NOT_HAVE_SA_LEN
+ s5353.sin_len = sizeof(s5353);
+#endif
s5353.sin_family = AF_INET;
s5353.sin_port = MulticastDNSPort.NotAnInteger;
s5353.sin_addr.s_addr = 0;
