Made on IRCNow

Commit Diff

Commit:: 02b0a5151719d04081af2db01e8266a1eafb8537
From:: Alexander Barton <alex@barton.de>
Date:: Fri Jul 8 16:18:38 2005 UTC
Message:: Renamed "Rendezvous" to "Zeroconf".
Actions:: Patch | Tree
commit - a874c26c254e044bf10276d27ec8a9a19ce44c9b
commit + 02b0a5151719d04081af2db01e8266a1eafb8537
blob - 23a5d9c4ac14a57fb55a181d8deb570127eadb6c
blob + 87cf3062aaebf15851efe3200cb8ba070349bb8f
--- configure.in
+++ configure.in
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
-# $Id: configure.in,v 1.113 2005/07/08 12:39:38 alex Exp $
+# $Id: configure.in,v 1.114 2005/07/08 16:18:38 alex Exp $
 #
 
 # -- Initialisation --
@@ -30,7 +30,7 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used
 AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
 AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
 AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol should be used])
-AH_TEMPLATE([RENDEZVOUS], [Define if Rendezvous support should be included])
+AH_TEMPLATE([ZEROCONF], [Define if support for Zeroconf should be included])
 AH_TEMPLATE([IDENTAUTH], [Define if the server should do IDENT requests])
 
 AH_TEMPLATE([TARGET_OS], [Target operating system name])
@@ -246,32 +246,32 @@ int deny_severity = 0;
 	]
 )
 
-x_rendezvous_on=no
-AC_ARG_WITH(rendezvous,
-	[  --with-rendezvous       enable support for "Rendezvous"],
+x_zeroconf_on=no
+AC_ARG_WITH(zeroconf,
+	[  --with-zeroconf         enable support for "Zeroconf"],
 	[	if test "$withval" != "no"; then
 			if test "$withval" != "yes"; then
 				CFLAGS="-I$withval/include $CFLAGS"
 				CPPFLAGS="-I$withval/include $CPPFLAGS"
 				LDFLAGS="-L$withval/lib $LDFLAGS"
 			fi
-			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_rendezvous_on=osx,
+			AC_CHECK_FUNCS(DNSServiceRegistrationCreate, x_zeroconf_on=osx,
 			[
 				AC_CHECK_LIB(pthread, pthread_mutexattr_init)
 				AC_CHECK_LIB(howl, sw_discovery_init)
 				AC_CHECK_FUNCS(sw_discovery_init, \
-				 x_rendezvous_on=howl, \
-				 AC_MSG_ERROR([Can't enable Rendezvous!]))
+				 x_zeroconf_on=howl, \
+				 AC_MSG_ERROR([Can't enable Zeroconf!]))
 			])
 		fi
 	]
 )
-if test "$x_rendezvous_on" = "osx"; then
+if test "$x_zeroconf_on" = "osx"; then
 	AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
 	 mach/port.h],,AC_MSG_ERROR([required C header missing!]))
-	AC_DEFINE(RENDEZVOUS, 1)
+	AC_DEFINE(ZEROCONF, 1)
 fi
-if test "$x_rendezvous_on" = "howl"; then
+if test "$x_zeroconf_on" = "howl"; then
 	for dir in /usr/local/include /usr/local/include/howl* \
 	 /usr/include /usr/include/howl*; do
 	 	test -d "$dir" || continue
@@ -290,7 +290,7 @@ if test "$x_rendezvous_on" = "howl"; then
 	done
 	AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \
 	 AC_MSG_ERROR([required C header missing!]))
-	AC_DEFINE(RENDEZVOUS, 1)
+	AC_DEFINE(ZEROCONF, 1)
 fi
 
 x_identauth_on=no
@@ -413,8 +413,8 @@ echo
 
 echo $ECHO_N "     Syslog support: $ECHO_C"
 test "$x_syslog_on" = "yes" \
-	&& echo $ECHO_N "yes $ECHO_C" \
-	|| echo $ECHO_N "no  $ECHO_C"
+	&& echo $ECHO_N "yes   $ECHO_C" \
+	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "  Enable debug code: $ECHO_C"
 test "$x_debug_on" = "yes" \
 	&& echo "yes" \
@@ -422,8 +422,8 @@ test "$x_debug_on" = "yes" \
 
 echo $ECHO_N "   zlib compression: $ECHO_C"
 test "$x_zlib_on" = "yes" \
-	&& echo $ECHO_N "yes $ECHO_C" \
-	|| echo $ECHO_N "no  $ECHO_C"
+	&& echo $ECHO_N "yes   $ECHO_C" \
+	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        IRC sniffer: $ECHO_C"
 test "$x_sniffer_on" = "yes" \
 	&& echo "yes" \
@@ -431,17 +431,25 @@ test "$x_sniffer_on" = "yes" \
 
 echo $ECHO_N "   Use TCP Wrappers: $ECHO_C"
 test "$x_tcpwrap_on" = "yes" \
-	&& echo $ECHO_N "yes $ECHO_C" \
-	|| echo $ECHO_N "no  $ECHO_C"
+	&& echo $ECHO_N "yes   $ECHO_C" \
+	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "    Strict RFC mode: $ECHO_C"
 test "$x_strict_rfc_on" = "yes" \
 	&& echo "yes" \
 	|| echo "no"
 
-echo $ECHO_N " Rendezvous support: $ECHO_C"
-test "$x_rendezvous_on" = "osx" -o "$x_rendezvous_on" = "howl" \
-	&& echo $ECHO_N "yes $ECHO_C" \
-	|| echo $ECHO_N "no  $ECHO_C"
+echo $ECHO_N "   Zeroconf support: $ECHO_C"
+case "$x_zeroconf_on" in
+	osx)
+		echo $ECHO_N "Apple $ECHO_C"
+		;;
+	howl)
+		echo $ECHO_N "Howl  $ECHO_C"
+		;;
+	*)
+		echo $ECHO_N "no    $ECHO_C"
+		;;
+esac
 echo $ECHO_N "      IRC+ protocol: $ECHO_C"
 test "$x_ircplus_on" = "yes" \
 	&& echo "yes" \
@@ -449,11 +457,11 @@ test "$x_ircplus_on" = "yes" \
 
 echo $ECHO_N "      IDENT support: $ECHO_C"
 test "$x_identauth_on" = "yes" \
-	&& echo $ECHO_N "yes $ECHO_C" \
-	|| echo $ECHO_N "no  $ECHO_C"
+	&& echo $ECHO_N "yes   $ECHO_C" \
+	|| echo $ECHO_N "no    $ECHO_C"
 echo $ECHO_N "        I/O backend: $ECHO_C"
 	echo "$x_io_backend"
 
-echo; echo
+echo
 
 # -eof-
blob - 7e68b71362b3ccfe089845684759171576d155cb
blob + b63a89fbade8ecc17412cf54ffbe39e052f30131
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -17,7 +17,7 @@
 #include "portab.h"
 #include "io.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.157 2005/07/07 18:49:04 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.158 2005/07/08 16:18:39 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -72,7 +72,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.157 2005/07
 #include "parse.h"
 #include "tool.h"
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 # include "rendezvous.h"
 #endif
 
@@ -301,7 +301,7 @@ Conn_ExitListeners( void )
 	/* Close down all listening sockets */
 	int *fd;
 	unsigned int arraylen;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 	Rendezvous_UnregisterListeners( );
 #endif
 
@@ -330,7 +330,7 @@ Conn_NewListener( const UINT16 Port )
 	struct sockaddr_in addr;
 	struct in_addr inaddr;
 	int sock;
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 	char name[CLIENT_ID_LEN], *info;
 #endif
 
@@ -392,7 +392,7 @@ Conn_NewListener( const UINT16 Port )
 	if( Conf_ListenAddress[0]) Log( LOG_INFO, "Now listening on %s:%d (socket %d).", Conf_ListenAddress, Port, sock );
 	else Log( LOG_INFO, "Now listening on 0.0.0.0:%d (socket %d).", Port, sock );
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 	/* Get best server description text */
 	if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
 	else
@@ -417,7 +417,7 @@ Conn_NewListener( const UINT16 Port )
 	else strlcpy( name, info, sizeof( name ));
 
 	/* Register service */
-	Rendezvous_Register( name, RENDEZVOUS_TYPE, Port );
+	Rendezvous_Register( name, MDNS_TYPE, Port );
 #endif
 	return true;
 } /* Conn_NewListener */
@@ -448,7 +448,7 @@ Conn_Handler( void )
 	{
 		timeout = true;
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 		Rendezvous_Handler( );
 #endif
 
blob - e05a6d12b89c049a69c2062249da67b465c3f89e
blob + 8feb5b86e21687c8144fa4d62742f4e7b6d73ede
--- src/ngircd/defines.h
+++ src/ngircd/defines.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: defines.h,v 1.54 2005/07/05 22:44:47 alex Exp $
+ * $Id: defines.h,v 1.55 2005/07/08 16:18:39 alex Exp $
  */
 
 
@@ -122,8 +122,8 @@
 #define CUT_TXTSUFFIX "[CUT]"		/* Suffix for oversized messages that
 					   have been shortened and cut off. */
 
-#ifdef RENDEZVOUS
-#define RENDEZVOUS_TYPE "_ircu._tcp."	/* Service type to register with mDNS */
+#ifdef ZEROCONF
+#define MDNS_TYPE "_ircu._tcp."		/* Service type to register with mDNS */
 #endif
 
 
blob - 6f965853777c32182aae4b7d316017a90bb8adee
blob + 7ef93175c0a3b9905f894675034837a211a1d35f
--- src/ngircd/ngircd.c
+++ src/ngircd/ngircd.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.103 2005/07/07 18:37:36 fw Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.104 2005/07/08 16:18:39 alex Exp $";
 
 /**
  * @file
@@ -48,7 +48,7 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.103 2005/
 #include "parse.h"
 #include "irc.h"
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 #include "rendezvous.h"
 #endif
 
@@ -272,7 +272,7 @@ main( int argc, const char *argv[] )
 		Lists_Init( );
 		Channel_Init( );
 		Client_Init( );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 		Rendezvous_Init( );
 #endif
 		Conn_Init( );
@@ -321,7 +321,7 @@ main( int argc, const char *argv[] )
 
 		/* Alles abmelden */
 		Conn_Exit( );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 		Rendezvous_Exit( );
 #endif
 		Client_Exit( );
@@ -361,11 +361,11 @@ Fill_Version( void )
 
 	strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
 #endif
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 	if( NGIRCd_VersionAddition[0] )
 		strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
 
-	strlcat( NGIRCd_VersionAddition, "RENDEZVOUS", sizeof NGIRCd_VersionAddition );
+	strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef IDENTAUTH
 	if( NGIRCd_VersionAddition[0] )
blob - f7a4b4a6a8db2e8acbdf81d233ae1b0b9fa59b6b
blob + ef43b3ace52527a097b5af59334e747ecdbe8ae5
--- src/ngircd/rendezvous.c
+++ src/ngircd/rendezvous.c
@@ -18,10 +18,10 @@
 
 #include "portab.h"
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 
 
-static char UNUSED id[] = "$Id: rendezvous.c,v 1.5 2005/03/19 18:43:49 fw Exp $";
+static char UNUSED id[] = "$Id: rendezvous.c,v 1.6 2005/07/08 16:18:39 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -360,7 +360,7 @@ LOCAL sw_result HOWL_API Registration_Reply_Handler( s
 #endif /* Howl */
 
 
-#endif	/* RENDEZVOUS */
+#endif	/* ZEROCONF */
 
 
 /* -eof- */
blob - 1f8df67be6e0f55d51520e55e6d0b5350fdfabb4
blob + 4f1f06ad2fbb355bf899ba0dd8e29b7c0aee9bf9
--- src/ngircd/rendezvous.h
+++ src/ngircd/rendezvous.h
@@ -8,13 +8,13 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: rendezvous.h,v 1.2 2005/03/19 18:43:49 fw Exp $
+ * $Id: rendezvous.h,v 1.3 2005/07/08 16:18:39 alex Exp $
  *
  * "Rendezvous" functions (Header)
  */
 
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 
 #ifndef __rdezvous_h__
 #define __rdezvous_h__
@@ -33,7 +33,7 @@ GLOBAL void Rendezvous_Handler( void );
 
 #endif	/* __rdezvous_h__ */
 
-#endif	/* RENDEZVOUS */
+#endif	/* ZEROCONF */
 
 
 /* -eof- */