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 876 by michael, Wed Oct 24 21:51:21 2007 UTC vs.
ircd-hybrid-8/src/ircd.c (file contents), Revision 1503 by michael, Tue Aug 14 09:05:58 2012 UTC

#	Line 24 | Line 24
24
25		#include "stdinc.h"
26		#include "s_user.h"
27	<	#include "tools.h"
27	>	#include "list.h"
28		#include "ircd.h"
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"
39	–	#include "list.h"
37		#include "s_gline.h"
38		#include "motd.h"
42	–	#include "ircd_handler.h"
43	–	#include "msg.h"         /* msgtab */
39		#include "hostmask.h"
40		#include "numeric.h"
41		#include "packet.h"
42		#include "parse.h"
43		#include "irc_res.h"
44		#include "restart.h"
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 */
56	–	#include "s_stats.h"
52		#include "send.h"
53		#include "whowas.h"
54		#include "modules.h"
#	Line 65 | Line 60
60		#include "supported.h"
61		#include "watch.h"
62
68	–	/* Try and find the correct name to use with getrlimit() for setting the max.
69	–	* number of files allowed to be open by this process.
70	–	*/
63
64		/* /quote set variables */
65		struct SetOptions GlobalSetOptions;
#	Line 78 | 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 */
79		struct LocalUser meLocalUser; /* That's also part of me */
87	–	unsigned long connect_id = 0; /* unique connect ID */
80
89	–	static unsigned long initialVMTop = 0;   /* top of virtual memory at init */
81		const char *logFileName = LPATH;
82		const char *pidFileName = PPATH;
83
84		char **myargv;
94	–	char ircd_platform[PLATFORMLEN];
85
86		int dorehash = 0;
87		int doremotd = 0;
98	–	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;
107	<	#endif
108	<
109	<	int splitmode;
110	<	int splitchecking;
111	<	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 123 | Line 107 | unsigned int split_servers;
107
108		int rehashed_klines = 0;
109
126	–	/*
127	–	* get_vm_top - get the operating systems notion of the resident set size
128	–	*/
129	–	#ifndef _WIN32
130	–	static unsigned long
131	–	get_vm_top(void)
132	–	{
133	–	/*
134	–	* NOTE: sbrk is not part of the ANSI C library or the POSIX.1 standard
135	–	* however it seems that everyone defines it. Calling sbrk with a 0
136	–	* argument will return a pointer to the top of the process virtual
137	–	* memory without changing the process size, so this call should be
138	–	* reasonably safe (sbrk returns the new value for the top of memory).
139	–	* This code relies on the notion that the address returned will be an
140	–	* offset from 0 (NULL), so the result of sbrk is cast to a size_t and
141	–	* returned. We really shouldn't be using it here but...
142	–	*/
143	–
144	–	void *vptr = sbrk(0);
145	–	return((unsigned long)vptr);
146	–	}
110
111		/*
112		* print_startup - print startup information
#	Line 175 | Line 138 | make_daemon(void)
138
139		setsid();
140		}
178	–	#endif
179	–
180	–	/*
181	–	* get_maxrss - get the operating systems notion of the resident set size
182	–	*/
183	–	unsigned long
184	–	get_maxrss(void)
185	–	{
186	–	#ifdef _WIN32
187	–	return (0);   /* FIXME */
188	–	#else
189	–	return (get_vm_top() - initialVMTop);
190	–	#endif
191	–	}
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 218 | Line 167 | set_time(void)
167		{
168		static char to_send[200];
169		struct timeval newtime;
221	–	#ifdef _WIN32
222	–	FILETIME ft;
223	–
224	–	GetSystemTimeAsFileTime(&ft);
225	–	if (ft.dwLowDateTime < 0xd53e8000)
226	–	ft.dwHighDateTime--;
227	–	ft.dwLowDateTime -= 0xd53e8000;
228	–	ft.dwHighDateTime -= 0x19db1de;
229	–
230	–	newtime.tv_sec  = (*(uint64_t *) &ft) / 10000000;
231	–	newtime.tv_usec = (*(uint64_t *) &ft) / 10 % 1000000;
232	–	#else
170		newtime.tv_sec  = 0;
171		newtime.tv_usec = 0;
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",
179		strerror(errno));
180		restart("Clock Failure");
181		}
245	–	#endif
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 282 | Line 219 | io_loop(void)
219		{
220		struct Client *client_p = ptr->data;
221		assert(client_p->localClient->list_task);
222	<	safe_list_channels(client_p, client_p->localClient->list_task, 0, 0);
222	>	safe_list_channels(client_p, client_p->localClient->list_task, 0);
223		}
224		}
225
#	Line 348 | Line 285 | initialize_global_set_options(void)
285		}
286
287		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
351	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
288		/* End of global set options */
289		}
290
#	Line 362 | Line 298 | static void
298		initialize_message_files(void)
299		{
300		init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
365	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
301		init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
302
303		read_message_file(&ConfigFileEntry.motd);
369	–	read_message_file(&ConfigFileEntry.opermotd);
304		read_message_file(&ConfigFileEntry.linksfile);
305
306		init_isupport();
#	Line 381 | Line 315 | static void
315		initialize_server_capabs(void)
316		{
317		add_capability("QS", CAP_QS, 1);
384	–	add_capability("LL", CAP_LL, 1);
318		add_capability("EOB", CAP_EOB, 1);
319	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
387	<	add_capability("TS6", CAP_TS6, 0);
388	<	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 401 | 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();
410	–	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);
417	<	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 433 | Line 365 | write_pidfile(const char *filename)
365		static void
366		check_pidfile(const char *filename)
367		{
368	<	#ifndef _WIN32
437	<	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 459 | Line 390 | check_pidfile(const char *filename)
390		}
391		}
392
393	<	fbclose(fb);
393	>	fclose(fb);
394		}
395		else if (errno != ENOENT)
396		{
397		/* log(L_ERROR, "Error opening pid file %s", filename); */
398		}
468	–	#endif
399		}
400
401		/* setup_corefile()
#	Line 503 | Line 433 | init_ssl(void)
433		SSL_load_error_strings();
434		SSLeay_add_ssl_algorithms();
435
436	<	ServerInfo.ctx = SSL_CTX_new(SSLv23_server_method());
507	<	if (!ServerInfo.ctx)
436	>	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
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.ctx, SSL_OP_NO_SSLv2);
446	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
447	<	SSL_CTX_set_verify(ServerInfo.ctx, SSL_VERIFY_NONE, NULL);
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	>	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	<	bio_spare_fd = save_spare_fd("SSL private key validation");
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 532 | Line 472 | init_callbacks(void)
472		{
473		iorecv_cb = register_callback("iorecv", iorecv_default);
474		iosend_cb = register_callback("iosend", iosend_default);
535	–	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
536	–	iosendctrl_cb = register_callback("iosendctrl", NULL);
475		}
476
477		int
#	Line 542 | Line 480 | main(int argc, char *argv[])
480		/* Check to see if the user is running
481		* us as root, which is a nono
482		*/
545	–	#ifndef _WIN32
483		if (geteuid() == 0)
484		{
485		fprintf(stderr, "Don't run ircd as root!!!\n");
486	<	return(-1);
486	>	return -1;
487		}
488
489		/* Setup corefile size immediately after boot -kre */
490		setup_corefile();
491
555	–	/* set initialVMTop before we allocate any memory */
556	–	initialVMTop = get_vm_top();
557	–	#endif
558	–
492		/* save server boot time right away, so getrusage works correctly */
493		set_time();
494
495	<	/* It ain't random, but it ought to be a little harder to guess */
496	<	srand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
497	<	memset(&me, 0, sizeof(me));
565	<	memset(&meLocalUser, 0, sizeof(meLocalUser));
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	>
498		me.localClient = &meLocalUser;
499		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
500		of Client list */
569	–
570	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
571	–
501		/* Initialise the channel capability usage counts... */
502		init_chcap_usage_counts();
503
#	Line 579 | Line 508 | main(int argc, char *argv[])
508		ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
509		ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
510		ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
582	–	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
511		ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
512		ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
513		myargv = argv;
#	Line 601 | Line 529 | main(int argc, char *argv[])
529
530		init_ssl();
531
604	–	#ifndef _WIN32
532		if (!server_state.foreground)
533		{
534		make_daemon();
#	Line 611 | Line 538 | main(int argc, char *argv[])
538		print_startup(getpid());
539
540		setup_signals();
614	–	#endif
615	–
616	–	get_ircd_platform(ircd_platform);
541
542		/* Init the event subsystem */
543		eventInit();
544		/* We need this to initialise the fd array before anything else */
545		fdlist_init();
546	<	init_log(logFileName);
546	>	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
547		check_can_use_v6();
548		init_comm();         /* This needs to be setup early ! -- adrian */
549		/* Check if there is pidfile and daemon already running */
550		check_pidfile(pidFileName);
551
628	–	#ifndef NOBALLOC
552		initBlockHeap();
630	–	#endif
553		init_dlink_nodes();
554		init_callbacks();
555		initialize_message_files();
#	Line 635 | Line 557 | main(int argc, char *argv[])
557		init_hash();
558		init_ip_hash_table();      /* client host ip hash table */
559		init_host_hash();          /* Host-hashtable. */
638	–	clear_tree_parse();
560		init_client();
561		init_class();
562	<	init_whowas();
562	>	whowas_init();
563		watch_init();
643	–	init_stats();
644	–	read_conf_files(1);   /* cold start init conf files */
645	–	initServerMask();
646	–	me.id[0] = '\0';
647	–	init_uid();
564		init_auth();          /* Initialise the auth code */
649	–	#ifndef _WIN32
565		init_resolver();      /* Needs to be setup before the io loop */
566	<	#endif
566	>	modules_init();
567	>	read_conf_files(1);   /* cold start init conf files */
568	>	init_uid();
569		initialize_server_capabs();   /* Set up default_server_capabs */
570		initialize_global_set_options();
571		init_channels();
572
573	<	if (ServerInfo.name == NULL)
573	>	if (EmptyString(ServerInfo.sid))
574		{
575	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
575	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
576		exit(EXIT_FAILURE);
577		}
578	+
579	+	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
580	+
581	+	if (EmptyString(ServerInfo.name))
582	+	{
583	+	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
584	+	exit(EXIT_FAILURE);
585	+	}
586	+
587		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
588
589		/* serverinfo{} description must exist.  If not, error out.*/
590	<	if (ServerInfo.description == NULL)
590	>	if (EmptyString(ServerInfo.description))
591		{
592	<	ilog(L_CRIT,
667	<	"ERROR: No server description specified in serverinfo block.");
592	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
593		exit(EXIT_FAILURE);
594		}
595	+
596		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
597
598	<	me.from    = &me;
599	<	me.servptr = &me;
598	>	me.from                   = &me;
599	>	me.servptr                = &me;
600	>	me.localClient->lasttime  = CurrentTime;
601	>	me.localClient->since     = CurrentTime;
602	>	me.localClient->firsttime = CurrentTime;
603
604		SetMe(&me);
605		make_server(&me);
606
607	<	me.lasttime = me.since = me.firsttime = CurrentTime;
607	>	hash_add_id(&me);
608		hash_add_client(&me);
609
610		/* add ourselves to global_serv_list */
611		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
612
684	–	check_class();
685	–
686	–	#ifndef STATIC_MODULES
613		if (chdir(MODPATH))
614		{
615	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
615	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
616		exit(EXIT_FAILURE);
617		}
618
619		load_all_modules(1);
620		load_conf_modules();
621		load_core_modules(1);
622	+
623		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
624	<	chdir(ConfigFileEntry.dpath);
625	<	#else
626	<	load_all_modules(1);
627	<	#endif
624	>	if (chdir(ConfigFileEntry.dpath))
625	>	{
626	>	perror("chdir");
627	>	exit(EXIT_FAILURE);
628	>	}
629	>
630		/*
631		* assemble_umode_buffer() has to be called after
632		* reading conf/loading modules.
#	Line 706 | Line 635 | main(int argc, char *argv[])
635
636		write_pidfile(pidFileName);
637
638	<	ilog(L_NOTICE, "Server Ready");
638	>	ilog(LOG_TYPE_IRCD, "Server Ready");
639
640		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
641		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 715 | Line 644 | main(int argc, char *argv[])
644		/* No, 'cause after a restart it would cause all sorts of nick collides */
645		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
646
718	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
719	–
647		/* Setup the timeout check. I'll shift it later :)  -- adrian */
648		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
649
#	Line 729 | Line 656 | main(int argc, char *argv[])
656		eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
657
658		io_loop();
659	<	return(0);
659	>	return 0;
660		}

Diff Legend

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