diff options
17 files changed, 100 insertions, 139 deletions
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch index 91198dea73..f5d424d58f 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Create-subroutine-for-cleaning-recent-interfaces.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- | 14 | mDNSPosix/mDNSPosix.c | 24 ++++++++++++++---------- |
15 | 1 file changed, 14 insertions(+), 10 deletions(-) | 15 | 1 file changed, 14 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
18 | index 0a7c3dfa2475..fe7242d83599 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
21 | @@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockaddr *intfAddr, mDNSIPPort port, int interf | 21 | @@ -1322,6 +1322,19 @@ mDNSlocal int SetupSocket(struct sockadd |
22 | return err; | 22 | return err; |
23 | } | 23 | } |
24 | 24 | ||
@@ -38,7 +38,7 @@ index 0a7c3dfa2475..fe7242d83599 100644 | |||
38 | // Creates a PosixNetworkInterface for the interface whose IP address is | 38 | // Creates a PosixNetworkInterface for the interface whose IP address is |
39 | // intfAddr and whose name is intfName and registers it with mDNS core. | 39 | // intfAddr and whose name is intfName and registers it with mDNS core. |
40 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, | 40 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, |
41 | @@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) | 41 | @@ -1559,16 +1572,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c |
42 | 42 | ||
43 | // Clean up. | 43 | // Clean up. |
44 | if (intfList != NULL) freeifaddrs(intfList); | 44 | if (intfList != NULL) freeifaddrs(intfList); |
@@ -56,6 +56,3 @@ index 0a7c3dfa2475..fe7242d83599 100644 | |||
56 | 56 | ||
57 | return err; | 57 | return err; |
58 | } | 58 | } |
59 | -- | ||
60 | 2.35.1 | ||
61 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch index daee318ae4..7e76f07c0e 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Handle-interface-without-ifa_addr.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 4 +++- | 14 | mDNSPosix/mDNSPosix.c | 4 +++- |
15 | 1 file changed, 3 insertions(+), 1 deletion(-) | 15 | 1 file changed, 3 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
18 | index d7f31cc4d5cf..f10301253f58 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
21 | @@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) | 21 | @@ -1895,6 +1895,7 @@ mDNSlocal void InterfaceChangeCallback(i |
22 | continue; | 22 | continue; |
23 | 23 | ||
24 | if ((ifa_loop4 == NULL) && | 24 | if ((ifa_loop4 == NULL) && |
@@ -26,7 +26,7 @@ index d7f31cc4d5cf..f10301253f58 100644 | |||
26 | ((*ifi)->ifa_addr->sa_family == AF_INET) && | 26 | ((*ifi)->ifa_addr->sa_family == AF_INET) && |
27 | ((*ifi)->ifa_flags & IFF_UP) && | 27 | ((*ifi)->ifa_flags & IFF_UP) && |
28 | ((*ifi)->ifa_flags & IFF_LOOPBACK)) | 28 | ((*ifi)->ifa_flags & IFF_LOOPBACK)) |
29 | @@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) | 29 | @@ -1903,7 +1904,8 @@ mDNSlocal void InterfaceChangeCallback(i |
30 | continue; | 30 | continue; |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch index 4a60a95728..82825b294d 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch | |||
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | mDNSPosix/nss_mdns.c | 3 +++ | 11 | mDNSPosix/nss_mdns.c | 3 +++ |
12 | 1 file changed, 3 insertions(+) | 12 | 1 file changed, 3 insertions(+) |
13 | 13 | ||
14 | diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c | 14 | Index: mDNSResponder/mDNSPosix/nss_mdns.c |
15 | index afadb3c6c33b..84c312759463 100644 | 15 | =================================================================== |
16 | --- a/mDNSPosix/nss_mdns.c | 16 | --- mDNSResponder.orig/mDNSPosix/nss_mdns.c |
17 | +++ b/mDNSPosix/nss_mdns.c | 17 | +++ mDNSResponder/mDNSPosix/nss_mdns.c |
18 | @@ -89,6 +89,9 @@ | 18 | @@ -89,6 +89,9 @@ |
19 | 19 | ||
20 | #include <dns_sd.h> | 20 | #include <dns_sd.h> |
@@ -25,6 +25,3 @@ index afadb3c6c33b..84c312759463 100644 | |||
25 | 25 | ||
26 | //---------- | 26 | //---------- |
27 | // Public functions | 27 | // Public functions |
28 | -- | ||
29 | 2.35.1 | ||
30 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch index aa3dda8d55..867db88a50 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-Create-subroutine-for-tearing-down-an-interface.patch | |||
@@ -13,11 +13,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
13 | mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ | 13 | mDNSPosix/mDNSPosix.c | 22 ++++++++++++++++------ |
14 | 1 file changed, 16 insertions(+), 6 deletions(-) | 14 | 1 file changed, 16 insertions(+), 6 deletions(-) |
15 | 15 | ||
16 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 16 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
17 | index fe7242d83599..a32a880c0ce5 100644 | 17 | =================================================================== |
18 | --- a/mDNSPosix/mDNSPosix.c | 18 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
19 | +++ b/mDNSPosix/mDNSPosix.c | 19 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
20 | @@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface(PosixNetworkInterface *intf) | 20 | @@ -1043,6 +1043,19 @@ mDNSlocal void FreePosixNetworkInterface |
21 | gRecentInterfaces = intf; | 21 | gRecentInterfaces = intf; |
22 | } | 22 | } |
23 | 23 | ||
@@ -37,7 +37,7 @@ index fe7242d83599..a32a880c0ce5 100644 | |||
37 | // Grab the first interface, deregister it, free it, and repeat until done. | 37 | // Grab the first interface, deregister it, free it, and repeat until done. |
38 | mDNSlocal void ClearInterfaceList(mDNS *const m) | 38 | mDNSlocal void ClearInterfaceList(mDNS *const m) |
39 | { | 39 | { |
40 | @@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS *const m) | 40 | @@ -1051,13 +1064,10 @@ mDNSlocal void ClearInterfaceList(mDNS * |
41 | while (m->HostInterfaces) | 41 | while (m->HostInterfaces) |
42 | { | 42 | { |
43 | PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); | 43 | PosixNetworkInterface *intf = (PosixNetworkInterface*)(m->HostInterfaces); |
@@ -54,6 +54,3 @@ index fe7242d83599..a32a880c0ce5 100644 | |||
54 | } | 54 | } |
55 | 55 | ||
56 | mDNSlocal int SetupIPv6Socket(int fd) | 56 | mDNSlocal int SetupIPv6Socket(int fd) |
57 | -- | ||
58 | 2.35.1 | ||
59 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch index 7f660396b4..03fb1bc0d7 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch | |||
@@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
9 | mDNSPosix/Makefile | 2 +- | 9 | mDNSPosix/Makefile | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 12 | Index: mDNSResponder/mDNSPosix/Makefile |
13 | index 802a13dd70b6..5e74193c0e89 100755 | 13 | =================================================================== |
14 | --- a/mDNSPosix/Makefile | 14 | --- mDNSResponder.orig/mDNSPosix/Makefile |
15 | +++ b/mDNSPosix/Makefile | 15 | +++ mDNSResponder/mDNSPosix/Makefile |
16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) | 16 | @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$ |
17 | CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(OBJDIR)/dnssd_errstring.c.so.o | 17 | CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o $(OBJDIR)/dnssd_errstring.c.so.o |
18 | 18 | ||
19 | $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) | 19 | $(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS) |
@@ -22,6 +22,3 @@ index 802a13dd70b6..5e74193c0e89 100755 | |||
22 | $(STRIP) $@ | 22 | $(STRIP) $@ |
23 | 23 | ||
24 | Clients: setup libdns_sd ../Clients/build/dns-sd | 24 | Clients: setup libdns_sd ../Clients/build/dns-sd |
25 | -- | ||
26 | 2.35.1 | ||
27 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch index d2a9995ffa..f1cda2b895 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0003-Track-interface-socket-family.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.h | 2 ++ | 14 | mDNSPosix/mDNSPosix.h | 2 ++ |
15 | 2 files changed, 3 insertions(+) | 15 | 2 files changed, 3 insertions(+) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
18 | index a32a880c0ce5..9a5b4d7ea4cb 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
21 | @@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct | 21 | @@ -1415,6 +1415,7 @@ mDNSlocal int SetupOneInterface(mDNS *co |
22 | // Set up the extra fields in PosixNetworkInterface. | 22 | // Set up the extra fields in PosixNetworkInterface. |
23 | assert(intf->intfName != NULL); // intf->intfName already set up above | 23 | assert(intf->intfName != NULL); // intf->intfName already set up above |
24 | intf->index = intfIndex; | 24 | intf->index = intfIndex; |
@@ -26,10 +26,10 @@ index a32a880c0ce5..9a5b4d7ea4cb 100644 | |||
26 | intf->multicastSocket4 = -1; | 26 | intf->multicastSocket4 = -1; |
27 | #if HAVE_IPV6 | 27 | #if HAVE_IPV6 |
28 | intf->multicastSocket6 = -1; | 28 | intf->multicastSocket6 = -1; |
29 | diff --git a/mDNSPosix/mDNSPosix.h b/mDNSPosix/mDNSPosix.h | 29 | Index: mDNSResponder/mDNSPosix/mDNSPosix.h |
30 | index 9675591b0434..dd7864cd0d5e 100644 | 30 | =================================================================== |
31 | --- a/mDNSPosix/mDNSPosix.h | 31 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.h |
32 | +++ b/mDNSPosix/mDNSPosix.h | 32 | +++ mDNSResponder/mDNSPosix/mDNSPosix.h |
33 | @@ -19,6 +19,7 @@ | 33 | @@ -19,6 +19,7 @@ |
34 | #define __mDNSPlatformPosix_h | 34 | #define __mDNSPlatformPosix_h |
35 | 35 | ||
@@ -46,6 +46,3 @@ index 9675591b0434..dd7864cd0d5e 100644 | |||
46 | int multicastSocket4; | 46 | int multicastSocket4; |
47 | #if HAVE_IPV6 | 47 | #if HAVE_IPV6 |
48 | int multicastSocket6; | 48 | int multicastSocket6; |
49 | -- | ||
50 | 2.35.1 | ||
51 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch index a5f7f0136b..6bc36456f6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-Indicate-loopback-interface-to-mDNS-core.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 7 ++++--- | 14 | mDNSPosix/mDNSPosix.c | 7 ++++--- |
15 | 1 file changed, 4 insertions(+), 3 deletions(-) | 15 | 1 file changed, 4 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
18 | index 9a5b4d7ea4cb..02a19b438e03 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
21 | @@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(void) | 21 | @@ -1348,7 +1348,7 @@ mDNSlocal void CleanRecentInterfaces(voi |
22 | // Creates a PosixNetworkInterface for the interface whose IP address is | 22 | // Creates a PosixNetworkInterface for the interface whose IP address is |
23 | // intfAddr and whose name is intfName and registers it with mDNS core. | 23 | // intfAddr and whose name is intfName and registers it with mDNS core. |
24 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, | 24 | mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct sockaddr *intfMask, |
@@ -27,7 +27,7 @@ index 9a5b4d7ea4cb..02a19b438e03 100644 | |||
27 | { | 27 | { |
28 | int err = 0; | 28 | int err = 0; |
29 | PosixNetworkInterface *intf; | 29 | PosixNetworkInterface *intf; |
30 | @@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *const m, struct sockaddr *intfAddr, struct | 30 | @@ -1411,6 +1411,7 @@ mDNSlocal int SetupOneInterface(mDNS *co |
31 | 31 | ||
32 | intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; | 32 | intf->coreIntf.Advertise = m->AdvertiseLocalAddresses; |
33 | intf->coreIntf.McastTxRx = mDNStrue; | 33 | intf->coreIntf.McastTxRx = mDNStrue; |
@@ -35,7 +35,7 @@ index 9a5b4d7ea4cb..02a19b438e03 100644 | |||
35 | 35 | ||
36 | // Set up the extra fields in PosixNetworkInterface. | 36 | // Set up the extra fields in PosixNetworkInterface. |
37 | assert(intf->intfName != NULL); // intf->intfName already set up above | 37 | assert(intf->intfName != NULL); // intf->intfName already set up above |
38 | @@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) | 38 | @@ -1561,7 +1562,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c |
39 | } | 39 | } |
40 | #endif | 40 | #endif |
41 | if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, | 41 | if (SetupOneInterface(m, i->ifa_addr, i->ifa_netmask, |
@@ -44,7 +44,7 @@ index 9a5b4d7ea4cb..02a19b438e03 100644 | |||
44 | { | 44 | { |
45 | if (i->ifa_addr->sa_family == AF_INET) | 45 | if (i->ifa_addr->sa_family == AF_INET) |
46 | foundav4 = mDNStrue; | 46 | foundav4 = mDNStrue; |
47 | @@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *const m) | 47 | @@ -1578,7 +1579,7 @@ mDNSlocal int SetupInterfaceList(mDNS *c |
48 | // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) | 48 | // if ((m->HostInterfaces == NULL) && (firstLoopback != NULL)) |
49 | if (!foundav4 && firstLoopback) | 49 | if (!foundav4 && firstLoopback) |
50 | (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, | 50 | (void) SetupOneInterface(m, firstLoopback->ifa_addr, firstLoopback->ifa_netmask, |
@@ -53,6 +53,3 @@ index 9a5b4d7ea4cb..02a19b438e03 100644 | |||
53 | } | 53 | } |
54 | 54 | ||
55 | // Clean up. | 55 | // Clean up. |
56 | -- | ||
57 | 2.35.1 | ||
58 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch index a8e8dae60a..837580ac36 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch | |||
@@ -12,10 +12,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
12 | mDNSPosix/Makefile | 14 ++++++++------ | 12 | mDNSPosix/Makefile | 14 ++++++++------ |
13 | 1 file changed, 8 insertions(+), 6 deletions(-) | 13 | 1 file changed, 8 insertions(+), 6 deletions(-) |
14 | 14 | ||
15 | diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile | 15 | Index: mDNSResponder/mDNSPosix/Makefile |
16 | index 5e74193c0e89..b4313c36b035 100755 | 16 | =================================================================== |
17 | --- a/mDNSPosix/Makefile | 17 | --- mDNSResponder.orig/mDNSPosix/Makefile |
18 | +++ b/mDNSPosix/Makefile | 18 | +++ mDNSResponder/mDNSPosix/Makefile |
19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) | 19 | @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) |
20 | ifeq ($(tls), no) | 20 | ifeq ($(tls), no) |
21 | CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined | 21 | CFLAGS_OS = -D_GNU_SOURCE -DHAVE_IPV6 -DNOT_HAVE_SA_LEN -DUSES_NETLINK -DHAVE_LINUX -DTARGET_OS_LINUX -ftabstop=4 -Wno-expansion-to-defined |
@@ -59,6 +59,3 @@ index 5e74193c0e89..b4313c36b035 100755 | |||
59 | 59 | ||
60 | $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c | 60 | $(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c |
61 | 61 | ||
62 | -- | ||
63 | 2.35.1 | ||
64 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch index 1aec34f243..f00116c617 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-Use-list-for-changed-interfaces.patch | |||
@@ -15,10 +15,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
15 | mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- | 15 | mDNSPosix/mDNSPosix.c | 58 ++++++++++++++++++++++++++++++++----------- |
16 | 1 file changed, 43 insertions(+), 15 deletions(-) | 16 | 1 file changed, 43 insertions(+), 15 deletions(-) |
17 | 17 | ||
18 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 18 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
19 | index 02a19b438e03..e20adda92229 100644 | 19 | =================================================================== |
20 | --- a/mDNSPosix/mDNSPosix.c | 20 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
21 | +++ b/mDNSPosix/mDNSPosix.c | 21 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
22 | @@ -74,6 +74,14 @@ struct IfChangeRec | 22 | @@ -74,6 +74,14 @@ struct IfChangeRec |
23 | }; | 23 | }; |
24 | typedef struct IfChangeRec IfChangeRec; | 24 | typedef struct IfChangeRec IfChangeRec; |
@@ -34,7 +34,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
34 | // Note that static data is initialized to zero in (modern) C. | 34 | // Note that static data is initialized to zero in (modern) C. |
35 | static PosixEventSource *gEventSources; // linked list of PosixEventSource's | 35 | static PosixEventSource *gEventSources; // linked list of PosixEventSource's |
36 | static sigset_t gEventSignalSet; // Signals which event loop listens for | 36 | static sigset_t gEventSignalSet; // Signals which event loop listens for |
37 | @@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int *pFD) | 37 | @@ -1621,6 +1629,23 @@ mDNSlocal mStatus OpenIfNotifySocket(int |
38 | return err; | 38 | return err; |
39 | } | 39 | } |
40 | 40 | ||
@@ -58,7 +58,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
58 | #if MDNS_DEBUGMSGS | 58 | #if MDNS_DEBUGMSGS |
59 | mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) | 59 | mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) |
60 | { | 60 | { |
61 | @@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(const struct nlmsghdr *pNLMsg) | 61 | @@ -1648,14 +1673,13 @@ mDNSlocal void PrintNetLinkMsg(cons |
62 | } | 62 | } |
63 | #endif | 63 | #endif |
64 | 64 | ||
@@ -74,7 +74,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
74 | 74 | ||
75 | // The structure here is more complex than it really ought to be because, | 75 | // The structure here is more complex than it really ought to be because, |
76 | // unfortunately, there's no good way to size a buffer in advance large | 76 | // unfortunately, there's no good way to size a buffer in advance large |
77 | @@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) | 77 | @@ -1691,9 +1715,9 @@ mDNSlocal mDNSu32 ProcessRoutingNo |
78 | 78 | ||
79 | // Process the NetLink message | 79 | // Process the NetLink message |
80 | if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) | 80 | if (pNLMsg->nlmsg_type == RTM_GETLINK || pNLMsg->nlmsg_type == RTM_NEWLINK) |
@@ -86,7 +86,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
86 | 86 | ||
87 | // Advance pNLMsg to the next message in the buffer | 87 | // Advance pNLMsg to the next message in the buffer |
88 | if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) | 88 | if ((pNLMsg->nlmsg_flags & NLM_F_MULTI) != 0 && pNLMsg->nlmsg_type != NLMSG_DONE) |
89 | @@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) | 89 | @@ -1704,8 +1728,6 @@ mDNSlocal mDNSu32 ProcessRoutingNo |
90 | else | 90 | else |
91 | break; // all done! | 91 | break; // all done! |
92 | } | 92 | } |
@@ -95,7 +95,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
95 | } | 95 | } |
96 | 96 | ||
97 | #else // USES_NETLINK | 97 | #else // USES_NETLINK |
98 | @@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMsg(const struct ifa_msghdr *pRSMsg) | 98 | @@ -1737,14 +1759,13 @@ mDNSlocal void PrintRoutingSocketMs |
99 | } | 99 | } |
100 | #endif | 100 | #endif |
101 | 101 | ||
@@ -111,7 +111,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
111 | 111 | ||
112 | readCount = read(sd, buff, sizeof buff); | 112 | readCount = read(sd, buff, sizeof buff); |
113 | if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) | 113 | if (readCount < (ssize_t) sizeof(struct ifa_msghdr)) |
114 | @@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNotification(int sd) | 114 | @@ -1759,12 +1780,10 @@ mDNSlocal mDNSu32 ProcessRoutingNo |
115 | pRSMsg->ifam_type == RTM_IFINFO) | 115 | pRSMsg->ifam_type == RTM_IFINFO) |
116 | { | 116 | { |
117 | if (pRSMsg->ifam_type == RTM_IFINFO) | 117 | if (pRSMsg->ifam_type == RTM_IFINFO) |
@@ -126,7 +126,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
126 | } | 126 | } |
127 | 127 | ||
128 | #endif // USES_NETLINK | 128 | #endif // USES_NETLINK |
129 | @@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) | 129 | @@ -1774,7 +1793,8 @@ mDNSlocal void InterfaceChangeCallback(i |
130 | { | 130 | { |
131 | IfChangeRec *pChgRec = (IfChangeRec*) context; | 131 | IfChangeRec *pChgRec = (IfChangeRec*) context; |
132 | fd_set readFDs; | 132 | fd_set readFDs; |
@@ -136,7 +136,7 @@ index 02a19b438e03..e20adda92229 100644 | |||
136 | struct timeval zeroTimeout = { 0, 0 }; | 136 | struct timeval zeroTimeout = { 0, 0 }; |
137 | 137 | ||
138 | (void)fd; // Unused | 138 | (void)fd; // Unused |
139 | @@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) | 139 | @@ -1782,17 +1802,25 @@ mDNSlocal void InterfaceChangeCallback(i |
140 | FD_ZERO(&readFDs); | 140 | FD_ZERO(&readFDs); |
141 | FD_SET(pChgRec->NotifySD, &readFDs); | 141 | FD_SET(pChgRec->NotifySD, &readFDs); |
142 | 142 | ||
@@ -164,6 +164,3 @@ index 02a19b438e03..e20adda92229 100644 | |||
164 | } | 164 | } |
165 | 165 | ||
166 | // Register with either a Routing Socket or RtNetLink to listen for interface changes. | 166 | // Register with either a Routing Socket or RtNetLink to listen for interface changes. |
167 | -- | ||
168 | 2.35.1 | ||
169 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 4cda71bdb1..fd2f2f1178 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch | |||
@@ -10,11 +10,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
10 | mDNSCore/mDNS.c | 2 +- | 10 | mDNSCore/mDNS.c | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c | 13 | Index: mDNSResponder/mDNSCore/mDNS.c |
14 | index eecd7daa724e..1e843c081938 100644 | 14 | =================================================================== |
15 | --- a/mDNSCore/mDNS.c | 15 | --- mDNSResponder.orig/mDNSCore/mDNS.c |
16 | +++ b/mDNSCore/mDNS.c | 16 | +++ mDNSResponder/mDNSCore/mDNS.c |
17 | @@ -10210,7 +10210,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * | 17 | @@ -10231,7 +10231,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA |
18 | #else | 18 | #else |
19 | const DNSServRef dnsserv = qptr->qDNSServer; | 19 | const DNSServRef dnsserv = qptr->qDNSServer; |
20 | #endif | 20 | #endif |
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch index 882d08e6c6..80cdbca500 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-Handle-noisy-netlink-sockets.patch | |||
@@ -27,11 +27,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
27 | mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- | 27 | mDNSPosix/mDNSPosix.c | 182 +++++++++++++++++++++++++++++++++++++++--- |
28 | 1 file changed, 172 insertions(+), 10 deletions(-) | 28 | 1 file changed, 172 insertions(+), 10 deletions(-) |
29 | 29 | ||
30 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 30 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
31 | index e20adda92229..5d52de31f79b 100644 | 31 | =================================================================== |
32 | --- a/mDNSPosix/mDNSPosix.c | 32 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
33 | +++ b/mDNSPosix/mDNSPosix.c | 33 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
34 | @@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change | 34 | @@ -1788,14 +1788,43 @@ mDNSlocal void ProcessRoutingNo |
35 | 35 | ||
36 | #endif // USES_NETLINK | 36 | #endif // USES_NETLINK |
37 | 37 | ||
@@ -75,7 +75,7 @@ index e20adda92229..5d52de31f79b 100644 | |||
75 | 75 | ||
76 | (void)fd; // Unused | 76 | (void)fd; // Unused |
77 | 77 | ||
78 | @@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(int fd, void *context) | 78 | @@ -1810,12 +1839,149 @@ mDNSlocal void InterfaceChangeCallback(i |
79 | } | 79 | } |
80 | while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); | 80 | while (0 < select(pChgRec->NotifySD + 1, &readFDs, (fd_set*) NULL, (fd_set*) NULL, &zeroTimeout)); |
81 | 81 | ||
@@ -230,7 +230,7 @@ index e20adda92229..5d52de31f79b 100644 | |||
230 | while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) | 230 | while ((changedInterface = (NetworkInterfaceIndex*)changedInterfaces.Head) != NULL) |
231 | { | 231 | { |
232 | RemoveFromList(&changedInterfaces, changedInterface); | 232 | RemoveFromList(&changedInterfaces, changedInterface); |
233 | @@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS *const m) | 233 | @@ -1947,15 +2113,11 @@ mDNSexport void mDNSPlatformClose(mDNS * |
234 | #endif | 234 | #endif |
235 | } | 235 | } |
236 | 236 | ||
@@ -247,6 +247,3 @@ index e20adda92229..5d52de31f79b 100644 | |||
247 | ClearInterfaceList(m); | 247 | ClearInterfaceList(m); |
248 | err = SetupInterfaceList(m); | 248 | err = SetupInterfaceList(m); |
249 | return PosixErrorToStatus(err); | 249 | return PosixErrorToStatus(err); |
250 | -- | ||
251 | 2.35.1 | ||
252 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch index 268e574c50..c12a02fcdd 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch | |||
@@ -12,14 +12,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
12 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
13 | create mode 100644 Makefile | 13 | create mode 100644 Makefile |
14 | 14 | ||
15 | diff --git a/Makefile b/Makefile | 15 | Index: mDNSResponder/Makefile |
16 | new file mode 100644 | 16 | =================================================================== |
17 | index 000000000000..feb6ac67ef47 | ||
18 | --- /dev/null | 17 | --- /dev/null |
19 | +++ b/Makefile | 18 | +++ mDNSResponder/Makefile |
20 | @@ -0,0 +1,2 @@ | 19 | @@ -0,0 +1,2 @@ |
21 | +all clean: | 20 | +all clean: |
22 | + cd mDNSPosix && $(MAKE) $@ | 21 | + cd mDNSPosix && $(MAKE) $@ |
23 | -- | ||
24 | 2.35.1 | ||
25 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch index e53b0fd3ae..dae1ac7ea0 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-Mark-deleted-interfaces-as-being-changed.patch | |||
@@ -22,11 +22,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
22 | mDNSPosix/mDNSPosix.c | 2 +- | 22 | mDNSPosix/mDNSPosix.c | 2 +- |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 25 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
26 | index 5d52de31f79b..77d982f4c50b 100644 | 26 | =================================================================== |
27 | --- a/mDNSPosix/mDNSPosix.c | 27 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
28 | +++ b/mDNSPosix/mDNSPosix.c | 28 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
29 | @@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change | 29 | @@ -1714,7 +1714,7 @@ mDNSlocal void ProcessRoutingNo |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | // Process the NetLink message | 32 | // Process the NetLink message |
@@ -35,6 +35,3 @@ index 5d52de31f79b..77d982f4c50b 100644 | |||
35 | AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); | 35 | AddInterfaceIndexToList(changedInterfaces, ((struct ifinfomsg*) NLMSG_DATA(pNLMsg))->ifi_index); |
36 | else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) | 36 | else if (pNLMsg->nlmsg_type == RTM_DELADDR || pNLMsg->nlmsg_type == RTM_NEWADDR) |
37 | AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); | 37 | AddInterfaceIndexToList(changedInterfaces, ((struct ifaddrmsg*) NLMSG_DATA(pNLMsg))->ifa_index); |
38 | -- | ||
39 | 2.35.1 | ||
40 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch index e689f8c267..1789001e14 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0008-Handle-errors-from-socket-calls.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
14 | mDNSPosix/mDNSPosix.c | 12 +++++++++--- | 14 | mDNSPosix/mDNSPosix.c | 12 +++++++++--- |
15 | 1 file changed, 9 insertions(+), 3 deletions(-) | 15 | 1 file changed, 9 insertions(+), 3 deletions(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mDNSPosix.c b/mDNSPosix/mDNSPosix.c | 17 | Index: mDNSResponder/mDNSPosix/mDNSPosix.c |
18 | index 77d982f4c50b..cab512160afb 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mDNSPosix.c | 19 | --- mDNSResponder.orig/mDNSPosix/mDNSPosix.c |
20 | +++ b/mDNSPosix/mDNSPosix.c | 20 | +++ mDNSResponder/mDNSPosix/mDNSPosix.c |
21 | @@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change | 21 | @@ -1677,7 +1677,7 @@ mDNSlocal void ProcessRoutingNo |
22 | // Read through the messages on sd and if any indicate that any interface records should | 22 | // Read through the messages on sd and if any indicate that any interface records should |
23 | // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. | 23 | // be torn down and rebuilt, return affected indices as a bitmask. Otherwise return 0. |
24 | { | 24 | { |
@@ -27,7 +27,7 @@ index 77d982f4c50b..cab512160afb 100644 | |||
27 | char buff[4096]; | 27 | char buff[4096]; |
28 | struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; | 28 | struct nlmsghdr *pNLMsg = (struct nlmsghdr*) buff; |
29 | 29 | ||
30 | @@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change | 30 | @@ -1686,7 +1686,10 @@ mDNSlocal void ProcessRoutingNo |
31 | // enough to hold all pending data and so avoid message fragmentation. | 31 | // enough to hold all pending data and so avoid message fragmentation. |
32 | // (Note that FIONREAD is not supported on AF_NETLINK.) | 32 | // (Note that FIONREAD is not supported on AF_NETLINK.) |
33 | 33 | ||
@@ -39,7 +39,7 @@ index 77d982f4c50b..cab512160afb 100644 | |||
39 | while (1) | 39 | while (1) |
40 | { | 40 | { |
41 | // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. | 41 | // Make sure we've got an entire nlmsghdr in the buffer, and payload, too. |
42 | @@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNotification(int sd, GenLinkedList *change | 42 | @@ -1702,7 +1705,9 @@ mDNSlocal void ProcessRoutingNo |
43 | pNLMsg = (struct nlmsghdr*) buff; | 43 | pNLMsg = (struct nlmsghdr*) buff; |
44 | 44 | ||
45 | // read more data | 45 | // read more data |
@@ -50,7 +50,7 @@ index 77d982f4c50b..cab512160afb 100644 | |||
50 | continue; // spin around and revalidate with new readCount | 50 | continue; // spin around and revalidate with new readCount |
51 | } | 51 | } |
52 | else | 52 | else |
53 | @@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanReceiveUnicast(void) | 53 | @@ -2017,6 +2022,7 @@ mDNSlocal mDNSBool mDNSPlatformInit_CanR |
54 | int err; | 54 | int err; |
55 | int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); | 55 | int s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); |
56 | struct sockaddr_in s5353; | 56 | struct sockaddr_in s5353; |
@@ -58,6 +58,3 @@ index 77d982f4c50b..cab512160afb 100644 | |||
58 | s5353.sin_family = AF_INET; | 58 | s5353.sin_family = AF_INET; |
59 | s5353.sin_port = MulticastDNSPort.NotAnInteger; | 59 | s5353.sin_port = MulticastDNSPort.NotAnInteger; |
60 | s5353.sin_addr.s_addr = 0; | 60 | s5353.sin_addr.s_addr = 0; |
61 | -- | ||
62 | 2.35.1 | ||
63 | |||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch index 74d387368c..d443bc97b2 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch | |||
@@ -14,20 +14,18 @@ Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com> | |||
14 | mDNSPosix/mbedtls.c | 2 -- | 14 | mDNSPosix/mbedtls.c | 2 -- |
15 | 1 file changed, 2 deletions(-) | 15 | 1 file changed, 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c | 17 | Index: mDNSResponder/mDNSPosix/mbedtls.c |
18 | index a73681b..ab8f8c7 100644 | 18 | =================================================================== |
19 | --- a/mDNSPosix/mbedtls.c | 19 | --- mDNSResponder.orig/mDNSPosix/mbedtls.c |
20 | +++ b/mDNSPosix/mbedtls.c | 20 | +++ mDNSResponder/mDNSPosix/mbedtls.c |
21 | @@ -38,10 +38,8 @@ | 21 | @@ -38,10 +38,8 @@ |
22 | #include <mbedtls/sha256.h> | 22 | #include <mbedtls/sha256.h> |
23 | #include <mbedtls/base64.h> | 23 | #include <mbedtls/base64.h> |
24 | 24 | ||
25 | -#include <mbedtls/certs.h> | 25 | -#include <mbedtls/certs.h> |
26 | #include <mbedtls/x509.h> | 26 | #include <mbedtls/x509.h> |
27 | #include <mbedtls/ssl.h> | 27 | #include <mbedtls/ssl.h> |
28 | -#include <mbedtls/config.h> | 28 | -#include <mbedtls/config.h> |
29 | 29 | ||
30 | // Posix TLS server context | 30 | // Posix TLS server context |
31 | struct TLSContext_struct { | 31 | struct TLSContext_struct { |
32 | -- | ||
33 | 2.34.1 | ||
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch b/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch index 9fe721ff07..511a6fdc18 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0015-Add-missing-limits.h.patch | |||
@@ -9,10 +9,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
9 | mDNSShared/PlatformCommon.c | 1 + | 9 | mDNSShared/PlatformCommon.c | 1 + |
10 | 1 file changed, 1 insertion(+) | 10 | 1 file changed, 1 insertion(+) |
11 | 11 | ||
12 | diff --git a/mDNSShared/PlatformCommon.c b/mDNSShared/PlatformCommon.c | 12 | Index: mDNSResponder/mDNSShared/PlatformCommon.c |
13 | index 9ce15468e217..c308af3e8b0e 100644 | 13 | =================================================================== |
14 | --- a/mDNSShared/PlatformCommon.c | 14 | --- mDNSResponder.orig/mDNSShared/PlatformCommon.c |
15 | +++ b/mDNSShared/PlatformCommon.c | 15 | +++ mDNSResponder/mDNSShared/PlatformCommon.c |
16 | @@ -32,6 +32,7 @@ | 16 | @@ -32,6 +32,7 @@ |
17 | #include <time.h> | 17 | #include <time.h> |
18 | #include <sys/time.h> // Needed for #include <sys/time.h>(). | 18 | #include <sys/time.h> // Needed for #include <sys/time.h>(). |
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb b/meta-networking/recipes-protocols/mdns/mdns_2200.40.37.0.1.bb index 8370ed50c0..af2b337172 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2200.0.8.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2200.40.37.0.1.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=31c50371921e0fb731003bbc665f29bf" | |||
6 | 6 | ||
7 | DEPENDS:append:libc-musl = " musl-nscd" | 7 | DEPENDS:append:libc-musl = " musl-nscd" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=main \ | 9 | SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https;branch=rel/mDNSResponder-2200 \ |
10 | file://0001-dns-sd-Include-missing-headers.patch \ | 10 | file://0001-dns-sd-Include-missing-headers.patch \ |
11 | file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ | 11 | file://0002-make-Set-libdns_sd.so-soname-correctly.patch \ |
12 | file://0004-make-Separate-TLS-targets-from-libraries.patch \ | 12 | file://0004-make-Separate-TLS-targets-from-libraries.patch \ |
@@ -25,7 +25,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https | |||
25 | file://0015-Add-missing-limits.h.patch \ | 25 | file://0015-Add-missing-limits.h.patch \ |
26 | file://0001-Handle-interface-without-ifa_addr.patch \ | 26 | file://0001-Handle-interface-without-ifa_addr.patch \ |
27 | " | 27 | " |
28 | SRCREV = "d5029b5dff8aa59d1fc07ed796e994106ef58dee" | 28 | SRCREV = "a9f4049ab772ca57b5afc9804ae5004beb711d6e" |
29 | 29 | ||
30 | # We install a stub Makefile in the top directory so that the various checks | 30 | # We install a stub Makefile in the top directory so that the various checks |
31 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst | 31 | # in base.bbclass pass their tests for a Makefile, this ensures (that amongst |