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 1446 by michael, Mon Jun 25 20:05:12 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 3065 by michael, Thu Feb 27 19:03:46 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 = { .use_logging = 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 114 | 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 141 | make_daemon(void)
141		static int printVersion = 0;
142
143		static struct lgetopt myopts[] = {
144	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
146	<	STRING, "File to use for dline.conf"},
147	<	{"configfile", &ConfigFileEntry.configfile,
144	>	{"configfile", &ConfigFileEntry.configfile,
145		STRING, "File to use for ircd.conf"},
146	<	{"klinefile",  &ConfigFileEntry.klinefile,
147	<	STRING, "File to use for kline.conf"},
148	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
149	<	STRING, "File to use for xline.conf"},
150	<	{"logfile",    &logFileName,
146	>	{"glinefile",  &ConfigFileEntry.glinefile,
147	>	STRING, "File to use for gline database"},
148	>	{"klinefile",  &ConfigFileEntry.klinefile,
149	>	STRING, "File to use for kline database"},
150	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
151	>	STRING, "File to use for dline database"},
152	>	{"xlinefile",  &ConfigFileEntry.xlinefile,
153	>	STRING, "File to use for xline database"},
154	>	{"resvfile",  &ConfigFileEntry.resvfile,
155	>	STRING, "File to use for resv database"},
156	>	{"logfile",    &logFileName,
157		STRING, "File to use for ircd.log"},
158		{"pidfile",    &pidFileName,
159		STRING, "File to use for process ID"},
160	<	{"foreground", &server_state.foreground,
160	>	{"foreground", &server_state.foreground,
161		YESNO, "Run in foreground (don't detach)"},
162	<	{"version",    &printVersion,
162	>	{"version",    &printVersion,
163		YESNO, "Print version and exit"},
164		{"help", NULL, USAGE, "Print this text"},
165		{NULL, NULL, STRING, NULL},
#	Line 165 | Line 168 | static struct lgetopt myopts[] = {
168		void
169		set_time(void)
170		{
171	<	static char to_send[200];
169	<	struct timeval newtime;
170	<	newtime.tv_sec  = 0;
171	<	newtime.tv_usec = 0;
171	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
172
173		if (gettimeofday(&newtime, NULL) == -1)
174		{
175		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
176		strerror(errno));
177	<	sendto_realops_flags(UMODE_ALL, L_ALL,
177	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
178		"Clock Failure (%s), TS can be corrupted",
179		strerror(errno));
180		restart("Clock Failure");
#	Line 182 | Line 182 | set_time(void)
182
183		if (newtime.tv_sec < CurrentTime)
184		{
185	<	snprintf(to_send, sizeof(to_send),
186	<	"System clock is running backwards - (%lu < %lu)",
187	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
188	<	report_error(L_ALL, to_send, me.name, 0);
185	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
186	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
187	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
188	>	"System clock is running backwards - (%lu < %lu)",
189	>	(unsigned long)newtime.tv_sec,
190	>	(unsigned long)CurrentTime);
191		set_back_events(CurrentTime - newtime.tv_sec);
192		}
193
#	Line 200 | Line 202 | io_loop(void)
202		{
203		/*
204		* Maybe we want a flags word?
205	<	* ie. if (REHASHED_KLINES(global_flags))
205	>	* ie. if (REHASHED_KLINES(global_flags))
206		* SET_REHASHED_KLINES(global_flags)
207		* CLEAR_REHASHED_KLINES(global_flags)
208		*
#	Line 232 | Line 234 | io_loop(void)
234		comm_select();
235		exit_aborted_clients();
236		free_exited_clients();
235	–	send_queued_all();
237
238		/* Check to see whether we have to rehash the configuration .. */
239		if (dorehash)
#	Line 242 | Line 243 | io_loop(void)
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 254 | 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)
#	Line 288 | Line 289 | initialize_global_set_options(void)
289		/* End of global set options */
290		}
291
291	–	/* initialize_message_files()
292	–	*
293	–	* inputs       - none
294	–	* output       - none
295	–	* side effects - Set up all message files needed, motd etc.
296	–	*/
297	–	static void
298	–	initialize_message_files(void)
299	–	{
300	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
301	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
302	–
303	–	read_message_file(&ConfigFileEntry.motd);
304	–	read_message_file(&ConfigFileEntry.linksfile);
305	–
306	–	init_isupport();
307	–	}
308	–
292		/* initialize_server_capabs()
293		*
294		* inputs       - none
#	Line 337 | Line 320 | write_pidfile(const char *filename)
320
321		if ((fb = fopen(filename, "w")))
322		{
323	<	char buff[32];
323	>	char buff[IRCD_BUFSIZE];
324		unsigned int pid = (unsigned int)getpid();
325
326		snprintf(buff, sizeof(buff), "%u\n", pid);
#	Line 366 | Line 349 | static void
349		check_pidfile(const char *filename)
350		{
351		FILE *fb;
352	<	char buff[32];
352	>	char buff[IRCD_BUFSIZE];
353		pid_t pidfromfile;
354
355		/* Don't do logging here, since we don't have log() initialised */
#	Line 420 | Line 403 | setup_corefile(void)
403		#endif
404		}
405
406	+	#ifdef HAVE_LIBCRYPTO
407	+	static int
408	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
409	+	{
410	+	return 1;
411	+	}
412	+	#endif
413	+
414		/* init_ssl()
415		*
416		* inputs       - nothing
#	Line 427 | Line 418 | setup_corefile(void)
418		* side effects - setups SSL context.
419		*/
420		static void
421	<	init_ssl(void)
421	>	ssl_init(void)
422		{
423		#ifdef HAVE_LIBCRYPTO
424	+	const unsigned char session_id[] = "ircd-hybrid";
425	+
426		SSL_load_error_strings();
427		SSLeay_add_ssl_algorithms();
428
#	Line 444 | Line 437 | init_ssl(void)
437
438		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
439		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
440	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
440	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
441	>	always_accept_verify_cb);
442	>	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
443
444		if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
445		{
#	Line 457 | Line 452 | init_ssl(void)
452
453		SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
454		SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
455	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
455	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
456	>	always_accept_verify_cb);
457		#endif /* HAVE_LIBCRYPTO */
458		}
459
464	–	/* init_callbacks()
465	–	*
466	–	* inputs       - nothing
467	–	* output       - nothing
468	–	* side effects - setups standard hook points
469	–	*/
470	–	static void
471	–	init_callbacks(void)
472	–	{
473	–	iorecv_cb = register_callback("iorecv", iorecv_default);
474	–	iosend_cb = register_callback("iosend", iosend_default);
475	–	}
476	–
460		int
461		main(int argc, char *argv[])
462		{
463	<	/* Check to see if the user is running
481	<	* us as root, which is a nono
482	<	*/
463	>	/* Check to see if the user is running us as root, which is a nono */
464		if (geteuid() == 0)
465		{
466		fprintf(stderr, "Don't run ircd as root!!!\n");
#	Line 496 | Line 477 | main(int argc, char *argv[])
477		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
478
479		me.localClient = &meLocalUser;
480	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
480	>	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
481		of Client list */
482		/* Initialise the channel capability usage counts... */
483		init_chcap_usage_counts();
484
485		ConfigFileEntry.dpath      = DPATH;
486	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
487	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
488	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
489	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
490	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
491	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
492	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
512	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
513	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
486	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
487	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
488	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
489	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
490	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
491	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
492	>
493		myargv = argv;
494		umask(077);                /* better safe than sorry --SRB */
495
#	Line 518 | Line 497 | main(int argc, char *argv[])
497
498		if (printVersion)
499		{
500	<	printf("ircd: version %s\n", ircd_version);
500	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
501		exit(EXIT_SUCCESS);
502		}
503
#	Line 528 | Line 507 | main(int argc, char *argv[])
507		exit(EXIT_FAILURE);
508		}
509
510	<	init_ssl();
510	>	ssl_init();
511
512		if (!server_state.foreground)
513		{
#	Line 542 | Line 521 | main(int argc, char *argv[])
521
522		/* Init the event subsystem */
523		eventInit();
524	+
525		/* We need this to initialise the fd array before anything else */
526		fdlist_init();
527	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
527	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
528		check_can_use_v6();
529	<	init_comm();         /* This needs to be setup early ! -- adrian */
529	>	init_netio();         /* This needs to be setup early ! -- adrian */
530	>
531		/* Check if there is pidfile and daemon already running */
532		check_pidfile(pidFileName);
533
534	<	initBlockHeap();
534	>	mp_pool_init();
535		init_dlink_nodes();
536	<	init_callbacks();
556	<	initialize_message_files();
536	>	init_isupport();
537		dbuf_init();
538	<	init_hash();
538	>	hash_init();
539		init_ip_hash_table();      /* client host ip hash table */
540		init_host_hash();          /* Host-hashtable. */
541	<	init_client();
542	<	init_class();
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 */
549		init_uid();
550		initialize_server_capabs();   /* Set up default_server_capabs */
551		initialize_global_set_options();
552	<	init_channels();
552	>	channel_init();
553	>	read_links_file();
554	>	motd_init();
555	>	#ifdef HAVE_LIBGEOIP
556	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
557	>	#endif
558
559		if (EmptyString(ServerInfo.sid))
560		{
#	Line 607 | Line 592 | main(int argc, char *argv[])
592
593		hash_add_id(&me);
594		hash_add_client(&me);
595	<
595	>
596		/* add ourselves to global_serv_list */
597		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
598
599	+	load_kline_database();
600	+	load_dline_database();
601	+	load_gline_database();
602	+	load_xline_database();
603	+	load_resv_database();
604	+
605		if (chdir(MODPATH))
606		{
607		ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
#	Line 648 | Line 639 | main(int argc, char *argv[])
639		/* Setup the timeout check. I'll shift it later :)  -- adrian */
640		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
641
642	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
643	+
644		if (ConfigServerHide.links_delay > 0)
645		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
646		else

Diff Legend

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