ViewVC Help

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

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

Comparing:
ircd-hybrid/src/ircd.c (file contents), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid-8/src/ircd.c (file contents), Revision 1404 by michael, Thu May 10 20:41:45 2012 UTC

#	Line 19 | Line 19
19		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
20		*  USA
21		*
22	<	*  $Id: ircd.c,v 7.369 2005/09/24 09:27:18 michael Exp $
22	>	*  $Id$
23		*/
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 63 | Line 58
58		#include "balloc.h"
59		#include "motd.h"
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 */
79		struct LocalUser meLocalUser; /* That's also part of me */
86	–	unsigned long connect_id = 0; /* unique connect ID */
80
88	–	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;
93	–	char ircd_platform[PLATFORMLEN];
85
86		int dorehash = 0;
87		int doremotd = 0;
97	–	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;
106	<	#endif
107	<
108	<	int splitmode;
109	<	int splitchecking;
110	<	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 122 | Line 107 | unsigned int split_servers;
107
108		int rehashed_klines = 0;
109
125	–	/*
126	–	* get_vm_top - get the operating systems notion of the resident set size
127	–	*/
128	–	#ifndef _WIN32
129	–	static unsigned long
130	–	get_vm_top(void)
131	–	{
132	–	/*
133	–	* NOTE: sbrk is not part of the ANSI C library or the POSIX.1 standard
134	–	* however it seems that everyone defines it. Calling sbrk with a 0
135	–	* argument will return a pointer to the top of the process virtual
136	–	* memory without changing the process size, so this call should be
137	–	* reasonably safe (sbrk returns the new value for the top of memory).
138	–	* This code relies on the notion that the address returned will be an
139	–	* offset from 0 (NULL), so the result of sbrk is cast to a size_t and
140	–	* returned. We really shouldn't be using it here but...
141	–	*/
142	–
143	–	void *vptr = sbrk(0);
144	–	return((unsigned long)vptr);
145	–	}
110
111		/*
112		* print_startup - print startup information
#	Line 174 | Line 138 | make_daemon(void)
138
139		setsid();
140		}
177	–	#endif
178	–
179	–	/*
180	–	* get_maxrss - get the operating systems notion of the resident set size
181	–	*/
182	–	unsigned long
183	–	get_maxrss(void)
184	–	{
185	–	#ifdef _WIN32
186	–	return (0);   /* FIXME */
187	–	#else
188	–	return (get_vm_top() - initialVMTop);
189	–	#endif
190	–	}
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 217 | Line 167 | set_time(void)
167		{
168		static char to_send[200];
169		struct timeval newtime;
220	–	#ifdef _WIN32
221	–	FILETIME ft;
222	–
223	–	GetSystemTimeAsFileTime(&ft);
224	–	if (ft.dwLowDateTime < 0xd53e8000)
225	–	ft.dwHighDateTime--;
226	–	ft.dwLowDateTime -= 0xd53e8000;
227	–	ft.dwHighDateTime -= 0x19db1de;
228	–
229	–	newtime.tv_sec  = (*(uint64_t *) &ft) / 10000000;
230	–	newtime.tv_usec = (*(uint64_t *) &ft) / 10 % 1000000;
231	–	#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		}
244	–	#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 281 | 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 347 | Line 285 | initialize_global_set_options(void)
285		}
286
287		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
350	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
288		/* End of global set options */
289		}
290
#	Line 380 | Line 317 | static void
317		initialize_server_capabs(void)
318		{
319		add_capability("QS", CAP_QS, 1);
383	–	add_capability("LL", CAP_LL, 1);
320		add_capability("EOB", CAP_EOB, 1);
321	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
386	<	add_capability("TS6", CAP_TS6, 0);
387	<	add_capability("ZIP", CAP_ZIP, 0);
321	>	add_capability("TS6", CAP_TS6, 0);
322		add_capability("CLUSTER", CAP_CLUSTER, 1);
323	+	add_capability("SVS", CAP_SVS, 1);
324		#ifdef HALFOPS
325		add_capability("HOPS", CAP_HOPS, 1);
326		#endif
#	Line 400 | Line 335 | initialize_server_capabs(void)
335		static void
336		write_pidfile(const char *filename)
337		{
338	<	FBFILE *fb;
338	>	FILE *fb;
339
340	<	if ((fb = fbopen(filename, "w")))
340	>	if ((fb = fopen(filename, "w")))
341		{
342		char buff[32];
343		unsigned int pid = (unsigned int)getpid();
409	–	size_t nbytes = ircsprintf(buff, "%u\n", pid);
344
345	<	if ((fbputs(buff, fb, nbytes) == -1))
346	<	ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
345	>	snprintf(buff, sizeof(buff), "%u\n", pid);
346	>
347	>	if ((fputs(buff, fb) == -1))
348	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
349		pid, filename, strerror(errno));
350
351	<	fbclose(fb);
416	<	return;
351	>	fclose(fb);
352		}
353		else
354		{
355	<	ilog(L_ERROR, "Error opening pid file %s", filename);
355	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
356		}
357		}
358
#	Line 432 | Line 367 | write_pidfile(const char *filename)
367		static void
368		check_pidfile(const char *filename)
369		{
370	<	#ifndef _WIN32
436	<	FBFILE *fb;
370	>	FILE *fb;
371		char buff[32];
372		pid_t pidfromfile;
373
374		/* Don't do logging here, since we don't have log() initialised */
375	<	if ((fb = fbopen(filename, "r")))
375	>	if ((fb = fopen(filename, "r")))
376		{
377	<	if (fbgets(buff, 20, fb) == NULL)
377	>	if (fgets(buff, 20, fb) == NULL)
378		{
379		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
380		* strerror(errno));
#	Line 458 | Line 392 | check_pidfile(const char *filename)
392		}
393		}
394
395	<	fbclose(fb);
395	>	fclose(fb);
396		}
397		else if (errno != ENOENT)
398		{
399		/* log(L_ERROR, "Error opening pid file %s", filename); */
400		}
467	–	#endif
401		}
402
403		/* setup_corefile()
#	Line 502 | Line 435 | init_ssl(void)
435		SSL_load_error_strings();
436		SSLeay_add_ssl_algorithms();
437
438	<	ServerInfo.ctx = SSL_CTX_new(SSLv23_server_method());
506	<	if (!ServerInfo.ctx)
438	>	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
439		{
440		const char *s;
441
442	<	fprintf(stderr, "ERROR: Could not initialize the SSL context -- %s\n",
442	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
443		s = ERR_lib_error_string(ERR_get_error()));
444	<	ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
444	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
445		}
446
447	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_NO_SSLv2);
448	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
449	<	SSL_CTX_set_verify(ServerInfo.ctx, SSL_VERIFY_NONE, NULL);
447	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
448	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
449	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
450	>
451	>	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
452	>	{
453	>	const char *s;
454	>
455	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
456	>	s = ERR_lib_error_string(ERR_get_error()));
457	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
458	>	}
459
460	<	bio_spare_fd = save_spare_fd("SSL private key validation");
460	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
461	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
462	>	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
463		#endif /* HAVE_LIBCRYPTO */
464		}
465
#	Line 529 | Line 472 | init_ssl(void)
472		static void
473		init_callbacks(void)
474		{
475	<	iorecv_cb = register_callback("iorecv", NULL);
476	<	iosend_cb = register_callback("iosend", NULL);
534	<	iorecvctrl_cb = register_callback("iorecvctrl", NULL);
535	<	iosendctrl_cb = register_callback("iosendctrl", NULL);
475	>	iorecv_cb = register_callback("iorecv", iorecv_default);
476	>	iosend_cb = register_callback("iosend", iosend_default);
477		}
478
479		int
#	Line 541 | Line 482 | main(int argc, char *argv[])
482		/* Check to see if the user is running
483		* us as root, which is a nono
484		*/
544	–	#ifndef _WIN32
485		if (geteuid() == 0)
486		{
487		fprintf(stderr, "Don't run ircd as root!!!\n");
488	<	return(-1);
488	>	return -1;
489		}
490
491		/* Setup corefile size immediately after boot -kre */
492		setup_corefile();
493
554	–	/* set initialVMTop before we allocate any memory */
555	–	initialVMTop = get_vm_top();
556	–	#endif
557	–
494		/* save server boot time right away, so getrusage works correctly */
495		set_time();
496
497	<	/* It ain't random, but it ought to be a little harder to guess */
498	<	srand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
499	<	memset(&me, 0, sizeof(me));
564	<	memset(&meLocalUser, 0, sizeof(meLocalUser));
497	>	/* It ain't random, but it ought to be a little harder to guess */
498	>	init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
499	>
500		me.localClient = &meLocalUser;
501		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
502		of Client list */
568	–
569	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
570	–
503		/* Initialise the channel capability usage counts... */
504		init_chcap_usage_counts();
505
#	Line 600 | Line 532 | main(int argc, char *argv[])
532
533		init_ssl();
534
603	–	#ifndef _WIN32
535		if (!server_state.foreground)
536		{
537		make_daemon();
#	Line 610 | Line 541 | main(int argc, char *argv[])
541		print_startup(getpid());
542
543		setup_signals();
613	–	#endif
614	–
615	–	get_ircd_platform(ircd_platform);
544
545		/* Init the event subsystem */
546		eventInit();
547		/* We need this to initialise the fd array before anything else */
548		fdlist_init();
549	<	init_log(logFileName);
549	>	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
550		check_can_use_v6();
551		init_comm();         /* This needs to be setup early ! -- adrian */
552		/* Check if there is pidfile and daemon already running */
553		check_pidfile(pidFileName);
554
627	–	#ifndef NOBALLOC
555		initBlockHeap();
629	–	#endif
556		init_dlink_nodes();
557		init_callbacks();
558		initialize_message_files();
#	Line 634 | Line 560 | main(int argc, char *argv[])
560		init_hash();
561		init_ip_hash_table();      /* client host ip hash table */
562		init_host_hash();          /* Host-hashtable. */
637	–	clear_tree_parse();
563		init_client();
564		init_class();
565	<	init_whowas();
566	<	init_stats();
642	<	read_conf_files(1);   /* cold start init conf files */
643	<	initServerMask();
644	<	me.id[0] = '\0';
645	<	init_uid();
565	>	whowas_init();
566	>	watch_init();
567		init_auth();          /* Initialise the auth code */
647	–	#ifndef _WIN32
568		init_resolver();      /* Needs to be setup before the io loop */
569	<	#endif
569	>	modules_init();
570	>	read_conf_files(1);   /* cold start init conf files */
571	>	init_uid();
572		initialize_server_capabs();   /* Set up default_server_capabs */
573		initialize_global_set_options();
574		init_channels();
575
576	<	if (ServerInfo.name == NULL)
576	>	if (EmptyString(ServerInfo.sid))
577		{
578	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
578	>	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
579		exit(EXIT_FAILURE);
580		}
581	+
582	+	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
583	+
584	+	if (EmptyString(ServerInfo.name))
585	+	{
586	+	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
587	+	exit(EXIT_FAILURE);
588	+	}
589	+
590		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
591
592		/* serverinfo{} description must exist.  If not, error out.*/
593	<	if (ServerInfo.description == NULL)
593	>	if (EmptyString(ServerInfo.description))
594		{
595	<	ilog(L_CRIT,
665	<	"ERROR: No server description specified in serverinfo block.");
595	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
596		exit(EXIT_FAILURE);
597		}
598	+
599		strlcpy(me.info, ServerInfo.description, sizeof(me.info));
600
601	<	me.from    = &me;
602	<	me.servptr = &me;
601	>	me.from                   = &me;
602	>	me.servptr                = &me;
603	>	me.localClient->lasttime  = CurrentTime;
604	>	me.localClient->since     = CurrentTime;
605	>	me.localClient->firsttime = CurrentTime;
606
607		SetMe(&me);
608		make_server(&me);
609
610	<	me.lasttime = me.since = me.firsttime = CurrentTime;
610	>	hash_add_id(&me);
611		hash_add_client(&me);
612
613		/* add ourselves to global_serv_list */
614		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
615
682	–	check_class();
683	–
684	–	#ifndef STATIC_MODULES
616		if (chdir(MODPATH))
617		{
618	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
618	>	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
619		exit(EXIT_FAILURE);
620		}
621
622		load_all_modules(1);
623		load_conf_modules();
624		load_core_modules(1);
625	+
626		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
627	<	chdir(ConfigFileEntry.dpath);
628	<	#else
629	<	load_all_modules(1);
630	<	#endif
627	>	if (chdir(ConfigFileEntry.dpath))
628	>	{
629	>	perror("chdir");
630	>	exit(EXIT_FAILURE);
631	>	}
632	>
633		/*
634		* assemble_umode_buffer() has to be called after
635		* reading conf/loading modules.
#	Line 704 | Line 638 | main(int argc, char *argv[])
638
639		write_pidfile(pidFileName);
640
641	<	ilog(L_NOTICE, "Server Ready");
641	>	ilog(LOG_TYPE_IRCD, "Server Ready");
642
643		eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
644		eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
#	Line 713 | Line 647 | main(int argc, char *argv[])
647		/* No, 'cause after a restart it would cause all sorts of nick collides */
648		eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
649
716	–	eventAddIsh("collect_zipstats", collect_zipstats, NULL, ZIPSTATS_TIME);
717	–
650		/* Setup the timeout check. I'll shift it later :)  -- adrian */
651		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
652
#	Line 727 | Line 659 | main(int argc, char *argv[])
659		eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
660
661		io_loop();
662	<	return(0);
662	>	return 0;
663		}

Comparing:
ircd-hybrid/src/ircd.c (property svn:keywords), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid-8/src/ircd.c (property svn:keywords), Revision 1404 by michael, Thu May 10 20:41:45 2012 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id Revision

Diff Legend

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