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 1117 by michael, Tue Dec 21 15:01:46 2010 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 1654 by michael, Fri Nov 16 19:39:37 2012 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	<
63	<	/* 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	<	*/
62	>	#include "conf_db.h"
63	>	#include "conf_class.h"
64
65		/* /quote set variables */
66		struct SetOptions GlobalSetOptions;
#	Line 77 | Line 71 | struct config_file_entry ConfigFileEntry
71		struct server_info ServerInfo;
72		/* admin info set from ircd.conf */
73		struct admin_info AdminInfo = { NULL, NULL, NULL };
74	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
74	>	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
75		struct ServerState_t server_state = { 0 };
76	<	struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
76	>	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
77		struct ServerStatistics ServerStats;
78		struct timeval SystemTime;
79		struct Client me;             /* That's me */
#	Line 89 | Line 83 | const char *logFileName = LPATH;
83		const char *pidFileName = PPATH;
84
85		char **myargv;
92	–	char ircd_platform[PLATFORMLEN];
86
87		int dorehash = 0;
88		int doremotd = 0;
#	Line 98 | Line 91 | int doremotd = 0;
91		* initialize_server_capabs
92		*/
93		int default_server_capabs = 0;
101	–
102	–	#ifdef HAVE_LIBCRYPTO
103	–	int bio_spare_fd = -1;
104	–	#endif
105	–
94		unsigned int splitmode;
95		unsigned int splitchecking;
96		unsigned int split_users;
#	Line 154 | Line 142 | make_daemon(void)
142
143		static int printVersion = 0;
144
145	<	struct lgetopt myopts[] = {
145	>	static struct lgetopt myopts[] = {
146		{"dlinefile",  &ConfigFileEntry.dlinefile,
147		STRING, "File to use for dline.conf"},
148		{"configfile", &ConfigFileEntry.configfile,
#	Line 185 | Line 173 | set_time(void)
173
174		if (gettimeofday(&newtime, NULL) == -1)
175		{
176	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
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");
#	Line 195 | Line 183 | set_time(void)
183
184		if (newtime.tv_sec < CurrentTime)
185		{
186	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
187	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
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);
190		set_back_events(CurrentTime - newtime.tv_sec);
191		}
#	Line 255 | Line 244 | io_loop(void)
244		if (doremotd)
245		{
246		read_message_file(&ConfigFileEntry.motd);
247	<	sendto_realops_flags(UMODE_ALL, L_ALL,
247	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
248		"Got signal SIGUSR1, reloading ircd motd file");
249		doremotd = 0;
250		}
#	Line 297 | Line 286 | initialize_global_set_options(void)
286		}
287
288		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
300	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
289		/* End of global set options */
290		}
291
#	Line 311 | Line 299 | static void
299		initialize_message_files(void)
300		{
301		init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
314	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
302		init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
303
304		read_message_file(&ConfigFileEntry.motd);
318	–	read_message_file(&ConfigFileEntry.opermotd);
305		read_message_file(&ConfigFileEntry.linksfile);
306
307		init_isupport();
#	Line 332 | Line 318 | initialize_server_capabs(void)
318		add_capability("QS", CAP_QS, 1);
319		add_capability("EOB", CAP_EOB, 1);
320		add_capability("TS6", CAP_TS6, 0);
335	–	add_capability("ZIP", CAP_ZIP, 0);
321		add_capability("CLUSTER", CAP_CLUSTER, 1);
322	+	add_capability("SVS", CAP_SVS, 1);
323		#ifdef HALFOPS
324		add_capability("HOPS", CAP_HOPS, 1);
325		#endif
#	Line 348 | Line 334 | initialize_server_capabs(void)
334		static void
335		write_pidfile(const char *filename)
336		{
337	<	FBFILE *fb;
337	>	FILE *fb;
338
339	<	if ((fb = fbopen(filename, "w")))
339	>	if ((fb = fopen(filename, "w")))
340		{
341		char buff[32];
342		unsigned int pid = (unsigned int)getpid();
357	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
343
344	<	if ((fbputs(buff, fb, nbytes) == -1))
345	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
344	>	snprintf(buff, sizeof(buff), "%u\n", pid);
345	>
346	>	if ((fputs(buff, fb) == -1))
347	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
348		pid, filename, strerror(errno));
349
350	<	fbclose(fb);
364	<	return;
350	>	fclose(fb);
351		}
352		else
353		{
354	<	ilog(L_ERROR, "Error opening pid file %s", filename);
354	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
355		}
356		}
357
#	Line 380 | Line 366 | write_pidfile(const char *filename)
366		static void
367		check_pidfile(const char *filename)
368		{
369	<	FBFILE *fb;
369	>	FILE *fb;
370		char buff[32];
371		pid_t pidfromfile;
372
373		/* Don't do logging here, since we don't have log() initialised */
374	<	if ((fb = fbopen(filename, "r")))
374	>	if ((fb = fopen(filename, "r")))
375		{
376	<	if (fbgets(buff, 20, fb) == NULL)
376	>	if (fgets(buff, 20, fb) == NULL)
377		{
378		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
379		* strerror(errno));
#	Line 405 | Line 391 | check_pidfile(const char *filename)
391		}
392		}
393
394	<	fbclose(fb);
394	>	fclose(fb);
395		}
396		else if (errno != ENOENT)
397		{
#	Line 452 | Line 438 | init_ssl(void)
438		{
439		const char *s;
440
441	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
441	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
442		s = ERR_lib_error_string(ERR_get_error()));
443	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
443	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
444		}
445
446	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
446	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
447		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
448		SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
449
450	<	bio_spare_fd = save_spare_fd("SSL private key validation");
450	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
451	>	{
452	>	const char *s;
453	>
454	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
455	>	s = ERR_lib_error_string(ERR_get_error()));
456	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
457	>	}
458	>
459	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
460	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
461	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
462		#endif /* HAVE_LIBCRYPTO */
463		}
464
#	Line 476 | Line 473 | init_callbacks(void)
473		{
474		iorecv_cb = register_callback("iorecv", iorecv_default);
475		iosend_cb = register_callback("iosend", iosend_default);
479	–	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
480	–	iosendctrl_cb = register_callback("iosendctrl", NULL);
476		}
477
478		int
#	Line 501 | Line 496 | main(int argc, char *argv[])
496		/* It ain't random, but it ought to be a little harder to guess */
497		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
498
504	–	memset(&me, 0, sizeof(me));
505	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
499		me.localClient = &meLocalUser;
500		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
501		of Client list */
509	–
510	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
511	–	memset(&ServerStats, 0, sizeof(ServerStats));
512	–
502		/* Initialise the channel capability usage counts... */
503		init_chcap_usage_counts();
504
#	Line 517 | Line 506 | main(int argc, char *argv[])
506		ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
507		ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
508		ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
520	–	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
521	–	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
509		ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
510	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
511	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
525	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
510	>	//  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
511	>	//  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
512		myargv = argv;
513		umask(077);                /* better safe than sorry --SRB */
514
#	Line 552 | Line 538 | main(int argc, char *argv[])
538
539		setup_signals();
540
555	–	get_ircd_platform(ircd_platform);
556	–
541		/* Init the event subsystem */
542		eventInit();
543		/* We need this to initialise the fd array before anything else */
544		fdlist_init();
545	<	init_log(logFileName);
545	>	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
546		check_can_use_v6();
547		init_comm();         /* This needs to be setup early ! -- adrian */
548		/* Check if there is pidfile and daemon already running */
549		check_pidfile(pidFileName);
550
551	<	initBlockHeap();
551	>	mp_pool_init();
552		init_dlink_nodes();
553		init_callbacks();
554		initialize_message_files();
#	Line 572 | Line 556 | main(int argc, char *argv[])
556		init_hash();
557		init_ip_hash_table();      /* client host ip hash table */
558		init_host_hash();          /* Host-hashtable. */
575	–	clear_tree_parse();
559		init_client();
560	<	init_class();
561	<	init_whowas();
560	>	class_init();
561	>	whowas_init();
562		watch_init();
563		init_auth();          /* Initialise the auth code */
564		init_resolver();      /* Needs to be setup before the io loop */
565	+	modules_init();
566		read_conf_files(1);   /* cold start init conf files */
567		init_uid();
568		initialize_server_capabs();   /* Set up default_server_capabs */
#	Line 587 | Line 571 | main(int argc, char *argv[])
571
572		if (EmptyString(ServerInfo.sid))
573		{
574	<	ilog(L_CRIT, "ERROR: No server id specified in serverinfo block.");
574	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
575		exit(EXIT_FAILURE);
576		}
577
#	Line 595 | Line 579 | main(int argc, char *argv[])
579
580		if (EmptyString(ServerInfo.name))
581		{
582	<	ilog(L_CRIT, "ERROR: No server name specified in serverinfo block.");
582	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
583		exit(EXIT_FAILURE);
584		}
585
#	Line 604 | Line 588 | main(int argc, char *argv[])
588		/* serverinfo{} description must exist.  If not, error out.*/
589		if (EmptyString(ServerInfo.description))
590		{
591	<	ilog(L_CRIT, "ERROR: No server description specified in serverinfo block.");
591	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
592		exit(EXIT_FAILURE);
593		}
594
595		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
596
597	<	me.from    = &me;
598	<	me.servptr = &me;
597	>	me.from                   = &me;
598	>	me.servptr                = &me;
599	>	me.localClient->lasttime  = CurrentTime;
600	>	me.localClient->since     = CurrentTime;
601	>	me.localClient->firsttime = CurrentTime;
602
603		SetMe(&me);
604		make_server(&me);
605
619	–	me.lasttime = me.since = me.firsttime = CurrentTime;
620	–
606		hash_add_id(&me);
607		hash_add_client(&me);
608
609		/* add ourselves to global_serv_list */
610		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
611
612	<	#ifndef STATIC_MODULES
612	>	load_kline_database();
613	>	load_dline_database();
614	>	load_gline_database();
615	>	load_xline_database();
616	>	load_resv_database();
617	>
618		if (chdir(MODPATH))
619		{
620	<	ilog(L_CRIT, "Could not load core modules. Terminating!");
620	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
621		exit(EXIT_FAILURE);
622		}
623
#	Line 641 | Line 631 | main(int argc, char *argv[])
631		perror("chdir");
632		exit(EXIT_FAILURE);
633		}
634	<	#else
645	<	load_all_modules(1);
646	<	#endif
634	>
635		/*
636		* assemble_umode_buffer() has to be called after
637		* reading conf/loading modules.
#	Line 652 | Line 640 | main(int argc, char *argv[])
640
641		write_pidfile(pidFileName);
642
643	<	ilog(L_NOTICE, "Server Ready");
643	>	ilog(LOG_TYPE_IRCD, "Server Ready");
644
645		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
646		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 661 | Line 649 | main(int argc, char *argv[])
649		/* No, 'cause after a restart it would cause all sorts of nick collides */
650		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
651
664	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
665	–
652		/* Setup the timeout check. I'll shift it later :)  -- adrian */
653		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
654
655	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
656	+
657		if (ConfigServerHide.links_delay > 0)
658		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
659		else

Diff Legend

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