mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-11-13 12:07:10 +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

14
src/ngircd/conn.c
View File

@@ -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/07 18:49:04 fw Exp $";
#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

6
src/ngircd/defines.h
View File

@@ -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

12
src/ngircd/ngircd.c
View File

@@ -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/07/07 18:37:36 fw Exp $";
#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] )

6
src/ngircd/rendezvous.c
View File

@@ -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( sw_discovery Session, sw_di
#endif /* Howl */
#endif /* RENDEZVOUS */
#endif /* ZEROCONF */
/* -eof- */

6
src/ngircd/rendezvous.h
View File

@@ -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- */