ROOT-7542: Remove dead xrootd bonjour code

cmake/modules/RootConfiguration.cmake

@@ -252,7 +252,6 @@ set(buildbonjour ${value${bonjour}})
 set(dnssdlibdir ${BONJOUR_LIBRARY_DIR})
 set(dnssdlib ${BONJOUR_LIBRARY})
 set(dnsdincdir ${BONJOUR_INCLUDE_DIR})
-set(bonjourcppflags)
 
 set(buildchirp ${value${chirp}})
 set(chirplibdir ${CHIRP_LIBRARY_DIR})

config/Makefile.in

@@ -241,7 +241,6 @@ BUILDBONJOUR   := @buildbonjour@
 DNSSDLIBDIR    := @dnssdlibdir@
 DNSSDLIB       := @dnssdlib@
 DNSSDINCDIR    := $(filter-out /usr/include, @dnssdincdir@)
-BONJOURCPPFLAGS := @bonjourcppflags@
 
 BUILDCHIRP     := @buildchirp@
 CHIRPLIBDIR    := @chirplibdir@

configure

@@ -4542,7 +4542,6 @@ check_explicit "$enable_hdfs" "$enable_hdfs_explicit" \
 #
 # Check for libdns_sd
 #
-bonjourcppflags=
 case $platform in
     linux|macosx|ios)
         ;;
@@ -4628,9 +4627,6 @@ if test ! "x$enable_bonjour" = "xno" ; then
             enable_bonjour="no"
         fi
     fi
-    if test ! "x$enable_bonjour" = "xno" ; then
-       bonjourcppflags="-DBUILD_BONJOUR"
-    fi
 fi
 check_explicit "$enable_bonjour" "$enable_bonjour_explicit" \
      "Explicitly required Bonjour dependencies not fulfilled"
@@ -5251,7 +5247,6 @@ if test "x$enable_xrootd" = "xyes" ; then
    #
    # Check libraries now
    hasxrdutils="no"
-   libxrdoucbjr=""
    #
    # Release date of version 3.1.0 containing the new lib packaging
    decreftre=300000000
@@ -5273,7 +5268,6 @@ if test "x$enable_xrootd" = "xyes" ; then
    else
       xrdlibs="libXrdNet libXrdOuc libXrdSys libXrdClient libXrd"
    fi
-   tmpxrdlibdir=""
    xrdlibext=""
    for ll in $xrdlibs ; do
       #
@@ -5290,10 +5284,6 @@ if test "x$enable_xrootd" = "xyes" ; then
          break
       else
          xrdlibext="$found_ext"
-         tmpxrdlibdir="$found_dir"
-         if test "x$ll" = "xlibXrdUtils" || test "x$ll" = "xlibXrdOuc"; then
-            libxrdoucbjr="$found_lib"
-         fi
       fi
    done
 
@@ -5317,18 +5307,6 @@ if test "x$enable_xrootd" = "xyes" ; then
       fi
    fi
 
-   #
-   # Check if bonjour is available for code potentially using it ...
-   if test "x$enable_xrootd" = "xyes"; then
-      xrdlibdir="$tmpxrdlibdir"
-      if test "x$enable_bonjour" = "xyes"; then
-         check_symbol XrdOucBonjour "$libxrdoucbjr" "$xrdlibdir"
-         if test  $found_symbol -eq 0 ; then
-            bonjourcppflags=
-         fi
-      fi
-   fi
-
    #
    # Build the new client interface (libNetxNG) only for xrootd >= 3.3.5
    decrefng=300030005
@@ -7502,7 +7480,6 @@ sed -e "s|@aclocaldir@|$aclocaldir|"            \
     -e "s|@asimagelib@|$asimagelib|"            \
     -e "s|@asimagelibdir@|$asimagelibdir|"      \
     -e "s|@bindir@|$bindir|"                    \
-    -e "s|@bonjourcppflags@|$bonjourcppflags|"  \
     -e "s|@buildasimage@|$enable_asimage|"      \
     -e "s|@builtinafterimage@|$enable_builtin_afterimage|"  \
     -e "s|@buildftgl@|$enable_builtin_ftgl|"    \

proof/proofd/Module.mk

@@ -262,7 +262,7 @@ distclean::     distclean-$(MODNAME)
 $(PROOFDEXEO): CXXFLAGS += $(AUTHFLAGS)
 
 $(XPDO): $(XROOTDMAKE) $(XRDHDRS)
-$(XPDO): CXXFLAGS += $(XPDINCEXTRA) $(EXTRA_XRDFLAGS) $(BONJOURCPPFLAGS)
+$(XPDO): CXXFLAGS += $(XPDINCEXTRA) $(EXTRA_XRDFLAGS)
 
 ifneq ($(ICC_GE_9),)
 # remove when xrootd has moved from strstream.h -> sstream.

proof/proofd/inc/XrdProofdNetMgr.h

@@ -24,9 +24,6 @@
 
 #include "XpdSysPthread.h"
 
-#if defined(BUILD_BONJOUR)
-#include "XrdOuc/XrdOucBonjour.hh"
-#endif
 #include "XrdOuc/XrdOucHash.hh"
 
 #include "XrdProofConn.h"
@@ -71,16 +68,6 @@ class XrdProofdNetMgr : public XrdProofdConfig {
    int                DoDirectiveWorker(char *, XrdOucStream *, bool);
 
    bool               fBonjourEnabled;
-#if defined(BUILD_BONJOUR)
-   int                fBonjourRequestedSrvType; // Register, Discover or Both.
-   XrdOucBonjour     *fBonjourManager; // A reference to the Bonjour manager.
-   XrdOucString       fBonjourServiceType;
-   XrdOucString       fBonjourName;
-   XrdOucString       fBonjourDomain;
-   int                fBonjourCores;
-   int                LoadBonjourModule(int srvtype);
-   static void *      ProcessBonjourUpdate(void * context);
-#endif
 
 public:
    XrdProofdNetMgr(XrdProofdManager *mgr, XrdProtocol_Config *pi, XrdSysError *e);
@@ -117,15 +104,6 @@ class XrdProofdNetMgr : public XrdProofdConfig {
    std::list<XrdProofWorker *> *GetActiveWorkers();
    std::list<XrdProofWorker *> *GetNodes();
 
-#if defined(BUILD_BONJOUR)
-   // Interface of Bonjour services.
-   int                GetBonjourRequestedServiceType() const { return fBonjourRequestedSrvType; }
-   const char        *GetBonjourServiceType() const { return (fBonjourServiceType.length()) ? fBonjourServiceType.c_str() : "_proof._tcp."; }
-   const char        *GetBonjourName() const { return (fBonjourName.length()) ? fBonjourName.c_str() : NULL; }
-   const char        *GetBonjourDomain() const { return (fBonjourDomain.length()) ? fBonjourDomain.c_str() : NULL; }
-   int                GetBonjourCores() const { return fBonjourCores; }
-   static bool        CheckBonjourRoleCoherence(int role, int bonjourSrvType);
-#endif
    void               BalanceNodesOrder();
 };
 

proof/proofd/src/XrdProofdManager.cxx

@@ -1769,10 +1769,6 @@ int XrdProofdManager::DoDirectiveAllowedUsers(char *val, XrdOucStream *cfg, bool
 
 int XrdProofdManager::DoDirectiveRole(char *val, XrdOucStream *cfg, bool)
 {
-#if defined(BUILD_BONJOUR)
-   XPDLOC(ALL, "Manager::DoDirectiveRole")
-#endif
-
    if (!val)
       // undefined inputs
       return -1;
@@ -1797,13 +1793,6 @@ int XrdProofdManager::DoDirectiveRole(char *val, XrdOucStream *cfg, bool)
       fSrvType = kXPD_AnyServer;
    }
 
-#if defined(BUILD_BONJOUR)
-   // Check the compatibility of the roles and give a warning to the user.
-   if (!XrdProofdNetMgr::CheckBonjourRoleCoherence(SrvType(), fNetMgr->GetBonjourRequestedServiceType())) {
-      TRACE(XERR, "Warning: xpd.role directive and xpd.bonjour service selection are not compatible");
-   }
-#endif
-
    return 0;
 }