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 1241 by michael, Thu Sep 29 20:26:09 2011 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 4892 by michael, Wed Nov 19 17:14:30 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 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"
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	+	#include "ipcache.h"
60
61
62	<	/* /quote set variables */
63	<	struct SetOptions GlobalSetOptions;
62	>	#ifdef HAVE_LIBGEOIP
63	>	GeoIP *geoip_ctx;
64	>	#endif
65
70	–	/* configuration set from ircd.conf */
71	–	struct config_file_entry ConfigFileEntry;
72	–	/* server info set from ircd.conf */
73	–	struct server_info ServerInfo;
74	–	/* admin info set from ircd.conf */
75	–	struct admin_info AdminInfo = { NULL, NULL, NULL };
76	–	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
77	–	struct ServerState_t server_state = { 0 };
78	–	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
79	–	struct ServerStatistics ServerStats;
66		struct timeval SystemTime;
67		struct Client me;             /* That's me */
68	<	struct LocalUser meLocalUser; /* That's also part of me */
68	>	struct Connection meConnection; /* That's also part of me */
69
70		const char *logFileName = LPATH;
71		const char *pidFileName = PPATH;
72
73		char **myargv;
88	–	char ircd_platform[PLATFORMLEN];
74
75		int dorehash = 0;
76		int doremotd = 0;
#	Line 93 | 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;
97	<
98	<	#ifdef HAVE_LIBCRYPTO
99	<	int bio_spare_fd = -1;
100	<	#endif
101	<
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	>	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	<	int rehashed_klines = 0;
122	>	struct event event_write_links_file =
123	>	{
124	>	.name = "write_links_file",
125	>	.handler = write_links_file,
126	>	};
127
128
129		/*
#	Line 123 | 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);
138	>	: "foreground", ConfigGeneral.dpath);
139		}
140
141		static void
#	Line 150 | 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"},
156	<	{"configfile", &ConfigFileEntry.configfile,
162	>	static struct lgetopt myopts[] =
163	>	{
164	>	{"configfile", &ConfigGeneral.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",  &ConfigGeneral.glinefile,
167	>	STRING, "File to use for gline database"},
168	>	{"klinefile",  &ConfigGeneral.klinefile,
169	>	STRING, "File to use for kline database"},
170	>	{"dlinefile",  &ConfigGeneral.dlinefile,
171	>	STRING, "File to use for dline database"},
172	>	{"xlinefile",  &ConfigGeneral.xlinefile,
173	>	STRING, "File to use for xline database"},
174	>	{"resvfile",  &ConfigGeneral.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 174 | Line 188 | struct lgetopt myopts[] = {
188		void
189		set_time(void)
190		{
191	<	static char to_send[200];
178	<	struct timeval newtime;
179	<	newtime.tv_sec  = 0;
180	<	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 205 | Line 218 | set_time(void)
218		static void
219		io_loop(void)
220		{
221	<	while (1 == 1)
221	>	while (1)
222		{
210	–	/*
211	–	* Maybe we want a flags word?
212	–	* ie. if (REHASHED_KLINES(global_flags))
213	–	* SET_REHASHED_KLINES(global_flags)
214	–	* CLEAR_REHASHED_KLINES(global_flags)
215	–	*
216	–	* - Dianora
217	–	*/
218	–	if (rehashed_klines)
219	–	{
220	–	check_conf_klines();
221	–	rehashed_klines = 0;
222	–	}
223	–
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	<	{
229	<	struct Client *client_p = ptr->data;
230	<	assert(client_p->localClient->list_task);
231	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
232	<	}
225	>	dlink_node *node = NULL, *node_next = NULL;
226	>	DLINK_FOREACH_SAFE(node, node_next, listing_client_list.head)
227	>	safe_list_channels(node->data, 0);
228		}
229
230	<	/* Run pending events, then get the number of seconds to the next
231	<	* event
237	<	*/
238	<	while (eventNextTime() <= CurrentTime)
239	<	eventRun();
230	>	/* Run pending events */
231	>	event_run();
232
233		comm_select();
234		exit_aborted_clients();
235		free_exited_clients();
244	–	send_queued_all();
236
237		/* Check to see whether we have to rehash the configuration .. */
238		if (dorehash)
#	Line 249 | 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 263 | 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		{
271	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
272	–
263		GlobalSetOptions.autoconn  = 1;
264		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
265		GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
266
267	<	if (ConfigFileEntry.default_floodcount)
268	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
267	>	if (ConfigGeneral.default_floodcount)
268	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
269		else
270		GlobalSetOptions.floodcount = 10;
271
#	Line 294 | Line 284 | initialize_global_set_options(void)
284		}
285
286		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
297	–	/* End of global set options */
298	–	}
299	–
300	–	/* initialize_message_files()
301	–	*
302	–	* inputs       - none
303	–	* output       - none
304	–	* side effects - Set up all message files needed, motd etc.
305	–	*/
306	–	static void
307	–	initialize_message_files(void)
308	–	{
309	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
310	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
311	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
312	–
313	–	read_message_file(&ConfigFileEntry.motd);
314	–	read_message_file(&ConfigFileEntry.opermotd);
315	–	read_message_file(&ConfigFileEntry.linksfile);
316	–
317	–	init_isupport();
287		}
288
289		/* initialize_server_capabs()
#	Line 328 | 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);
331	–	add_capability("ZIP", CAP_ZIP, 0);
300		add_capability("CLUSTER", CAP_CLUSTER, 1);
301		add_capability("SVS", CAP_SVS, 1);
302	<	#ifdef HALFOPS
302	>	add_capability("CHW", CAP_CHW, 1);
303		add_capability("HOPS", CAP_HOPS, 1);
336	–	#endif
304		}
305
306		/* write_pidfile()
#	Line 345 | 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();
354	–	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);
361	<	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 (%s)",
333	>	filename, strerror(errno));
334		}
335		}
336
#	Line 377 | 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))
356		{
357		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
358		* strerror(errno));
#	Line 402 | Line 370 | check_pidfile(const char *filename)
370		}
371		}
372
373	<	fbclose(fb);
373	>	fclose(fb);
374		}
375		else if (errno != ENOENT)
376		{
#	Line 432 | 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 439 | 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		SSL_load_error_strings();
422		SSLeay_add_ssl_algorithms();
423
424	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
424	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
425		{
426	<	const char *s;
426	>	const char *s = ERR_lib_error_string(ERR_get_error());
427
428	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
429	<	s = ERR_lib_error_string(ERR_get_error()));
430	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
428	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
429	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
430	>	exit(EXIT_FAILURE);
431	>	return;  /* Not reached */
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|SSL_OP_NO_TICKET);
435	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
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_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
439	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
440
441	<	bio_spare_fd = save_spare_fd("SSL private key validation");
442	<	#endif /* HAVE_LIBCRYPTO */
443	<	}
441	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
442	>	{
443	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
444
445	<	/* init_callbacks()
446	<	*
447	<	* inputs       - nothing
448	<	* output       - nothing
449	<	* side effects - setups standard hook points
450	<	*/
451	<	static void
452	<	init_callbacks(void)
453	<	{
454	<	iorecv_cb = register_callback("iorecv", iorecv_default);
455	<	iosend_cb = register_callback("iosend", iosend_default);
456	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
457	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
445	>	if (key)
446	>	{
447	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
448	>	EC_KEY_free(key);
449	>	}
450	>	}
451	>
452	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
453	>	#endif
454	>
455	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
456	>	{
457	>	const char *s = ERR_lib_error_string(ERR_get_error());
458	>
459	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
461	>	exit(EXIT_FAILURE);
462	>	return;  /* Not reached */
463	>	}
464	>
465	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
466	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
467	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
468	>	always_accept_verify_cb);
469	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
470	>	#endif /* HAVE_LIBCRYPTO */
471		}
472
473		int
474		main(int argc, char *argv[])
475		{
476	<	/* Check to see if the user is running
477	<	* us as root, which is a nono
485	<	*/
486	<	if (geteuid() == 0)
476	>	/* Check to see if the user is running us as root, which is a nono */
477	>	if (!geteuid())
478		{
479	<	fprintf(stderr, "Don't run ircd as root!!!\n");
479	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
480		return -1;
481		}
482
#	Line 498 | Line 489 | main(int argc, char *argv[])
489		/* It ain't random, but it ought to be a little harder to guess */
490		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
491
492	<	me.localClient = &meLocalUser;
493	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
492	>	me.connection = &meConnection;
493	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
494		of Client list */
495	<	/* Initialise the channel capability usage counts... */
496	<	init_chcap_usage_counts();
495	>	ConfigLog.use_logging = 1;
496	>	ConfigGeneral.dpath      = DPATH;
497	>	ConfigGeneral.spath      = SPATH;
498	>	ConfigGeneral.mpath      = MPATH;
499	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
500	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
501	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
502	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
503	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
504	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
505
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         */
506		myargv = argv;
507		umask(077);                /* better safe than sorry --SRB */
508
#	Line 521 | Line 510 | main(int argc, char *argv[])
510
511		if (printVersion)
512		{
513	<	printf("ircd: version %s\n", ircd_version);
513	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
514		exit(EXIT_SUCCESS);
515		}
516
517	<	if (chdir(ConfigFileEntry.dpath))
517	>	if (chdir(ConfigGeneral.dpath))
518		{
519		perror("chdir");
520		exit(EXIT_FAILURE);
521		}
522
523	<	init_ssl();
523	>	ssl_init();
524
525		if (!server_state.foreground)
526		{
#	Line 543 | Line 532 | main(int argc, char *argv[])
532
533		setup_signals();
534
546	–	get_ircd_platform(ircd_platform);
547	–
548	–	/* Init the event subsystem */
549	–	eventInit();
535		/* We need this to initialise the fd array before anything else */
536		fdlist_init();
537	<	init_log(logFileName);
538	<	check_can_use_v6();
539	<	init_comm();         /* This needs to be setup early ! -- adrian */
537	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
538	>
539	>	init_netio();         /* This needs to be setup early ! -- adrian */
540	>
541		/* Check if there is pidfile and daemon already running */
542		check_pidfile(pidFileName);
543
544	<	initBlockHeap();
544	>	mp_pool_init();
545		init_dlink_nodes();
546	<	init_callbacks();
561	<	initialize_message_files();
546	>	init_isupport();
547		dbuf_init();
548	<	init_hash();
549	<	init_ip_hash_table();      /* client host ip hash table */
550	<	init_host_hash();          /* Host-hashtable. */
551	<	clear_tree_parse();
552	<	init_client();
568	<	init_class();
569	<	init_whowas();
548	>	hash_init();
549	>	ipcache_init();
550	>	client_init();
551	>	class_init();
552	>	whowas_init();
553		watch_init();
554	<	init_auth();          /* Initialise the auth code */
554	>	auth_init();          /* Initialise the auth code */
555		init_resolver();      /* Needs to be setup before the io loop */
556	+	modules_init();
557		read_conf_files(1);   /* cold start init conf files */
558		init_uid();
559		initialize_server_capabs();   /* Set up default_server_capabs */
560		initialize_global_set_options();
561	<	init_channels();
561	>	channel_init();
562	>	read_links_file();
563	>	motd_init();
564	>	#ifdef HAVE_LIBGEOIP
565	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
566	>	#endif
567
568	<	if (EmptyString(ServerInfo.sid))
568	>	if (EmptyString(ConfigServerInfo.sid))
569		{
570	<	ilog(L_CRIT, "ERROR: No server id specified in serverinfo block.");
570	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
571		exit(EXIT_FAILURE);
572		}
573
574	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
574	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
575
576	<	if (EmptyString(ServerInfo.name))
576	>	if (EmptyString(ConfigServerInfo.name))
577		{
578	<	ilog(L_CRIT, "ERROR: No server name specified in serverinfo block.");
578	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
579		exit(EXIT_FAILURE);
580		}
581
582	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
582	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
583
584		/* serverinfo{} description must exist.  If not, error out.*/
585	<	if (EmptyString(ServerInfo.description))
585	>	if (EmptyString(ConfigServerInfo.description))
586		{
587	<	ilog(L_CRIT, "ERROR: No server description specified in serverinfo block.");
587	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
588		exit(EXIT_FAILURE);
589		}
590
591	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
591	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
592
593		me.from                   = &me;
594		me.servptr                = &me;
595	<	me.localClient->lasttime  = CurrentTime;
596	<	me.localClient->since     = CurrentTime;
597	<	me.localClient->firsttime = CurrentTime;
595	>	me.connection->lasttime  = CurrentTime;
596	>	me.connection->since     = CurrentTime;
597	>	me.connection->firsttime = CurrentTime;
598
599		SetMe(&me);
600		make_server(&me);
601
602		hash_add_id(&me);
603		hash_add_client(&me);
604	<
605	<	/* add ourselves to global_serv_list */
606	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
604	>
605	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
606	>
607	>	load_kline_database();
608	>	load_dline_database();
609	>	load_gline_database();
610	>	load_xline_database();
611	>	load_resv_database();
612
613		if (chdir(MODPATH))
614		{
615	<	ilog(L_CRIT, "Could not load core modules. Terminating!");
615	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
616		exit(EXIT_FAILURE);
617		}
618
#	Line 627 | Line 621 | main(int argc, char *argv[])
621		load_core_modules(1);
622
623		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
624	<	if (chdir(ConfigFileEntry.dpath))
624	>	if (chdir(ConfigGeneral.dpath))
625		{
626		perror("chdir");
627		exit(EXIT_FAILURE);
#	Line 641 | Line 635 | main(int argc, char *argv[])
635
636		write_pidfile(pidFileName);
637
638	<	ilog(L_NOTICE, "Server Ready");
638	>	ilog(LOG_TYPE_IRCD, "Server Ready");
639
640	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
641	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
640	>	event_addish(&event_cleanup_glines, NULL);
641	>	event_addish(&event_cleanup_tklines, NULL);
642
643		/* We want try_connections to be called as soon as possible now! -- adrian */
644		/* No, 'cause after a restart it would cause all sorts of nick collides */
645	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
652	<
653	<	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
645	>	event_addish(&event_try_connections, NULL);
646
647		/* Setup the timeout check. I'll shift it later :)  -- adrian */
648	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
648	>	event_add(&event_comm_checktimeouts, NULL);
649	>
650	>	event_addish(&event_save_all_databases, NULL);
651
652		if (ConfigServerHide.links_delay > 0)
653	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
653	>	{
654	>	event_write_links_file.when = ConfigServerHide.links_delay;
655	>	event_addish(&event_write_links_file, NULL);
656	>	}
657		else
658		ConfigServerHide.links_disabled = 1;
659
660		if (splitmode)
661	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
661	>	event_addish(&splitmode_event, NULL);
662
663		io_loop();
664		return 0;

Diff Legend

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