diff options
author | Mikko Rapeli <mikko.rapeli@bmw.de> | 2020-09-05 20:29:49 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-09-08 11:53:53 -0700 |
commit | 21afab4609d081413971fc5813548d56afeb8eb9 (patch) | |
tree | 86d0a1a566cbec3fbd3f26ec228b0a07ad77d6cc /meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch | |
parent | c1592909204eee5a9b7ec2ef556007d243c86f34 (diff) | |
download | meta-openembedded-21afab4609d081413971fc5813548d56afeb8eb9.tar.gz |
mdns: update to version 1096.40.7
Refresh Makefile patch (build.patch) to properly cross compile
mdns. Then try refresh patches which still apply. Following patches
don't apply anymore due to refactoring done on mdns side so thus
dropping patches:
* 0005-Handle-noisy-netlink-sockets.patch
* 0007-Indicate-loopback-interface-to-mDNS-core.patch
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch')
-rw-r--r-- | meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch b/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch index d64fb35db1..d9adde04c2 100644 --- a/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch +++ b/meta-networking/recipes-protocols/mdns/files/0011-Change-a-dynamic-allocation-to-file-scope-variable.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 19de26db69408f02241e232b39224589a0f630df Mon Sep 17 00:00:00 2001 | 1 | From 9ff06108cd44e84ba6c68bfa6737e793f117e303 Mon Sep 17 00:00:00 2001 |
2 | From: Nate Karstens <nate.karstens@garmin.com> | 2 | From: Nate Karstens <nate.karstens@garmin.com> |
3 | Date: Thu, 10 Aug 2017 08:46:03 -0500 | 3 | Date: Thu, 10 Aug 2017 08:46:03 -0500 |
4 | Subject: [PATCH 11/11] Change a dynamic allocation to file-scope variable | 4 | Subject: [PATCH] Change a dynamic allocation to file-scope variable |
5 | 5 | ||
6 | Changes a variable from being dynamically-allocated to being | 6 | Changes a variable from being dynamically-allocated to being |
7 | statically-allocated at the file scope. Addresses a Coverity | 7 | statically-allocated at the file scope. Addresses a Coverity |
@@ -11,14 +11,14 @@ Upstream-Status: Submitted [dts@apple.com] | |||
11 | 11 | ||
12 | Signed-off-by: Nate Karstens <nate.karstens@garmin.com> | 12 | Signed-off-by: Nate Karstens <nate.karstens@garmin.com> |
13 | --- | 13 | --- |
14 | mDNSPosix/mDNSPosix.c | 12 ++++-------- | 14 | mDNSPosix/mDNSPosix.c | 14 ++++---------- |
15 | 1 file changed, 4 insertions(+), 8 deletions(-) | 15 | 1 file changed, 4 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c |
18 | index 84af26b..b7795ed 100644 | 18 | index 7aeee7b..2d25016 100755 |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- a/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ b/mDNSPosix/mDNSPosix.c |
21 | @@ -91,6 +91,7 @@ static sigset_t gEventSignalSet; // Signals which event loop list | 21 | @@ -81,6 +81,7 @@ static sigset_t gEventSignalSet; // Signals which event loop list |
22 | static sigset_t gEventSignals; // Signals which were received while inside loop | 22 | static sigset_t gEventSignals; // Signals which were received while inside loop |
23 | 23 | ||
24 | static PosixNetworkInterface *gRecentInterfaces; | 24 | static PosixNetworkInterface *gRecentInterfaces; |
@@ -26,13 +26,13 @@ index 84af26b..b7795ed 100644 | |||
26 | 26 | ||
27 | // *************************************************************************** | 27 | // *************************************************************************** |
28 | // Globals (for debugging) | 28 | // Globals (for debugging) |
29 | @@ -1412,16 +1413,11 @@ cleanup: | 29 | @@ -1641,18 +1642,11 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) |
30 | mDNSlocal mStatus WatchForInterfaceChange(mDNS *const m) | 30 | mDNSlocal mStatus WatchForInterfaceChange(mDNS *const m) |
31 | { | 31 | { |
32 | mStatus err; | 32 | mStatus err; |
33 | - IfChangeRec *pChgRec; | 33 | - IfChangeRec *pChgRec; |
34 | 34 | ||
35 | - pChgRec = (IfChangeRec*) mDNSPlatformMemAllocate(sizeof *pChgRec); | 35 | - pChgRec = (IfChangeRec*) mDNSPlatformMemAllocateClear(sizeof *pChgRec); |
36 | - if (pChgRec == NULL) | 36 | - if (pChgRec == NULL) |
37 | - return mStatus_NoMemoryErr; | 37 | - return mStatus_NoMemoryErr; |
38 | - | 38 | - |
@@ -42,10 +42,12 @@ index 84af26b..b7795ed 100644 | |||
42 | + err = OpenIfNotifySocket(&gChgRec.NotifySD); | 42 | + err = OpenIfNotifySocket(&gChgRec.NotifySD); |
43 | if (err == 0) | 43 | if (err == 0) |
44 | - err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec); | 44 | - err = mDNSPosixAddFDToEventLoop(pChgRec->NotifySD, InterfaceChangeCallback, pChgRec); |
45 | - if (err) | ||
46 | - mDNSPlatformMemFree(pChgRec); | ||
45 | + err = mDNSPosixAddFDToEventLoop(gChgRec.NotifySD, InterfaceChangeCallback, &gChgRec); | 47 | + err = mDNSPosixAddFDToEventLoop(gChgRec.NotifySD, InterfaceChangeCallback, &gChgRec); |
46 | 48 | ||
47 | return err; | 49 | return err; |
48 | } | 50 | } |
49 | -- | 51 | -- |
50 | 2.17.1 | 52 | 2.20.1 |
51 | 53 | ||