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-8/src/ircd.c (file contents), Revision 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/ircd.c (file contents), Revision 2159 by michael, Sun Jun 2 18:22:01 2013 UTC

#	Line 36 | Line 36
36		#include "ircd_signal.h"
37		#include "s_gline.h"
38		#include "motd.h"
39	+	#include "conf.h"
40		#include "hostmask.h"
41		#include "numeric.h"
42		#include "packet.h"
#	Line 45 | Line 46
46		#include "rng_mt.h"
47		#include "s_auth.h"
48		#include "s_bsd.h"
48	–	#include "conf.h"
49		#include "log.h"
50		#include "s_misc.h"
51		#include "s_serv.h"      /* try_connections */
#	Line 53 | Line 53
53		#include "whowas.h"
54		#include "modules.h"
55		#include "memory.h"
56	+	#include "mempool.h"
57		#include "hook.h"
58		#include "ircd_getopt.h"
58	–	#include "balloc.h"
59	–	#include "motd.h"
59		#include "supported.h"
60		#include "watch.h"
61	+	#include "conf_db.h"
62	+	#include "conf_class.h"
63
64
65	+	#ifdef HAVE_LIBGEOIP
66	+	GeoIP *geoip_ctx;
67	+	#endif
68		/* /quote set variables */
69		struct SetOptions GlobalSetOptions;
70
#	Line 72 | Line 76 | struct server_info ServerInfo;
76		struct admin_info AdminInfo = { NULL, NULL, NULL };
77		struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
78		struct ServerState_t server_state = { 0 };
79	<	struct logging_entry ConfigLoggingEntry = { 1, 1 };
79	>	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
80		struct ServerStatistics ServerStats;
81		struct timeval SystemTime;
82		struct Client me;             /* That's me */
#	Line 82 | Line 86 | const char *logFileName = LPATH;
86		const char *pidFileName = PPATH;
87
88		char **myargv;
85	–	char ircd_platform[PLATFORMLEN];
89
90		int dorehash = 0;
91		int doremotd = 0;
#	Line 142 | Line 145 | make_daemon(void)
145
146		static int printVersion = 0;
147
148	<	struct lgetopt myopts[] = {
146	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
147	<	STRING, "File to use for dline.conf"},
148	>	static struct lgetopt myopts[] = {
149		{"configfile", &ConfigFileEntry.configfile,
150		STRING, "File to use for ircd.conf"},
151	+	{"glinefile",  &ConfigFileEntry.glinefile,
152	+	STRING, "File to use for gline database"},
153		{"klinefile",  &ConfigFileEntry.klinefile,
154	<	STRING, "File to use for kline.conf"},
154	>	STRING, "File to use for kline database"},
155	>	{"dlinefile",  &ConfigFileEntry.dlinefile,
156	>	STRING, "File to use for dline database"},
157		{"xlinefile",  &ConfigFileEntry.xlinefile,
158	<	STRING, "File to use for xline.conf"},
158	>	STRING, "File to use for xline database"},
159	>	{"resvfile",  &ConfigFileEntry.resvfile,
160	>	STRING, "File to use for resv database"},
161		{"logfile",    &logFileName,
162		STRING, "File to use for ircd.log"},
163		{"pidfile",    &pidFileName,
#	Line 175 | Line 182 | set_time(void)
182		{
183		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
184		strerror(errno));
185	<	sendto_realops_flags(UMODE_ALL, L_ALL,
185	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
186		"Clock Failure (%s), TS can be corrupted",
187		strerror(errno));
188		restart("Clock Failure");
#	Line 243 | Line 250 | io_loop(void)
250		}
251		if (doremotd)
252		{
253	<	read_message_file(&ConfigFileEntry.motd);
254	<	sendto_realops_flags(UMODE_ALL, L_ALL,
255	<	"Got signal SIGUSR1, reloading ircd motd file");
253	>	motd_recache();
254	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
255	>	"Got signal SIGUSR1, reloading motd files");
256		doremotd = 0;
257		}
258		}
#	Line 289 | Line 296 | initialize_global_set_options(void)
296		/* End of global set options */
297		}
298
292	–	/* initialize_message_files()
293	–	*
294	–	* inputs       - none
295	–	* output       - none
296	–	* side effects - Set up all message files needed, motd etc.
297	–	*/
298	–	static void
299	–	initialize_message_files(void)
300	–	{
301	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
302	–	init_message_file(OPER_MOTD, OPATH, &ConfigFileEntry.opermotd);
303	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
304	–
305	–	read_message_file(&ConfigFileEntry.motd);
306	–	read_message_file(&ConfigFileEntry.opermotd);
307	–	read_message_file(&ConfigFileEntry.linksfile);
308	–
309	–	init_isupport();
310	–	}
311	–
299		/* initialize_server_capabs()
300		*
301		* inputs       - none
#	Line 336 | Line 323 | initialize_server_capabs(void)
323		static void
324		write_pidfile(const char *filename)
325		{
326	<	FBFILE *fb;
326	>	FILE *fb;
327
328	<	if ((fb = fbopen(filename, "w")))
328	>	if ((fb = fopen(filename, "w")))
329		{
330		char buff[32];
331		unsigned int pid = (unsigned int)getpid();
345	–	size_t nbytes = snprintf(buff, sizeof(buff), "%u\n", pid);
332
333	<	if ((fbputs(buff, fb, nbytes) == -1))
333	>	snprintf(buff, sizeof(buff), "%u\n", pid);
334	>
335	>	if ((fputs(buff, fb) == -1))
336		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
337		pid, filename, strerror(errno));
338
339	<	fbclose(fb);
352	<	return;
339	>	fclose(fb);
340		}
341		else
342		{
#	Line 368 | Line 355 | write_pidfile(const char *filename)
355		static void
356		check_pidfile(const char *filename)
357		{
358	<	FBFILE *fb;
358	>	FILE *fb;
359		char buff[32];
360		pid_t pidfromfile;
361
362		/* Don't do logging here, since we don't have log() initialised */
363	<	if ((fb = fbopen(filename, "r")))
363	>	if ((fb = fopen(filename, "r")))
364		{
365	<	if (fbgets(buff, 20, fb) == NULL)
365	>	if (fgets(buff, 20, fb) == NULL)
366		{
367		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
368		* strerror(errno));
#	Line 393 | Line 380 | check_pidfile(const char *filename)
380		}
381		}
382
383	<	fbclose(fb);
383	>	fclose(fb);
384		}
385		else if (errno != ENOENT)
386		{
#	Line 430 | Line 417 | setup_corefile(void)
417		* side effects - setups SSL context.
418		*/
419		static void
420	<	init_ssl(void)
420	>	ssl_init(void)
421		{
422		#ifdef HAVE_LIBCRYPTO
423		SSL_load_error_strings();
#	Line 445 | Line 432 | init_ssl(void)
432		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
433		}
434
435	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2);
435	>	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
436		SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
437		SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
438
#	Line 458 | Line 445 | init_ssl(void)
445		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
446		}
447
448	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2);
448	>	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
449		SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
450		SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
451		#endif /* HAVE_LIBCRYPTO */
452		}
453
467	–	/* init_callbacks()
468	–	*
469	–	* inputs       - nothing
470	–	* output       - nothing
471	–	* side effects - setups standard hook points
472	–	*/
473	–	static void
474	–	init_callbacks(void)
475	–	{
476	–	iorecv_cb = register_callback("iorecv", iorecv_default);
477	–	iosend_cb = register_callback("iosend", iosend_default);
478	–	}
479	–
454		int
455		main(int argc, char *argv[])
456		{
#	Line 505 | Line 479 | main(int argc, char *argv[])
479		init_chcap_usage_counts();
480
481		ConfigFileEntry.dpath      = DPATH;
482	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
483	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
484	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
485	<	ConfigFileEntry.rxlinefile = RXPATH; /* Server regex xline file   */
486	<	ConfigFileEntry.rklinefile = RKPATH; /* Server regex kline file   */
487	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
488	<	ConfigFileEntry.glinefile  = GPATH;  /* gline log file            */
515	<	ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
516	<	ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
482	>	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
483	>	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
484	>	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
485	>	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
486	>	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
487	>	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
488	>
489		myargv = argv;
490		umask(077);                /* better safe than sorry --SRB */
491
#	Line 531 | Line 503 | main(int argc, char *argv[])
503		exit(EXIT_FAILURE);
504		}
505
506	<	init_ssl();
506	>	ssl_init();
507
508		if (!server_state.foreground)
509		{
#	Line 543 | Line 515 | main(int argc, char *argv[])
515
516		setup_signals();
517
546	–	get_ircd_platform(ircd_platform);
547	–
518		/* Init the event subsystem */
519		eventInit();
520		/* We need this to initialise the fd array before anything else */
521		fdlist_init();
522	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
522	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
523		check_can_use_v6();
524		init_comm();         /* This needs to be setup early ! -- adrian */
525		/* Check if there is pidfile and daemon already running */
526		check_pidfile(pidFileName);
527
528	<	initBlockHeap();
528	>	mp_pool_init();
529		init_dlink_nodes();
530	<	init_callbacks();
561	<	initialize_message_files();
530	>	init_isupport();
531		dbuf_init();
532	<	init_hash();
532	>	hash_init();
533		init_ip_hash_table();      /* client host ip hash table */
534		init_host_hash();          /* Host-hashtable. */
535	<	clear_tree_parse();
536	<	init_client();
537	<	init_class();
569	<	init_whowas();
535	>	client_init();
536	>	class_init();
537	>	whowas_init();
538		watch_init();
539	<	init_auth();          /* Initialise the auth code */
539	>	auth_init();          /* Initialise the auth code */
540		init_resolver();      /* Needs to be setup before the io loop */
541	+	modules_init();
542		read_conf_files(1);   /* cold start init conf files */
543		init_uid();
544		initialize_server_capabs();   /* Set up default_server_capabs */
545		initialize_global_set_options();
546	<	init_channels();
546	>	channel_init();
547	>	motd_init();
548	>	#ifdef HAVE_LIBGEOIP
549	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
550	>	#endif
551
552		if (EmptyString(ServerInfo.sid))
553		{
#	Line 616 | Line 589 | main(int argc, char *argv[])
589		/* add ourselves to global_serv_list */
590		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
591
592	+	load_kline_database();
593	+	load_dline_database();
594	+	load_gline_database();
595	+	load_xline_database();
596	+	load_resv_database();
597	+
598		if (chdir(MODPATH))
599		{
600		ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
#	Line 653 | Line 632 | main(int argc, char *argv[])
632		/* Setup the timeout check. I'll shift it later :)  -- adrian */
633		eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
634
635	+	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
636	+
637		if (ConfigServerHide.links_delay > 0)
638		eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
639		else

Diff Legend

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