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 876 by michael, Wed Oct 24 21:51:21 2007 UTC vs.
ircd-hybrid-8/src/ircd.c (file contents), Revision 1241 by michael, Thu Sep 29 20:26:09 2011 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"
#	Line 34 | Line 34
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37	–	#include "sprintf_irc.h"
37		#include "ircd_signal.h"
39	–	#include "list.h"
38		#include "s_gline.h"
39		#include "motd.h"
40		#include "ircd_handler.h"
#	Line 47 | Line 45
45		#include "parse.h"
46		#include "irc_res.h"
47		#include "restart.h"
48	+	#include "rng_mt.h"
49		#include "s_auth.h"
50		#include "s_bsd.h"
51		#include "s_conf.h"
52		#include "s_log.h"
53		#include "s_misc.h"
54		#include "s_serv.h"      /* try_connections */
56	–	#include "s_stats.h"
55		#include "send.h"
56		#include "whowas.h"
57		#include "modules.h"
#	Line 65 | Line 63
63		#include "supported.h"
64		#include "watch.h"
65
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	–	*/
66
67		/* /quote set variables */
68		struct SetOptions GlobalSetOptions;
#	Line 78 | Line 73 | struct config_file_entry ConfigFileEntry
73		struct server_info ServerInfo;
74		/* admin info set from ircd.conf */
75		struct admin_info AdminInfo = { NULL, NULL, NULL };
76	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0 };
76	>	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
77		struct ServerState_t server_state = { 0 };
78		struct logging_entry ConfigLoggingEntry = { 1, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
79	+	struct ServerStatistics ServerStats;
80		struct timeval SystemTime;
81		struct Client me;             /* That's me */
82		struct LocalUser meLocalUser; /* That's also part of me */
87	–	unsigned long connect_id = 0; /* unique connect ID */
83
89	–	static unsigned long initialVMTop = 0;   /* top of virtual memory at init */
84		const char *logFileName = LPATH;
85		const char *pidFileName = PPATH;
86
#	Line 95 | Line 89 | char ircd_platform[PLATFORMLEN];
89
90		int dorehash = 0;
91		int doremotd = 0;
98	–	time_t nextconnect = 1;       /* time for next try_connections call */
92
93		/* Set to zero because it should be initialized later using
94		* initialize_server_capabs
#	Line 106 | Line 99 | int default_server_capabs = 0;
99		int bio_spare_fd = -1;
100		#endif
101
102	<	int splitmode;
103	<	int splitchecking;
104	<	int split_users;
102	>	unsigned int splitmode;
103	>	unsigned int splitchecking;
104	>	unsigned int split_users;
105		unsigned int split_servers;
106
107		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 123 | Line 116 | unsigned int split_servers;
116
117		int rehashed_klines = 0;
118
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	–	}
119
120		/*
121		* print_startup - print startup information
#	Line 175 | Line 147 | make_daemon(void)
147
148		setsid();
149		}
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	–	}
150
151		static int printVersion = 0;
152
#	Line 218 | Line 176 | set_time(void)
176		{
177		static char to_send[200];
178		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
179		newtime.tv_sec  = 0;
180		newtime.tv_usec = 0;
181
#	Line 242 | Line 188 | set_time(void)
188		strerror(errno));
189		restart("Clock Failure");
190		}
245	–	#endif
191
192		if (newtime.tv_sec < CurrentTime)
193		{
194	<	ircsprintf(to_send, "System clock is running backwards - (%lu < %lu)",
195	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
194	>	snprintf(to_send, sizeof(to_send),
195	>	"System clock is running backwards - (%lu < %lu)",
196	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
197		report_error(L_ALL, to_send, me.name, 0);
198		set_back_events(CurrentTime - newtime.tv_sec);
199		}
#	Line 282 | Line 228 | io_loop(void)
228		{
229		struct Client *client_p = ptr->data;
230		assert(client_p->localClient->list_task);
231	<	safe_list_channels(client_p, client_p->localClient->list_task, 0, 0);
231	>	safe_list_channels(client_p, client_p->localClient->list_task, 0);
232		}
233		}
234
#	Line 348 | Line 294 | initialize_global_set_options(void)
294		}
295
296		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
351	–	GlobalSetOptions.idletime = ConfigFileEntry.idletime;
297		/* End of global set options */
298		}
299
#	Line 381 | Line 326 | static void
326		initialize_server_capabs(void)
327		{
328		add_capability("QS", CAP_QS, 1);
384	–	add_capability("LL", CAP_LL, 1);
329		add_capability("EOB", CAP_EOB, 1);
330	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
387	<	add_capability("TS6", CAP_TS6, 0);
330	>	add_capability("TS6", CAP_TS6, 0);
331		add_capability("ZIP", CAP_ZIP, 0);
332		add_capability("CLUSTER", CAP_CLUSTER, 1);
333	+	add_capability("SVS", CAP_SVS, 1);
334		#ifdef HALFOPS
335		add_capability("HOPS", CAP_HOPS, 1);
336		#endif
#	Line 407 | Line 351 | write_pidfile(const char *filename)
351		{
352		char buff[32];
353		unsigned int pid = (unsigned int)getpid();
354	<	size_t nbytes = ircsprintf(buff, "%u\n", pid);
354	>	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
355
356		if ((fbputs(buff, fb, nbytes) == -1))
357		ilog(L_ERROR, "Error writing %u to pid file %s (%s)",
#	Line 433 | Line 377 | write_pidfile(const char *filename)
377		static void
378		check_pidfile(const char *filename)
379		{
436	–	#ifndef _WIN32
380		FBFILE *fb;
381		char buff[32];
382		pid_t pidfromfile;
#	Line 465 | Line 408 | check_pidfile(const char *filename)
408		{
409		/* log(L_ERROR, "Error opening pid file %s", filename); */
410		}
468	–	#endif
411		}
412
413		/* setup_corefile()
#	Line 503 | Line 445 | init_ssl(void)
445		SSL_load_error_strings();
446		SSLeay_add_ssl_algorithms();
447
448	<	ServerInfo.ctx = SSL_CTX_new(SSLv23_server_method());
507	<	if (!ServerInfo.ctx)
448	>	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
449		{
450		const char *s;
451
#	Line 513 | Line 454 | init_ssl(void)
454		ilog(L_CRIT, "ERROR: Could not initialize the SSL context -- %s\n", s);
455		}
456
457	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_NO_SSLv2);
458	<	SSL_CTX_set_options(ServerInfo.ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
459	<	SSL_CTX_set_verify(ServerInfo.ctx, SSL_VERIFY_NONE, NULL);
457	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
458	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
459	>	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
460
461		bio_spare_fd = save_spare_fd("SSL private key validation");
462		#endif /* HAVE_LIBCRYPTO */
#	Line 542 | Line 483 | main(int argc, char *argv[])
483		/* Check to see if the user is running
484		* us as root, which is a nono
485		*/
545	–	#ifndef _WIN32
486		if (geteuid() == 0)
487		{
488		fprintf(stderr, "Don't run ircd as root!!!\n");
489	<	return(-1);
489	>	return -1;
490		}
491
492		/* Setup corefile size immediately after boot -kre */
493		setup_corefile();
494
555	–	/* set initialVMTop before we allocate any memory */
556	–	initialVMTop = get_vm_top();
557	–	#endif
558	–
495		/* save server boot time right away, so getrusage works correctly */
496		set_time();
497
498	<	/* It ain't random, but it ought to be a little harder to guess */
499	<	srand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
500	<	memset(&me, 0, sizeof(me));
565	<	memset(&meLocalUser, 0, sizeof(meLocalUser));
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	>
501		me.localClient = &meLocalUser;
502		dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
503		of Client list */
569	–
570	–	memset(&ServerInfo, 0, sizeof(ServerInfo));
571	–
504		/* Initialise the channel capability usage counts... */
505		init_chcap_usage_counts();
506
#	Line 601 | Line 533 | main(int argc, char *argv[])
533
534		init_ssl();
535
604	–	#ifndef _WIN32
536		if (!server_state.foreground)
537		{
538		make_daemon();
#	Line 611 | Line 542 | main(int argc, char *argv[])
542		print_startup(getpid());
543
544		setup_signals();
614	–	#endif
545
546		get_ircd_platform(ircd_platform);
547
#	Line 625 | Line 555 | main(int argc, char *argv[])
555		/* Check if there is pidfile and daemon already running */
556		check_pidfile(pidFileName);
557
628	–	#ifndef NOBALLOC
558		initBlockHeap();
630	–	#endif
559		init_dlink_nodes();
560		init_callbacks();
561		initialize_message_files();
#	Line 640 | Line 568 | main(int argc, char *argv[])
568		init_class();
569		init_whowas();
570		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();
571		init_auth();          /* Initialise the auth code */
649	–	#ifndef _WIN32
572		init_resolver();      /* Needs to be setup before the io loop */
573	<	#endif
573	>	read_conf_files(1);   /* cold start init conf files */
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, "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(L_CRIT, "No server name specified in serverinfo block.");
589	>	ilog(L_CRIT, "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,
667	<	"ERROR: No server description specified in serverinfo block.");
598	>	ilog(L_CRIT, "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
684	–	check_class();
685	–
686	–	#ifndef STATIC_MODULES
619		if (chdir(MODPATH))
620		{
621	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
621	>	ilog(L_CRIT, "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 729 | Line 664 | main(int argc, char *argv[])
664		eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
665
666		io_loop();
667	<	return(0);
667	>	return 0;
668		}

Diff Legend

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