ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/ircd.c (file contents), Revision 1149 by michael, Sun Jul 31 20:04:17 2011 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 4209 by michael, Sat Jul 12 18:15:19 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"
32	–	#include "common.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 "ircd_handler.h"
41	<	#include "msg.h"         /* msgtab */
40	>	#include "conf.h"
41		#include "hostmask.h"
43	–	#include "numeric.h"
44	–	#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 "s_conf.h"
49	<	#include "s_log.h"
53	<	#include "s_misc.h"
54	<	#include "s_serv.h"      /* try_connections */
48	>	#include "log.h"
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"
61	–	#include "balloc.h"
62	–	#include "motd.h"
63	–	#include "supported.h"
56		#include "watch.h"
57	+	#include "conf_db.h"
58	+	#include "conf_class.h"
59
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	–	*/
60
61	<	/* /quote set variables */
62	<	struct SetOptions GlobalSetOptions;
61	>	#ifdef HAVE_LIBGEOIP
62	>	GeoIP *geoip_ctx;
63	>	#endif
64
73	–	/* configuration set from ircd.conf */
74	–	struct config_file_entry ConfigFileEntry;
75	–	/* server info set from ircd.conf */
76	–	struct server_info ServerInfo;
77	–	/* admin info set from ircd.conf */
78	–	struct admin_info AdminInfo = { NULL, NULL, NULL };
79	–	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
80	–	struct ServerState_t server_state = { 0 };
81	–	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
65		struct ServerStatistics ServerStats;
66		struct timeval SystemTime;
67		struct Client me;             /* That's me */
#	Line 88 | Line 71 | const char *logFileName = LPATH;
71		const char *pidFileName = PPATH;
72
73		char **myargv;
91	–	char ircd_platform[PLATFORMLEN];
74
75		int dorehash = 0;
76		int doremotd = 0;
#	Line 96 | 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;
100	<
101	<	#ifdef HAVE_LIBCRYPTO
102	<	int bio_spare_fd = -1;
103	<	#endif
104	<
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 126 | 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 153 | 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"},
159	<	{"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 177 | Line 188 | struct lgetopt myopts[] = {
188		void
189		set_time(void)
190		{
191	<	static char to_send[200];
181	<	struct timeval newtime;
182	<	newtime.tv_sec  = 0;
183	<	newtime.tv_usec = 0;
191	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
192
193		if (gettimeofday(&newtime, NULL) == -1)
194		{
195	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
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 208 | Line 218 | set_time(void)
218		static void
219		io_loop(void)
220		{
221	<	while (1 == 1)
221	>	while (1)
222		{
213	–	/*
214	–	* Maybe we want a flags word?
215	–	* ie. if (REHASHED_KLINES(global_flags))
216	–	* SET_REHASHED_KLINES(global_flags)
217	–	* CLEAR_REHASHED_KLINES(global_flags)
218	–	*
219	–	* - Dianora
220	–	*/
221	–	if (rehashed_klines)
222	–	{
223	–	check_conf_klines();
224	–	rehashed_klines = 0;
225	–	}
226	–
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	<	{
232	<	struct Client *client_p = ptr->data;
233	<	assert(client_p->localClient->list_task);
234	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
235	<	}
227	>	safe_list_channels(ptr->data, 0);
228		}
229
230	<	/* Run pending events, then get the number of seconds to the next
231	<	* event
240	<	*/
241	<	while (eventNextTime() <= CurrentTime)
242	<	eventRun();
230	>	/* Run pending events */
231	>	event_run();
232
233		comm_select();
234		exit_aborted_clients();
235		free_exited_clients();
247	–	send_queued_all();
236
237		/* Check to see whether we have to rehash the configuration .. */
238		if (dorehash)
#	Line 252 | 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 266 | 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)
262		{
274	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
275	–
263		GlobalSetOptions.autoconn  = 1;
264		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
265		GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
#	Line 297 | Line 284 | initialize_global_set_options(void)
284		}
285
286		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
300	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
301	–	/* End of global set options */
302	–	}
303	–
304	–	/* initialize_message_files()
305	–	*
306	–	* inputs       - none
307	–	* output       - none
308	–	* side effects - Set up all message files needed, motd etc.
309	–	*/
310	–	static void
311	–	initialize_message_files(void)
312	–	{
313	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
314	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
315	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
316	–
317	–	read_message_file(&ConfigFileEntry.motd);
318	–	read_message_file(&ConfigFileEntry.opermotd);
319	–	read_message_file(&ConfigFileEntry.linksfile);
320	–
321	–	init_isupport();
287		}
288
289		/* initialize_server_capabs()
#	Line 332 | Line 297 | initialize_server_capabs(void)
297		add_capability("QS", CAP_QS, 1);
298		add_capability("EOB", CAP_EOB, 1);
299		add_capability("TS6", CAP_TS6, 0);
335	–	add_capability("ZIP", CAP_ZIP, 0);
300		add_capability("CLUSTER", CAP_CLUSTER, 1);
301	<	#ifdef HALFOPS
301	>	add_capability("SVS", CAP_SVS, 1);
302	>	add_capability("CHW", CAP_CHW, 1);
303		add_capability("HOPS", CAP_HOPS, 1);
339	–	#endif
304		}
305
306		/* write_pidfile()
#	Line 348 | Line 312 | initialize_server_capabs(void)
312		static void
313		write_pidfile(const char *filename)
314		{
315	<	FBFILE *fb;
315	>	FILE *fb;
316
317	<	if ((fb = fbopen(filename, "w")))
317	>	if ((fb = fopen(filename, "w")))
318		{
319	<	char buff[32];
319	>	char buff[IRCD_BUFSIZE];
320		unsigned int pid = (unsigned int)getpid();
357	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
321
322	<	if ((fbputs(buff, fb, nbytes) == -1))
323	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
322	>	snprintf(buff, sizeof(buff), "%u\n", pid);
323	>
324	>	if ((fputs(buff, fb) == -1))
325	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
326		pid, filename, strerror(errno));
327
328	<	fbclose(fb);
364	<	return;
328	>	fclose(fb);
329		}
330		else
331		{
332	<	ilog(L_ERROR, "Error opening pid file %s", filename);
332	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
333		}
334		}
335
#	Line 380 | Line 344 | write_pidfile(const char *filename)
344		static void
345		check_pidfile(const char *filename)
346		{
347	<	FBFILE *fb;
348	<	char buff[32];
347	>	FILE *fb;
348	>	char buff[IRCD_BUFSIZE];
349		pid_t pidfromfile;
350
351		/* Don't do logging here, since we don't have log() initialised */
352	<	if ((fb = fbopen(filename, "r")))
352	>	if ((fb = fopen(filename, "r")))
353		{
354	<	if (fbgets(buff, 20, fb) == NULL)
354	>	if (fgets(buff, 20, fb) == NULL)
355		{
356		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
357		* strerror(errno));
#	Line 405 | Line 369 | check_pidfile(const char *filename)
369		}
370		}
371
372	<	fbclose(fb);
372	>	fclose(fb);
373		}
374		else if (errno != ENOENT)
375		{
#	Line 435 | Line 399 | setup_corefile(void)
399		#endif
400		}
401
402	+	#ifdef HAVE_LIBCRYPTO
403	+	static int
404	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
405	+	{
406	+	return 1;
407	+	}
408	+	#endif
409	+
410		/* init_ssl()
411		*
412		* inputs       - nothing
#	Line 442 | Line 414 | setup_corefile(void)
414		* side effects - setups SSL context.
415		*/
416		static void
417	<	init_ssl(void)
417	>	ssl_init(void)
418		{
419		#ifdef HAVE_LIBCRYPTO
420	+	const unsigned char session_id[] = "ircd-hybrid";
421	+
422		SSL_load_error_strings();
423		SSLeay_add_ssl_algorithms();
424
425		if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
426		{
427	<	const char *s;
427	>	const char *s = ERR_lib_error_string(ERR_get_error());
428
429	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
430	<	s = ERR_lib_error_string(ERR_get_error()));
457	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
429	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
430	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
431		}
432
433	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
434	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
435	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
433	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
434	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
435	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
436	>	always_accept_verify_cb);
437	>	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
438
439	<	bio_spare_fd = save_spare_fd("SSL private key validation");
440	<	#endif /* HAVE_LIBCRYPTO */
441	<	}
439	>	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
440	>	{
441	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
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	<	{
452	<	iorecv_cb = register_callback("iorecv", iorecv_default);
453	<	iosend_cb = register_callback("iosend", iosend_default);
454	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
455	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
443	>	if (key)
444	>	{
445	>	SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
446	>	EC_KEY_free(key);
447	>	}
448	>	}
449	>
450	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
451	>	#endif
452	>
453	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
454	>	{
455	>	const char *s = ERR_lib_error_string(ERR_get_error());
456	>
457	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
458	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
459	>	}
460	>
461	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
462	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
463	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
464	>	always_accept_verify_cb);
465	>	#endif /* HAVE_LIBCRYPTO */
466		}
467
468		int
469		main(int argc, char *argv[])
470		{
471	<	/* Check to see if the user is running
487	<	* us as root, which is a nono
488	<	*/
471	>	/* Check to see if the user is running us as root, which is a nono */
472		if (geteuid() == 0)
473		{
474	<	fprintf(stderr, "Don't run ircd as root!!!\n");
474	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
475		return -1;
476		}
477
#	Line 502 | Line 485 | main(int argc, char *argv[])
485		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
486
487		me.localClient = &meLocalUser;
488	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
488	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
489		of Client list */
490	<	/* Initialise the channel capability usage counts... */
508	<	init_chcap_usage_counts();
509	<
490	>	ConfigLoggingEntry.use_logging = 1;
491		ConfigFileEntry.dpath      = DPATH;
492	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
493	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
494	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
495	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
496	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
497	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
498	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
499	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
500	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
492	>	ConfigFileEntry.spath      = SPATH;
493	>	ConfigFileEntry.mpath      = MPATH;
494	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
495	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
496	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
497	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
498	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
499	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
500	>
501		myargv = argv;
502		umask(077);                /* better safe than sorry --SRB */
503
#	Line 524 | Line 505 | main(int argc, char *argv[])
505
506		if (printVersion)
507		{
508	<	printf("ircd: version %s\n", ircd_version);
508	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
509		exit(EXIT_SUCCESS);
510		}
511
#	Line 534 | Line 515 | main(int argc, char *argv[])
515		exit(EXIT_FAILURE);
516		}
517
518	<	init_ssl();
518	>	ssl_init();
519
520		if (!server_state.foreground)
521		{
#	Line 546 | Line 527 | main(int argc, char *argv[])
527
528		setup_signals();
529
549	–	get_ircd_platform(ircd_platform);
550	–
551	–	/* Init the event subsystem */
552	–	eventInit();
530		/* We need this to initialise the fd array before anything else */
531		fdlist_init();
532	<	init_log(logFileName);
532	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
533		check_can_use_v6();
534	<	init_comm();         /* This needs to be setup early ! -- adrian */
534	>	init_netio();         /* This needs to be setup early ! -- adrian */
535	>
536		/* Check if there is pidfile and daemon already running */
537		check_pidfile(pidFileName);
538
539	<	initBlockHeap();
539	>	mp_pool_init();
540		init_dlink_nodes();
541	<	init_callbacks();
564	<	initialize_message_files();
541	>	init_isupport();
542		dbuf_init();
543	<	init_hash();
543	>	hash_init();
544		init_ip_hash_table();      /* client host ip hash table */
545		init_host_hash();          /* Host-hashtable. */
546	<	clear_tree_parse();
547	<	init_client();
548	<	init_class();
572	<	init_whowas();
546	>	client_init();
547	>	class_init();
548	>	whowas_init();
549		watch_init();
550	<	init_auth();          /* Initialise the auth code */
550	>	auth_init();          /* Initialise the auth code */
551		init_resolver();      /* Needs to be setup before the io loop */
552	+	modules_init();
553		read_conf_files(1);   /* cold start init conf files */
554		init_uid();
555		initialize_server_capabs();   /* Set up default_server_capabs */
556		initialize_global_set_options();
557	<	init_channels();
557	>	channel_init();
558	>	read_links_file();
559	>	motd_init();
560	>	#ifdef HAVE_LIBGEOIP
561	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
562	>	#endif
563
564		if (EmptyString(ServerInfo.sid))
565		{
566	<	ilog(L_CRIT, "ERROR: No server id specified in serverinfo block.");
566	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
567		exit(EXIT_FAILURE);
568		}
569
#	Line 589 | Line 571 | main(int argc, char *argv[])
571
572		if (EmptyString(ServerInfo.name))
573		{
574	<	ilog(L_CRIT, "ERROR: No server name specified in serverinfo block.");
574	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
575		exit(EXIT_FAILURE);
576		}
577
#	Line 598 | Line 580 | main(int argc, char *argv[])
580		/* serverinfo{} description must exist.  If not, error out.*/
581		if (EmptyString(ServerInfo.description))
582		{
583	<	ilog(L_CRIT, "ERROR: No server description specified in serverinfo block.");
583	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
584		exit(EXIT_FAILURE);
585		}
586
587		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
588
589	<	me.from     = &me;
590	<	me.servptr  = &me;
591	<	me.lasttime = me.since = me.firsttime = CurrentTime;
589	>	me.from                   = &me;
590	>	me.servptr                = &me;
591	>	me.localClient->lasttime  = CurrentTime;
592	>	me.localClient->since     = CurrentTime;
593	>	me.localClient->firsttime = CurrentTime;
594
595		SetMe(&me);
596		make_server(&me);
597
598		hash_add_id(&me);
599		hash_add_client(&me);
600	<
601	<	/* add ourselves to global_serv_list */
602	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
600	>
601	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
602	>
603	>	load_kline_database();
604	>	load_dline_database();
605	>	load_gline_database();
606	>	load_xline_database();
607	>	load_resv_database();
608
609		if (chdir(MODPATH))
610		{
611	<	ilog(L_CRIT, "Could not load core modules. Terminating!");
611	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
612		exit(EXIT_FAILURE);
613		}
614
#	Line 642 | Line 631 | main(int argc, char *argv[])
631
632		write_pidfile(pidFileName);
633
634	<	ilog(L_NOTICE, "Server Ready");
634	>	ilog(LOG_TYPE_IRCD, "Server Ready");
635
636	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
637	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
636	>	event_addish(&event_cleanup_glines, NULL);
637	>	event_addish(&event_cleanup_tklines, NULL);
638
639		/* We want try_connections to be called as soon as possible now! -- adrian */
640		/* No, 'cause after a restart it would cause all sorts of nick collides */
641	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
653	<
654	<	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
641	>	event_addish(&event_try_connections, NULL);
642
643		/* Setup the timeout check. I'll shift it later :)  -- adrian */
644	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
644	>	event_addish(&event_comm_checktimeouts, NULL);
645	>
646	>	event_addish(&event_save_all_databases, NULL);
647
648		if (ConfigServerHide.links_delay > 0)
649	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
649	>	{
650	>	event_write_links_file.when = ConfigServerHide.links_delay;
651	>	event_addish(&event_write_links_file, NULL);
652	>	}
653		else
654		ConfigServerHide.links_disabled = 1;
655
656		if (splitmode)
657	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
657	>	event_addish(&splitmode_event, NULL);
658
659		io_loop();
660		return 0;

Diff Legend

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