ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/ircd.c

Comparing:
ircd-hybrid-7.2/src/ircd.c (file contents), Revision 948 by michael, Tue Jul 21 17:34:06 2009 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 2159 by michael, Sun Jun 2 18:22:01 2013 UTC

#	Line 24 | Line 24
24
25		#include "stdinc.h"
26		#include "s_user.h"
27	<	#include "tools.h"
27	>	#include "list.h"
28		#include "ircd.h"
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "event.h"
33		#include "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
37	–	#include "sprintf_irc.h"
36		#include "ircd_signal.h"
39	–	#include "list.h"
37		#include "s_gline.h"
38		#include "motd.h"
39	<	#include "ircd_handler.h"
43	<	#include "msg.h"         /* msgtab */
39	>	#include "conf.h"
40		#include "hostmask.h"
41		#include "numeric.h"
42		#include "packet.h"
43		#include "parse.h"
44		#include "irc_res.h"
45		#include "restart.h"
46	+	#include "rng_mt.h"
47		#include "s_auth.h"
48		#include "s_bsd.h"
49	<	#include "s_conf.h"
53	<	#include "s_log.h"
49	>	#include "log.h"
50		#include "s_misc.h"
51		#include "s_serv.h"      /* try_connections */
52		#include "send.h"
53		#include "whowas.h"
54		#include "modules.h"
55		#include "memory.h"
56	+	#include "mempool.h"
57		#include "hook.h"
58		#include "ircd_getopt.h"
62	–	#include "balloc.h"
63	–	#include "motd.h"
59		#include "supported.h"
60		#include "watch.h"
61	+	#include "conf_db.h"
62	+	#include "conf_class.h"
63
67	–	/* Try and find the correct name to use with getrlimit() for setting the max.
68	–	* number of files allowed to be open by this process.
69	–	*/
64
65	+	#ifdef HAVE_LIBGEOIP
66	+	GeoIP *geoip_ctx;
67	+	#endif
68		/* /quote set variables */
69		struct SetOptions GlobalSetOptions;
70
#	Line 77 | Line 74 | struct config_file_entry ConfigFileEntry
74		struct server_info ServerInfo;
75		/* admin info set from ircd.conf */
76		struct admin_info AdminInfo = { NULL, NULL, NULL };
77	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
77	>	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
78		struct ServerState_t server_state = { 0 };
79	<	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
79	>	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
80		struct ServerStatistics ServerStats;
81		struct timeval SystemTime;
82		struct Client me;             /* That's me */
83		struct LocalUser meLocalUser; /* That's also part of me */
84
88	–	static unsigned long initialVMTop = 0;   /* top of virtual memory at init */
85		const char *logFileName = LPATH;
86		const char *pidFileName = PPATH;
87
88		char **myargv;
93	–	char ircd_platform[PLATFORMLEN];
89
90		int dorehash = 0;
91		int doremotd = 0;
97	–	time_t nextconnect = 1;       /* time for next try_connections call */
92
93		/* Set to zero because it should be initialized later using
94		* initialize_server_capabs
95		*/
96		int default_server_capabs = 0;
97	<
98	<	#ifdef HAVE_LIBCRYPTO
99	<	int bio_spare_fd = -1;
106	<	#endif
107	<
108	<	int splitmode;
109	<	int splitchecking;
110	<	int split_users;
97	>	unsigned int splitmode;
98	>	unsigned int splitchecking;
99	>	unsigned int split_users;
100		unsigned int split_servers;
101
102		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 153 | Line 142 | make_daemon(void)
142
143		setsid();
144		}
156	–	#endif
145
146		static int printVersion = 0;
147
148	<	struct lgetopt myopts[] = {
161	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
162	<	STRING, "File to use for dline.conf"},
148	>	static struct lgetopt myopts[] = {
149		{"configfile", &ConfigFileEntry.configfile,
150		STRING, "File to use for ircd.conf"},
151	+	{"glinefile",  &ConfigFileEntry.glinefile,
152	+	STRING, "File to use for gline database"},
153		{"klinefile",  &ConfigFileEntry.klinefile,
154	<	STRING, "File to use for kline.conf"},
154	>	STRING, "File to use for kline database"},
155	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
156	>	STRING, "File to use for dline database"},
157		{"xlinefile",  &ConfigFileEntry.xlinefile,
158	<	STRING, "File to use for xline.conf"},
158	>	STRING, "File to use for xline database"},
159	>	{"resvfile",  &ConfigFileEntry.resvfile,
160	>	STRING, "File to use for resv database"},
161		{"logfile",    &logFileName,
162		STRING, "File to use for ircd.log"},
163		{"pidfile",    &pidFileName,
#	Line 183 | Line 175 | set_time(void)
175		{
176		static char to_send[200];
177		struct timeval newtime;
186	–	#ifdef _WIN32
187	–	FILETIME ft;
188	–
189	–	GetSystemTimeAsFileTime(&ft);
190	–	if (ft.dwLowDateTime < 0xd53e8000)
191	–	ft.dwHighDateTime--;
192	–	ft.dwLowDateTime -= 0xd53e8000;
193	–	ft.dwHighDateTime -= 0x19db1de;
194	–
195	–	newtime.tv_sec  = (*(uint64_t *) &ft) / 10000000;
196	–	newtime.tv_usec = (*(uint64_t *) &ft) / 10 % 1000000;
197	–	#else
178		newtime.tv_sec  = 0;
179		newtime.tv_usec = 0;
180
181		if (gettimeofday(&newtime, NULL) == -1)
182		{
183	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
183	>	ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
184		strerror(errno));
185	<	sendto_realops_flags(UMODE_ALL, L_ALL,
185	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
186		"Clock Failure (%s), TS can be corrupted",
187		strerror(errno));
188		restart("Clock Failure");
189		}
210	–	#endif
190
191		if (newtime.tv_sec < CurrentTime)
192		{
193	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
194	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
193	>	snprintf(to_send, sizeof(to_send),
194	>	"System clock is running backwards - (%lu < %lu)",
195	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
196		report_error(L_ALL, to_send, me.name, 0);
197		set_back_events(CurrentTime - newtime.tv_sec);
198		}
#	Line 270 | Line 250 | io_loop(void)
250		}
251		if (doremotd)
252		{
253	<	read_message_file(&ConfigFileEntry.motd);
254	<	sendto_realops_flags(UMODE_ALL, L_ALL,
255	<	"Got signal SIGUSR1, reloading ircd motd file");
253	>	motd_recache();
254	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
255	>	"Got signal SIGUSR1, reloading motd files");
256		doremotd = 0;
257		}
258		}
#	Line 313 | Line 293 | initialize_global_set_options(void)
293		}
294
295		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
316	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
296		/* End of global set options */
297		}
298
320	–	/* initialize_message_files()
321	–	*
322	–	* inputs       - none
323	–	* output       - none
324	–	* side effects - Set up all message files needed, motd etc.
325	–	*/
326	–	static void
327	–	initialize_message_files(void)
328	–	{
329	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
330	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
331	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
332	–
333	–	read_message_file(&ConfigFileEntry.motd);
334	–	read_message_file(&ConfigFileEntry.opermotd);
335	–	read_message_file(&ConfigFileEntry.linksfile);
336	–
337	–	init_isupport();
338	–	}
339	–
299		/* initialize_server_capabs()
300		*
301		* inputs       - none
#	Line 347 | Line 306 | initialize_server_capabs(void)
306		{
307		add_capability("QS", CAP_QS, 1);
308		add_capability("EOB", CAP_EOB, 1);
309	<
351	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
352	<	add_capability("TS6", CAP_TS6, 0);
353	<
354	<	add_capability("ZIP", CAP_ZIP, 0);
309	>	add_capability("TS6", CAP_TS6, 0);
310		add_capability("CLUSTER", CAP_CLUSTER, 1);
311	+	add_capability("SVS", CAP_SVS, 1);
312		#ifdef HALFOPS
313		add_capability("HOPS", CAP_HOPS, 1);
314		#endif
#	Line 367 | Line 323 | initialize_server_capabs(void)
323		static void
324		write_pidfile(const char *filename)
325		{
326	<	FBFILE *fb;
326	>	FILE *fb;
327
328	<	if ((fb = fbopen(filename, "w")))
328	>	if ((fb = fopen(filename, "w")))
329		{
330		char buff[32];
331		unsigned int pid = (unsigned int)getpid();
376	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
332
333	<	if ((fbputs(buff, fb, nbytes) == -1))
334	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
333	>	snprintf(buff, sizeof(buff), "%u\n", pid);
334	>
335	>	if ((fputs(buff, fb) == -1))
336	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
337		pid, filename, strerror(errno));
338
339	<	fbclose(fb);
383	<	return;
339	>	fclose(fb);
340		}
341		else
342		{
343	<	ilog(L_ERROR, "Error opening pid file %s", filename);
343	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
344		}
345		}
346
#	Line 399 | Line 355 | write_pidfile(const char *filename)
355		static void
356		check_pidfile(const char *filename)
357		{
358	<	#ifndef _WIN32
403	<	FBFILE *fb;
358	>	FILE *fb;
359		char buff[32];
360		pid_t pidfromfile;
361
362		/* Don't do logging here, since we don't have log() initialised */
363	<	if ((fb = fbopen(filename, "r")))
363	>	if ((fb = fopen(filename, "r")))
364		{
365	<	if (fbgets(buff, 20, fb) == NULL)
365	>	if (fgets(buff, 20, fb) == NULL)
366		{
367		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
368		* strerror(errno));
#	Line 425 | Line 380 | check_pidfile(const char *filename)
380		}
381		}
382
383	<	fbclose(fb);
383	>	fclose(fb);
384		}
385		else if (errno != ENOENT)
386		{
387		/* log(L_ERROR, "Error opening pid file %s", filename); */
388		}
434	–	#endif
389		}
390
391		/* setup_corefile()
#	Line 463 | Line 417 | setup_corefile(void)
417		* side effects - setups SSL context.
418		*/
419		static void
420	<	init_ssl(void)
420	>	ssl_init(void)
421		{
422		#ifdef HAVE_LIBCRYPTO
423		SSL_load_error_strings();
424		SSLeay_add_ssl_algorithms();
425
426	<	ServerInfo.ctx = SSL_CTX_new(SSLv23_server_method());
473	<	if (!ServerInfo.ctx)
426	>	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
427		{
428		const char *s;
429
430	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
430	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
431		s = ERR_lib_error_string(ERR_get_error()));
432	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
432	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
433		}
434
435	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_NO_SSLv2);
436	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
437	<	SSL_CTX_set_verify(ServerInfo.ctx, SSL_VERIFY_NONE, NULL);
435	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
436	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
437	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
438
439	<	bio_spare_fd = save_spare_fd("SSL private key validation");
440	<	#endif /* HAVE_LIBCRYPTO */
441	<	}
439	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
440	>	{
441	>	const char *s;
442
443	<	/* init_callbacks()
444	<	*
445	<	* inputs       - nothing
446	<	* output       - nothing
447	<	* side effects - setups standard hook points
448	<	*/
449	<	static void
450	<	init_callbacks(void)
451	<	{
499	<	iorecv_cb = register_callback("iorecv", iorecv_default);
500	<	iosend_cb = register_callback("iosend", iosend_default);
501	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
502	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
443	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
444	>	s = ERR_lib_error_string(ERR_get_error()));
445	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
446	>	}
447	>
448	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
449	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
450	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
451	>	#endif /* HAVE_LIBCRYPTO */
452		}
453
454		int
#	Line 508 | Line 457 | main(int argc, char *argv[])
457		/* Check to see if the user is running
458		* us as root, which is a nono
459		*/
511	–	#ifndef _WIN32
460		if (geteuid() == 0)
461		{
462		fprintf(stderr, "Don't run ircd as root!!!\n");
463	<	return(-1);
463	>	return -1;
464		}
465
466		/* Setup corefile size immediately after boot -kre */
467		setup_corefile();
520	–	#endif
468
469		/* save server boot time right away, so getrusage works correctly */
470		set_time();
471
472	<	/* It ain't random, but it ought to be a little harder to guess */
473	<	srand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
474	<	memset(&me, 0, sizeof(me));
528	<	memset(&meLocalUser, 0, sizeof(meLocalUser));
472	>	/* It ain't random, but it ought to be a little harder to guess */
473	>	init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
474	>
475		me.localClient = &meLocalUser;
476		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
477		of Client list */
532	–
533	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
534	–	memset(&ServerStats, 0, sizeof(ServerStats));
535	–
478		/* Initialise the channel capability usage counts... */
479		init_chcap_usage_counts();
480
481		ConfigFileEntry.dpath      = DPATH;
482	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
483	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
484	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
485	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
486	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
487	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
488	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
547	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
548	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
482	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
483	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
484	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
485	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
486	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
487	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
488	>
489		myargv = argv;
490		umask(077);                /* better safe than sorry --SRB */
491
#	Line 563 | Line 503 | main(int argc, char *argv[])
503		exit(EXIT_FAILURE);
504		}
505
506	<	init_ssl();
506	>	ssl_init();
507
568	–	#ifndef _WIN32
508		if (!server_state.foreground)
509		{
510		make_daemon();
#	Line 575 | Line 514 | main(int argc, char *argv[])
514		print_startup(getpid());
515
516		setup_signals();
578	–	#endif
579	–
580	–	get_ircd_platform(ircd_platform);
517
518		/* Init the event subsystem */
519		eventInit();
520		/* We need this to initialise the fd array before anything else */
521		fdlist_init();
522	<	init_log(logFileName);
522	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
523		check_can_use_v6();
524		init_comm();         /* This needs to be setup early ! -- adrian */
525		/* Check if there is pidfile and daemon already running */
526		check_pidfile(pidFileName);
527
528	<	#ifndef NOBALLOC
593	<	initBlockHeap();
594	<	#endif
528	>	mp_pool_init();
529		init_dlink_nodes();
530	<	init_callbacks();
597	<	initialize_message_files();
530	>	init_isupport();
531		dbuf_init();
532	<	init_hash();
532	>	hash_init();
533		init_ip_hash_table();      /* client host ip hash table */
534		init_host_hash();          /* Host-hashtable. */
535	<	clear_tree_parse();
536	<	init_client();
537	<	init_class();
605	<	init_whowas();
535	>	client_init();
536	>	class_init();
537	>	whowas_init();
538		watch_init();
539	+	auth_init();          /* Initialise the auth code */
540	+	init_resolver();      /* Needs to be setup before the io loop */
541	+	modules_init();
542		read_conf_files(1);   /* cold start init conf files */
608	–	me.id[0] = '\0';
543		init_uid();
610	–	init_auth();          /* Initialise the auth code */
611	–	#ifndef _WIN32
612	–	init_resolver();      /* Needs to be setup before the io loop */
613	–	#endif
544		initialize_server_capabs();   /* Set up default_server_capabs */
545		initialize_global_set_options();
546	<	init_channels();
546	>	channel_init();
547	>	motd_init();
548	>	#ifdef HAVE_LIBGEOIP
549	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
550	>	#endif
551
552	<	if (ServerInfo.name == NULL)
552	>	if (EmptyString(ServerInfo.sid))
553		{
554	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
554	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
555	>	exit(EXIT_FAILURE);
556	>	}
557	>
558	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
559	>
560	>	if (EmptyString(ServerInfo.name))
561	>	{
562	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
563		exit(EXIT_FAILURE);
564		}
565
566		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
567
568		/* serverinfo{} description must exist.  If not, error out.*/
569	<	if (ServerInfo.description == NULL)
569	>	if (EmptyString(ServerInfo.description))
570		{
571	<	ilog(L_CRIT,
630	<	"ERROR: No server description specified in serverinfo block.");
571	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
572		exit(EXIT_FAILURE);
573		}
574
575		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
576
577	<	me.from    = &me;
578	<	me.servptr = &me;
577	>	me.from                   = &me;
578	>	me.servptr                = &me;
579	>	me.localClient->lasttime  = CurrentTime;
580	>	me.localClient->since     = CurrentTime;
581	>	me.localClient->firsttime = CurrentTime;
582
583		SetMe(&me);
584		make_server(&me);
585
586	<	me.lasttime = me.since = me.firsttime = CurrentTime;
586	>	hash_add_id(&me);
587		hash_add_client(&me);
588
589		/* add ourselves to global_serv_list */
590		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
591
592	<	check_class();
592	>	load_kline_database();
593	>	load_dline_database();
594	>	load_gline_database();
595	>	load_xline_database();
596	>	load_resv_database();
597
650	–	#ifndef STATIC_MODULES
598		if (chdir(MODPATH))
599		{
600	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
600	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
601		exit(EXIT_FAILURE);
602		}
603
604		load_all_modules(1);
605		load_conf_modules();
606		load_core_modules(1);
607	+
608		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
609	<	chdir(ConfigFileEntry.dpath);
610	<	#else
611	<	load_all_modules(1);
612	<	#endif
609	>	if (chdir(ConfigFileEntry.dpath))
610	>	{
611	>	perror("chdir");
612	>	exit(EXIT_FAILURE);
613	>	}
614	>
615		/*
616		* assemble_umode_buffer() has to be called after
617		* reading conf/loading modules.
#	Line 670 | Line 620 | main(int argc, char *argv[])
620
621		write_pidfile(pidFileName);
622
623	<	ilog(L_NOTICE, "Server Ready");
623	>	ilog(LOG_TYPE_IRCD, "Server Ready");
624
625		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
626		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 679 | Line 629 | main(int argc, char *argv[])
629		/* No, 'cause after a restart it would cause all sorts of nick collides */
630		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
631
682	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
683	–
632		/* Setup the timeout check. I'll shift it later :)  -- adrian */
633		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
634
635	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
636	+
637		if (ConfigServerHide.links_delay > 0)
638		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
639		else

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)