diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-19 08:54:52 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-20 11:23:33 +0200 |
commit | 7d33d36d73d2e902b107fb597e84e44ab11274a9 (patch) | |
tree | 7ef04cf1c29216f342da8e5ee69de7c1290959aa /mDNSResponder/mDNSPosix | |
parent | mDNSResponder: Update to v765.20.4 (diff) | |
download | rtems-libbsd-7d33d36d73d2e902b107fb597e84e44ab11274a9.tar.bz2 |
mDNSResponder: Update to v765.30.11
The sources can be obtained via:
https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-765.30.11.tar.gz
Update #3522.
Diffstat (limited to 'mDNSResponder/mDNSPosix')
-rwxr-xr-x | mDNSResponder/mDNSPosix/Responder.c | 4 | ||||
-rwxr-xr-x | mDNSResponder/mDNSPosix/mDNSPosix.c | 36 | ||||
-rwxr-xr-x | mDNSResponder/mDNSPosix/mDNSUNP.c | 4 |
3 files changed, 36 insertions, 8 deletions
diff --git a/mDNSResponder/mDNSPosix/Responder.c b/mDNSResponder/mDNSPosix/Responder.c index 3996b7b9..7a77bcdf 100755 --- a/mDNSResponder/mDNSPosix/Responder.c +++ b/mDNSResponder/mDNSPosix/Responder.c @@ -503,6 +503,7 @@ static mStatus RegisterServicesInFile(const char *filePath) { mStatus status = mStatus_NoError; FILE * fp = fopen(filePath, "r"); + int rv; if (fp == NULL) { return mStatus_UnknownErr; @@ -603,7 +604,8 @@ static mStatus RegisterServicesInFile(const char *filePath) status = mStatus_UnknownErr; } - assert(0 == fclose(fp)); + rv = fclose(fp); + assert(rv == 0); return status; } diff --git a/mDNSResponder/mDNSPosix/mDNSPosix.c b/mDNSResponder/mDNSPosix/mDNSPosix.c index 07633703..857c5832 100755 --- a/mDNSResponder/mDNSPosix/mDNSPosix.c +++ b/mDNSResponder/mDNSPosix/mDNSPosix.c @@ -584,11 +584,20 @@ mDNSexport mDNSu32 mDNSPlatformInterfaceIndexfromInterfaceID(mDNS *const m, mDNS // interface must have already been deregistered with the mDNS core. mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf) { + int rv; assert(intf != NULL); if (intf->intfName != NULL) free((void *)intf->intfName); - if (intf->multicastSocket4 != -1) assert(close(intf->multicastSocket4) == 0); + if (intf->multicastSocket4 != -1) + { + rv = close(intf->multicastSocket4); + assert(rv == 0); + } #if HAVE_IPV6 - if (intf->multicastSocket6 != -1) assert(close(intf->multicastSocket6) == 0); + if (intf->multicastSocket6 != -1) + { + rv = close(intf->multicastSocket6); + assert(rv == 0); + } #endif // Move interface to the RecentInterfaces list for a minute @@ -851,7 +860,13 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf } // Clean up - if (err != 0 && *sktPtr != -1) { assert(close(*sktPtr) == 0); *sktPtr = -1; } + if (err != 0 && *sktPtr != -1) + { + int rv; + rv = close(*sktPtr); + assert(rv == 0); + *sktPtr = -1; + } assert((err == 0) == (*sktPtr != -1)); return err; } @@ -1353,11 +1368,20 @@ mDNSexport mStatus mDNSPlatformInit(mDNS *const m) // In our case all we need to do is to tear down every network interface. mDNSexport void mDNSPlatformClose(mDNS *const m) { + int rv; assert(m != NULL); ClearInterfaceList(m); - if (m->p->unicastSocket4 != -1) assert(close(m->p->unicastSocket4) == 0); + if (m->p->unicastSocket4 != -1) + { + rv = close(m->p->unicastSocket4); + assert(rv == 0); + } #if HAVE_IPV6 - if (m->p->unicastSocket6 != -1) assert(close(m->p->unicastSocket6) == 0); + if (m->p->unicastSocket6 != -1) + { + rv = close(m->p->unicastSocket6); + assert(rv == 0); + } #endif } @@ -1662,7 +1686,7 @@ mDNSexport mDNSBool mDNSPlatformInterfaceIsD2D(mDNSInterfaceID InterfaceID) return mDNSfalse; } -mDNSexport void mDNSPlatformSetSocktOpt(void *sock, mDNSTransport_Type transType, mDNSAddr_Type addrType, DNSQuestion *q) +mDNSexport void mDNSPlatformSetSocktOpt(void *sock, mDNSTransport_Type transType, mDNSAddr_Type addrType, const DNSQuestion *q) { (void) sock; (void) transType; diff --git a/mDNSResponder/mDNSPosix/mDNSUNP.c b/mDNSResponder/mDNSPosix/mDNSUNP.c index 3cfeac6e..a7aafb27 100755 --- a/mDNSResponder/mDNSPosix/mDNSUNP.c +++ b/mDNSResponder/mDNSPosix/mDNSUNP.c @@ -199,7 +199,9 @@ gotError: } done: if (sockfd != -1) { - assert(close(sockfd) == 0); + int rv; + rv = close(sockfd); + assert(rv == 0); } if (fp != NULL) { fclose(fp); |