ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/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 1325 by michael, Sat Mar 31 10:29:02 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 93 | Line 86 | char ircd_platform[PLATFORMLEN];
86
87		int dorehash = 0;
88		int doremotd = 0;
96	–	time_t nextconnect = 1;       /* time for next try_connections call */
89
90		/* Set to zero because it should be initialized later using
91		* initialize_server_capabs
92		*/
93		int default_server_capabs = 0;
94	<
95	<	#ifdef HAVE_LIBCRYPTO
96	<	int bio_spare_fd = -1;
105	<	#endif
106	<
107	<	int splitmode;
108	<	int splitchecking;
109	<	int split_users;
94	>	unsigned int splitmode;
95	>	unsigned int splitchecking;
96	>	unsigned int split_users;
97		unsigned int split_servers;
98
99		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 186 | 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,
179		"Clock Failure (%s), TS can be corrupted",
#	Line 196 | 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 298 | Line 286 | initialize_global_set_options(void)
286		}
287
288		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
301	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
289		/* End of global set options */
290		}
291
#	Line 332 | Line 319 | initialize_server_capabs(void)
319		{
320		add_capability("QS", CAP_QS, 1);
321		add_capability("EOB", CAP_EOB, 1);
322	<
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);
322	>	add_capability("TS6", CAP_TS6, 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 352 | 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();
361	–	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);
368	<	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 384 | 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 409 | Line 393 | check_pidfile(const char *filename)
393		}
394		}
395
396	<	fbclose(fb);
396	>	fclose(fb);
397		}
398		else if (errno != ENOENT)
399		{
#	Line 456 | 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");
452	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
453	>	{
454	>	const char *s;
455	>
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
#	Line 480 | Line 475 | init_callbacks(void)
475		{
476		iorecv_cb = register_callback("iorecv", iorecv_default);
477		iosend_cb = register_callback("iosend", iosend_default);
483	–	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
484	–	iosendctrl_cb = register_callback("iosendctrl", NULL);
478		}
479
480		int
#	Line 505 | Line 498 | main(int argc, char *argv[])
498		/* It ain't random, but it ought to be a little harder to guess */
499		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
500
508	–	memset(&me, 0, sizeof(me));
509	–	memset(&meLocalUser, 0, sizeof(meLocalUser));
501		me.localClient = &meLocalUser;
502		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
503		of Client list */
513	–
514	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
515	–	memset(&ServerStats, 0, sizeof(ServerStats));
516	–
504		/* Initialise the channel capability usage counts... */
505		init_chcap_usage_counts();
506
#	Line 562 | Line 549 | main(int argc, char *argv[])
549		eventInit();
550		/* We need this to initialise the fd array before anything else */
551		fdlist_init();
552	<	init_log(logFileName);
552	>	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
553		check_can_use_v6();
554		init_comm();         /* This needs to be setup early ! -- adrian */
555		/* Check if there is pidfile and daemon already running */
556		check_pidfile(pidFileName);
557
571	–	#ifndef NOBALLOC
558		initBlockHeap();
573	–	#endif
559		init_dlink_nodes();
560		init_callbacks();
561		initialize_message_files();
#	Line 586 | Line 571 | main(int argc, char *argv[])
571		init_auth();          /* Initialise the auth code */
572		init_resolver();      /* Needs to be setup before the io loop */
573		read_conf_files(1);   /* cold start init conf files */
589	–	me.id[0] = '\0';
574		init_uid();
575		initialize_server_capabs();   /* Set up default_server_capabs */
576		initialize_global_set_options();
577		init_channels();
578
579	<	if (ServerInfo.name == NULL)
579	>	if (EmptyString(ServerInfo.sid))
580		{
581	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
581	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
582	>	exit(EXIT_FAILURE);
583	>	}
584	>
585	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
586	>
587	>	if (EmptyString(ServerInfo.name))
588	>	{
589	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
590		exit(EXIT_FAILURE);
591		}
592
593		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
594
595		/* serverinfo{} description must exist.  If not, error out.*/
596	<	if (ServerInfo.description == NULL)
596	>	if (EmptyString(ServerInfo.description))
597		{
598	<	ilog(L_CRIT,
607	<	"ERROR: No server description specified in serverinfo block.");
598	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
599		exit(EXIT_FAILURE);
600		}
601
602		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
603
604	<	me.from    = &me;
605	<	me.servptr = &me;
604	>	me.from                   = &me;
605	>	me.servptr                = &me;
606	>	me.localClient->lasttime  = CurrentTime;
607	>	me.localClient->since     = CurrentTime;
608	>	me.localClient->firsttime = CurrentTime;
609
610		SetMe(&me);
611		make_server(&me);
612
613	<	me.lasttime = me.since = me.firsttime = CurrentTime;
613	>	hash_add_id(&me);
614		hash_add_client(&me);
615
616		/* add ourselves to global_serv_list */
617		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
618
625	–	check_class();
626	–
627	–	#ifndef STATIC_MODULES
619		if (chdir(MODPATH))
620		{
621	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
621	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
622		exit(EXIT_FAILURE);
623		}
624
625		load_all_modules(1);
626		load_conf_modules();
627		load_core_modules(1);
628	+
629		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
630	<	chdir(ConfigFileEntry.dpath);
631	<	#else
632	<	load_all_modules(1);
633	<	#endif
630	>	if (chdir(ConfigFileEntry.dpath))
631	>	{
632	>	perror("chdir");
633	>	exit(EXIT_FAILURE);
634	>	}
635	>
636		/*
637		* assemble_umode_buffer() has to be called after
638		* reading conf/loading modules.
#	Line 647 | Line 641 | main(int argc, char *argv[])
641
642		write_pidfile(pidFileName);
643
644	<	ilog(L_NOTICE, "Server Ready");
644	>	ilog(LOG_TYPE_IRCD, "Server Ready");
645
646		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
647		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 656 | Line 650 | main(int argc, char *argv[])
650		/* No, 'cause after a restart it would cause all sorts of nick collides */
651		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
652
659	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
660	–
653		/* Setup the timeout check. I'll shift it later :)  -- adrian */
654		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
655

Diff Legend

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