ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/ircd.c (file contents), Revision 1316 by michael, Tue Mar 27 17:05:51 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 4161 by michael, Thu Jul 3 18:25:53 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  ircd.c: Starts up and runs the ircd.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file ircd.c
23	>	* \brief Starts up and runs the ircd.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28	<	#include "s_user.h"
28	>	#include "user.h"
29		#include "list.h"
30		#include "ircd.h"
31		#include "channel.h"
30	–	#include "channel_mode.h"
32		#include "client.h"
33		#include "event.h"
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd_signal.h"
38	<	#include "s_gline.h"
38	>	#include "gline.h"
39		#include "motd.h"
40	+	#include "conf.h"
41		#include "hostmask.h"
40	–	#include "numeric.h"
41	–	#include "packet.h"
42		#include "parse.h"
43	<	#include "irc_res.h"
43	>	#include "res.h"
44		#include "restart.h"
45		#include "rng_mt.h"
46	<	#include "s_auth.h"
46	>	#include "auth.h"
47		#include "s_bsd.h"
48	–	#include "conf.h"
48		#include "log.h"
49	<	#include "s_misc.h"
51	<	#include "s_serv.h"      /* try_connections */
49	>	#include "server.h"      /* try_connections */
50		#include "send.h"
51		#include "whowas.h"
52		#include "modules.h"
53		#include "memory.h"
54	<	#include "hook.h"
54	>	#include "mempool.h"
55		#include "ircd_getopt.h"
58	–	#include "balloc.h"
59	–	#include "motd.h"
60	–	#include "supported.h"
56		#include "watch.h"
57	+	#include "conf_db.h"
58	+	#include "conf_class.h"
59
60
61	<	/* /quote set variables */
62	<	struct SetOptions GlobalSetOptions;
61	>	#ifdef HAVE_LIBGEOIP
62	>	GeoIP *geoip_ctx;
63	>	#endif
64
67	–	/* configuration set from ircd.conf */
68	–	struct config_file_entry ConfigFileEntry;
69	–	/* server info set from ircd.conf */
70	–	struct server_info ServerInfo;
71	–	/* admin info set from ircd.conf */
72	–	struct admin_info AdminInfo = { NULL, NULL, NULL };
73	–	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
74	–	struct ServerState_t server_state = { 0 };
75	–	struct logging_entry ConfigLoggingEntry = { 1, 1 };
65		struct ServerStatistics ServerStats;
66		struct timeval SystemTime;
67		struct Client me;             /* That's me */
#	Line 82 | Line 71 | const char *logFileName = LPATH;
71		const char *pidFileName = PPATH;
72
73		char **myargv;
85	–	char ircd_platform[PLATFORMLEN];
74
75		int dorehash = 0;
76		int doremotd = 0;
#	Line 90 | Line 78 | int doremotd = 0;
78		/* Set to zero because it should be initialized later using
79		* initialize_server_capabs
80		*/
81	<	int default_server_capabs = 0;
81	>	unsigned int default_server_capabs;
82		unsigned int splitmode;
83		unsigned int splitchecking;
84		unsigned int split_users;
85		unsigned int split_servers;
86
87	<	/* Do klines the same way hybrid-6 did them, i.e. at the
88	<	* top of the next io_loop instead of in the same loop as
89	<	* the klines are being applied.
90	<	*
91	<	* This should fix strange CPU starvation as very indirectly reported.
92	<	* (Why do you people not email bug reports? WHY? WHY?)
93	<	*
94	<	* - Dianora
95	<	*/
87	>	static struct event event_cleanup_glines =
88	>	{
89	>	.name = "cleanup_glines",
90	>	.handler = cleanup_glines,
91	>	.when = CLEANUP_GLINES_TIME
92	>	};
93	>
94	>	static struct event event_cleanup_tklines =
95	>	{
96	>	.name = "cleanup_tklines",
97	>	.handler = cleanup_tklines,
98	>	.when = CLEANUP_TKLINES_TIME
99	>	};
100	>
101	>	static struct event event_try_connections =
102	>	{
103	>	.name = "try_connections",
104	>	.handler = try_connections,
105	>	.when = STARTUP_CONNECTIONS_TIME
106	>	};
107	>
108	>	static struct event event_comm_checktimeouts =
109	>	{
110	>	.name = "comm_checktimeouts",
111	>	.handler = comm_checktimeouts,
112	>	.when = 1
113	>	};
114
115	<	int rehashed_klines = 0;
115	>	static struct event event_save_all_databases =
116	>	{
117	>	.name = "save_all_databases",
118	>	.handler = save_all_databases,
119	>	.when = DATABASE_UPDATE_TIMEOUT
120	>	};
121	>
122	>	struct event event_write_links_file =
123	>	{
124	>	.name = "write_links_file",
125	>	.handler = write_links_file,
126	>	};
127
128
129		/*
#	Line 115 | Line 132 | int rehashed_klines = 0;
132		static void
133		print_startup(int pid)
134		{
135	<	printf("ircd: version %s\n", ircd_version);
135	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
136		printf("ircd: pid %d\n", pid);
137		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
138		: "foreground", ConfigFileEntry.dpath);
#	Line 142 | Line 159 | make_daemon(void)
159
160		static int printVersion = 0;
161
162	<	struct lgetopt myopts[] = {
163	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
164	<	STRING, "File to use for dline.conf"},
148	<	{"configfile", &ConfigFileEntry.configfile,
162	>	static struct lgetopt myopts[] =
163	>	{
164	>	{"configfile", &ConfigFileEntry.configfile,
165		STRING, "File to use for ircd.conf"},
166	<	{"klinefile",  &ConfigFileEntry.klinefile,
167	<	STRING, "File to use for kline.conf"},
168	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
169	<	STRING, "File to use for xline.conf"},
170	<	{"logfile",    &logFileName,
166	>	{"glinefile",  &ConfigFileEntry.glinefile,
167	>	STRING, "File to use for gline database"},
168	>	{"klinefile",  &ConfigFileEntry.klinefile,
169	>	STRING, "File to use for kline database"},
170	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
171	>	STRING, "File to use for dline database"},
172	>	{"xlinefile",  &ConfigFileEntry.xlinefile,
173	>	STRING, "File to use for xline database"},
174	>	{"resvfile",  &ConfigFileEntry.resvfile,
175	>	STRING, "File to use for resv database"},
176	>	{"logfile",    &logFileName,
177		STRING, "File to use for ircd.log"},
178		{"pidfile",    &pidFileName,
179		STRING, "File to use for process ID"},
180	<	{"foreground", &server_state.foreground,
180	>	{"foreground", &server_state.foreground,
181		YESNO, "Run in foreground (don't detach)"},
182	<	{"version",    &printVersion,
182	>	{"version",    &printVersion,
183		YESNO, "Print version and exit"},
184		{"help", NULL, USAGE, "Print this text"},
185		{NULL, NULL, STRING, NULL},
#	Line 166 | Line 188 | struct lgetopt myopts[] = {
188		void
189		set_time(void)
190		{
191	<	static char to_send[200];
170	<	struct timeval newtime;
171	<	newtime.tv_sec  = 0;
172	<	newtime.tv_usec = 0;
191	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
192
193		if (gettimeofday(&newtime, NULL) == -1)
194		{
195		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
196		strerror(errno));
197	<	sendto_realops_flags(UMODE_ALL, L_ALL,
197	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
198		"Clock Failure (%s), TS can be corrupted",
199		strerror(errno));
200	<	restart("Clock Failure");
200	>	server_die("Clock Failure", 1);
201		}
202
203		if (newtime.tv_sec < CurrentTime)
204		{
205	<	snprintf(to_send, sizeof(to_send),
206	<	"System clock is running backwards - (%lu < %lu)",
207	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
208	<	report_error(L_ALL, to_send, me.name, 0);
205	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
206	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
207	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
208	>	"System clock is running backwards - (%lu < %lu)",
209	>	(unsigned long)newtime.tv_sec,
210	>	(unsigned long)CurrentTime);
211		set_back_events(CurrentTime - newtime.tv_sec);
212		}
213
#	Line 197 | Line 218 | set_time(void)
218		static void
219		io_loop(void)
220		{
221	<	while (1 == 1)
221	>	while (1)
222		{
202	–	/*
203	–	* Maybe we want a flags word?
204	–	* ie. if (REHASHED_KLINES(global_flags))
205	–	* SET_REHASHED_KLINES(global_flags)
206	–	* CLEAR_REHASHED_KLINES(global_flags)
207	–	*
208	–	* - Dianora
209	–	*/
210	–	if (rehashed_klines)
211	–	{
212	–	check_conf_klines();
213	–	rehashed_klines = 0;
214	–	}
215	–
223		if (listing_client_list.head)
224		{
225		dlink_node *ptr = NULL, *ptr_next = NULL;
226		DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
227	<	{
221	<	struct Client *client_p = ptr->data;
222	<	assert(client_p->localClient->list_task);
223	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
224	<	}
227	>	safe_list_channels(ptr->data, 0);
228		}
229
230	<	/* Run pending events, then get the number of seconds to the next
231	<	* event
229	<	*/
230	<	while (eventNextTime() <= CurrentTime)
231	<	eventRun();
230	>	/* Run pending events */
231	>	event_run();
232
233		comm_select();
234		exit_aborted_clients();
235		free_exited_clients();
236	–	send_queued_all();
236
237		/* Check to see whether we have to rehash the configuration .. */
238		if (dorehash)
#	Line 241 | Line 240 | io_loop(void)
240		rehash(1);
241		dorehash = 0;
242		}
243	+
244		if (doremotd)
245		{
246	<	read_message_file(&ConfigFileEntry.motd);
247	<	sendto_realops_flags(UMODE_ALL, L_ALL,
248	<	"Got signal SIGUSR1, reloading ircd motd file");
246	>	motd_recache();
247	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
248	>	"Got signal SIGUSR1, reloading motd file(s)");
249		doremotd = 0;
250		}
251		}
#	Line 255 | Line 255 | io_loop(void)
255		*
256		* inputs       - none
257		* output       - none
258	<	* side effects - This sets all global set options needed
258	>	* side effects - This sets all global set options needed
259		*/
260		static void
261		initialize_global_set_options(void)
#	Line 289 | Line 289 | initialize_global_set_options(void)
289		/* End of global set options */
290		}
291
292	–	/* initialize_message_files()
293	–	*
294	–	* inputs       - none
295	–	* output       - none
296	–	* side effects - Set up all message files needed, motd etc.
297	–	*/
298	–	static void
299	–	initialize_message_files(void)
300	–	{
301	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
302	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
303	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
304	–
305	–	read_message_file(&ConfigFileEntry.motd);
306	–	read_message_file(&ConfigFileEntry.opermotd);
307	–	read_message_file(&ConfigFileEntry.linksfile);
308	–
309	–	init_isupport();
310	–	}
311	–
292		/* initialize_server_capabs()
293		*
294		* inputs       - none
#	Line 322 | Line 302 | initialize_server_capabs(void)
302		add_capability("TS6", CAP_TS6, 0);
303		add_capability("CLUSTER", CAP_CLUSTER, 1);
304		add_capability("SVS", CAP_SVS, 1);
305	<	#ifdef HALFOPS
305	>	add_capability("CHW", CAP_CHW, 1);
306		add_capability("HOPS", CAP_HOPS, 1);
327	–	#endif
307		}
308
309		/* write_pidfile()
#	Line 336 | Line 315 | initialize_server_capabs(void)
315		static void
316		write_pidfile(const char *filename)
317		{
318	<	FBFILE *fb;
318	>	FILE *fb;
319
320	<	if ((fb = fbopen(filename, "w")))
320	>	if ((fb = fopen(filename, "w")))
321		{
322	<	char buff[32];
322	>	char buff[IRCD_BUFSIZE];
323		unsigned int pid = (unsigned int)getpid();
345	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
324
325	<	if ((fbputs(buff, fb, nbytes) == -1))
325	>	snprintf(buff, sizeof(buff), "%u\n", pid);
326	>
327	>	if ((fputs(buff, fb) == -1))
328		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
329		pid, filename, strerror(errno));
330
331	<	fbclose(fb);
352	<	return;
331	>	fclose(fb);
332		}
333		else
334		{
#	Line 368 | Line 347 | write_pidfile(const char *filename)
347		static void
348		check_pidfile(const char *filename)
349		{
350	<	FBFILE *fb;
351	<	char buff[32];
350	>	FILE *fb;
351	>	char buff[IRCD_BUFSIZE];
352		pid_t pidfromfile;
353
354		/* Don't do logging here, since we don't have log() initialised */
355	<	if ((fb = fbopen(filename, "r")))
355	>	if ((fb = fopen(filename, "r")))
356		{
357	<	if (fbgets(buff, 20, fb) == NULL)
357	>	if (fgets(buff, 20, fb) == NULL)
358		{
359		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
360		* strerror(errno));
#	Line 393 | Line 372 | check_pidfile(const char *filename)
372		}
373		}
374
375	<	fbclose(fb);
375	>	fclose(fb);
376		}
377		else if (errno != ENOENT)
378		{
#	Line 423 | Line 402 | setup_corefile(void)
402		#endif
403		}
404
405	+	#ifdef HAVE_LIBCRYPTO
406	+	static int
407	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
408	+	{
409	+	return 1;
410	+	}
411	+	#endif
412	+
413		/* init_ssl()
414		*
415		* inputs       - nothing
#	Line 430 | 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	+	const unsigned char session_id[] = "ircd-hybrid";
424	+
425		SSL_load_error_strings();
426		SSLeay_add_ssl_algorithms();
427
428		if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
429		{
430	<	const char *s;
430	>	const char *s = ERR_lib_error_string(ERR_get_error());
431
432	<	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
444	<	s = ERR_lib_error_string(ERR_get_error()));
432	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
433		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
434		}
435
436		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
437	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
438	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
437	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
438	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
439	>	always_accept_verify_cb);
440	>	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
441	>
442	>	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
443	>	{
444	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
445	>
446	>	if (key)
447	>	{
448	>	SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
449	>	EC_KEY_free(key);
450	>	}
451	>	}
452	>
453	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
454	>	#endif
455
456		if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
457		{
458	<	const char *s;
458	>	const char *s = ERR_lib_error_string(ERR_get_error());
459
460	<	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
457	<	s = ERR_lib_error_string(ERR_get_error()));
460	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
461		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
462		}
463
464		SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
465	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
466	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
465	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
466	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
467	>	always_accept_verify_cb);
468		#endif /* HAVE_LIBCRYPTO */
469		}
470
467	–	/* init_callbacks()
468	–	*
469	–	* inputs       - nothing
470	–	* output       - nothing
471	–	* side effects - setups standard hook points
472	–	*/
473	–	static void
474	–	init_callbacks(void)
475	–	{
476	–	iorecv_cb = register_callback("iorecv", iorecv_default);
477	–	iosend_cb = register_callback("iosend", iosend_default);
478	–	}
479	–
471		int
472		main(int argc, char *argv[])
473		{
474	<	/* Check to see if the user is running
484	<	* us as root, which is a nono
485	<	*/
474	>	/* Check to see if the user is running us as root, which is a nono */
475		if (geteuid() == 0)
476		{
477	<	fprintf(stderr, "Don't run ircd as root!!!\n");
477	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
478		return -1;
479		}
480
#	Line 499 | Line 488 | main(int argc, char *argv[])
488		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
489
490		me.localClient = &meLocalUser;
491	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
491	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
492		of Client list */
493	<	/* Initialise the channel capability usage counts... */
505	<	init_chcap_usage_counts();
506	<
493	>	ConfigLoggingEntry.use_logging = 1;
494		ConfigFileEntry.dpath      = DPATH;
495	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
496	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
497	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
498	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
499	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
500	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
501	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
502	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
503	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
495	>	ConfigFileEntry.spath      = SPATH;
496	>	ConfigFileEntry.mpath      = MPATH;
497	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
498	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
499	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
500	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
501	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
502	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
503	>
504		myargv = argv;
505		umask(077);                /* better safe than sorry --SRB */
506
#	Line 521 | Line 508 | main(int argc, char *argv[])
508
509		if (printVersion)
510		{
511	<	printf("ircd: version %s\n", ircd_version);
511	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
512		exit(EXIT_SUCCESS);
513		}
514
#	Line 531 | Line 518 | main(int argc, char *argv[])
518		exit(EXIT_FAILURE);
519		}
520
521	<	init_ssl();
521	>	ssl_init();
522
523		if (!server_state.foreground)
524		{
#	Line 543 | Line 530 | main(int argc, char *argv[])
530
531		setup_signals();
532
546	–	get_ircd_platform(ircd_platform);
547	–
548	–	/* Init the event subsystem */
549	–	eventInit();
533		/* We need this to initialise the fd array before anything else */
534		fdlist_init();
535	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
535	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
536		check_can_use_v6();
537	<	init_comm();         /* This needs to be setup early ! -- adrian */
537	>	init_netio();         /* This needs to be setup early ! -- adrian */
538	>
539		/* Check if there is pidfile and daemon already running */
540		check_pidfile(pidFileName);
541
542	<	initBlockHeap();
542	>	mp_pool_init();
543		init_dlink_nodes();
544	<	init_callbacks();
561	<	initialize_message_files();
544	>	init_isupport();
545		dbuf_init();
546	<	init_hash();
546	>	hash_init();
547		init_ip_hash_table();      /* client host ip hash table */
548		init_host_hash();          /* Host-hashtable. */
549	<	clear_tree_parse();
550	<	init_client();
551	<	init_class();
569	<	init_whowas();
549	>	client_init();
550	>	class_init();
551	>	whowas_init();
552		watch_init();
553	<	init_auth();          /* Initialise the auth code */
553	>	auth_init();          /* Initialise the auth code */
554		init_resolver();      /* Needs to be setup before the io loop */
555	+	modules_init();
556		read_conf_files(1);   /* cold start init conf files */
557		init_uid();
558		initialize_server_capabs();   /* Set up default_server_capabs */
559		initialize_global_set_options();
560	<	init_channels();
560	>	channel_init();
561	>	read_links_file();
562	>	motd_init();
563	>	#ifdef HAVE_LIBGEOIP
564	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
565	>	#endif
566
567		if (EmptyString(ServerInfo.sid))
568		{
#	Line 612 | Line 600 | main(int argc, char *argv[])
600
601		hash_add_id(&me);
602		hash_add_client(&me);
603	<
603	>
604		/* add ourselves to global_serv_list */
605		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
606
607	+	load_kline_database();
608	+	load_dline_database();
609	+	load_gline_database();
610	+	load_xline_database();
611	+	load_resv_database();
612	+
613		if (chdir(MODPATH))
614		{
615		ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
#	Line 643 | Line 637 | main(int argc, char *argv[])
637
638		ilog(LOG_TYPE_IRCD, "Server Ready");
639
640	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
641	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
640	>	event_addish(&event_cleanup_glines, NULL);
641	>	event_addish(&event_cleanup_tklines, NULL);
642
643		/* We want try_connections to be called as soon as possible now! -- adrian */
644		/* No, 'cause after a restart it would cause all sorts of nick collides */
645	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
645	>	event_addish(&event_try_connections, NULL);
646
647		/* Setup the timeout check. I'll shift it later :)  -- adrian */
648	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
648	>	event_addish(&event_comm_checktimeouts, NULL);
649	>
650	>	event_addish(&event_save_all_databases, NULL);
651
652		if (ConfigServerHide.links_delay > 0)
653	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
653	>	{
654	>	event_write_links_file.when = ConfigServerHide.links_delay;
655	>	event_addish(&event_write_links_file, NULL);
656	>	}
657		else
658		ConfigServerHide.links_disabled = 1;
659
660		if (splitmode)
661	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
661	>	event_addish(&splitmode_event, NULL);
662
663		io_loop();
664		return 0;

Diff Legend

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