mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

Renamed "Rendezvous" to "Zeroconf".

Browse Source
This commit is contained in:
Alexander Barton
2005-07-08 16:18:38 +00:00
parent a874c26c25
commit 02b0a51517
6 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
configure.in
View File

@@ -8,7 +8,7 @@
# (at your option) any later version. # (at your option) any later version.
# Please read the file COPYING, README and AUTHORS for more information. # 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 -- # -- Initialisation --
@@ -30,7 +30,7 @@ AH_TEMPLATE([SYSLOG], [Define if syslog should be used for logging])
AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled]) AH_TEMPLATE([ZLIB], [Define if zlib compression should be enabled])
AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used]) AH_TEMPLATE([TCPWRAP], [Define if TCP wrappers should be used])
AH_TEMPLATE([IRCPLUS], [Define if IRC+ protocol 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([IDENTAUTH], [Define if the server should do IDENT requests])
AH_TEMPLATE([TARGET_OS], [Target operating system name]) AH_TEMPLATE([TARGET_OS], [Target operating system name])
@@ -246,32 +246,32 @@ int deny_severity = 0;
] ]
) )
x_rendezvous_on=no x_zeroconf_on=no
AC_ARG_WITH(rendezvous, AC_ARG_WITH(zeroconf,
[ --with-rendezvous enable support for "Rendezvous"], [ --with-zeroconf enable support for "Zeroconf"],
[ if test "$withval" != "no"; then [ if test "$withval" != "no"; then
if test "$withval" != "yes"; then if test "$withval" != "yes"; then
CFLAGS="-I$withval/include $CFLAGS" CFLAGS="-I$withval/include $CFLAGS"
CPPFLAGS="-I$withval/include $CPPFLAGS" CPPFLAGS="-I$withval/include $CPPFLAGS"
LDFLAGS="-L$withval/lib $LDFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS"
fi 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(pthread, pthread_mutexattr_init)
AC_CHECK_LIB(howl, sw_discovery_init) AC_CHECK_LIB(howl, sw_discovery_init)
AC_CHECK_FUNCS(sw_discovery_init, \ AC_CHECK_FUNCS(sw_discovery_init, \
x_rendezvous_on=howl, \ x_zeroconf_on=howl, \
AC_MSG_ERROR([Can't enable Rendezvous!])) AC_MSG_ERROR([Can't enable Zeroconf!]))
]) ])
fi fi
] ]
) )
if test "$x_rendezvous_on" = "osx"; then if test "$x_zeroconf_on" = "osx"; then
AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \ AC_CHECK_HEADERS([DNSServiceDiscovery/DNSServiceDiscovery.h \
mach/port.h],,AC_MSG_ERROR([required C header missing!])) mach/port.h],,AC_MSG_ERROR([required C header missing!]))
AC_DEFINE(RENDEZVOUS, 1) AC_DEFINE(ZEROCONF, 1)
fi 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* \ for dir in /usr/local/include /usr/local/include/howl* \
/usr/include /usr/include/howl*; do /usr/include /usr/include/howl*; do
test -d "$dir" || continue test -d "$dir" || continue
@@ -290,7 +290,7 @@ if test "$x_rendezvous_on" = "howl"; then
done done
AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \ AC_CHECK_HEADERS([rendezvous/rendezvous.h],, \
AC_MSG_ERROR([required C header missing!])) AC_MSG_ERROR([required C header missing!]))
AC_DEFINE(RENDEZVOUS, 1) AC_DEFINE(ZEROCONF, 1)
fi fi
x_identauth_on=no x_identauth_on=no
@@ -438,10 +438,18 @@ test "$x_strict_rfc_on" = "yes" \
&& echo "yes" \ && echo "yes" \
|| echo "no" || echo "no"
echo $ECHO_N " Rendezvous support: $ECHO_C" echo $ECHO_N " Zeroconf support: $ECHO_C"
test "$x_rendezvous_on" = "osx" -o "$x_rendezvous_on" = "howl" \ case "$x_zeroconf_on" in
&& echo $ECHO_N "yes $ECHO_C" \ osx)
|| echo $ECHO_N "no $ECHO_C" 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" echo $ECHO_N " IRC+ protocol: $ECHO_C"
test "$x_ircplus_on" = "yes" \ test "$x_ircplus_on" = "yes" \
&& echo "yes" \ && echo "yes" \
@@ -454,6 +462,6 @@ test "$x_identauth_on" = "yes" \
echo $ECHO_N " I/O backend: $ECHO_C" echo $ECHO_N " I/O backend: $ECHO_C"
echo "$x_io_backend" echo "$x_io_backend"
echo; echo echo
# -eof- # -eof-

14
src/ngircd/conn.c
View File

@@ -17,7 +17,7 @@
#include "portab.h" #include "portab.h"
#include "io.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 "imp.h"
#include <assert.h> #include <assert.h>
@@ -72,7 +72,7 @@ static char UNUSED id[] = "$Id: conn.c,v 1.157 2005/07/07 18:49:04 fw Exp $";
#include "parse.h" #include "parse.h"
#include "tool.h" #include "tool.h"
#ifdef RENDEZVOUS #ifdef ZEROCONF
# include "rendezvous.h" # include "rendezvous.h"
#endif #endif
@@ -301,7 +301,7 @@ Conn_ExitListeners( void )
/* Close down all listening sockets */ /* Close down all listening sockets */
int *fd; int *fd;
unsigned int arraylen; unsigned int arraylen;
#ifdef RENDEZVOUS #ifdef ZEROCONF
Rendezvous_UnregisterListeners( ); Rendezvous_UnregisterListeners( );
#endif #endif
@@ -330,7 +330,7 @@ Conn_NewListener( const UINT16 Port )
struct sockaddr_in addr; struct sockaddr_in addr;
struct in_addr inaddr; struct in_addr inaddr;
int sock; int sock;
#ifdef RENDEZVOUS #ifdef ZEROCONF
char name[CLIENT_ID_LEN], *info; char name[CLIENT_ID_LEN], *info;
#endif #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 ); 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 ); 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 */ /* Get best server description text */
if( ! Conf_ServerInfo[0] ) info = Conf_ServerName; if( ! Conf_ServerInfo[0] ) info = Conf_ServerName;
else else
@@ -417,7 +417,7 @@ Conn_NewListener( const UINT16 Port )
else strlcpy( name, info, sizeof( name )); else strlcpy( name, info, sizeof( name ));
/* Register service */ /* Register service */
Rendezvous_Register( name, RENDEZVOUS_TYPE, Port ); Rendezvous_Register( name, MDNS_TYPE, Port );
#endif #endif
return true; return true;
} /* Conn_NewListener */ } /* Conn_NewListener */
@@ -448,7 +448,7 @@ Conn_Handler( void )
{ {
timeout = true; timeout = true;
#ifdef RENDEZVOUS #ifdef ZEROCONF
Rendezvous_Handler( ); Rendezvous_Handler( );
#endif #endif

6
src/ngircd/defines.h
View File

@@ -8,7 +8,7 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * 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 #define CUT_TXTSUFFIX "[CUT]" /* Suffix for oversized messages that
have been shortened and cut off. */ have been shortened and cut off. */
#ifdef RENDEZVOUS #ifdef ZEROCONF
#define RENDEZVOUS_TYPE "_ircu._tcp." /* Service type to register with mDNS */ #define MDNS_TYPE "_ircu._tcp." /* Service type to register with mDNS */
#endif #endif

12
src/ngircd/ngircd.c
View File

@@ -12,7 +12,7 @@
#include "portab.h" #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 * @file
@@ -48,7 +48,7 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.103 2005/07/07 18:37:36 fw Exp $";
#include "parse.h" #include "parse.h"
#include "irc.h" #include "irc.h"
#ifdef RENDEZVOUS #ifdef ZEROCONF
#include "rendezvous.h" #include "rendezvous.h"
#endif #endif
@@ -272,7 +272,7 @@ main( int argc, const char *argv[] )
Lists_Init( ); Lists_Init( );
Channel_Init( ); Channel_Init( );
Client_Init( ); Client_Init( );
#ifdef RENDEZVOUS #ifdef ZEROCONF
Rendezvous_Init( ); Rendezvous_Init( );
#endif #endif
Conn_Init( ); Conn_Init( );
@@ -321,7 +321,7 @@ main( int argc, const char *argv[] )
/* Alles abmelden */ /* Alles abmelden */
Conn_Exit( ); Conn_Exit( );
#ifdef RENDEZVOUS #ifdef ZEROCONF
Rendezvous_Exit( ); Rendezvous_Exit( );
#endif #endif
Client_Exit( ); Client_Exit( );
@@ -361,11 +361,11 @@ Fill_Version( void )
strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition ); strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
#endif #endif
#ifdef RENDEZVOUS #ifdef ZEROCONF
if( NGIRCd_VersionAddition[0] ) if( NGIRCd_VersionAddition[0] )
strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition ); strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
strlcat( NGIRCd_VersionAddition, "RENDEZVOUS", sizeof NGIRCd_VersionAddition ); strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
#endif #endif
#ifdef IDENTAUTH #ifdef IDENTAUTH
if( NGIRCd_VersionAddition[0] ) if( NGIRCd_VersionAddition[0] )

6
src/ngircd/rendezvous.c
View File

@@ -18,10 +18,10 @@
#include "portab.h" #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 "imp.h"
#include <assert.h> #include <assert.h>
@@ -360,7 +360,7 @@ LOCAL sw_result HOWL_API Registration_Reply_Handler( sw_discovery Session, sw_di
#endif /* Howl */ #endif /* Howl */
#endif /* RENDEZVOUS */ #endif /* ZEROCONF */
/* -eof- */ /* -eof- */

6
src/ngircd/rendezvous.h
View File

@@ -8,13 +8,13 @@
* (at your option) any later version. * (at your option) any later version.
* Please read the file COPYING, README and AUTHORS for more information. * 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) * "Rendezvous" functions (Header)
*/ */
#ifdef RENDEZVOUS #ifdef ZEROCONF
#ifndef __rdezvous_h__ #ifndef __rdezvous_h__
#define __rdezvous_h__ #define __rdezvous_h__
@@ -33,7 +33,7 @@ GLOBAL void Rendezvous_Handler( void );
#endif /* __rdezvous_h__ */ #endif /* __rdezvous_h__ */
#endif /* RENDEZVOUS */ #endif /* ZEROCONF */
/* -eof- */ /* -eof- */