ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/ircd.c

Comparing:
ircd-hybrid-8/src/ircd.c (file contents), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 3215 by michael, Tue Mar 25 19:23:15 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"
#	Line 36 | Line 38
38		#include "ircd_signal.h"
39		#include "s_gline.h"
40		#include "motd.h"
41	+	#include "conf.h"
42		#include "hostmask.h"
43		#include "numeric.h"
44		#include "packet.h"
#	Line 45 | Line 48
48		#include "rng_mt.h"
49		#include "s_auth.h"
50		#include "s_bsd.h"
48	–	#include "conf.h"
51		#include "log.h"
52		#include "s_misc.h"
53		#include "s_serv.h"      /* try_connections */
#	Line 53 | Line 55
55		#include "whowas.h"
56		#include "modules.h"
57		#include "memory.h"
58	+	#include "mempool.h"
59		#include "hook.h"
60		#include "ircd_getopt.h"
58	–	#include "balloc.h"
59	–	#include "motd.h"
61		#include "supported.h"
62		#include "watch.h"
63	+	#include "conf_db.h"
64	+	#include "conf_class.h"
65
66
67	+	#ifdef HAVE_LIBGEOIP
68	+	GeoIP *geoip_ctx;
69	+	#endif
70	+
71		/* /quote set variables */
72		struct SetOptions GlobalSetOptions;
73	<
74	<	/* 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 };
73	>	struct Counter Count;
74	>	struct ServerState_t server_state;
75		struct ServerStatistics ServerStats;
76		struct timeval SystemTime;
77		struct Client me;             /* That's me */
#	Line 82 | Line 81 | const char *logFileName = LPATH;
81		const char *pidFileName = PPATH;
82
83		char **myargv;
85	–	char ircd_platform[PLATFORMLEN];
84
85		int dorehash = 0;
86		int doremotd = 0;
#	Line 115 | Line 113 | int rehashed_klines = 0;
113		static void
114		print_startup(int pid)
115		{
116	<	printf("ircd: version %s\n", ircd_version);
116	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
117		printf("ircd: pid %d\n", pid);
118		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
119		: "foreground", ConfigFileEntry.dpath);
#	Line 142 | Line 140 | make_daemon(void)
140
141		static int printVersion = 0;
142
143	<	struct lgetopt myopts[] = {
144	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
145	<	STRING, "File to use for dline.conf"},
148	<	{"configfile", &ConfigFileEntry.configfile,
143	>	static struct lgetopt myopts[] =
144	>	{
145	>	{"configfile", &ConfigFileEntry.configfile,
146		STRING, "File to use for ircd.conf"},
147	<	{"klinefile",  &ConfigFileEntry.klinefile,
148	<	STRING, "File to use for kline.conf"},
149	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
150	<	STRING, "File to use for xline.conf"},
151	<	{"logfile",    &logFileName,
147	>	{"glinefile",  &ConfigFileEntry.glinefile,
148	>	STRING, "File to use for gline database"},
149	>	{"klinefile",  &ConfigFileEntry.klinefile,
150	>	STRING, "File to use for kline database"},
151	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
152	>	STRING, "File to use for dline database"},
153	>	{"xlinefile",  &ConfigFileEntry.xlinefile,
154	>	STRING, "File to use for xline database"},
155	>	{"resvfile",  &ConfigFileEntry.resvfile,
156	>	STRING, "File to use for resv database"},
157	>	{"logfile",    &logFileName,
158		STRING, "File to use for ircd.log"},
159		{"pidfile",    &pidFileName,
160		STRING, "File to use for process ID"},
161	<	{"foreground", &server_state.foreground,
161	>	{"foreground", &server_state.foreground,
162		YESNO, "Run in foreground (don't detach)"},
163	<	{"version",    &printVersion,
163	>	{"version",    &printVersion,
164		YESNO, "Print version and exit"},
165		{"help", NULL, USAGE, "Print this text"},
166		{NULL, NULL, STRING, NULL},
#	Line 166 | Line 169 | struct lgetopt myopts[] = {
169		void
170		set_time(void)
171		{
172	<	static char to_send[200];
170	<	struct timeval newtime;
171	<	newtime.tv_sec  = 0;
172	<	newtime.tv_usec = 0;
172	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
173
174		if (gettimeofday(&newtime, NULL) == -1)
175		{
176		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
177		strerror(errno));
178	<	sendto_realops_flags(UMODE_ALL, L_ALL,
178	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
179		"Clock Failure (%s), TS can be corrupted",
180		strerror(errno));
181	<	restart("Clock Failure");
181	>	server_die("Clock Failure", 1);
182		}
183
184		if (newtime.tv_sec < CurrentTime)
185		{
186	<	snprintf(to_send, sizeof(to_send),
187	<	"System clock is running backwards - (%lu < %lu)",
188	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
189	<	report_error(L_ALL, to_send, me.name, 0);
186	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
187	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
188	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
189	>	"System clock is running backwards - (%lu < %lu)",
190	>	(unsigned long)newtime.tv_sec,
191	>	(unsigned long)CurrentTime);
192		set_back_events(CurrentTime - newtime.tv_sec);
193		}
194
#	Line 197 | Line 199 | set_time(void)
199		static void
200		io_loop(void)
201		{
202	<	while (1 == 1)
202	>	while (1)
203		{
204		/*
205		* Maybe we want a flags word?
206	<	* ie. if (REHASHED_KLINES(global_flags))
206	>	* ie. if (REHASHED_KLINES(global_flags))
207		* SET_REHASHED_KLINES(global_flags)
208		* CLEAR_REHASHED_KLINES(global_flags)
209		*
#	Line 233 | Line 235 | io_loop(void)
235		comm_select();
236		exit_aborted_clients();
237		free_exited_clients();
236	–	send_queued_all();
238
239		/* Check to see whether we have to rehash the configuration .. */
240		if (dorehash)
#	Line 241 | Line 242 | io_loop(void)
242		rehash(1);
243		dorehash = 0;
244		}
245	+
246		if (doremotd)
247		{
248	<	read_message_file(&ConfigFileEntry.motd);
249	<	sendto_realops_flags(UMODE_ALL, L_ALL,
250	<	"Got signal SIGUSR1, reloading ircd motd file");
248	>	motd_recache();
249	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
250	>	"Got signal SIGUSR1, reloading motd file(s)");
251		doremotd = 0;
252		}
253		}
#	Line 255 | Line 257 | io_loop(void)
257		*
258		* inputs       - none
259		* output       - none
260	<	* side effects - This sets all global set options needed
260	>	* side effects - This sets all global set options needed
261		*/
262		static void
263		initialize_global_set_options(void)
#	Line 289 | Line 291 | initialize_global_set_options(void)
291		/* End of global set options */
292		}
293
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();
310	–	}
311	–
294		/* initialize_server_capabs()
295		*
296		* inputs       - none
#	Line 336 | Line 318 | initialize_server_capabs(void)
318		static void
319		write_pidfile(const char *filename)
320		{
321	<	FBFILE *fb;
321	>	FILE *fb;
322
323	<	if ((fb = fbopen(filename, "w")))
323	>	if ((fb = fopen(filename, "w")))
324		{
325	<	char buff[32];
325	>	char buff[IRCD_BUFSIZE];
326		unsigned int pid = (unsigned int)getpid();
345	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
327
328	<	if ((fbputs(buff, fb, nbytes) == -1))
328	>	snprintf(buff, sizeof(buff), "%u\n", pid);
329	>
330	>	if ((fputs(buff, fb) == -1))
331		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
332		pid, filename, strerror(errno));
333
334	<	fbclose(fb);
352	<	return;
334	>	fclose(fb);
335		}
336		else
337		{
#	Line 368 | Line 350 | write_pidfile(const char *filename)
350		static void
351		check_pidfile(const char *filename)
352		{
353	<	FBFILE *fb;
354	<	char buff[32];
353	>	FILE *fb;
354	>	char buff[IRCD_BUFSIZE];
355		pid_t pidfromfile;
356
357		/* Don't do logging here, since we don't have log() initialised */
358	<	if ((fb = fbopen(filename, "r")))
358	>	if ((fb = fopen(filename, "r")))
359		{
360	<	if (fbgets(buff, 20, fb) == NULL)
360	>	if (fgets(buff, 20, fb) == NULL)
361		{
362		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
363		* strerror(errno));
#	Line 393 | Line 375 | check_pidfile(const char *filename)
375		}
376		}
377
378	<	fbclose(fb);
378	>	fclose(fb);
379		}
380		else if (errno != ENOENT)
381		{
#	Line 423 | Line 405 | setup_corefile(void)
405		#endif
406		}
407
408	+	#ifdef HAVE_LIBCRYPTO
409	+	static int
410	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
411	+	{
412	+	return 1;
413	+	}
414	+	#endif
415	+
416		/* init_ssl()
417		*
418		* inputs       - nothing
#	Line 430 | Line 420 | setup_corefile(void)
420		* side effects - setups SSL context.
421		*/
422		static void
423	<	init_ssl(void)
423	>	ssl_init(void)
424		{
425		#ifdef HAVE_LIBCRYPTO
426	+	const unsigned char session_id[] = "ircd-hybrid";
427	+
428		SSL_load_error_strings();
429		SSLeay_add_ssl_algorithms();
430
#	Line 445 | Line 437 | init_ssl(void)
437		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
438		}
439
440	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
440	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
441		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
442	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
442	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
443	>	always_accept_verify_cb);
444	>	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
445
446		if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
447		{
#	Line 458 | Line 452 | init_ssl(void)
452		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
453		}
454
455	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2);
455	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
456		SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
457	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
457	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
458	>	always_accept_verify_cb);
459		#endif /* HAVE_LIBCRYPTO */
460		}
461
467	–	/* init_callbacks()
468	–	*
469	–	* inputs       - nothing
470	–	* output       - nothing
471	–	* side effects - setups standard hook points
472	–	*/
473	–	static void
474	–	init_callbacks(void)
475	–	{
476	–	iorecv_cb = register_callback("iorecv", iorecv_default);
477	–	iosend_cb = register_callback("iosend", iosend_default);
478	–	}
479	–
462		int
463		main(int argc, char *argv[])
464		{
465	<	/* Check to see if the user is running
484	<	* us as root, which is a nono
485	<	*/
465	>	/* Check to see if the user is running us as root, which is a nono */
466		if (geteuid() == 0)
467		{
468		fprintf(stderr, "Don't run ircd as root!!!\n");
#	Line 499 | Line 479 | main(int argc, char *argv[])
479		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
480
481		me.localClient = &meLocalUser;
482	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
482	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
483		of Client list */
504	–	/* Initialise the channel capability usage counts... */
505	–	init_chcap_usage_counts();
506	–
484		ConfigFileEntry.dpath      = DPATH;
485	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
486	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
487	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
488	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
489	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
490	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
491	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
515	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
516	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
485	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
486	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
487	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
488	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
489	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
490	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
491	>
492		myargv = argv;
493		umask(077);                /* better safe than sorry --SRB */
494
#	Line 521 | Line 496 | main(int argc, char *argv[])
496
497		if (printVersion)
498		{
499	<	printf("ircd: version %s\n", ircd_version);
499	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
500		exit(EXIT_SUCCESS);
501		}
502
#	Line 531 | Line 506 | main(int argc, char *argv[])
506		exit(EXIT_FAILURE);
507		}
508
509	<	init_ssl();
509	>	ssl_init();
510
511		if (!server_state.foreground)
512		{
#	Line 543 | Line 518 | main(int argc, char *argv[])
518
519		setup_signals();
520
546	–	get_ircd_platform(ircd_platform);
547	–
521		/* Init the event subsystem */
522		eventInit();
523	+
524		/* We need this to initialise the fd array before anything else */
525		fdlist_init();
526	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
526	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
527		check_can_use_v6();
528	<	init_comm();         /* This needs to be setup early ! -- adrian */
528	>	init_netio();         /* This needs to be setup early ! -- adrian */
529	>
530		/* Check if there is pidfile and daemon already running */
531		check_pidfile(pidFileName);
532
533	<	initBlockHeap();
533	>	mp_pool_init();
534		init_dlink_nodes();
535	<	init_callbacks();
561	<	initialize_message_files();
535	>	init_isupport();
536		dbuf_init();
537	<	init_hash();
537	>	hash_init();
538		init_ip_hash_table();      /* client host ip hash table */
539		init_host_hash();          /* Host-hashtable. */
540	<	clear_tree_parse();
541	<	init_client();
542	<	init_class();
569	<	init_whowas();
540	>	client_init();
541	>	class_init();
542	>	whowas_init();
543		watch_init();
544	<	init_auth();          /* Initialise the auth code */
544	>	auth_init();          /* Initialise the auth code */
545		init_resolver();      /* Needs to be setup before the io loop */
546	+	modules_init();
547		read_conf_files(1);   /* cold start init conf files */
548		init_uid();
549		initialize_server_capabs();   /* Set up default_server_capabs */
550		initialize_global_set_options();
551	<	init_channels();
551	>	channel_init();
552	>	read_links_file();
553	>	motd_init();
554	>	#ifdef HAVE_LIBGEOIP
555	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
556	>	#endif
557
558		if (EmptyString(ServerInfo.sid))
559		{
#	Line 612 | Line 591 | main(int argc, char *argv[])
591
592		hash_add_id(&me);
593		hash_add_client(&me);
594	<
594	>
595		/* add ourselves to global_serv_list */
596		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
597
598	+	load_kline_database();
599	+	load_dline_database();
600	+	load_gline_database();
601	+	load_xline_database();
602	+	load_resv_database();
603	+
604		if (chdir(MODPATH))
605		{
606		ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
#	Line 653 | Line 638 | main(int argc, char *argv[])
638		/* Setup the timeout check. I'll shift it later :)  -- adrian */
639		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
640
641	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
642	+
643		if (ConfigServerHide.links_delay > 0)
644		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
645		else

Diff Legend

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