Skip to content

Commit

Permalink
13668 mdns: update to mDNSResponder-1310.80.1
Browse files Browse the repository at this point in the history
Reviewed by: C Fraire <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
  • Loading branch information
tsoome committed Mar 30, 2021
1 parent e4cc400 commit 472cd20
Show file tree
Hide file tree
Showing 43 changed files with 10,484 additions and 8,572 deletions.
2 changes: 1 addition & 1 deletion exception_lists/cstyle
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ usr/src/common/bzip2/decompress.c
usr/src/common/bzip2/bzlib_private.h
usr/src/common/bzip2/huffman.c
usr/src/common/crypto/chacha/chacha.c
usr/src/contrib
usr/src/contrib/
usr/src/grub/grub-0.97/grub/asmstub.c
usr/src/grub/grub-0.97/stage2/bios.c
usr/src/grub/grub-0.97/stage2/builtins.c
Expand Down
2 changes: 1 addition & 1 deletion exception_lists/wscheck
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ usr/src/uts/common/io/e1000api/*
usr/src/uts/common/io/qede/*
usr/src/uts/common/io/i40e/core/*
usr/src/uts/common/io/ixgbe/core/*
usr/src/contrib/ast/*
usr/src/contrib/*
usr/src/cmd/ast/libshell/misc/shell_styleguide.docbook

# bhyve sources
Expand Down
2 changes: 1 addition & 1 deletion usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SRCS= ClientCommon.c dns-sd.c
SRCDIR= $(SRC)/contrib/mDNSResponder
CFLAGS += $(CSTD_GNU99)
CPPFLAGS += -I$(SRCDIR)/mDNSShared
CPPFLAGS += -DmDNSResponderVersion=878.1.1
CPPFLAGS += -DmDNSResponderVersion=1310.80.1
CPPFLAGS += -DMDNS_VERSIONSTR_NODTS
LDLIBS += -lsocket -ldns_sd

Expand Down
7 changes: 5 additions & 2 deletions usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,23 @@ SRCDIR= $(SRC)/contrib/mDNSResponder
OBJS= DNSCommon.o DNSDigest.o GenLinkedList.o \
PlatformCommon.o PosixDaemon.o \
mDNS.o mDNSDebug.o mDNSPosix.o mDNSUNP.o \
uDNS.o uds_daemon.o CryptoAlg.o anonymous.o dnssd_ipc.o
uDNS.o uds_daemon.o dnssd_ipc.o posix_utilities.o \
ClientRequests.o
SRCS= $(OBJS:%.o=%.c)

MDNSFLAGS= -DNOT_HAVE_SA_LEN \
-DLOG_PERROR=0 -DHAVE_SOLARIS -DTARGET_OS_SOLARIS \
-D_XPG4_2 -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME \
-DHAVE_IPV6=1 -Dasm=__asm -DMDNSD_NOROOT \
-DPID_FILE=\"\" -DMDNSD_USER=\"noaccess\" \
-DmDNSResponderVersion=878.260.1
-DmDNSResponderVersion=1310.80.1

include ../../../Makefile.cmd

CERRWARN += -_gcc=-Wno-unused-variable
CERRWARN += -_gcc=-Wno-implicit-function-declaration
CERRWARN += -_gcc7=-Wno-expansion-to-defined
CERRWARN += -_gcc10=-Wno-expansion-to-defined
CERRWARN += $(CNOWARN_UNINIT)

# not linted
Expand Down
442 changes: 277 additions & 165 deletions usr/src/contrib/mDNSResponder/Clients/dns-sd.c

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions usr/src/contrib/mDNSResponder/README
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,24 @@

The mdns vendor source repository is at https://github.com/illumos/mdns/.

Updated from upstream version mDNSResponder-1310.80.1
Updated from upstream version mDNSResponder-878.260.1
Updated from upstream version mDNSResponder-878.1.1
Updated from upstream version mDNSResponder-625.41.2
Updated from upstream version mDNSResponder-576.30.4

Multicast DNS and Service Discovery support in Solaris using the
Multicast DNS and Service Discovery support in illumos using the
Apple Bonjour source code (v107.6). Apple Bonjour source can be
downloaded from:
http:https://developer.apple.com/networking/bonjour/download/
https:https://opensource.apple.com/tarballs/mDNSResponder/
The following components are integrated from the Apple Bonjour
source in Solaris:
source in illumos:
libdns_sd: usr/src/lib/libdns_sd <dns_sd.h>
mdnsd: usr/src/cmd/cmd-inet/usr.lib/mdnsd
dns-sd: usr/src/cmd/cmd-inet/usr.bin/dns-sd

Following fixes have been made to the Apple Bonjour source
integrated in Solaris:
integrated in illumos:
* 64-bit support by adding pad bytes in ipc_msg_hdr_struct
* 64-bit support in libjdns_sd, dnssd.jar (JNISupport.c, DNSSD.java)
* mdnsd switches to user 'noaccess' and not 'nobody' after init
Expand Down
280 changes: 0 additions & 280 deletions usr/src/contrib/mDNSResponder/mDNSCore/CryptoAlg.c

This file was deleted.

Loading

0 comments on commit 472cd20

Please sign in to comment.