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 1286 by michael, Sun Feb 5 15:20:03 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 4399 by michael, Mon Aug 4 19:35:36 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 "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 };
66		struct ServerStatistics ServerStats;
67		struct timeval SystemTime;
68		struct Client me;             /* That's me */
#	Line 82 | Line 72 | const char *logFileName = LPATH;
72		const char *pidFileName = PPATH;
73
74		char **myargv;
85	–	char ircd_platform[PLATFORMLEN];
75
76		int dorehash = 0;
77		int doremotd = 0;
#	Line 90 | Line 79 | int doremotd = 0;
79		/* Set to zero because it should be initialized later using
80		* initialize_server_capabs
81		*/
82	<	int default_server_capabs = 0;
94	<
95	<	#ifdef HAVE_LIBCRYPTO
96	<	int bio_spare_fd = -1;
97	<	#endif
98	<
82	>	unsigned int default_server_capabs;
83		unsigned int splitmode;
84		unsigned int splitchecking;
85		unsigned int split_users;
86		unsigned int split_servers;
87
88	<	/* Do klines the same way hybrid-6 did them, i.e. at the
89	<	* top of the next io_loop instead of in the same loop as
90	<	* the klines are being applied.
91	<	*
92	<	* This should fix strange CPU starvation as very indirectly reported.
93	<	* (Why do you people not email bug reports? WHY? WHY?)
110	<	*
111	<	* - Dianora
112	<	*/
88	>	static struct event event_cleanup_glines =
89	>	{
90	>	.name = "cleanup_glines",
91	>	.handler = cleanup_glines,
92	>	.when = CLEANUP_GLINES_TIME
93	>	};
94
95	<	int rehashed_klines = 0;
95	>	static struct event event_cleanup_tklines =
96	>	{
97	>	.name = "cleanup_tklines",
98	>	.handler = cleanup_tklines,
99	>	.when = CLEANUP_TKLINES_TIME
100	>	};
101	>
102	>	static struct event event_try_connections =
103	>	{
104	>	.name = "try_connections",
105	>	.handler = try_connections,
106	>	.when = STARTUP_CONNECTIONS_TIME
107	>	};
108	>
109	>	static struct event event_comm_checktimeouts =
110	>	{
111	>	.name = "comm_checktimeouts",
112	>	.handler = comm_checktimeouts,
113	>	.when = 1
114	>	};
115	>
116	>	static struct event event_save_all_databases =
117	>	{
118	>	.name = "save_all_databases",
119	>	.handler = save_all_databases,
120	>	.when = DATABASE_UPDATE_TIMEOUT
121	>	};
122	>
123	>	struct event event_write_links_file =
124	>	{
125	>	.name = "write_links_file",
126	>	.handler = write_links_file,
127	>	};
128
129
130		/*
#	Line 120 | Line 133 | int rehashed_klines = 0;
133		static void
134		print_startup(int pid)
135		{
136	<	printf("ircd: version %s\n", ircd_version);
136	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
137		printf("ircd: pid %d\n", pid);
138		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
139	<	: "foreground", ConfigFileEntry.dpath);
139	>	: "foreground", ConfigGeneral.dpath);
140		}
141
142		static void
#	Line 147 | Line 160 | make_daemon(void)
160
161		static int printVersion = 0;
162
163	<	struct lgetopt myopts[] = {
164	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
165	<	STRING, "File to use for dline.conf"},
153	<	{"configfile", &ConfigFileEntry.configfile,
163	>	static struct lgetopt myopts[] =
164	>	{
165	>	{"configfile", &ConfigGeneral.configfile,
166		STRING, "File to use for ircd.conf"},
167	<	{"klinefile",  &ConfigFileEntry.klinefile,
168	<	STRING, "File to use for kline.conf"},
169	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
170	<	STRING, "File to use for xline.conf"},
171	<	{"logfile",    &logFileName,
167	>	{"glinefile",  &ConfigGeneral.glinefile,
168	>	STRING, "File to use for gline database"},
169	>	{"klinefile",  &ConfigGeneral.klinefile,
170	>	STRING, "File to use for kline database"},
171	>	{"dlinefile",  &ConfigGeneral.dlinefile,
172	>	STRING, "File to use for dline database"},
173	>	{"xlinefile",  &ConfigGeneral.xlinefile,
174	>	STRING, "File to use for xline database"},
175	>	{"resvfile",  &ConfigGeneral.resvfile,
176	>	STRING, "File to use for resv database"},
177	>	{"logfile",    &logFileName,
178		STRING, "File to use for ircd.log"},
179		{"pidfile",    &pidFileName,
180		STRING, "File to use for process ID"},
181	<	{"foreground", &server_state.foreground,
181	>	{"foreground", &server_state.foreground,
182		YESNO, "Run in foreground (don't detach)"},
183	<	{"version",    &printVersion,
183	>	{"version",    &printVersion,
184		YESNO, "Print version and exit"},
185		{"help", NULL, USAGE, "Print this text"},
186		{NULL, NULL, STRING, NULL},
#	Line 171 | Line 189 | struct lgetopt myopts[] = {
189		void
190		set_time(void)
191		{
192	<	static char to_send[200];
175	<	struct timeval newtime;
176	<	newtime.tv_sec  = 0;
177	<	newtime.tv_usec = 0;
192	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
193
194		if (gettimeofday(&newtime, NULL) == -1)
195		{
196		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
197		strerror(errno));
198	<	sendto_realops_flags(UMODE_ALL, L_ALL,
198	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
199		"Clock Failure (%s), TS can be corrupted",
200		strerror(errno));
201	<	restart("Clock Failure");
201	>	server_die("Clock Failure", 1);
202		}
203
204		if (newtime.tv_sec < CurrentTime)
205		{
206	<	snprintf(to_send, sizeof(to_send),
207	<	"System clock is running backwards - (%lu < %lu)",
208	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
209	<	report_error(L_ALL, to_send, me.name, 0);
206	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
207	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
208	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
209	>	"System clock is running backwards - (%lu < %lu)",
210	>	(unsigned long)newtime.tv_sec,
211	>	(unsigned long)CurrentTime);
212		set_back_events(CurrentTime - newtime.tv_sec);
213		}
214
#	Line 202 | Line 219 | set_time(void)
219		static void
220		io_loop(void)
221		{
222	<	while (1 == 1)
222	>	while (1)
223		{
207	–	/*
208	–	* Maybe we want a flags word?
209	–	* ie. if (REHASHED_KLINES(global_flags))
210	–	* SET_REHASHED_KLINES(global_flags)
211	–	* CLEAR_REHASHED_KLINES(global_flags)
212	–	*
213	–	* - Dianora
214	–	*/
215	–	if (rehashed_klines)
216	–	{
217	–	check_conf_klines();
218	–	rehashed_klines = 0;
219	–	}
220	–
224		if (listing_client_list.head)
225		{
226		dlink_node *ptr = NULL, *ptr_next = NULL;
227		DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
228	<	{
226	<	struct Client *client_p = ptr->data;
227	<	assert(client_p->localClient->list_task);
228	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
229	<	}
228	>	safe_list_channels(ptr->data, 0);
229		}
230
231	<	/* Run pending events, then get the number of seconds to the next
232	<	* event
234	<	*/
235	<	while (eventNextTime() <= CurrentTime)
236	<	eventRun();
231	>	/* Run pending events */
232	>	event_run();
233
234		comm_select();
235		exit_aborted_clients();
236		free_exited_clients();
241	–	send_queued_all();
237
238		/* Check to see whether we have to rehash the configuration .. */
239		if (dorehash)
#	Line 246 | Line 241 | io_loop(void)
241		rehash(1);
242		dorehash = 0;
243		}
244	+
245		if (doremotd)
246		{
247	<	read_message_file(&ConfigFileEntry.motd);
248	<	sendto_realops_flags(UMODE_ALL, L_ALL,
249	<	"Got signal SIGUSR1, reloading ircd motd file");
247	>	motd_recache();
248	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
249	>	"Got signal SIGUSR1, reloading motd file(s)");
250		doremotd = 0;
251		}
252		}
#	Line 260 | Line 256 | io_loop(void)
256		*
257		* inputs       - none
258		* output       - none
259	<	* side effects - This sets all global set options needed
259	>	* side effects - This sets all global set options needed
260		*/
261		static void
262		initialize_global_set_options(void)
263		{
268	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
269	–
264		GlobalSetOptions.autoconn  = 1;
265		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
266		GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
267
268	<	if (ConfigFileEntry.default_floodcount)
269	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
268	>	if (ConfigGeneral.default_floodcount)
269	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
270		else
271		GlobalSetOptions.floodcount = 10;
272
#	Line 291 | Line 285 | initialize_global_set_options(void)
285		}
286
287		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
294	–	/* End of global set options */
295	–	}
296	–
297	–	/* initialize_message_files()
298	–	*
299	–	* inputs       - none
300	–	* output       - none
301	–	* side effects - Set up all message files needed, motd etc.
302	–	*/
303	–	static void
304	–	initialize_message_files(void)
305	–	{
306	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
307	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
308	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
309	–
310	–	read_message_file(&ConfigFileEntry.motd);
311	–	read_message_file(&ConfigFileEntry.opermotd);
312	–	read_message_file(&ConfigFileEntry.linksfile);
313	–
314	–	init_isupport();
288		}
289
290		/* initialize_server_capabs()
#	Line 325 | Line 298 | initialize_server_capabs(void)
298		add_capability("QS", CAP_QS, 1);
299		add_capability("EOB", CAP_EOB, 1);
300		add_capability("TS6", CAP_TS6, 0);
328	–	add_capability("ZIP", CAP_ZIP, 0);
301		add_capability("CLUSTER", CAP_CLUSTER, 1);
302		add_capability("SVS", CAP_SVS, 1);
303	<	#ifdef HALFOPS
303	>	add_capability("CHW", CAP_CHW, 1);
304		add_capability("HOPS", CAP_HOPS, 1);
333	–	#endif
305		}
306
307		/* write_pidfile()
#	Line 342 | Line 313 | initialize_server_capabs(void)
313		static void
314		write_pidfile(const char *filename)
315		{
316	<	FBFILE *fb;
316	>	FILE *fb;
317
318	<	if ((fb = fbopen(filename, "w")))
318	>	if ((fb = fopen(filename, "w")))
319		{
320	<	char buff[32];
320	>	char buff[IRCD_BUFSIZE];
321		unsigned int pid = (unsigned int)getpid();
351	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
322
323	<	if ((fbputs(buff, fb, nbytes) == -1))
323	>	snprintf(buff, sizeof(buff), "%u\n", pid);
324	>
325	>	if ((fputs(buff, fb) == -1))
326		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
327		pid, filename, strerror(errno));
328
329	<	fbclose(fb);
358	<	return;
329	>	fclose(fb);
330		}
331		else
332		{
#	Line 374 | Line 345 | write_pidfile(const char *filename)
345		static void
346		check_pidfile(const char *filename)
347		{
348	<	FBFILE *fb;
349	<	char buff[32];
348	>	FILE *fb;
349	>	char buff[IRCD_BUFSIZE];
350		pid_t pidfromfile;
351
352		/* Don't do logging here, since we don't have log() initialised */
353	<	if ((fb = fbopen(filename, "r")))
353	>	if ((fb = fopen(filename, "r")))
354		{
355	<	if (fbgets(buff, 20, fb) == NULL)
355	>	if (fgets(buff, 20, fb) == NULL)
356		{
357		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
358		* strerror(errno));
#	Line 399 | Line 370 | check_pidfile(const char *filename)
370		}
371		}
372
373	<	fbclose(fb);
373	>	fclose(fb);
374		}
375		else if (errno != ENOENT)
376		{
#	Line 429 | Line 400 | setup_corefile(void)
400		#endif
401		}
402
403	+	#ifdef HAVE_LIBCRYPTO
404	+	static int
405	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
406	+	{
407	+	return 1;
408	+	}
409	+	#endif
410	+
411		/* init_ssl()
412		*
413		* inputs       - nothing
#	Line 436 | Line 415 | setup_corefile(void)
415		* side effects - setups SSL context.
416		*/
417		static void
418	<	init_ssl(void)
418	>	ssl_init(void)
419		{
420		#ifdef HAVE_LIBCRYPTO
421	+	const unsigned char session_id[] = "ircd-hybrid";
422	+
423		SSL_load_error_strings();
424		SSLeay_add_ssl_algorithms();
425
426	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
426	>	if ((ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
427		{
428	<	const char *s;
428	>	const char *s = ERR_lib_error_string(ERR_get_error());
429
430	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
431	<	s = ERR_lib_error_string(ERR_get_error()));
451	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL context -- %s\n", s);
430	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
431	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
432		}
433
434	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
435	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
436	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
434	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
435	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
436	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
437	>	always_accept_verify_cb);
438	>	SSL_CTX_set_session_id_context(ConfigServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
439
440	<	bio_spare_fd = save_spare_fd("SSL private key validation");
441	<	#endif /* HAVE_LIBCRYPTO */
442	<	}
440	>	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
441	>	{
442	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
443
444	<	/* init_callbacks()
445	<	*
446	<	* inputs       - nothing
447	<	* output       - nothing
448	<	* side effects - setups standard hook points
449	<	*/
450	<	static void
451	<	init_callbacks(void)
452	<	{
453	<	iorecv_cb = register_callback("iorecv", iorecv_default);
454	<	iosend_cb = register_callback("iosend", iosend_default);
455	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
456	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
444	>	if (key)
445	>	{
446	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
447	>	EC_KEY_free(key);
448	>	}
449	>	}
450	>
451	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
452	>	#endif
453	>
454	>	if ((ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
455	>	{
456	>	const char *s = ERR_lib_error_string(ERR_get_error());
457	>
458	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
459	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460	>	}
461	>
462	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
463	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
464	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
465	>	always_accept_verify_cb);
466	>	#endif /* HAVE_LIBCRYPTO */
467		}
468
469		int
470		main(int argc, char *argv[])
471		{
472	<	/* Check to see if the user is running
481	<	* us as root, which is a nono
482	<	*/
472	>	/* Check to see if the user is running us as root, which is a nono */
473		if (geteuid() == 0)
474		{
475	<	fprintf(stderr, "Don't run ircd as root!!!\n");
475	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
476		return -1;
477		}
478
#	Line 496 | Line 486 | main(int argc, char *argv[])
486		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
487
488		me.localClient = &meLocalUser;
489	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
489	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
490		of Client list */
491	<	/* Initialise the channel capability usage counts... */
492	<	init_chcap_usage_counts();
491	>	ConfigLog.use_logging = 1;
492	>	ConfigGeneral.dpath      = DPATH;
493	>	ConfigGeneral.spath      = SPATH;
494	>	ConfigGeneral.mpath      = MPATH;
495	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
496	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
497	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
498	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
499	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
500	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
501
504	–	ConfigFileEntry.dpath      = DPATH;
505	–	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
506	–	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
507	–	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
508	–	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
509	–	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
510	–	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
511	–	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
512	–	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
513	–	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
502		myargv = argv;
503		umask(077);                /* better safe than sorry --SRB */
504
#	Line 518 | Line 506 | main(int argc, char *argv[])
506
507		if (printVersion)
508		{
509	<	printf("ircd: version %s\n", ircd_version);
509	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
510		exit(EXIT_SUCCESS);
511		}
512
513	<	if (chdir(ConfigFileEntry.dpath))
513	>	if (chdir(ConfigGeneral.dpath))
514		{
515		perror("chdir");
516		exit(EXIT_FAILURE);
517		}
518
519	<	init_ssl();
519	>	ssl_init();
520
521		if (!server_state.foreground)
522		{
#	Line 540 | Line 528 | main(int argc, char *argv[])
528
529		setup_signals();
530
543	–	get_ircd_platform(ircd_platform);
544	–
545	–	/* Init the event subsystem */
546	–	eventInit();
531		/* We need this to initialise the fd array before anything else */
532		fdlist_init();
533	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
533	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
534		check_can_use_v6();
535	<	init_comm();         /* This needs to be setup early ! -- adrian */
535	>	init_netio();         /* This needs to be setup early ! -- adrian */
536	>
537		/* Check if there is pidfile and daemon already running */
538		check_pidfile(pidFileName);
539
540	<	initBlockHeap();
540	>	mp_pool_init();
541		init_dlink_nodes();
542	<	init_callbacks();
558	<	initialize_message_files();
542	>	init_isupport();
543		dbuf_init();
544	<	init_hash();
545	<	init_ip_hash_table();      /* client host ip hash table */
544	>	hash_init();
545	>	ipcache_init();
546		init_host_hash();          /* Host-hashtable. */
547	<	clear_tree_parse();
548	<	init_client();
549	<	init_class();
566	<	init_whowas();
547	>	client_init();
548	>	class_init();
549	>	whowas_init();
550		watch_init();
551	<	init_auth();          /* Initialise the auth code */
551	>	auth_init();          /* Initialise the auth code */
552		init_resolver();      /* Needs to be setup before the io loop */
553	+	modules_init();
554		read_conf_files(1);   /* cold start init conf files */
555		init_uid();
556		initialize_server_capabs();   /* Set up default_server_capabs */
557		initialize_global_set_options();
558	<	init_channels();
558	>	channel_init();
559	>	read_links_file();
560	>	motd_init();
561	>	#ifdef HAVE_LIBGEOIP
562	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
563	>	#endif
564
565	<	if (EmptyString(ServerInfo.sid))
565	>	if (EmptyString(ConfigServerInfo.sid))
566		{
567		ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
568		exit(EXIT_FAILURE);
569		}
570
571	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
571	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
572
573	<	if (EmptyString(ServerInfo.name))
573	>	if (EmptyString(ConfigServerInfo.name))
574		{
575		ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
576		exit(EXIT_FAILURE);
577		}
578
579	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
579	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
580
581		/* serverinfo{} description must exist.  If not, error out.*/
582	<	if (EmptyString(ServerInfo.description))
582	>	if (EmptyString(ConfigServerInfo.description))
583		{
584		ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
585		exit(EXIT_FAILURE);
586		}
587
588	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
588	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
589
590		me.from                   = &me;
591		me.servptr                = &me;
#	Line 609 | Line 598 | main(int argc, char *argv[])
598
599		hash_add_id(&me);
600		hash_add_client(&me);
601	<
602	<	/* add ourselves to global_serv_list */
603	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
601	>
602	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
603	>
604	>	load_kline_database();
605	>	load_dline_database();
606	>	load_gline_database();
607	>	load_xline_database();
608	>	load_resv_database();
609
610		if (chdir(MODPATH))
611		{
#	Line 624 | Line 618 | main(int argc, char *argv[])
618		load_core_modules(1);
619
620		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
621	<	if (chdir(ConfigFileEntry.dpath))
621	>	if (chdir(ConfigGeneral.dpath))
622		{
623		perror("chdir");
624		exit(EXIT_FAILURE);
#	Line 640 | Line 634 | main(int argc, char *argv[])
634
635		ilog(LOG_TYPE_IRCD, "Server Ready");
636
637	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
638	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
637	>	event_addish(&event_cleanup_glines, NULL);
638	>	event_addish(&event_cleanup_tklines, NULL);
639
640		/* We want try_connections to be called as soon as possible now! -- adrian */
641		/* No, 'cause after a restart it would cause all sorts of nick collides */
642	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
649	<
650	<	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
642	>	event_addish(&event_try_connections, NULL);
643
644		/* Setup the timeout check. I'll shift it later :)  -- adrian */
645	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
645	>	event_add(&event_comm_checktimeouts, NULL);
646	>
647	>	event_addish(&event_save_all_databases, NULL);
648
649		if (ConfigServerHide.links_delay > 0)
650	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
650	>	{
651	>	event_write_links_file.when = ConfigServerHide.links_delay;
652	>	event_addish(&event_write_links_file, NULL);
653	>	}
654		else
655		ConfigServerHide.links_disabled = 1;
656
657		if (splitmode)
658	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
658	>	event_addish(&splitmode_event, NULL);
659
660		io_loop();
661		return 0;

Diff Legend

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