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 982 by michael, Thu Aug 13 22:15:08 2009 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 3167 by michael, Sat Mar 15 22:01:39 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"
29	<	#include "tools.h"
29	>	#include "list.h"
30		#include "ircd.h"
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
32	–	#include "common.h"
34		#include "event.h"
35		#include "fdlist.h"
36		#include "hash.h"
37		#include "irc_string.h"
37	–	#include "sprintf_irc.h"
38		#include "ircd_signal.h"
39	–	#include "list.h"
39		#include "s_gline.h"
40		#include "motd.h"
41	<	#include "ircd_handler.h"
43	<	#include "msg.h"         /* msgtab */
41	>	#include "conf.h"
42		#include "hostmask.h"
43		#include "numeric.h"
44		#include "packet.h"
#	Line 50 | Line 48
48		#include "rng_mt.h"
49		#include "s_auth.h"
50		#include "s_bsd.h"
51	<	#include "s_conf.h"
54	<	#include "s_log.h"
51	>	#include "log.h"
52		#include "s_misc.h"
53		#include "s_serv.h"      /* try_connections */
54		#include "send.h"
55		#include "whowas.h"
56		#include "modules.h"
57		#include "memory.h"
58	+	#include "mempool.h"
59		#include "hook.h"
60		#include "ircd_getopt.h"
63	–	#include "balloc.h"
64	–	#include "motd.h"
61		#include "supported.h"
62		#include "watch.h"
63	+	#include "conf_db.h"
64	+	#include "conf_class.h"
65
66	<	/* Try and find the correct name to use with getrlimit() for setting the max.
67	<	* number of files allowed to be open by this process.
68	<	*/
66	>
67	>	#ifdef HAVE_LIBGEOIP
68	>	GeoIP *geoip_ctx;
69	>	#endif
70
71		/* /quote set variables */
72		struct SetOptions GlobalSetOptions;
73	<
74	<	/* configuration set from ircd.conf */
76	<	struct config_file_entry ConfigFileEntry;
77	<	/* server info set from ircd.conf */
78	<	struct server_info ServerInfo;
79	<	/* admin info set from ircd.conf */
80	<	struct admin_info AdminInfo = { NULL, NULL, NULL };
81	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
82	<	struct ServerState_t server_state = { 0 };
83	<	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
73	>	struct Counter Count;
74	>	struct ServerState_t server_state;
75		struct ServerStatistics ServerStats;
76		struct timeval SystemTime;
77		struct Client me;             /* That's me */
#	Line 90 | Line 81 | const char *logFileName = LPATH;
81		const char *pidFileName = PPATH;
82
83		char **myargv;
93	–	char ircd_platform[PLATFORMLEN];
84
85		int dorehash = 0;
86		int doremotd = 0;
97	–	time_t nextconnect = 1;       /* time for next try_connections call */
87
88		/* Set to zero because it should be initialized later using
89		* initialize_server_capabs
90		*/
91		int default_server_capabs = 0;
92	<
93	<	#ifdef HAVE_LIBCRYPTO
94	<	int bio_spare_fd = -1;
106	<	#endif
107	<
108	<	int splitmode;
109	<	int splitchecking;
110	<	int split_users;
92	>	unsigned int splitmode;
93	>	unsigned int splitchecking;
94	>	unsigned int split_users;
95		unsigned int split_servers;
96
97		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 123 | Line 107 | unsigned int split_servers;
107		int rehashed_klines = 0;
108
109
126	–	#ifndef _WIN32
110		/*
111		* print_startup - print startup information
112		*/
113		static void
114		print_startup(int pid)
115		{
116	<	printf("ircd: version %s\n", ircd_version);
116	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
117		printf("ircd: pid %d\n", pid);
118		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
119		: "foreground", ConfigFileEntry.dpath);
#	Line 154 | Line 137 | make_daemon(void)
137
138		setsid();
139		}
157	–	#endif
140
141		static int printVersion = 0;
142
143	<	struct lgetopt myopts[] = {
144	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
163	<	STRING, "File to use for dline.conf"},
164	<	{"configfile", &ConfigFileEntry.configfile,
143	>	static struct lgetopt myopts[] = {
144	>	{"configfile", &ConfigFileEntry.configfile,
145		STRING, "File to use for ircd.conf"},
146	<	{"klinefile",  &ConfigFileEntry.klinefile,
147	<	STRING, "File to use for kline.conf"},
148	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
149	<	STRING, "File to use for xline.conf"},
150	<	{"logfile",    &logFileName,
146	>	{"glinefile",  &ConfigFileEntry.glinefile,
147	>	STRING, "File to use for gline database"},
148	>	{"klinefile",  &ConfigFileEntry.klinefile,
149	>	STRING, "File to use for kline database"},
150	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
151	>	STRING, "File to use for dline database"},
152	>	{"xlinefile",  &ConfigFileEntry.xlinefile,
153	>	STRING, "File to use for xline database"},
154	>	{"resvfile",  &ConfigFileEntry.resvfile,
155	>	STRING, "File to use for resv database"},
156	>	{"logfile",    &logFileName,
157		STRING, "File to use for ircd.log"},
158		{"pidfile",    &pidFileName,
159		STRING, "File to use for process ID"},
160	<	{"foreground", &server_state.foreground,
160	>	{"foreground", &server_state.foreground,
161		YESNO, "Run in foreground (don't detach)"},
162	<	{"version",    &printVersion,
162	>	{"version",    &printVersion,
163		YESNO, "Print version and exit"},
164		{"help", NULL, USAGE, "Print this text"},
165		{NULL, NULL, STRING, NULL},
#	Line 182 | Line 168 | struct lgetopt myopts[] = {
168		void
169		set_time(void)
170		{
171	<	static char to_send[200];
186	<	struct timeval newtime;
187	<	#ifdef _WIN32
188	<	FILETIME ft;
189	<
190	<	GetSystemTimeAsFileTime(&ft);
191	<	if (ft.dwLowDateTime < 0xd53e8000)
192	<	ft.dwHighDateTime--;
193	<	ft.dwLowDateTime -= 0xd53e8000;
194	<	ft.dwHighDateTime -= 0x19db1de;
195	<
196	<	newtime.tv_sec  = (*(uint64_t *) &ft) / 10000000;
197	<	newtime.tv_usec = (*(uint64_t *) &ft) / 10 % 1000000;
198	<	#else
199	<	newtime.tv_sec  = 0;
200	<	newtime.tv_usec = 0;
171	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
172
173		if (gettimeofday(&newtime, NULL) == -1)
174		{
175	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
175	>	ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
176		strerror(errno));
177	<	sendto_realops_flags(UMODE_ALL, L_ALL,
177	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
178		"Clock Failure (%s), TS can be corrupted",
179		strerror(errno));
180	<	restart("Clock Failure");
180	>	server_die("Clock Failure", 1);
181		}
211	–	#endif
182
183		if (newtime.tv_sec < CurrentTime)
184		{
185	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
186	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
187	<	report_error(L_ALL, to_send, me.name, 0);
185	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
186	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
187	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
188	>	"System clock is running backwards - (%lu < %lu)",
189	>	(unsigned long)newtime.tv_sec,
190	>	(unsigned long)CurrentTime);
191		set_back_events(CurrentTime - newtime.tv_sec);
192		}
193
#	Line 229 | Line 202 | io_loop(void)
202		{
203		/*
204		* Maybe we want a flags word?
205	<	* ie. if (REHASHED_KLINES(global_flags))
205	>	* ie. if (REHASHED_KLINES(global_flags))
206		* SET_REHASHED_KLINES(global_flags)
207		* CLEAR_REHASHED_KLINES(global_flags)
208		*
#	Line 261 | Line 234 | io_loop(void)
234		comm_select();
235		exit_aborted_clients();
236		free_exited_clients();
264	–	send_queued_all();
237
238		/* Check to see whether we have to rehash the configuration .. */
239		if (dorehash)
#	Line 271 | Line 243 | io_loop(void)
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 283 | 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 314 | Line 286 | initialize_global_set_options(void)
286		}
287
288		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
317	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
289		/* End of global set options */
290		}
291
321	–	/* initialize_message_files()
322	–	*
323	–	* inputs       - none
324	–	* output       - none
325	–	* side effects - Set up all message files needed, motd etc.
326	–	*/
327	–	static void
328	–	initialize_message_files(void)
329	–	{
330	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
331	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
332	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
333	–
334	–	read_message_file(&ConfigFileEntry.motd);
335	–	read_message_file(&ConfigFileEntry.opermotd);
336	–	read_message_file(&ConfigFileEntry.linksfile);
337	–
338	–	init_isupport();
339	–	}
340	–
292		/* initialize_server_capabs()
293		*
294		* inputs       - none
#	Line 348 | Line 299 | initialize_server_capabs(void)
299		{
300		add_capability("QS", CAP_QS, 1);
301		add_capability("EOB", CAP_EOB, 1);
302	<
352	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
353	<	add_capability("TS6", CAP_TS6, 0);
354	<
355	<	add_capability("ZIP", CAP_ZIP, 0);
302	>	add_capability("TS6", CAP_TS6, 0);
303		add_capability("CLUSTER", CAP_CLUSTER, 1);
304	+	add_capability("SVS", CAP_SVS, 1);
305		#ifdef HALFOPS
306		add_capability("HOPS", CAP_HOPS, 1);
307		#endif
#	Line 368 | Line 316 | initialize_server_capabs(void)
316		static void
317		write_pidfile(const char *filename)
318		{
319	<	FBFILE *fb;
319	>	FILE *fb;
320
321	<	if ((fb = fbopen(filename, "w")))
321	>	if ((fb = fopen(filename, "w")))
322		{
323	<	char buff[32];
323	>	char buff[IRCD_BUFSIZE];
324		unsigned int pid = (unsigned int)getpid();
377	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
325
326	<	if ((fbputs(buff, fb, nbytes) == -1))
327	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
326	>	snprintf(buff, sizeof(buff), "%u\n", pid);
327	>
328	>	if ((fputs(buff, fb) == -1))
329	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
330		pid, filename, strerror(errno));
331
332	<	fbclose(fb);
384	<	return;
332	>	fclose(fb);
333		}
334		else
335		{
336	<	ilog(L_ERROR, "Error opening pid file %s", filename);
336	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
337		}
338		}
339
#	Line 400 | Line 348 | write_pidfile(const char *filename)
348		static void
349		check_pidfile(const char *filename)
350		{
351	<	#ifndef _WIN32
352	<	FBFILE *fb;
405	<	char buff[32];
351	>	FILE *fb;
352	>	char buff[IRCD_BUFSIZE];
353		pid_t pidfromfile;
354
355		/* Don't do logging here, since we don't have log() initialised */
356	<	if ((fb = fbopen(filename, "r")))
356	>	if ((fb = fopen(filename, "r")))
357		{
358	<	if (fbgets(buff, 20, fb) == NULL)
358	>	if (fgets(buff, 20, fb) == NULL)
359		{
360		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
361		* strerror(errno));
#	Line 426 | Line 373 | check_pidfile(const char *filename)
373		}
374		}
375
376	<	fbclose(fb);
376	>	fclose(fb);
377		}
378		else if (errno != ENOENT)
379		{
380		/* log(L_ERROR, "Error opening pid file %s", filename); */
381		}
435	–	#endif
382		}
383
384		/* setup_corefile()
#	Line 457 | Line 403 | setup_corefile(void)
403		#endif
404		}
405
406	+	#ifdef HAVE_LIBCRYPTO
407	+	static int
408	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
409	+	{
410	+	return 1;
411	+	}
412	+	#endif
413	+
414		/* init_ssl()
415		*
416		* inputs       - nothing
#	Line 464 | Line 418 | setup_corefile(void)
418		* side effects - setups SSL context.
419		*/
420		static void
421	<	init_ssl(void)
421	>	ssl_init(void)
422		{
423		#ifdef HAVE_LIBCRYPTO
424	+	const unsigned char session_id[] = "ircd-hybrid";
425	+
426		SSL_load_error_strings();
427		SSLeay_add_ssl_algorithms();
428
#	Line 474 | Line 430 | init_ssl(void)
430		{
431		const char *s;
432
433	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
433	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
434		s = ERR_lib_error_string(ERR_get_error()));
435	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
435	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
436		}
437
438	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
438	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
439		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
440	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
440	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
441	>	always_accept_verify_cb);
442	>	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
443
444	<	bio_spare_fd = save_spare_fd("SSL private key validation");
445	<	#endif /* HAVE_LIBCRYPTO */
446	<	}
444	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
445	>	{
446	>	const char *s;
447
448	<	/* init_callbacks()
449	<	*
450	<	* inputs       - nothing
451	<	* output       - nothing
452	<	* side effects - setups standard hook points
453	<	*/
454	<	static void
455	<	init_callbacks(void)
456	<	{
457	<	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);
448	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
449	>	s = ERR_lib_error_string(ERR_get_error()));
450	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
451	>	}
452	>
453	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
454	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
455	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
456	>	always_accept_verify_cb);
457	>	#endif /* HAVE_LIBCRYPTO */
458		}
459
460		int
461		main(int argc, char *argv[])
462		{
463	<	/* Check to see if the user is running
509	<	* us as root, which is a nono
510	<	*/
511	<	#ifndef _WIN32
463	>	/* Check to see if the user is running us as root, which is a nono */
464		if (geteuid() == 0)
465		{
466		fprintf(stderr, "Don't run ircd as root!!!\n");
#	Line 517 | Line 469 | main(int argc, char *argv[])
469
470		/* Setup corefile size immediately after boot -kre */
471		setup_corefile();
520	–	#endif
472
473		/* save server boot time right away, so getrusage works correctly */
474		set_time();
#	Line 525 | Line 476 | main(int argc, char *argv[])
476		/* It ain't random, but it ought to be a little harder to guess */
477		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
478
528	–	memset(&me, 0, sizeof(me));
529	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
479		me.localClient = &meLocalUser;
480	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
480	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
481		of Client list */
533	–
534	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
535	–	memset(&ServerStats, 0, sizeof(ServerStats));
536	–
537	–	/* Initialise the channel capability usage counts... */
538	–	init_chcap_usage_counts();
539	–
482		ConfigFileEntry.dpath      = DPATH;
483	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
484	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
485	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
486	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
487	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
488	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
489	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
548	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
549	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
483	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
484	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
485	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
486	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
487	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
488	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
489	>
490		myargv = argv;
491		umask(077);                /* better safe than sorry --SRB */
492
#	Line 554 | Line 494 | main(int argc, char *argv[])
494
495		if (printVersion)
496		{
497	<	printf("ircd: version %s\n", ircd_version);
497	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
498		exit(EXIT_SUCCESS);
499		}
500
#	Line 564 | Line 504 | main(int argc, char *argv[])
504		exit(EXIT_FAILURE);
505		}
506
507	<	init_ssl();
507	>	ssl_init();
508
569	–	#ifndef _WIN32
509		if (!server_state.foreground)
510		{
511		make_daemon();
#	Line 576 | Line 515 | main(int argc, char *argv[])
515		print_startup(getpid());
516
517		setup_signals();
579	–	#endif
580	–
581	–	get_ircd_platform(ircd_platform);
518
519		/* Init the event subsystem */
520		eventInit();
521	+
522		/* We need this to initialise the fd array before anything else */
523		fdlist_init();
524	<	init_log(logFileName);
524	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
525		check_can_use_v6();
526	<	init_comm();         /* This needs to be setup early ! -- adrian */
526	>	init_netio();         /* This needs to be setup early ! -- adrian */
527	>
528		/* Check if there is pidfile and daemon already running */
529		check_pidfile(pidFileName);
530
531	<	#ifndef NOBALLOC
594	<	initBlockHeap();
595	<	#endif
531	>	mp_pool_init();
532		init_dlink_nodes();
533	<	init_callbacks();
598	<	initialize_message_files();
533	>	init_isupport();
534		dbuf_init();
535	<	init_hash();
535	>	hash_init();
536		init_ip_hash_table();      /* client host ip hash table */
537		init_host_hash();          /* Host-hashtable. */
538	<	clear_tree_parse();
539	<	init_client();
540	<	init_class();
606	<	init_whowas();
538	>	client_init();
539	>	class_init();
540	>	whowas_init();
541		watch_init();
542	+	auth_init();          /* Initialise the auth code */
543	+	init_resolver();      /* Needs to be setup before the io loop */
544	+	modules_init();
545		read_conf_files(1);   /* cold start init conf files */
609	–	me.id[0] = '\0';
546		init_uid();
611	–	init_auth();          /* Initialise the auth code */
612	–	#ifndef _WIN32
613	–	init_resolver();      /* Needs to be setup before the io loop */
614	–	#endif
547		initialize_server_capabs();   /* Set up default_server_capabs */
548		initialize_global_set_options();
549	<	init_channels();
549	>	channel_init();
550	>	read_links_file();
551	>	motd_init();
552	>	#ifdef HAVE_LIBGEOIP
553	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
554	>	#endif
555	>
556	>	if (EmptyString(ServerInfo.sid))
557	>	{
558	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
559	>	exit(EXIT_FAILURE);
560	>	}
561	>
562	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
563
564	<	if (ServerInfo.name == NULL)
564	>	if (EmptyString(ServerInfo.name))
565		{
566	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
566	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
567		exit(EXIT_FAILURE);
568		}
569
570		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
571
572		/* serverinfo{} description must exist.  If not, error out.*/
573	<	if (ServerInfo.description == NULL)
573	>	if (EmptyString(ServerInfo.description))
574		{
575	<	ilog(L_CRIT,
631	<	"ERROR: No server description specified in serverinfo block.");
575	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
576		exit(EXIT_FAILURE);
577		}
578
579		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
580
581	<	me.from    = &me;
582	<	me.servptr = &me;
581	>	me.from                   = &me;
582	>	me.servptr                = &me;
583	>	me.localClient->lasttime  = CurrentTime;
584	>	me.localClient->since     = CurrentTime;
585	>	me.localClient->firsttime = CurrentTime;
586
587		SetMe(&me);
588		make_server(&me);
589
590	<	me.lasttime = me.since = me.firsttime = CurrentTime;
590	>	hash_add_id(&me);
591		hash_add_client(&me);
592	<
592	>
593		/* add ourselves to global_serv_list */
594		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
595
596	<	check_class();
596	>	load_kline_database();
597	>	load_dline_database();
598	>	load_gline_database();
599	>	load_xline_database();
600	>	load_resv_database();
601
651	–	#ifndef STATIC_MODULES
602		if (chdir(MODPATH))
603		{
604	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
604	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
605		exit(EXIT_FAILURE);
606		}
607
608		load_all_modules(1);
609		load_conf_modules();
610		load_core_modules(1);
611	+
612		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
613	<	chdir(ConfigFileEntry.dpath);
614	<	#else
615	<	load_all_modules(1);
616	<	#endif
613	>	if (chdir(ConfigFileEntry.dpath))
614	>	{
615	>	perror("chdir");
616	>	exit(EXIT_FAILURE);
617	>	}
618	>
619		/*
620		* assemble_umode_buffer() has to be called after
621		* reading conf/loading modules.
#	Line 671 | Line 624 | main(int argc, char *argv[])
624
625		write_pidfile(pidFileName);
626
627	<	ilog(L_NOTICE, "Server Ready");
627	>	ilog(LOG_TYPE_IRCD, "Server Ready");
628
629		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
630		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 680 | Line 633 | main(int argc, char *argv[])
633		/* No, 'cause after a restart it would cause all sorts of nick collides */
634		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
635
683	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
684	–
636		/* Setup the timeout check. I'll shift it later :)  -- adrian */
637		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
638
639	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
640	+
641		if (ConfigServerHide.links_delay > 0)
642		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
643		else

Diff Legend

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