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 1307 by michael, Sat Mar 24 09:33:33 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 5470 by michael, Thu Feb 5 20:26:12 2015 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-2015 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
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 "s_conf.h"
49	<	#include "s_log.h"
50	<	#include "s_misc.h"
51	<	#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"
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	+	#include "ipcache.h"
60
61
62	<	/* /quote set variables */
63	<	struct SetOptions GlobalSetOptions;
62	>	#ifdef HAVE_LIBGEOIP
63	>	GeoIP *geoip_ctx;
64	>	#endif
65
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 };
76	–	struct ServerStatistics ServerStats;
66		struct timeval SystemTime;
67	<	struct Client me;             /* That's me */
68	<	struct LocalUser meLocalUser; /* That's also part of me */
67	>	struct Connection meConnection; /* That's also part of me */
68	>	struct Client me = { .connection = &meConnection };  /* That's me */
69
70	+	char **myargv;
71		const char *logFileName = LPATH;
72		const char *pidFileName = PPATH;
73
74	<	char **myargv;
75	<	char ircd_platform[PLATFORMLEN];
76	<
87	<	int dorehash = 0;
88	<	int doremotd = 0;
89	<
90	<	/* Set to zero because it should be initialized later using
91	<	* initialize_server_capabs
92	<	*/
93	<	int default_server_capabs = 0;
74	>	unsigned int dorehash;
75	>	unsigned int doremotd;
76	>	unsigned int default_server_capabs;
77		unsigned int splitmode;
78		unsigned int splitchecking;
79		unsigned int split_users;
80		unsigned int split_servers;
81
82	<	/* Do klines the same way hybrid-6 did them, i.e. at the
83	<	* top of the next io_loop instead of in the same loop as
84	<	* the klines are being applied.
85	<	*
86	<	* This should fix strange CPU starvation as very indirectly reported.
87	<	* (Why do you people not email bug reports? WHY? WHY?)
105	<	*
106	<	* - Dianora
107	<	*/
82	>	static struct event event_cleanup_glines =
83	>	{
84	>	.name = "cleanup_glines",
85	>	.handler = cleanup_glines,
86	>	.when = CLEANUP_GLINES_TIME
87	>	};
88
89	<	int rehashed_klines = 0;
89	>	static struct event event_cleanup_tklines =
90	>	{
91	>	.name = "cleanup_tklines",
92	>	.handler = cleanup_tklines,
93	>	.when = CLEANUP_TKLINES_TIME
94	>	};
95	>
96	>	static struct event event_try_connections =
97	>	{
98	>	.name = "try_connections",
99	>	.handler = try_connections,
100	>	.when = STARTUP_CONNECTIONS_TIME
101	>	};
102	>
103	>	static struct event event_comm_checktimeouts =
104	>	{
105	>	.name = "comm_checktimeouts",
106	>	.handler = comm_checktimeouts,
107	>	.when = 1
108	>	};
109	>
110	>	static struct event event_save_all_databases =
111	>	{
112	>	.name = "save_all_databases",
113	>	.handler = save_all_databases,
114	>	.when = DATABASE_UPDATE_TIMEOUT
115	>	};
116	>
117	>	struct event event_write_links_file =
118	>	{
119	>	.name = "write_links_file",
120	>	.handler = write_links_file,
121	>	};
122
123
124		/*
#	Line 115 | Line 127 | int rehashed_klines = 0;
127		static void
128		print_startup(int pid)
129		{
130	<	printf("ircd: version %s\n", ircd_version);
130	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
131		printf("ircd: pid %d\n", pid);
132		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
133	<	: "foreground", ConfigFileEntry.dpath);
133	>	: "foreground", ConfigGeneral.dpath);
134		}
135
136		static void
#	Line 142 | Line 154 | make_daemon(void)
154
155		static int printVersion = 0;
156
157	<	struct lgetopt myopts[] = {
158	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
159	<	STRING, "File to use for dline.conf"},
148	<	{"configfile", &ConfigFileEntry.configfile,
157	>	static struct lgetopt myopts[] =
158	>	{
159	>	{"configfile", &ConfigGeneral.configfile,
160		STRING, "File to use for ircd.conf"},
161	<	{"klinefile",  &ConfigFileEntry.klinefile,
162	<	STRING, "File to use for kline.conf"},
163	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
164	<	STRING, "File to use for xline.conf"},
165	<	{"logfile",    &logFileName,
161	>	{"glinefile",  &ConfigGeneral.glinefile,
162	>	STRING, "File to use for gline database"},
163	>	{"klinefile",  &ConfigGeneral.klinefile,
164	>	STRING, "File to use for kline database"},
165	>	{"dlinefile",  &ConfigGeneral.dlinefile,
166	>	STRING, "File to use for dline database"},
167	>	{"xlinefile",  &ConfigGeneral.xlinefile,
168	>	STRING, "File to use for xline database"},
169	>	{"resvfile",  &ConfigGeneral.resvfile,
170	>	STRING, "File to use for resv database"},
171	>	{"logfile",    &logFileName,
172		STRING, "File to use for ircd.log"},
173		{"pidfile",    &pidFileName,
174		STRING, "File to use for process ID"},
175	<	{"foreground", &server_state.foreground,
175	>	{"foreground", &server_state.foreground,
176		YESNO, "Run in foreground (don't detach)"},
177	<	{"version",    &printVersion,
177	>	{"version",    &printVersion,
178		YESNO, "Print version and exit"},
179		{"help", NULL, USAGE, "Print this text"},
180		{NULL, NULL, STRING, NULL},
#	Line 166 | Line 183 | struct lgetopt myopts[] = {
183		void
184		set_time(void)
185		{
186	<	static char to_send[200];
170	<	struct timeval newtime;
171	<	newtime.tv_sec  = 0;
172	<	newtime.tv_usec = 0;
186	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
187
188		if (gettimeofday(&newtime, NULL) == -1)
189		{
190		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
191		strerror(errno));
192	<	sendto_realops_flags(UMODE_ALL, L_ALL,
192	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
193		"Clock Failure (%s), TS can be corrupted",
194		strerror(errno));
195	<	restart("Clock Failure");
195	>	server_die("Clock Failure", 1);
196		}
197
198		if (newtime.tv_sec < CurrentTime)
199		{
200	<	snprintf(to_send, sizeof(to_send),
201	<	"System clock is running backwards - (%lu < %lu)",
202	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
203	<	report_error(L_ALL, to_send, me.name, 0);
200	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
201	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
202	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
203	>	"System clock is running backwards - (%lu < %lu)",
204	>	(unsigned long)newtime.tv_sec,
205	>	(unsigned long)CurrentTime);
206		set_back_events(CurrentTime - newtime.tv_sec);
207		}
208
#	Line 197 | Line 213 | set_time(void)
213		static void
214		io_loop(void)
215		{
216	<	while (1 == 1)
216	>	while (1)
217		{
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	–
218		if (listing_client_list.head)
219		{
220	<	dlink_node *ptr = NULL, *ptr_next = NULL;
221	<	DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
222	<	{
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	<	}
220	>	dlink_node *node = NULL, *node_next = NULL;
221	>	DLINK_FOREACH_SAFE(node, node_next, listing_client_list.head)
222	>	safe_list_channels(node->data, 0);
223		}
224
225	<	/* Run pending events, then get the number of seconds to the next
226	<	* event
229	<	*/
230	<	while (eventNextTime() <= CurrentTime)
231	<	eventRun();
225	>	/* Run pending events */
226	>	event_run();
227
228		comm_select();
229		exit_aborted_clients();
230		free_exited_clients();
236	–	send_queued_all();
231
232		/* Check to see whether we have to rehash the configuration .. */
233		if (dorehash)
234		{
235	<	rehash(1);
235	>	conf_rehash(1);
236		dorehash = 0;
237		}
238	+
239		if (doremotd)
240		{
241	<	read_message_file(&ConfigFileEntry.motd);
242	<	sendto_realops_flags(UMODE_ALL, L_ALL,
243	<	"Got signal SIGUSR1, reloading ircd motd file");
241	>	motd_recache();
242	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
243	>	"Got signal SIGUSR1, reloading motd file(s)");
244		doremotd = 0;
245		}
246		}
#	Line 255 | Line 250 | io_loop(void)
250		*
251		* inputs       - none
252		* output       - none
253	<	* side effects - This sets all global set options needed
253	>	* side effects - This sets all global set options needed
254		*/
255		static void
256		initialize_global_set_options(void)
257		{
263	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
264	–
258		GlobalSetOptions.autoconn  = 1;
259		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
260		GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
261
262	<	if (ConfigFileEntry.default_floodcount)
263	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
262	>	if (ConfigGeneral.default_floodcount)
263	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
264		else
265		GlobalSetOptions.floodcount = 10;
266
#	Line 286 | Line 279 | initialize_global_set_options(void)
279		}
280
281		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
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();
282		}
283
284		/* initialize_server_capabs()
#	Line 322 | Line 294 | initialize_server_capabs(void)
294		add_capability("TS6", CAP_TS6, 0);
295		add_capability("CLUSTER", CAP_CLUSTER, 1);
296		add_capability("SVS", CAP_SVS, 1);
297	<	#ifdef HALFOPS
297	>	add_capability("CHW", CAP_CHW, 1);
298		add_capability("HOPS", CAP_HOPS, 1);
327	–	#endif
299		}
300
301		/* write_pidfile()
#	Line 336 | Line 307 | initialize_server_capabs(void)
307		static void
308		write_pidfile(const char *filename)
309		{
310	<	FBFILE *fb;
310	>	FILE *fb;
311
312	<	if ((fb = fbopen(filename, "w")))
312	>	if ((fb = fopen(filename, "w")))
313		{
314	<	char buff[32];
314	>	char buff[IRCD_BUFSIZE];
315		unsigned int pid = (unsigned int)getpid();
345	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
316
317	<	if ((fbputs(buff, fb, nbytes) == -1))
317	>	snprintf(buff, sizeof(buff), "%u\n", pid);
318	>
319	>	if (fputs(buff, fb) == -1)
320		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
321		pid, filename, strerror(errno));
322
323	<	fbclose(fb);
352	<	return;
323	>	fclose(fb);
324		}
325		else
326		{
327	<	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
327	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s (%s)",
328	>	filename, strerror(errno));
329		}
330		}
331
#	Line 368 | Line 340 | write_pidfile(const char *filename)
340		static void
341		check_pidfile(const char *filename)
342		{
343	<	FBFILE *fb;
344	<	char buff[32];
343	>	FILE *fb;
344	>	char buff[IRCD_BUFSIZE];
345		pid_t pidfromfile;
346
347		/* Don't do logging here, since we don't have log() initialised */
348	<	if ((fb = fbopen(filename, "r")))
348	>	if ((fb = fopen(filename, "r")))
349		{
350	<	if (fbgets(buff, 20, fb) == NULL)
350	>	if (!fgets(buff, 20, fb))
351		{
352		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
353		* strerror(errno));
#	Line 393 | Line 365 | check_pidfile(const char *filename)
365		}
366		}
367
368	<	fbclose(fb);
368	>	fclose(fb);
369		}
370		else if (errno != ENOENT)
371		{
#	Line 423 | Line 395 | setup_corefile(void)
395		#endif
396		}
397
398	+	#ifdef HAVE_LIBCRYPTO
399	+	static int
400	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
401	+	{
402	+	return 1;
403	+	}
404	+	#endif
405	+
406		/* init_ssl()
407		*
408		* inputs       - nothing
#	Line 430 | Line 410 | setup_corefile(void)
410		* side effects - setups SSL context.
411		*/
412		static void
413	<	init_ssl(void)
413	>	ssl_init(void)
414		{
415		#ifdef HAVE_LIBCRYPTO
416		SSL_load_error_strings();
417		SSLeay_add_ssl_algorithms();
418
419	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
419	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
420		{
421	<	const char *s;
421	>	const char *s = ERR_lib_error_string(ERR_get_error());
422
423	<	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
424	<	s = ERR_lib_error_string(ERR_get_error()));
425	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
423	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
424	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
425	>	exit(EXIT_FAILURE);
426	>	return;  /* Not reached */
427		}
428
429	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
430	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
431	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
429	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
430	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
431	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
432	>	always_accept_verify_cb);
433	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
434	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
435
436	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
436	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
437		{
438	<	const char *s;
438	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
439
440	<	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
441	<	s = ERR_lib_error_string(ERR_get_error()));
442	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
440	>	if (key)
441	>	{
442	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
443	>	EC_KEY_free(key);
444	>	}
445		}
446
447	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2);
448	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
463	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
464	<	#endif /* HAVE_LIBCRYPTO */
465	<	}
447	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
448	>	#endif
449
450	<	/* init_callbacks()
451	<	*
452	<	* inputs       - nothing
453	<	* output       - nothing
454	<	* side effects - setups standard hook points
455	<	*/
456	<	static void
457	<	init_callbacks(void)
458	<	{
459	<	iorecv_cb = register_callback("iorecv", iorecv_default);
460	<	iosend_cb = register_callback("iosend", iosend_default);
450	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
451	>	{
452	>	const char *s = ERR_lib_error_string(ERR_get_error());
453	>
454	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
455	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
456	>	exit(EXIT_FAILURE);
457	>	return;  /* Not reached */
458	>	}
459	>
460	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
461	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
462	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
463	>	always_accept_verify_cb);
464	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
465	>	#endif /* HAVE_LIBCRYPTO */
466		}
467
468		int
469		main(int argc, char *argv[])
470		{
471	<	/* Check to see if the user is running
472	<	* us as root, which is a nono
485	<	*/
486	<	if (geteuid() == 0)
471	>	/* Check to see if the user is running us as root, which is a nono */
472	>	if (!geteuid())
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 498 | Line 484 | main(int argc, char *argv[])
484		/* It ain't random, but it ought to be a little harder to guess */
485		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
486
487	<	me.localClient = &meLocalUser;
502	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
487	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
488		of Client list */
489	<	/* Initialise the channel capability usage counts... */
490	<	init_chcap_usage_counts();
489	>	ConfigLog.use_logging = 1;
490	>	ConfigGeneral.dpath      = DPATH;
491	>	ConfigGeneral.spath      = SPATH;
492	>	ConfigGeneral.mpath      = MPATH;
493	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
494	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
495	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
496	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
497	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
498	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
499
507	–	ConfigFileEntry.dpath      = DPATH;
508	–	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
509	–	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
510	–	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
511	–	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
512	–	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
513	–	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
514	–	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
515	–	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
516	–	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
500		myargv = argv;
501		umask(077);                /* better safe than sorry --SRB */
502
#	Line 521 | Line 504 | main(int argc, char *argv[])
504
505		if (printVersion)
506		{
507	<	printf("ircd: version %s\n", ircd_version);
507	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
508		exit(EXIT_SUCCESS);
509		}
510
511	<	if (chdir(ConfigFileEntry.dpath))
511	>	if (chdir(ConfigGeneral.dpath))
512		{
513		perror("chdir");
514		exit(EXIT_FAILURE);
515		}
516
517	<	init_ssl();
517	>	ssl_init();
518
519		if (!server_state.foreground)
520		{
#	Line 543 | Line 526 | main(int argc, char *argv[])
526
527		setup_signals();
528
546	–	get_ircd_platform(ircd_platform);
547	–
548	–	/* Init the event subsystem */
549	–	eventInit();
529		/* We need this to initialise the fd array before anything else */
530		fdlist_init();
531	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
532	<	check_can_use_v6();
533	<	init_comm();         /* This needs to be setup early ! -- adrian */
531	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
532	>
533	>	init_netio();         /* This needs to be setup early ! -- adrian */
534	>
535		/* Check if there is pidfile and daemon already running */
536		check_pidfile(pidFileName);
537
538	<	initBlockHeap();
538	>	mp_pool_init();
539		init_dlink_nodes();
540	<	init_callbacks();
561	<	initialize_message_files();
540	>	init_isupport();
541		dbuf_init();
542	<	init_hash();
543	<	init_ip_hash_table();      /* client host ip hash table */
544	<	init_host_hash();          /* Host-hashtable. */
545	<	clear_tree_parse();
546	<	init_client();
568	<	init_class();
569	<	init_whowas();
542	>	hash_init();
543	>	ipcache_init();
544	>	client_init();
545	>	class_init();
546	>	whowas_init();
547		watch_init();
548	<	init_auth();          /* Initialise the auth code */
548	>	auth_init();          /* Initialise the auth code */
549		init_resolver();      /* Needs to be setup before the io loop */
550	+	modules_init();
551		read_conf_files(1);   /* cold start init conf files */
552		init_uid();
553		initialize_server_capabs();   /* Set up default_server_capabs */
554		initialize_global_set_options();
555	<	init_channels();
555	>	channel_init();
556	>	read_links_file();
557	>	motd_init();
558	>	user_usermodes_init();
559	>	#ifdef HAVE_LIBGEOIP
560	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
561	>	#endif
562
563	<	if (EmptyString(ServerInfo.sid))
563	>	if (EmptyString(ConfigServerInfo.sid))
564		{
565		ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
566		exit(EXIT_FAILURE);
567		}
568
569	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
569	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
570
571	<	if (EmptyString(ServerInfo.name))
571	>	if (EmptyString(ConfigServerInfo.name))
572		{
573		ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
574		exit(EXIT_FAILURE);
575		}
576
577	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
577	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
578
579		/* serverinfo{} description must exist.  If not, error out.*/
580	<	if (EmptyString(ServerInfo.description))
580	>	if (EmptyString(ConfigServerInfo.description))
581		{
582		ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
583		exit(EXIT_FAILURE);
584		}
585
586	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
586	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
587
588		me.from                   = &me;
589		me.servptr                = &me;
590	<	me.localClient->lasttime  = CurrentTime;
591	<	me.localClient->since     = CurrentTime;
592	<	me.localClient->firsttime = CurrentTime;
590	>	me.connection->lasttime  = CurrentTime;
591	>	me.connection->since     = CurrentTime;
592	>	me.connection->firsttime = CurrentTime;
593
594		SetMe(&me);
595		make_server(&me);
596
597		hash_add_id(&me);
598		hash_add_client(&me);
615	–
616	–	/* add ourselves to global_serv_list */
617	–	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
599
600	<	if (chdir(MODPATH))
601	<	{
602	<	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
603	<	exit(EXIT_FAILURE);
604	<	}
600	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
601	>
602	>	load_kline_database();
603	>	load_dline_database();
604	>	load_gline_database();
605	>	load_xline_database();
606	>	load_resv_database();
607
608		load_all_modules(1);
609		load_conf_modules();
610		load_core_modules(1);
611
629	–	/* Go back to DPATH after checking to see if we can chdir to MODPATH */
630	–	if (chdir(ConfigFileEntry.dpath))
631	–	{
632	–	perror("chdir");
633	–	exit(EXIT_FAILURE);
634	–	}
635	–
636	–	/*
637	–	* assemble_umode_buffer() has to be called after
638	–	* reading conf/loading modules.
639	–	*/
640	–	assemble_umode_buffer();
641	–
612		write_pidfile(pidFileName);
613
614		ilog(LOG_TYPE_IRCD, "Server Ready");
615
616	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
617	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
616	>	event_addish(&event_cleanup_glines, NULL);
617	>	event_addish(&event_cleanup_tklines, NULL);
618
619		/* We want try_connections to be called as soon as possible now! -- adrian */
620		/* No, 'cause after a restart it would cause all sorts of nick collides */
621	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
621	>	event_addish(&event_try_connections, NULL);
622
623		/* Setup the timeout check. I'll shift it later :)  -- adrian */
624	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
624	>	event_add(&event_comm_checktimeouts, NULL);
625	>
626	>	event_addish(&event_save_all_databases, NULL);
627
628		if (ConfigServerHide.links_delay > 0)
629	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
629	>	{
630	>	event_write_links_file.when = ConfigServerHide.links_delay;
631	>	event_addish(&event_write_links_file, NULL);
632	>	}
633		else
634		ConfigServerHide.links_disabled = 1;
635
636		if (splitmode)
637	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
637	>	event_addish(&splitmode_event, NULL);
638
639		io_loop();
640		return 0;

Diff Legend

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