ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/ircd.c (file contents), Revision 1013 by michael, Sun Oct 18 14:26:49 2009 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 5723 by michael, Sun Mar 22 16:28:58 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"
32	–	#include "common.h"
33		#include "event.h"
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37	–	#include "sprintf_irc.h"
37		#include "ircd_signal.h"
38	<	#include "s_gline.h"
38	>	#include "gline.h"
39		#include "motd.h"
40	<	#include "ircd_handler.h"
42	<	#include "msg.h"         /* msgtab */
40	>	#include "conf.h"
41		#include "hostmask.h"
44	–	#include "numeric.h"
45	–	#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"
54	<	#include "s_misc.h"
55	<	#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"
62	–	#include "balloc.h"
63	–	#include "motd.h"
64	–	#include "supported.h"
56		#include "watch.h"
57	+	#include "conf_db.h"
58	+	#include "conf_class.h"
59	+	#include "ipcache.h"
60
61	<	/* Try and find the correct name to use with getrlimit() for setting the max.
62	<	* number of files allowed to be open by this process.
63	<	*/
61	>
62	>	#ifdef HAVE_LIBGEOIP
63	>	GeoIP *geoip_ctx;
64	>	#endif
65
66		/* /quote set variables */
67		struct SetOptions GlobalSetOptions;
68	<
69	<	/* configuration set from ircd.conf */
75	<	struct config_file_entry ConfigFileEntry;
76	<	/* server info set from ircd.conf */
77	<	struct server_info ServerInfo;
78	<	/* admin info set from ircd.conf */
79	<	struct admin_info AdminInfo = { NULL, NULL, NULL };
80	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
81	<	struct ServerState_t server_state = { 0 };
82	<	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
68	>	struct Counter Count;
69	>	struct ServerState_t server_state;
70		struct ServerStatistics ServerStats;
71		struct timeval SystemTime;
72	<	struct Client me;             /* That's me */
73	<	struct LocalUser meLocalUser; /* That's also part of me */
72	>	struct Connection meConnection; /* That's also part of me */
73	>	struct Client me = { .connection = &meConnection };  /* That's me */
74
75	+	char **myargv;
76		const char *logFileName = LPATH;
77		const char *pidFileName = PPATH;
78
79	<	char **myargv;
80	<	char ircd_platform[PLATFORMLEN];
81	<
94	<	int dorehash = 0;
95	<	int doremotd = 0;
96	<
97	<	/* Set to zero because it should be initialized later using
98	<	* initialize_server_capabs
99	<	*/
100	<	int default_server_capabs = 0;
101	<
102	<	#ifdef HAVE_LIBCRYPTO
103	<	int bio_spare_fd = -1;
104	<	#endif
105	<
79	>	unsigned int dorehash;
80	>	unsigned int doremotd;
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	<	int rehashed_klines = 0;
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	>	struct event event_write_links_file =
123	>	{
124	>	.name = "write_links_file",
125	>	.handler = write_links_file,
126	>	};
127
128
129		/*
#	Line 127 | 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 154 | 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"},
160	<	{"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 178 | Line 188 | struct lgetopt myopts[] = {
188		void
189		set_time(void)
190		{
191	<	static char to_send[200];
182	<	struct timeval newtime;
183	<	newtime.tv_sec  = 0;
184	<	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	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
206	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
207	<	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	<	}
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
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)
239		{
240	<	rehash(1);
240	>	conf_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		{
263	<	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
264	<
276	<	GlobalSetOptions.autoconn  = 1;
263	>	GlobalSetOptions.maxclients = ConfigServerInfo.default_max_clients;
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;
282	<	else
283	<	GlobalSetOptions.floodcount = 10;
284	<
285	<	/* XXX I have no idea what to try here - Dianora */
286	<	GlobalSetOptions.joinfloodcount = 16;
287	<	GlobalSetOptions.joinfloodtime = 8;
266	>	GlobalSetOptions.spam_num = MAX_JOIN_LEAVE_COUNT;
267	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
268	>	GlobalSetOptions.joinfloodcount = ConfigChannel.default_join_flood_count;
269	>	GlobalSetOptions.joinfloodtime = ConfigChannel.default_join_flood_time;
270
271		split_servers = ConfigChannel.default_split_server_count;
272		split_users   = ConfigChannel.default_split_user_count;
#	Line 297 | Line 279 | initialize_global_set_options(void)
279		}
280
281		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();
282		}
283
284		/* initialize_server_capabs()
#	Line 331 | Line 291 | initialize_server_capabs(void)
291		{
292		add_capability("QS", CAP_QS, 1);
293		add_capability("EOB", CAP_EOB, 1);
294	<
335	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
336	<	add_capability("TS6", CAP_TS6, 0);
337	<
338	<	add_capability("ZIP", CAP_ZIP, 0);
294	>	add_capability("TS6", CAP_TS6, 0);
295		add_capability("CLUSTER", CAP_CLUSTER, 1);
296	<	#ifdef HALFOPS
296	>	add_capability("SVS", CAP_SVS, 1);
297	>	add_capability("CHW", CAP_CHW, 1);
298		add_capability("HOPS", CAP_HOPS, 1);
342	–	#endif
299		}
300
301		/* write_pidfile()
#	Line 351 | 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();
360	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
316
317	<	if ((fbputs(buff, fb, nbytes) == -1))
318	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
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);
367	<	return;
323	>	fclose(fb);
324		}
325		else
326	<	{
327	<	ilog(L_ERROR, "Error opening pid file %s", filename);
372	<	}
326	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s: %s",
327	>	filename, strerror(errno));
328		}
329
330		/* check_pidfile()
#	Line 383 | Line 338 | write_pidfile(const char *filename)
338		static void
339		check_pidfile(const char *filename)
340		{
341	<	FBFILE *fb;
342	<	char buff[32];
341	>	FILE *fb;
342	>	char buff[IRCD_BUFSIZE];
343		pid_t pidfromfile;
344
345		/* Don't do logging here, since we don't have log() initialised */
346	<	if ((fb = fbopen(filename, "r")))
346	>	if ((fb = fopen(filename, "r")))
347		{
348	<	if (fbgets(buff, 20, fb) == NULL)
348	>	if (!fgets(buff, 20, fb))
349		{
350		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
351		* strerror(errno));
#	Line 408 | Line 363 | check_pidfile(const char *filename)
363		}
364		}
365
366	<	fbclose(fb);
366	>	fclose(fb);
367		}
368		else if (errno != ENOENT)
369		{
#	Line 438 | Line 393 | setup_corefile(void)
393		#endif
394		}
395
396	+	#ifdef HAVE_LIBCRYPTO
397	+	static int
398	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
399	+	{
400	+	return 1;
401	+	}
402	+	#endif
403	+
404		/* init_ssl()
405		*
406		* inputs       - nothing
#	Line 445 | Line 408 | setup_corefile(void)
408		* side effects - setups SSL context.
409		*/
410		static void
411	<	init_ssl(void)
411	>	ssl_init(void)
412		{
413		#ifdef HAVE_LIBCRYPTO
414		SSL_load_error_strings();
415		SSLeay_add_ssl_algorithms();
416
417	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
417	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
418		{
419	<	const char *s;
419	>	const char *s = ERR_lib_error_string(ERR_get_error());
420
421	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
422	<	s = ERR_lib_error_string(ERR_get_error()));
423	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
421	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
422	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
423	>	exit(EXIT_FAILURE);
424	>	return;  /* Not reached */
425		}
426
427	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
428	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
429	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
427	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
428	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
429	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
430	>	always_accept_verify_cb);
431	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
432	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
433
434	<	bio_spare_fd = save_spare_fd("SSL private key validation");
435	<	#endif /* HAVE_LIBCRYPTO */
436	<	}
434	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
435	>	{
436	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
437
438	<	/* init_callbacks()
439	<	*
440	<	* inputs       - nothing
441	<	* output       - nothing
442	<	* side effects - setups standard hook points
443	<	*/
444	<	static void
445	<	init_callbacks(void)
446	<	{
447	<	iorecv_cb = register_callback("iorecv", iorecv_default);
448	<	iosend_cb = register_callback("iosend", iosend_default);
449	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
450	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
438	>	if (key)
439	>	{
440	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
441	>	EC_KEY_free(key);
442	>	}
443	>	}
444	>
445	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
446	>	#endif
447	>
448	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
449	>	{
450	>	const char *s = ERR_lib_error_string(ERR_get_error());
451	>
452	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
453	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
454	>	exit(EXIT_FAILURE);
455	>	return;  /* Not reached */
456	>	}
457	>
458	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
459	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
460	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
461	>	always_accept_verify_cb);
462	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
463	>	#endif /* HAVE_LIBCRYPTO */
464		}
465
466		int
467		main(int argc, char *argv[])
468		{
469	<	/* Check to see if the user is running
470	<	* us as root, which is a nono
491	<	*/
492	<	if (geteuid() == 0)
469	>	/* Check to see if the user is running us as root, which is a nono */
470	>	if (!geteuid())
471		{
472	<	fprintf(stderr, "Don't run ircd as root!!!\n");
472	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
473		return -1;
474		}
475
476		/* Setup corefile size immediately after boot -kre */
477		setup_corefile();
478
479	<	/* save server boot time right away, so getrusage works correctly */
479	>	/* Save server boot time right away, so getrusage works correctly */
480		set_time();
481
482	<	/* It ain't random, but it ought to be a little harder to guess */
482	>	/* It's not random, but it ought to be a little harder to guess */
483		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
484
485	<	memset(&me, 0, sizeof(me));
486	<	memset(&meLocalUser, 0, sizeof(meLocalUser));
487	<	me.localClient = &meLocalUser;
488	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
489	<	of Client list */
490	<
491	<	memset(&ServerInfo, 0, sizeof(ServerInfo));
492	<	memset(&ServerStats, 0, sizeof(ServerStats));
493	<
494	<	/* Initialise the channel capability usage counts... */
495	<	init_chcap_usage_counts();
496	<
519	<	ConfigFileEntry.dpath      = DPATH;
520	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
521	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
522	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
523	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
524	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
525	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
526	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
527	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
528	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
485	>	dlinkAdd(&me, &me.node, &global_client_list);
486	>
487	>	ConfigGeneral.dpath      = DPATH;
488	>	ConfigGeneral.spath      = SPATH;
489	>	ConfigGeneral.mpath      = MPATH;
490	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
491	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
492	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
493	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
494	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
495	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
496	>
497		myargv = argv;
498	<	umask(077);                /* better safe than sorry --SRB */
498	>	umask(077);  /* umask 077: u=rwx,g=,o= */
499
500		parseargs(&argc, &argv, myopts);
501
502		if (printVersion)
503		{
504	<	printf("ircd: version %s\n", ircd_version);
504	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
505		exit(EXIT_SUCCESS);
506		}
507
508	<	if (chdir(ConfigFileEntry.dpath))
508	>	if (chdir(ConfigGeneral.dpath))
509		{
510		perror("chdir");
511		exit(EXIT_FAILURE);
512		}
513
514	<	init_ssl();
514	>	ssl_init();
515
516		if (!server_state.foreground)
517		{
#	Line 555 | Line 523 | main(int argc, char *argv[])
523
524		setup_signals();
525
558	–	get_ircd_platform(ircd_platform);
559	–
560	–	/* Init the event subsystem */
561	–	eventInit();
526		/* We need this to initialise the fd array before anything else */
527		fdlist_init();
528	<	init_log(logFileName);
529	<	check_can_use_v6();
530	<	init_comm();         /* This needs to be setup early ! -- adrian */
528	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
529	>
530	>	init_netio();         /* This needs to be setup early ! -- adrian */
531	>
532		/* Check if there is pidfile and daemon already running */
533		check_pidfile(pidFileName);
534
535	<	initBlockHeap();
535	>	mp_pool_init();
536		init_dlink_nodes();
537	<	init_callbacks();
573	<	initialize_message_files();
537	>	init_isupport();
538		dbuf_init();
539	<	init_hash();
540	<	init_ip_hash_table();      /* client host ip hash table */
541	<	init_host_hash();          /* Host-hashtable. */
542	<	clear_tree_parse();
543	<	init_client();
580	<	init_class();
581	<	init_whowas();
539	>	hash_init();
540	>	ipcache_init();
541	>	client_init();
542	>	class_init();
543	>	whowas_init();
544		watch_init();
545	<	init_auth();          /* Initialise the auth code */
545	>	auth_init();          /* Initialise the auth code */
546		init_resolver();      /* Needs to be setup before the io loop */
547	+	modules_init();
548		read_conf_files(1);   /* cold start init conf files */
586	–	me.id[0] = '\0';
549		init_uid();
550		initialize_server_capabs();   /* Set up default_server_capabs */
551	<	initialize_global_set_options();
552	<	init_channels();
551	>	initialize_global_set_options();  /* Has to be called after read_conf_files() */
552	>	channel_init();
553	>	read_links_file();
554	>	motd_init();
555	>	user_usermodes_init();
556	>	#ifdef HAVE_LIBGEOIP
557	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
558	>	#endif
559
560	<	if (ServerInfo.name == NULL)
560	>	if (EmptyString(ConfigServerInfo.sid))
561		{
562	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
562	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
563		exit(EXIT_FAILURE);
564		}
565
566	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
566	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
567	>
568	>	if (EmptyString(ConfigServerInfo.name))
569	>	{
570	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
571	>	exit(EXIT_FAILURE);
572	>	}
573	>
574	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
575
576		/* serverinfo{} description must exist.  If not, error out.*/
577	<	if (ServerInfo.description == NULL)
577	>	if (EmptyString(ConfigServerInfo.description))
578		{
579	<	ilog(L_CRIT,
604	<	"ERROR: No server description specified in serverinfo block.");
579	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
580		exit(EXIT_FAILURE);
581		}
582
583	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
583	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
584
585	<	me.from    = &me;
585	>	me.from = &me;
586		me.servptr = &me;
587	+	me.connection->lasttime = CurrentTime;
588	+	me.connection->since = CurrentTime;
589	+	me.connection->firsttime = CurrentTime;
590
591		SetMe(&me);
592		make_server(&me);
593
594	<	me.lasttime = me.since = me.firsttime = CurrentTime;
594	>	hash_add_id(&me);
595		hash_add_client(&me);
618	–
619	–	/* add ourselves to global_serv_list */
620	–	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
596
597	<	check_class();
597	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
598
599	<	#ifndef STATIC_MODULES
600	<	if (chdir(MODPATH))
601	<	{
602	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
603	<	exit(EXIT_FAILURE);
629	<	}
599	>	load_kline_database();
600	>	load_dline_database();
601	>	load_gline_database();
602	>	load_xline_database();
603	>	load_resv_database();
604
605		load_all_modules(1);
606		load_conf_modules();
607		load_core_modules(1);
634	–	/* Go back to DPATH after checking to see if we can chdir to MODPATH */
635	–	chdir(ConfigFileEntry.dpath);
636	–	#else
637	–	load_all_modules(1);
638	–	#endif
639	–	/*
640	–	* assemble_umode_buffer() has to be called after
641	–	* reading conf/loading modules.
642	–	*/
643	–	assemble_umode_buffer();
608
609		write_pidfile(pidFileName);
610
611	<	ilog(L_NOTICE, "Server Ready");
611	>	ilog(LOG_TYPE_IRCD, "Server Ready");
612
613	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
614	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
613	>	event_addish(&event_cleanup_glines, NULL);
614	>	event_addish(&event_cleanup_tklines, NULL);
615
616		/* We want try_connections to be called as soon as possible now! -- adrian */
617		/* No, 'cause after a restart it would cause all sorts of nick collides */
618	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
655	<
656	<	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
618	>	event_addish(&event_try_connections, NULL);
619
620		/* Setup the timeout check. I'll shift it later :)  -- adrian */
621	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
621	>	event_add(&event_comm_checktimeouts, NULL);
622	>
623	>	event_addish(&event_save_all_databases, NULL);
624
625		if (ConfigServerHide.links_delay > 0)
626	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
626	>	{
627	>	event_write_links_file.when = ConfigServerHide.links_delay;
628	>	event_addish(&event_write_links_file, NULL);
629	>	}
630		else
631		ConfigServerHide.links_disabled = 1;
632
633		if (splitmode)
634	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
634	>	event_addish(&splitmode_event, NULL);
635
636		io_loop();
637		return 0;

Diff Legend

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