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 1011 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
ircd-hybrid-8/src/ircd.c (file contents), Revision 1446 by michael, Mon Jun 25 20:05:12 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"
41	–	#include "ircd_handler.h"
42	–	#include "msg.h"         /* msgtab */
39		#include "hostmask.h"
40		#include "numeric.h"
41		#include "packet.h"
#	Line 49 | Line 45
45		#include "rng_mt.h"
46		#include "s_auth.h"
47		#include "s_bsd.h"
48	<	#include "s_conf.h"
49	<	#include "s_log.h"
48	>	#include "conf.h"
49	>	#include "log.h"
50		#include "s_misc.h"
51		#include "s_serv.h"      /* try_connections */
52		#include "send.h"
#	Line 64 | Line 60
60		#include "supported.h"
61		#include "watch.h"
62
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	–	*/
63
64		/* /quote set variables */
65		struct SetOptions GlobalSetOptions;
#	Line 77 | Line 70 | struct config_file_entry ConfigFileEntry
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 };
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, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
75	>	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
76		struct ServerStatistics ServerStats;
77		struct timeval SystemTime;
78		struct Client me;             /* That's me */
#	Line 89 | Line 82 | const char *logFileName = LPATH;
82		const char *pidFileName = PPATH;
83
84		char **myargv;
92	–	char ircd_platform[PLATFORMLEN];
85
86		int dorehash = 0;
87		int doremotd = 0;
96	–	time_t nextconnect = 1;       /* time for next try_connections call */
88
89		/* Set to zero because it should be initialized later using
90		* initialize_server_capabs
91		*/
92		int default_server_capabs = 0;
93	<
94	<	#ifdef HAVE_LIBCRYPTO
95	<	int bio_spare_fd = -1;
105	<	#endif
106	<
107	<	int splitmode;
108	<	int splitchecking;
109	<	int split_users;
93	>	unsigned int splitmode;
94	>	unsigned int splitchecking;
95	>	unsigned int split_users;
96		unsigned int split_servers;
97
98		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 155 | Line 141 | make_daemon(void)
141
142		static int printVersion = 0;
143
144	<	struct lgetopt myopts[] = {
144	>	static struct lgetopt myopts[] = {
145		{"dlinefile",  &ConfigFileEntry.dlinefile,
146		STRING, "File to use for dline.conf"},
147		{"configfile", &ConfigFileEntry.configfile,
#	Line 186 | Line 172 | set_time(void)
172
173		if (gettimeofday(&newtime, NULL) == -1)
174		{
175	<	ilog(L_ERROR, "Clock Failure (%s), TS can be corrupted",
175	>	ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
176		strerror(errno));
177		sendto_realops_flags(UMODE_ALL, L_ALL,
178		"Clock Failure (%s), TS can be corrupted",
#	Line 196 | Line 182 | set_time(void)
182
183		if (newtime.tv_sec < CurrentTime)
184		{
185	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
186	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
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);
189		set_back_events(CurrentTime - newtime.tv_sec);
190		}
#	Line 298 | Line 285 | initialize_global_set_options(void)
285		}
286
287		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
301	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
288		/* End of global set options */
289		}
290
#	Line 312 | Line 298 | static void
298		initialize_message_files(void)
299		{
300		init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
315	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
301		init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
302
303		read_message_file(&ConfigFileEntry.motd);
319	–	read_message_file(&ConfigFileEntry.opermotd);
304		read_message_file(&ConfigFileEntry.linksfile);
305
306		init_isupport();
#	Line 332 | Line 316 | initialize_server_capabs(void)
316		{
317		add_capability("QS", CAP_QS, 1);
318		add_capability("EOB", CAP_EOB, 1);
319	<
336	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
337	<	add_capability("TS6", CAP_TS6, 0);
338	<
339	<	add_capability("ZIP", CAP_ZIP, 0);
319	>	add_capability("TS6", CAP_TS6, 0);
320		add_capability("CLUSTER", CAP_CLUSTER, 1);
321	+	add_capability("SVS", CAP_SVS, 1);
322		#ifdef HALFOPS
323		add_capability("HOPS", CAP_HOPS, 1);
324		#endif
#	Line 352 | Line 333 | initialize_server_capabs(void)
333		static void
334		write_pidfile(const char *filename)
335		{
336	<	FBFILE *fb;
336	>	FILE *fb;
337
338	<	if ((fb = fbopen(filename, "w")))
338	>	if ((fb = fopen(filename, "w")))
339		{
340		char buff[32];
341		unsigned int pid = (unsigned int)getpid();
361	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
342
343	<	if ((fbputs(buff, fb, nbytes) == -1))
344	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
343	>	snprintf(buff, sizeof(buff), "%u\n", pid);
344	>
345	>	if ((fputs(buff, fb) == -1))
346	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
347		pid, filename, strerror(errno));
348
349	<	fbclose(fb);
368	<	return;
349	>	fclose(fb);
350		}
351		else
352		{
353	<	ilog(L_ERROR, "Error opening pid file %s", filename);
353	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
354		}
355		}
356
#	Line 384 | Line 365 | write_pidfile(const char *filename)
365		static void
366		check_pidfile(const char *filename)
367		{
368	<	FBFILE *fb;
368	>	FILE *fb;
369		char buff[32];
370		pid_t pidfromfile;
371
372		/* Don't do logging here, since we don't have log() initialised */
373	<	if ((fb = fbopen(filename, "r")))
373	>	if ((fb = fopen(filename, "r")))
374		{
375	<	if (fbgets(buff, 20, fb) == NULL)
375	>	if (fgets(buff, 20, fb) == NULL)
376		{
377		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
378		* strerror(errno));
#	Line 409 | Line 390 | check_pidfile(const char *filename)
390		}
391		}
392
393	<	fbclose(fb);
393	>	fclose(fb);
394		}
395		else if (errno != ENOENT)
396		{
#	Line 456 | Line 437 | init_ssl(void)
437		{
438		const char *s;
439
440	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
440	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
441		s = ERR_lib_error_string(ERR_get_error()));
442	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
442	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
443		}
444
445	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
445	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
446		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
447		SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
448
449	<	bio_spare_fd = save_spare_fd("SSL private key validation");
449	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
450	>	{
451	>	const char *s;
452	>
453	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
454	>	s = ERR_lib_error_string(ERR_get_error()));
455	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
456	>	}
457	>
458	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
459	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
460	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
461		#endif /* HAVE_LIBCRYPTO */
462		}
463
#	Line 480 | Line 472 | init_callbacks(void)
472		{
473		iorecv_cb = register_callback("iorecv", iorecv_default);
474		iosend_cb = register_callback("iosend", iosend_default);
483	–	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
484	–	iosendctrl_cb = register_callback("iosendctrl", NULL);
475		}
476
477		int
#	Line 505 | Line 495 | main(int argc, char *argv[])
495		/* It ain't random, but it ought to be a little harder to guess */
496		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
497
508	–	memset(&me, 0, sizeof(me));
509	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
498		me.localClient = &meLocalUser;
499		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
500		of Client list */
513	–
514	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
515	–	memset(&ServerStats, 0, sizeof(ServerStats));
516	–
501		/* Initialise the channel capability usage counts... */
502		init_chcap_usage_counts();
503
#	Line 556 | Line 540 | main(int argc, char *argv[])
540
541		setup_signals();
542
559	–	get_ircd_platform(ircd_platform);
560	–
543		/* Init the event subsystem */
544		eventInit();
545		/* We need this to initialise the fd array before anything else */
546		fdlist_init();
547	<	init_log(logFileName);
547	>	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
548		check_can_use_v6();
549		init_comm();         /* This needs to be setup early ! -- adrian */
550		/* Check if there is pidfile and daemon already running */
551		check_pidfile(pidFileName);
552
571	–	#ifndef NOBALLOC
553		initBlockHeap();
573	–	#endif
554		init_dlink_nodes();
555		init_callbacks();
556		initialize_message_files();
#	Line 578 | Line 558 | main(int argc, char *argv[])
558		init_hash();
559		init_ip_hash_table();      /* client host ip hash table */
560		init_host_hash();          /* Host-hashtable. */
581	–	clear_tree_parse();
561		init_client();
562		init_class();
563	<	init_whowas();
563	>	whowas_init();
564		watch_init();
565		init_auth();          /* Initialise the auth code */
566		init_resolver();      /* Needs to be setup before the io loop */
567	+	modules_init();
568		read_conf_files(1);   /* cold start init conf files */
589	–	me.id[0] = '\0';
569		init_uid();
570		initialize_server_capabs();   /* Set up default_server_capabs */
571		initialize_global_set_options();
572		init_channels();
573
574	<	if (ServerInfo.name == NULL)
574	>	if (EmptyString(ServerInfo.sid))
575		{
576	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
576	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
577	>	exit(EXIT_FAILURE);
578	>	}
579	>
580	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
581	>
582	>	if (EmptyString(ServerInfo.name))
583	>	{
584	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
585		exit(EXIT_FAILURE);
586		}
587
588		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
589
590		/* serverinfo{} description must exist.  If not, error out.*/
591	<	if (ServerInfo.description == NULL)
591	>	if (EmptyString(ServerInfo.description))
592		{
593	<	ilog(L_CRIT,
607	<	"ERROR: No server description specified in serverinfo block.");
593	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
594		exit(EXIT_FAILURE);
595		}
596
597		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
598
599	<	me.from    = &me;
600	<	me.servptr = &me;
599	>	me.from                   = &me;
600	>	me.servptr                = &me;
601	>	me.localClient->lasttime  = CurrentTime;
602	>	me.localClient->since     = CurrentTime;
603	>	me.localClient->firsttime = CurrentTime;
604
605		SetMe(&me);
606		make_server(&me);
607
608	<	me.lasttime = me.since = me.firsttime = CurrentTime;
608	>	hash_add_id(&me);
609		hash_add_client(&me);
610
611		/* add ourselves to global_serv_list */
612		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
613
625	–	check_class();
626	–
627	–	#ifndef STATIC_MODULES
614		if (chdir(MODPATH))
615		{
616	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
616	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
617		exit(EXIT_FAILURE);
618		}
619
620		load_all_modules(1);
621		load_conf_modules();
622		load_core_modules(1);
623	+
624		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
625	<	chdir(ConfigFileEntry.dpath);
626	<	#else
627	<	load_all_modules(1);
628	<	#endif
625	>	if (chdir(ConfigFileEntry.dpath))
626	>	{
627	>	perror("chdir");
628	>	exit(EXIT_FAILURE);
629	>	}
630	>
631		/*
632		* assemble_umode_buffer() has to be called after
633		* reading conf/loading modules.
#	Line 647 | Line 636 | main(int argc, char *argv[])
636
637		write_pidfile(pidFileName);
638
639	<	ilog(L_NOTICE, "Server Ready");
639	>	ilog(LOG_TYPE_IRCD, "Server Ready");
640
641		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
642		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 656 | Line 645 | main(int argc, char *argv[])
645		/* No, 'cause after a restart it would cause all sorts of nick collides */
646		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
647
659	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
660	–
648		/* Setup the timeout check. I'll shift it later :)  -- adrian */
649		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
650

Diff Legend

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