Merge DNSSD into main Poco

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server
+      - run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server libavahi-client-dev
       - run: cmake -H. -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all
       - run: >-
           cd cmake-build &&
@@ -126,7 +126,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: brew install [email protected] mysql-client unixodbc libpq
-      - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
+      - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_DNSSD=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
       - run: >-
           cd cmake-build &&
           sudo -s
@@ -139,7 +139,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: brew install openssl@3 mysql-client unixodbc libpq
-      - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
+      - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_DNSSD=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all
       - run: >-
           cd cmake-build &&
           sudo -s
@@ -153,7 +153,7 @@ jobs:
       CPPUNIT_IGNORE: class CppUnit::TestCaller<class PathTest>.testFind,class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,class CppUnit::TestCaller<class ICMPClientTest>.testPing,class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
     steps:
       - uses: actions/checkout@v2
-      - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON -DCMAKE_CXX_FLAGS="/MP /EHsc" -DCMAKE_C_FLAGS=/MP
+      - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_DNSSD=OFF -DENABLE_TESTS=ON -DCMAKE_CXX_FLAGS="/MP /EHsc" -DCMAKE_C_FLAGS=/MP
       - run: cmake --build cmake-build --config Release
       - run: >-
           cd cmake-build;
@@ -197,7 +197,7 @@ jobs:
       CPPUNIT_IGNORE: class CppUnit::TestCaller<class PathTest>.testFind,class CppUnit::TestCaller<class ICMPSocketTest>.testSendToReceiveFrom,class CppUnit::TestCaller<class ICMPClientTest>.testPing,class CppUnit::TestCaller<class ICMPClientTest>.testBigPing,class CppUnit::TestCaller<class ICMPSocketTest>.testMTU,class CppUnit::TestCaller<class HTTPSClientSessionTest>.testProxy,class CppUnit::TestCaller<class HTTPSStreamFactoryTest>.testProxy
     steps:
       - uses: actions/checkout@v2
-      - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON -DCMAKE_CXX_FLAGS="/MP /EHsc" -DCMAKE_C_FLAGS=/MP
+      - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_DNSSD=OFF -DENABLE_TESTS=ON -DCMAKE_CXX_FLAGS="/MP /EHsc" -DCMAKE_C_FLAGS=/MP
       - run: cmake --build cmake-build --config Release
       - run: >-
           cd cmake-build;

.gitignore

@@ -131,6 +131,7 @@ lib/
 lib64/
 pocomsg.h
 **/UpgradeLog*.XML
+/out/build/x64-Debug
 
 # Eclipse generated files #
 ###########################

CMakeLists.txt

@@ -180,6 +180,12 @@ option(ENABLE_JSON "Enable JSON" ON)
 option(ENABLE_MONGODB "Enable MongoDB" ON)
 option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON)
 option(ENABLE_REDIS "Enable Redis" ON)
+option(ENABLE_DNSSD "Enable DNSSD" ON)
+option(ENABLE_DNSSD_DEFAULT "Enable DNSSD Default" ON)
+
+option(ENABLE_DNSSD_AVAHI "Enable DNSSD Avahi" OFF)
+option(ENABLE_DNSSD_BONJOUR "Enable DNSSD Bonjour" OFF)
+
 option(ENABLE_PROMETHEUS "Enable Prometheus" ON)
 option(ENABLE_PDF "Enable PDF" OFF)
 option(ENABLE_UTIL "Enable Util" ON)
@@ -354,6 +360,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS)
 	list(APPEND Poco_COMPONENTS "Redis")
 endif()
 
+if(ENABLE_DNSSD)
+	add_subdirectory(DNSSD)
+	list(APPEND Poco_COMPONENTS "DNSSD")
+endif()
+
 if(EXISTS ${PROJECT_SOURCE_DIR}/Prometheus AND ENABLE_PROMETHEUS)
 	add_subdirectory(Prometheus)
 	list(APPEND Poco_COMPONENTS "Prometheus")

DNSSD/.gitignore

@@ -0,0 +1,153 @@
+# Compiled #
+############
+*.com
+*.class
+*.dll
+*.dylib
+*.exe
+*.slo
+*.lo
+*.o
+*.so
+*.lai
+*.la
+*.a
+*.d
+*.vsp
+*.psess
+
+# Make #
+########
+config.build
+config.make
+
+# CMake #
+########
+cmake_install.cmake
+cmake_uninstall.cmake
+CMakeFiles
+CMakeCache.txt
+CPackConfig.cmake
+CPackSourceConfig.cmake
+cmake_*
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log*
+*.sqlite
+*.db
+test*.txt
+XML/testsuite/rss.xml
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+*~
+
+# VS generated files #
+######################
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.ipch
+*.ncb
+*.suo
+*.sdf
+*.opensdf
+*.opendb
+*.tlb
+*.tlh
+*.ilk
+*.lib
+*.exp
+*.idb
+*.rc
+*.res
+*.manifest
+*.tlog
+*.lastbuildstate
+*.unsuccessfulbuild
+release_shared/
+debug_shared/
+release_static/
+debug_static/
+release_static_md/
+debug_static_md/
+release_static_mt/
+debug_static_mt/
+bin/*
+bin64/*
+lib/*
+lib64/*
+pocomsg.h
+*/testsuite/bin/*
+Util/testsuite/TestConfiguration/
+
+# Eclipse generated files #
+######################
+.project
+.cproject
+.settings
+cmake-build/
+
+# Temporary files #
+###################
+*.bak
+CodeGeneration
+RemotingNG
+XSD
+stage/
+releases/
+Zip/testsuite/data*.bin
+Foundation/testsuite/globtest/
+TestConfiguration/
+
+# openssl binaries #
+####################
+openssl/packages/
+
+!openssl/Ionic/zip-v1.9/Release/*.dll
+!openssl/Ionic/zlib-v1.9/Release/*.dll
+
+!openssl/win32/bin/debug/*.dll
+!openssl/win32/bin/debug/*.lib
+!openssl/win32/bin/release/*.dll
+!openssl/win32/bin/release/*.lib
+
+!openssl/win64/bin/debug/*.dll
+!openssl/win64/bin/debug/*.lib
+!openssl/win64/bin/release/*.dll
+!openssl/win64/bin/release/*.lib
+
+!openssl/win32/lib/debug/*.lib
+!openssl/win32/lib/debug/*.pdb
+!openssl/win32/lib/release/*.lib
+
+!openssl/win64/lib/debug/*.lib
+!openssl/win64/lib/debug/*.pdb
+!openssl/win64/lib/release/*.lib
+
+/Debug

DNSSD/Avahi/CMakeLists.txt

@@ -0,0 +1,33 @@
+set(LIBNAME "DNSSDAvahi")
+set(POCO_LIBNAME "Poco${LIBNAME}")
+
+# Sources
+file(GLOB SRCS_G "src/*.cpp")
+POCO_SOURCES_AUTO( Avahi_SRCS ${SRCS_G})
+
+# Headers
+file(GLOB_RECURSE HDRS_G "include/*.h" )
+POCO_HEADERS_AUTO( Avahi_SRCS ${HDRS_G})
+
+add_definitions( ${Avahi_CFLAGS} -DTHREADSAFE)
+
+add_library( "${LIBNAME}" ${LIB_MODE} ${Avahi_SRCS} )
+add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
+set_target_properties( "${LIBNAME}"
+    PROPERTIES
+    VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
+    OUTPUT_NAME ${POCO_LIBNAME}
+    DEFINE_SYMBOL Avahi_EXPORTS
+    )
+
+target_link_libraries( "${LIBNAME}" Foundation Net DNSSD ${AVAHI_LIBRARIES})
+target_include_directories( "${LIBNAME}"
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
+    )
+target_compile_definitions("${LIBNAME}" PUBLIC ${LIB_MODE_DEFINITIONS})
+
+POCO_INSTALL("${LIBNAME}")
+POCO_GENERATE_PACKAGE("${LIBNAME}")

DNSSD/Avahi/Makefile

@@ -0,0 +1,21 @@
+#
+# Makefile
+#
+# $Id: //poco/1.7/DNSSD/Avahi/Makefile#1 $
+#
+# Makefile for Poco DNSSD Avahi
+#
+
+include $(POCO_BASE)/build/rules/global
+
+SYSLIBS += -lavahi-common -lavahi-client
+
+objects = \
+	AvahiResponderImpl AvahiBrowserImpl
+
+target         = PocoDNSSDAvahi
+target_version = 1
+target_libs    = PocoNet PocoDNSSD PocoFoundation
+
+include $(POCO_BASE)/build/rules/lib
+

DNSSD/Avahi/cmake/PocoDNSSDAvahiConfig.cmake

@@ -0,0 +1,5 @@
+include(CMakeFindDependencyMacro)
+find_dependency(PocoFoundation)
+find_dependency(PocoNet)
+find_dependency(PocoDNSSD)
+include("${CMAKE_CURRENT_LIST_DIR}/PocoDNSSDAvahiTargets.cmake")

DNSSD/Avahi/dependencies

@@ -0,0 +1,3 @@
+Foundation
+Net
+DNSSD

DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h

@@ -0,0 +1,72 @@
+//
+// Avahi.h
+//
+// $Id: //poco/1.7/DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h#1 $
+//
+// Library: DNSSD/Avahi
+// Package: Implementation
+// Module:  Avahi
+//
+// Basic definitions for the Poco DNSSD Avahi library.
+// This file must be the first file included by every other DNSSD Avahi
+// header file.
+//
+// Copyright (c) 2006-2016, Applied Informatics Software Engineering GmbH.
+// All rights reserved.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef DNSSD_Avahi_Avahi_INCLUDED
+#define DNSSD_Avahi_Avahi_INCLUDED
+
+
+#include "Poco/DNSSD/DNSSD.h"
+
+
+//
+// The following block is the standard way of creating macros which make exporting
+// from a DLL simpler. All files within this DLL are compiled with the Avahi_EXPORTS
+// symbol defined on the command line. This symbol should not be defined on any project
+// that uses this DLL. This way any other project whose source files include this file see
+// POCO_DNSSD_Avahi_API functions as being imported from a DLL, wheras this DLL sees symbols
+// defined with this macro as being exported.
+//
+#if defined(_WIN32) && defined(POCO_DLL)
+	#if defined(Avahi_EXPORTS)
+		#define POCO_DNSSD_Avahi_API __declspec(dllexport)
+	#else
+		#define POCO_DNSSD_Avahi_API __declspec(dllimport)
+	#endif
+#endif
+
+
+#if !defined(POCO_DNSSD_Avahi_API)
+	#define POCO_DNSSD_Avahi_API
+#endif
+
+
+#if defined(_MSC_VER)
+	#if !defined(POCO_NO_AUTOMATIC_LIBS) && !defined(Avahi_EXPORTS)
+		#pragma comment(lib, "PocoDNSSDAvahi" POCO_LIB_SUFFIX)
+	#endif
+#endif
+
+
+namespace Poco {
+namespace DNSSD {
+
+
+void POCO_DNSSD_Avahi_API initializeDNSSD();
+	/// Initialize the DNSSD subsystem.
+
+
+void POCO_DNSSD_Avahi_API uninitializeDNSSD();
+	/// Uninitialize the DNSSD subsystem.
+
+
+} } // namespace Poco::DNSSD
+
+
+#endif // DNSSD_Avahi_Avahi_INCLUDED