ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/ircd.c (file contents):
Revision 4319 by michael, Fri Aug 1 16:48:38 2014 UTC vs.
Revision 5723 by michael, Sun Mar 22 16:28:58 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 56 | Line 56
56		#include "watch.h"
57		#include "conf_db.h"
58		#include "conf_class.h"
59	+	#include "ipcache.h"
60
61
62		#ifdef HAVE_LIBGEOIP
63		GeoIP *geoip_ctx;
64		#endif
65
66	+	/* /quote set variables */
67	+	struct SetOptions GlobalSetOptions;
68	+	struct Counter Count;
69	+	struct ServerState_t server_state;
70		struct ServerStatistics ServerStats;
71		struct timeval SystemTime;
72	<	struct Client me;             /* That's me */
73	<	struct LocalUser meLocalUser; /* That's also part of me */
72	>	struct Connection meConnection; /* That's also part of me */
73	>	struct Client me = { .connection = &meConnection };  /* That's me */
74
75	+	char **myargv;
76		const char *logFileName = LPATH;
77		const char *pidFileName = PPATH;
78
79	<	char **myargv;
80	<
75	<	int dorehash = 0;
76	<	int doremotd = 0;
77	<
78	<	/* Set to zero because it should be initialized later using
79	<	* initialize_server_capabs
80	<	*/
79	>	unsigned int dorehash;
80	>	unsigned int doremotd;
81		unsigned int default_server_capabs;
82		unsigned int splitmode;
83		unsigned int splitchecking;
#	Line 135 | Line 135 | print_startup(int pid)
135		printf("ircd: version %s(%s)\n", ircd_version, serno);
136		printf("ircd: pid %d\n", pid);
137		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
138	<	: "foreground", ConfigFileEntry.dpath);
138	>	: "foreground", ConfigGeneral.dpath);
139		}
140
141		static void
#	Line 161 | Line 161 | static int printVersion = 0;
161
162		static struct lgetopt myopts[] =
163		{
164	<	{"configfile", &ConfigFileEntry.configfile,
164	>	{"configfile", &ConfigGeneral.configfile,
165		STRING, "File to use for ircd.conf"},
166	<	{"glinefile",  &ConfigFileEntry.glinefile,
166	>	{"glinefile",  &ConfigGeneral.glinefile,
167		STRING, "File to use for gline database"},
168	<	{"klinefile",  &ConfigFileEntry.klinefile,
168	>	{"klinefile",  &ConfigGeneral.klinefile,
169		STRING, "File to use for kline database"},
170	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
170	>	{"dlinefile",  &ConfigGeneral.dlinefile,
171		STRING, "File to use for dline database"},
172	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
172	>	{"xlinefile",  &ConfigGeneral.xlinefile,
173		STRING, "File to use for xline database"},
174	<	{"resvfile",  &ConfigFileEntry.resvfile,
174	>	{"resvfile",  &ConfigGeneral.resvfile,
175		STRING, "File to use for resv database"},
176		{"logfile",    &logFileName,
177		STRING, "File to use for ircd.log"},
#	Line 222 | Line 222 | io_loop(void)
222		{
223		if (listing_client_list.head)
224		{
225	<	dlink_node *ptr = NULL, *ptr_next = NULL;
226	<	DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
227	<	safe_list_channels(ptr->data, 0);
225	>	dlink_node *node = NULL, *node_next = NULL;
226	>	DLINK_FOREACH_SAFE(node, node_next, listing_client_list.head)
227	>	safe_list_channels(node->data, 0);
228		}
229
230		/* Run pending events */
#	Line 237 | Line 237 | io_loop(void)
237		/* Check to see whether we have to rehash the configuration .. */
238		if (dorehash)
239		{
240	<	rehash(1);
240	>	conf_rehash(1);
241		dorehash = 0;
242		}
243
#	Line 260 | Line 260 | io_loop(void)
260		static void
261		initialize_global_set_options(void)
262		{
263	<	GlobalSetOptions.autoconn  = 1;
263	>	GlobalSetOptions.maxclients = ConfigServerInfo.default_max_clients;
264	>	GlobalSetOptions.autoconn = 1;
265		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
266	<	GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
267	<
268	<	if (ConfigFileEntry.default_floodcount)
269	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
269	<	else
270	<	GlobalSetOptions.floodcount = 10;
271	<
272	<	/* XXX I have no idea what to try here - Dianora */
273	<	GlobalSetOptions.joinfloodcount = 16;
274	<	GlobalSetOptions.joinfloodtime = 8;
266	>	GlobalSetOptions.spam_num = MAX_JOIN_LEAVE_COUNT;
267	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
268	>	GlobalSetOptions.joinfloodcount = ConfigChannel.default_join_flood_count;
269	>	GlobalSetOptions.joinfloodtime = ConfigChannel.default_join_flood_time;
270
271		split_servers = ConfigChannel.default_split_server_count;
272		split_users   = ConfigChannel.default_split_user_count;
#	Line 321 | Line 316 | write_pidfile(const char *filename)
316
317		snprintf(buff, sizeof(buff), "%u\n", pid);
318
319	<	if ((fputs(buff, fb) == -1))
320	<	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
319	>	if (fputs(buff, fb) == -1)
320	>	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s: %s",
321		pid, filename, strerror(errno));
322
323		fclose(fb);
324		}
325		else
326	<	{
327	<	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
333	<	}
326	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s: %s",
327	>	filename, strerror(errno));
328		}
329
330		/* check_pidfile()
#	Line 351 | Line 345 | check_pidfile(const char *filename)
345		/* Don't do logging here, since we don't have log() initialised */
346		if ((fb = fopen(filename, "r")))
347		{
348	<	if (fgets(buff, 20, fb) == NULL)
348	>	if (!fgets(buff, 20, fb))
349		{
350		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
351		* strerror(errno));
#	Line 417 | Line 411 | static void
411		ssl_init(void)
412		{
413		#ifdef HAVE_LIBCRYPTO
420	–	const unsigned char session_id[] = "ircd-hybrid";
421	–
414		SSL_load_error_strings();
415		SSLeay_add_ssl_algorithms();
416
417	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
417	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
418		{
419		const char *s = ERR_lib_error_string(ERR_get_error());
420
421		fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
422	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
422	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
423	>	exit(EXIT_FAILURE);
424	>	return;  /* Not reached */
425		}
426
427	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
428	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
429	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
427	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
428	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
429	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
430		always_accept_verify_cb);
431	<	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
431	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
432	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
433
434	<	#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
434	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
435		{
436		EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
437
438		if (key)
439		{
440	<	SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
440	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
441		EC_KEY_free(key);
442		}
443		}
444
445	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
445	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
446		#endif
447
448	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
448	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
449		{
450		const char *s = ERR_lib_error_string(ERR_get_error());
451
452		fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
453	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
453	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
454	>	exit(EXIT_FAILURE);
455	>	return;  /* Not reached */
456		}
457
458	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
459	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
460	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
458	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
459	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
460	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
461		always_accept_verify_cb);
462	+	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
463		#endif /* HAVE_LIBCRYPTO */
464		}
465
#	Line 469 | Line 467 | int
467		main(int argc, char *argv[])
468		{
469		/* Check to see if the user is running us as root, which is a nono */
470	<	if (geteuid() == 0)
470	>	if (!geteuid())
471		{
472		fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
473		return -1;
#	Line 478 | Line 476 | main(int argc, char *argv[])
476		/* Setup corefile size immediately after boot -kre */
477		setup_corefile();
478
479	<	/* save server boot time right away, so getrusage works correctly */
479	>	/* Save server boot time right away, so getrusage works correctly */
480		set_time();
481
482	<	/* It ain't random, but it ought to be a little harder to guess */
482	>	/* It's not random, but it ought to be a little harder to guess */
483		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
484
485	<	me.localClient = &meLocalUser;
486	<	dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
487	<	of Client list */
488	<	ConfigLoggingEntry.use_logging = 1;
489	<	ConfigFileEntry.dpath      = DPATH;
490	<	ConfigFileEntry.spath      = SPATH;
491	<	ConfigFileEntry.mpath      = MPATH;
492	<	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
493	<	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
494	<	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
495	<	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
498	<	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
499	<	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
485	>	dlinkAdd(&me, &me.node, &global_client_list);
486	>
487	>	ConfigGeneral.dpath      = DPATH;
488	>	ConfigGeneral.spath      = SPATH;
489	>	ConfigGeneral.mpath      = MPATH;
490	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
491	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
492	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
493	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
494	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
495	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
496
497		myargv = argv;
498	<	umask(077);                /* better safe than sorry --SRB */
498	>	umask(077);  /* umask 077: u=rwx,g=,o= */
499
500		parseargs(&argc, &argv, myopts);
501
#	Line 509 | Line 505 | main(int argc, char *argv[])
505		exit(EXIT_SUCCESS);
506		}
507
508	<	if (chdir(ConfigFileEntry.dpath))
508	>	if (chdir(ConfigGeneral.dpath))
509		{
510		perror("chdir");
511		exit(EXIT_FAILURE);
#	Line 530 | Line 526 | main(int argc, char *argv[])
526		/* We need this to initialise the fd array before anything else */
527		fdlist_init();
528		log_set_file(LOG_TYPE_IRCD, 0, logFileName);
529	<	check_can_use_v6();
529	>
530		init_netio();         /* This needs to be setup early ! -- adrian */
531
532		/* Check if there is pidfile and daemon already running */
#	Line 542 | Line 538 | main(int argc, char *argv[])
538		dbuf_init();
539		hash_init();
540		ipcache_init();
545	–	init_host_hash();          /* Host-hashtable. */
541		client_init();
542		class_init();
543		whowas_init();
#	Line 553 | Line 548 | main(int argc, char *argv[])
548		read_conf_files(1);   /* cold start init conf files */
549		init_uid();
550		initialize_server_capabs();   /* Set up default_server_capabs */
551	<	initialize_global_set_options();
551	>	initialize_global_set_options();  /* Has to be called after read_conf_files() */
552		channel_init();
553		read_links_file();
554		motd_init();
555	+	user_usermodes_init();
556		#ifdef HAVE_LIBGEOIP
557		geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
558		#endif
559
560	<	if (EmptyString(ServerInfo.sid))
560	>	if (EmptyString(ConfigServerInfo.sid))
561		{
562		ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
563		exit(EXIT_FAILURE);
564		}
565
566	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
566	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
567
568	<	if (EmptyString(ServerInfo.name))
568	>	if (EmptyString(ConfigServerInfo.name))
569		{
570		ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
571		exit(EXIT_FAILURE);
572		}
573
574	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
574	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
575
576		/* serverinfo{} description must exist.  If not, error out.*/
577	<	if (EmptyString(ServerInfo.description))
577	>	if (EmptyString(ConfigServerInfo.description))
578		{
579		ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
580		exit(EXIT_FAILURE);
581		}
582
583	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
583	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
584
585	<	me.from                   = &me;
586	<	me.servptr                = &me;
587	<	me.localClient->lasttime  = CurrentTime;
588	<	me.localClient->since     = CurrentTime;
589	<	me.localClient->firsttime = CurrentTime;
585	>	me.from = &me;
586	>	me.servptr = &me;
587	>	me.connection->lasttime = CurrentTime;
588	>	me.connection->since = CurrentTime;
589	>	me.connection->firsttime = CurrentTime;
590
591		SetMe(&me);
592		make_server(&me);
#	Line 606 | Line 602 | main(int argc, char *argv[])
602		load_xline_database();
603		load_resv_database();
604
609	–	if (chdir(MODPATH))
610	–	{
611	–	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
612	–	exit(EXIT_FAILURE);
613	–	}
614	–
605		load_all_modules(1);
606		load_conf_modules();
607		load_core_modules(1);
608
619	–	/* Go back to DPATH after checking to see if we can chdir to MODPATH */
620	–	if (chdir(ConfigFileEntry.dpath))
621	–	{
622	–	perror("chdir");
623	–	exit(EXIT_FAILURE);
624	–	}
625	–
626	–	/*
627	–	* assemble_umode_buffer() has to be called after
628	–	* reading conf/loading modules.
629	–	*/
630	–	assemble_umode_buffer();
631	–
609		write_pidfile(pidFileName);
610
611		ilog(LOG_TYPE_IRCD, "Server Ready");
#	Line 641 | Line 618 | main(int argc, char *argv[])
618		event_addish(&event_try_connections, NULL);
619
620		/* Setup the timeout check. I'll shift it later :)  -- adrian */
621	<	event_addish(&event_comm_checktimeouts, NULL);
621	>	event_add(&event_comm_checktimeouts, NULL);
622
623		event_addish(&event_save_all_databases, NULL);
624

Diff Legend

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