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 1858 by michael, Thu Apr 25 15:00:52 2013 UTC

#	Line 29 | Line 29
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "event.h"
33		#include "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
37	–	#include "sprintf_irc.h"
36		#include "ircd_signal.h"
37		#include "s_gline.h"
38		#include "motd.h"
39	<	#include "ircd_handler.h"
42	<	#include "msg.h"         /* msgtab */
39	>	#include "conf.h"
40		#include "hostmask.h"
41		#include "numeric.h"
42		#include "packet.h"
#	Line 49 | Line 46
46		#include "rng_mt.h"
47		#include "s_auth.h"
48		#include "s_bsd.h"
49	<	#include "s_conf.h"
53	<	#include "s_log.h"
49	>	#include "log.h"
50		#include "s_misc.h"
51		#include "s_serv.h"      /* try_connections */
52		#include "send.h"
53		#include "whowas.h"
54		#include "modules.h"
55		#include "memory.h"
56	+	#include "mempool.h"
57		#include "hook.h"
58		#include "ircd_getopt.h"
62	–	#include "balloc.h"
59		#include "motd.h"
60		#include "supported.h"
61		#include "watch.h"
62	+	#include "conf_db.h"
63	+	#include "conf_class.h"
64
67	–	/* Try and find the correct name to use with getrlimit() for setting the max.
68	–	* number of files allowed to be open by this process.
69	–	*/
65
66	+	#ifdef HAVE_LIBGEOIP
67	+	GeoIP *geoip_ctx;
68	+	#endif
69		/* /quote set variables */
70		struct SetOptions GlobalSetOptions;
71
#	Line 77 | Line 75 | struct config_file_entry ConfigFileEntry
75		struct server_info ServerInfo;
76		/* admin info set from ircd.conf */
77		struct admin_info AdminInfo = { NULL, NULL, NULL };
78	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
78	>	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
79		struct ServerState_t server_state = { 0 };
80	<	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
80	>	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
81		struct ServerStatistics ServerStats;
82		struct timeval SystemTime;
83		struct Client me;             /* That's me */
#	Line 89 | Line 87 | const char *logFileName = LPATH;
87		const char *pidFileName = PPATH;
88
89		char **myargv;
92	–	char ircd_platform[PLATFORMLEN];
90
91		int dorehash = 0;
92		int doremotd = 0;
#	Line 98 | Line 95 | int doremotd = 0;
95		* initialize_server_capabs
96		*/
97		int default_server_capabs = 0;
101	–
102	–	#ifdef HAVE_LIBCRYPTO
103	–	int bio_spare_fd = -1;
104	–	#endif
105	–
98		unsigned int splitmode;
99		unsigned int splitchecking;
100		unsigned int split_users;
#	Line 154 | Line 146 | make_daemon(void)
146
147		static int printVersion = 0;
148
149	<	struct lgetopt myopts[] = {
158	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
159	<	STRING, "File to use for dline.conf"},
149	>	static struct lgetopt myopts[] = {
150		{"configfile", &ConfigFileEntry.configfile,
151		STRING, "File to use for ircd.conf"},
152	+	{"glinefile",  &ConfigFileEntry.glinefile,
153	+	STRING, "File to use for gline database"},
154		{"klinefile",  &ConfigFileEntry.klinefile,
155	<	STRING, "File to use for kline.conf"},
155	>	STRING, "File to use for kline database"},
156	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
157	>	STRING, "File to use for dline database"},
158		{"xlinefile",  &ConfigFileEntry.xlinefile,
159	<	STRING, "File to use for xline.conf"},
159	>	STRING, "File to use for xline database"},
160	>	{"resvfile",  &ConfigFileEntry.resvfile,
161	>	STRING, "File to use for resv database"},
162		{"logfile",    &logFileName,
163		STRING, "File to use for ircd.log"},
164		{"pidfile",    &pidFileName,
#	Line 185 | Line 181 | set_time(void)
181
182		if (gettimeofday(&newtime, NULL) == -1)
183		{
184	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
184	>	ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
185		strerror(errno));
186	<	sendto_realops_flags(UMODE_ALL, L_ALL,
186	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
187		"Clock Failure (%s), TS can be corrupted",
188		strerror(errno));
189		restart("Clock Failure");
#	Line 195 | Line 191 | set_time(void)
191
192		if (newtime.tv_sec < CurrentTime)
193		{
194	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
195	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
194	>	snprintf(to_send, sizeof(to_send),
195	>	"System clock is running backwards - (%lu < %lu)",
196	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
197		report_error(L_ALL, to_send, me.name, 0);
198		set_back_events(CurrentTime - newtime.tv_sec);
199		}
#	Line 255 | Line 252 | io_loop(void)
252		if (doremotd)
253		{
254		read_message_file(&ConfigFileEntry.motd);
255	<	sendto_realops_flags(UMODE_ALL, L_ALL,
255	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
256		"Got signal SIGUSR1, reloading ircd motd file");
257		doremotd = 0;
258		}
#	Line 297 | Line 294 | initialize_global_set_options(void)
294		}
295
296		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
300	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
297		/* End of global set options */
298		}
299
#	Line 311 | Line 307 | static void
307		initialize_message_files(void)
308		{
309		init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
314	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
310		init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
311
312		read_message_file(&ConfigFileEntry.motd);
318	–	read_message_file(&ConfigFileEntry.opermotd);
313		read_message_file(&ConfigFileEntry.linksfile);
314
315		init_isupport();
#	Line 331 | Line 325 | initialize_server_capabs(void)
325		{
326		add_capability("QS", CAP_QS, 1);
327		add_capability("EOB", CAP_EOB, 1);
328	<
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);
328	>	add_capability("TS6", CAP_TS6, 0);
329		add_capability("CLUSTER", CAP_CLUSTER, 1);
330	+	add_capability("SVS", CAP_SVS, 1);
331		#ifdef HALFOPS
332		add_capability("HOPS", CAP_HOPS, 1);
333		#endif
#	Line 351 | Line 342 | initialize_server_capabs(void)
342		static void
343		write_pidfile(const char *filename)
344		{
345	<	FBFILE *fb;
345	>	FILE *fb;
346
347	<	if ((fb = fbopen(filename, "w")))
347	>	if ((fb = fopen(filename, "w")))
348		{
349		char buff[32];
350		unsigned int pid = (unsigned int)getpid();
360	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
351
352	<	if ((fbputs(buff, fb, nbytes) == -1))
353	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
352	>	snprintf(buff, sizeof(buff), "%u\n", pid);
353	>
354	>	if ((fputs(buff, fb) == -1))
355	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
356		pid, filename, strerror(errno));
357
358	<	fbclose(fb);
367	<	return;
358	>	fclose(fb);
359		}
360		else
361		{
362	<	ilog(L_ERROR, "Error opening pid file %s", filename);
362	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
363		}
364		}
365
#	Line 383 | Line 374 | write_pidfile(const char *filename)
374		static void
375		check_pidfile(const char *filename)
376		{
377	<	FBFILE *fb;
377	>	FILE *fb;
378		char buff[32];
379		pid_t pidfromfile;
380
381		/* Don't do logging here, since we don't have log() initialised */
382	<	if ((fb = fbopen(filename, "r")))
382	>	if ((fb = fopen(filename, "r")))
383		{
384	<	if (fbgets(buff, 20, fb) == NULL)
384	>	if (fgets(buff, 20, fb) == NULL)
385		{
386		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
387		* strerror(errno));
#	Line 408 | Line 399 | check_pidfile(const char *filename)
399		}
400		}
401
402	<	fbclose(fb);
402	>	fclose(fb);
403		}
404		else if (errno != ENOENT)
405		{
#	Line 445 | Line 436 | setup_corefile(void)
436		* side effects - setups SSL context.
437		*/
438		static void
439	<	init_ssl(void)
439	>	ssl_init(void)
440		{
441		#ifdef HAVE_LIBCRYPTO
442		SSL_load_error_strings();
#	Line 455 | Line 446 | init_ssl(void)
446		{
447		const char *s;
448
449	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
449	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
450		s = ERR_lib_error_string(ERR_get_error()));
451	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
451	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
452		}
453
454	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
454	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
455		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
456		SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
457
458	<	bio_spare_fd = save_spare_fd("SSL private key validation");
459	<	#endif /* HAVE_LIBCRYPTO */
460	<	}
458	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
459	>	{
460	>	const char *s;
461
462	<	/* init_callbacks()
463	<	*
464	<	* inputs       - nothing
465	<	* output       - nothing
466	<	* side effects - setups standard hook points
467	<	*/
468	<	static void
469	<	init_callbacks(void)
470	<	{
480	<	iorecv_cb = register_callback("iorecv", iorecv_default);
481	<	iosend_cb = register_callback("iosend", iosend_default);
482	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
483	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
462	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
463	>	s = ERR_lib_error_string(ERR_get_error()));
464	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
465	>	}
466	>
467	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
468	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
469	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
470	>	#endif /* HAVE_LIBCRYPTO */
471		}
472
473		int
#	Line 504 | Line 491 | main(int argc, char *argv[])
491		/* It ain't random, but it ought to be a little harder to guess */
492		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
493
507	–	memset(&me, 0, sizeof(me));
508	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
494		me.localClient = &meLocalUser;
495		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
496		of Client list */
512	–
513	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
514	–	memset(&ServerStats, 0, sizeof(ServerStats));
515	–
497		/* Initialise the channel capability usage counts... */
498		init_chcap_usage_counts();
499
500		ConfigFileEntry.dpath      = DPATH;
501	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
502	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
503	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
504	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
505	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
506	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
507	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
527	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
528	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
501	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
502	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
503	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
504	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
505	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
506	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
507	>
508		myargv = argv;
509		umask(077);                /* better safe than sorry --SRB */
510
#	Line 543 | Line 522 | main(int argc, char *argv[])
522		exit(EXIT_FAILURE);
523		}
524
525	<	init_ssl();
525	>	ssl_init();
526
527		if (!server_state.foreground)
528		{
#	Line 555 | Line 534 | main(int argc, char *argv[])
534
535		setup_signals();
536
558	–	get_ircd_platform(ircd_platform);
559	–
537		/* Init the event subsystem */
538		eventInit();
539		/* We need this to initialise the fd array before anything else */
540		fdlist_init();
541	<	init_log(logFileName);
541	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
542		check_can_use_v6();
543		init_comm();         /* This needs to be setup early ! -- adrian */
544		/* Check if there is pidfile and daemon already running */
545		check_pidfile(pidFileName);
546
547	<	initBlockHeap();
547	>	mp_pool_init();
548		init_dlink_nodes();
572	–	init_callbacks();
549		initialize_message_files();
550		dbuf_init();
551	<	init_hash();
551	>	hash_init();
552		init_ip_hash_table();      /* client host ip hash table */
553		init_host_hash();          /* Host-hashtable. */
554	<	clear_tree_parse();
555	<	init_client();
556	<	init_class();
581	<	init_whowas();
554	>	client_init();
555	>	class_init();
556	>	whowas_init();
557		watch_init();
558	<	init_auth();          /* Initialise the auth code */
558	>	auth_init();          /* Initialise the auth code */
559		init_resolver();      /* Needs to be setup before the io loop */
560	+	modules_init();
561		read_conf_files(1);   /* cold start init conf files */
586	–	me.id[0] = '\0';
562		init_uid();
563		initialize_server_capabs();   /* Set up default_server_capabs */
564		initialize_global_set_options();
565	<	init_channels();
565	>	channel_init();
566	>	#ifdef HAVE_LIBGEOIP
567	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
568	>	#endif
569	>
570	>	if (EmptyString(ServerInfo.sid))
571	>	{
572	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
573	>	exit(EXIT_FAILURE);
574	>	}
575	>
576	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
577
578	<	if (ServerInfo.name == NULL)
578	>	if (EmptyString(ServerInfo.name))
579		{
580	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
580	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
581		exit(EXIT_FAILURE);
582		}
583
584		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
585
586		/* serverinfo{} description must exist.  If not, error out.*/
587	<	if (ServerInfo.description == NULL)
587	>	if (EmptyString(ServerInfo.description))
588		{
589	<	ilog(L_CRIT,
604	<	"ERROR: No server description specified in serverinfo block.");
589	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
590		exit(EXIT_FAILURE);
591		}
592
593		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
594
595	<	me.from    = &me;
596	<	me.servptr = &me;
595	>	me.from                   = &me;
596	>	me.servptr                = &me;
597	>	me.localClient->lasttime  = CurrentTime;
598	>	me.localClient->since     = CurrentTime;
599	>	me.localClient->firsttime = CurrentTime;
600
601		SetMe(&me);
602		make_server(&me);
603
604	<	me.lasttime = me.since = me.firsttime = CurrentTime;
604	>	hash_add_id(&me);
605		hash_add_client(&me);
606
607		/* add ourselves to global_serv_list */
608		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
609
610	<	check_class();
610	>	load_kline_database();
611	>	load_dline_database();
612	>	load_gline_database();
613	>	load_xline_database();
614	>	load_resv_database();
615
624	–	#ifndef STATIC_MODULES
616		if (chdir(MODPATH))
617		{
618	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
618	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
619		exit(EXIT_FAILURE);
620		}
621
622		load_all_modules(1);
623		load_conf_modules();
624		load_core_modules(1);
625	+
626		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
627	<	chdir(ConfigFileEntry.dpath);
628	<	#else
629	<	load_all_modules(1);
630	<	#endif
627	>	if (chdir(ConfigFileEntry.dpath))
628	>	{
629	>	perror("chdir");
630	>	exit(EXIT_FAILURE);
631	>	}
632	>
633		/*
634		* assemble_umode_buffer() has to be called after
635		* reading conf/loading modules.
#	Line 644 | Line 638 | main(int argc, char *argv[])
638
639		write_pidfile(pidFileName);
640
641	<	ilog(L_NOTICE, "Server Ready");
641	>	ilog(LOG_TYPE_IRCD, "Server Ready");
642
643		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
644		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 653 | Line 647 | main(int argc, char *argv[])
647		/* No, 'cause after a restart it would cause all sorts of nick collides */
648		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
649
656	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
657	–
650		/* Setup the timeout check. I'll shift it later :)  -- adrian */
651		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
652
653	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
654	+
655		if (ConfigServerHide.links_delay > 0)
656		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
657		else

Diff Legend

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