ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/ircd.c (file contents), Revision 1121 by michael, Sun Jan 9 11:03:03 2011 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 2156 by michael, Fri May 31 20:53:11 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"
59	<	#include "balloc.h"
63	<	#include "motd.h"
59	>	#include "message.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 254 | Line 251 | io_loop(void)
251		}
252		if (doremotd)
253		{
254	<	read_message_file(&ConfigFileEntry.motd);
255	<	sendto_realops_flags(UMODE_ALL, L_ALL,
256	<	"Got signal SIGUSR1, reloading ircd motd file");
254	>	motd_recache();
255	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
256	>	"Got signal SIGUSR1, reloading motd files");
257		doremotd = 0;
258		}
259		}
#	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 310 | Line 306 | initialize_global_set_options(void)
306		static void
307		initialize_message_files(void)
308		{
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	–
309		init_isupport();
310		}
311
#	Line 332 | Line 320 | initialize_server_capabs(void)
320		add_capability("QS", CAP_QS, 1);
321		add_capability("EOB", CAP_EOB, 1);
322		add_capability("TS6", CAP_TS6, 0);
335	–	add_capability("ZIP", CAP_ZIP, 0);
323		add_capability("CLUSTER", CAP_CLUSTER, 1);
324	+	add_capability("SVS", CAP_SVS, 1);
325		#ifdef HALFOPS
326		add_capability("HOPS", CAP_HOPS, 1);
327		#endif
#	Line 348 | Line 336 | initialize_server_capabs(void)
336		static void
337		write_pidfile(const char *filename)
338		{
339	<	FBFILE *fb;
339	>	FILE *fb;
340
341	<	if ((fb = fbopen(filename, "w")))
341	>	if ((fb = fopen(filename, "w")))
342		{
343		char buff[32];
344		unsigned int pid = (unsigned int)getpid();
357	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
345
346	<	if ((fbputs(buff, fb, nbytes) == -1))
347	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
346	>	snprintf(buff, sizeof(buff), "%u\n", pid);
347	>
348	>	if ((fputs(buff, fb) == -1))
349	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
350		pid, filename, strerror(errno));
351
352	<	fbclose(fb);
364	<	return;
352	>	fclose(fb);
353		}
354		else
355		{
356	<	ilog(L_ERROR, "Error opening pid file %s", filename);
356	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
357		}
358		}
359
#	Line 380 | Line 368 | write_pidfile(const char *filename)
368		static void
369		check_pidfile(const char *filename)
370		{
371	<	FBFILE *fb;
371	>	FILE *fb;
372		char buff[32];
373		pid_t pidfromfile;
374
375		/* Don't do logging here, since we don't have log() initialised */
376	<	if ((fb = fbopen(filename, "r")))
376	>	if ((fb = fopen(filename, "r")))
377		{
378	<	if (fbgets(buff, 20, fb) == NULL)
378	>	if (fgets(buff, 20, fb) == NULL)
379		{
380		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
381		* strerror(errno));
#	Line 405 | Line 393 | check_pidfile(const char *filename)
393		}
394		}
395
396	<	fbclose(fb);
396	>	fclose(fb);
397		}
398		else if (errno != ENOENT)
399		{
#	Line 442 | Line 430 | setup_corefile(void)
430		* side effects - setups SSL context.
431		*/
432		static void
433	<	init_ssl(void)
433	>	ssl_init(void)
434		{
435		#ifdef HAVE_LIBCRYPTO
436		SSL_load_error_strings();
#	Line 452 | Line 440 | init_ssl(void)
440		{
441		const char *s;
442
443	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
443	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
444		s = ERR_lib_error_string(ERR_get_error()));
445	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
445	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
446		}
447
448	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
448	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
449		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
450		SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
451
452	<	bio_spare_fd = save_spare_fd("SSL private key validation");
453	<	#endif /* HAVE_LIBCRYPTO */
454	<	}
452	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
453	>	{
454	>	const char *s;
455
456	<	/* init_callbacks()
457	<	*
458	<	* inputs       - nothing
459	<	* output       - nothing
460	<	* side effects - setups standard hook points
461	<	*/
462	<	static void
463	<	init_callbacks(void)
464	<	{
477	<	iorecv_cb = register_callback("iorecv", iorecv_default);
478	<	iosend_cb = register_callback("iosend", iosend_default);
479	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
480	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
456	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
457	>	s = ERR_lib_error_string(ERR_get_error()));
458	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
459	>	}
460	>
461	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
462	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
463	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
464	>	#endif /* HAVE_LIBCRYPTO */
465		}
466
467		int
#	Line 501 | Line 485 | main(int argc, char *argv[])
485		/* It ain't random, but it ought to be a little harder to guess */
486		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
487
504	–	memset(&me, 0, sizeof(me));
505	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
488		me.localClient = &meLocalUser;
489		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
490		of Client list */
509	–
510	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
511	–	memset(&ServerStats, 0, sizeof(ServerStats));
512	–
491		/* Initialise the channel capability usage counts... */
492		init_chcap_usage_counts();
493
494		ConfigFileEntry.dpath      = DPATH;
495	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
496	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
497	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
498	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
499	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
500	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
501	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
524	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
525	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
495	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
496	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
497	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
498	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
499	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
500	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
501	>
502		myargv = argv;
503		umask(077);                /* better safe than sorry --SRB */
504
#	Line 540 | Line 516 | main(int argc, char *argv[])
516		exit(EXIT_FAILURE);
517		}
518
519	<	init_ssl();
519	>	ssl_init();
520
521		if (!server_state.foreground)
522		{
#	Line 552 | Line 528 | main(int argc, char *argv[])
528
529		setup_signals();
530
555	–	get_ircd_platform(ircd_platform);
556	–
531		/* Init the event subsystem */
532		eventInit();
533		/* We need this to initialise the fd array before anything else */
534		fdlist_init();
535	<	init_log(logFileName);
535	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
536		check_can_use_v6();
537		init_comm();         /* This needs to be setup early ! -- adrian */
538		/* Check if there is pidfile and daemon already running */
539		check_pidfile(pidFileName);
540
541	<	initBlockHeap();
541	>	mp_pool_init();
542		init_dlink_nodes();
569	–	init_callbacks();
543		initialize_message_files();
544		dbuf_init();
545	<	init_hash();
545	>	hash_init();
546		init_ip_hash_table();      /* client host ip hash table */
547		init_host_hash();          /* Host-hashtable. */
548	<	clear_tree_parse();
549	<	init_client();
550	<	init_class();
578	<	init_whowas();
548	>	client_init();
549	>	class_init();
550	>	whowas_init();
551		watch_init();
552	<	init_auth();          /* Initialise the auth code */
552	>	auth_init();          /* Initialise the auth code */
553		init_resolver();      /* Needs to be setup before the io loop */
554	+	modules_init();
555		read_conf_files(1);   /* cold start init conf files */
556		init_uid();
557		initialize_server_capabs();   /* Set up default_server_capabs */
558		initialize_global_set_options();
559	<	init_channels();
559	>	channel_init();
560	>	motd_init();
561	>	#ifdef HAVE_LIBGEOIP
562	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
563	>	#endif
564
565		if (EmptyString(ServerInfo.sid))
566		{
567	<	ilog(L_CRIT, "ERROR: No server id specified in serverinfo block.");
567	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
568		exit(EXIT_FAILURE);
569		}
570
#	Line 595 | Line 572 | main(int argc, char *argv[])
572
573		if (EmptyString(ServerInfo.name))
574		{
575	<	ilog(L_CRIT, "ERROR: No server name specified in serverinfo block.");
575	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
576		exit(EXIT_FAILURE);
577		}
578
#	Line 604 | Line 581 | main(int argc, char *argv[])
581		/* serverinfo{} description must exist.  If not, error out.*/
582		if (EmptyString(ServerInfo.description))
583		{
584	<	ilog(L_CRIT, "ERROR: No server description specified in serverinfo block.");
584	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
585		exit(EXIT_FAILURE);
586		}
587
588		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
589
590	<	me.from    = &me;
591	<	me.servptr = &me;
590	>	me.from                   = &me;
591	>	me.servptr                = &me;
592	>	me.localClient->lasttime  = CurrentTime;
593	>	me.localClient->since     = CurrentTime;
594	>	me.localClient->firsttime = CurrentTime;
595
596		SetMe(&me);
597		make_server(&me);
598
619	–	me.lasttime = me.since = me.firsttime = CurrentTime;
620	–
599		hash_add_id(&me);
600		hash_add_client(&me);
601
602		/* add ourselves to global_serv_list */
603		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
604
605	+	load_kline_database();
606	+	load_dline_database();
607	+	load_gline_database();
608	+	load_xline_database();
609	+	load_resv_database();
610	+
611		if (chdir(MODPATH))
612		{
613	<	ilog(L_CRIT, "Could not load core modules. Terminating!");
613	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
614		exit(EXIT_FAILURE);
615		}
616
#	Line 649 | Line 633 | main(int argc, char *argv[])
633
634		write_pidfile(pidFileName);
635
636	<	ilog(L_NOTICE, "Server Ready");
636	>	ilog(LOG_TYPE_IRCD, "Server Ready");
637
638		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
639		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 658 | Line 642 | main(int argc, char *argv[])
642		/* No, 'cause after a restart it would cause all sorts of nick collides */
643		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
644
661	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
662	–
645		/* Setup the timeout check. I'll shift it later :)  -- adrian */
646		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
647
648	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
649	+
650		if (ConfigServerHide.links_delay > 0)
651		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
652		else

Diff Legend

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