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 3724 by michael, Sat May 31 16:27:09 2014 UTC vs.
Revision 4892 by michael, Wed Nov 19 17:14:30 2014 UTC

#	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 53 | Line 53
53		#include "memory.h"
54		#include "mempool.h"
55		#include "ircd_getopt.h"
56	–	#include "supported.h"
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;
66		struct timeval SystemTime;
67		struct Client me;             /* That's me */
68	<	struct LocalUser meLocalUser; /* That's also part of me */
68	>	struct Connection meConnection; /* That's also part of me */
69
70		const char *logFileName = LPATH;
71		const char *pidFileName = PPATH;
#	Line 83 | Line 78 | int doremotd = 0;
78		/* Set to zero because it should be initialized later using
79		* initialize_server_capabs
80		*/
81	<	int default_server_capabs = 0;
81	>	unsigned int default_server_capabs;
82		unsigned int splitmode;
83		unsigned int splitchecking;
84		unsigned int split_users;
85		unsigned int split_servers;
86
87	<	/* Do klines the same way hybrid-6 did them, i.e. at the
88	<	* top of the next io_loop instead of in the same loop as
89	<	* the klines are being applied.
90	<	*
91	<	* This should fix strange CPU starvation as very indirectly reported.
92	<	* (Why do you people not email bug reports? WHY? WHY?)
98	<	*
99	<	* - Dianora
100	<	*/
87	>	static struct event event_cleanup_glines =
88	>	{
89	>	.name = "cleanup_glines",
90	>	.handler = cleanup_glines,
91	>	.when = CLEANUP_GLINES_TIME
92	>	};
93
94	<	int rehashed_klines = 0;
94	>	static struct event event_cleanup_tklines =
95	>	{
96	>	.name = "cleanup_tklines",
97	>	.handler = cleanup_tklines,
98	>	.when = CLEANUP_TKLINES_TIME
99	>	};
100	>
101	>	static struct event event_try_connections =
102	>	{
103	>	.name = "try_connections",
104	>	.handler = try_connections,
105	>	.when = STARTUP_CONNECTIONS_TIME
106	>	};
107	>
108	>	static struct event event_comm_checktimeouts =
109	>	{
110	>	.name = "comm_checktimeouts",
111	>	.handler = comm_checktimeouts,
112	>	.when = 1
113	>	};
114	>
115	>	static struct event event_save_all_databases =
116	>	{
117	>	.name = "save_all_databases",
118	>	.handler = save_all_databases,
119	>	.when = DATABASE_UPDATE_TIMEOUT
120	>	};
121	>
122	>	struct event event_write_links_file =
123	>	{
124	>	.name = "write_links_file",
125	>	.handler = write_links_file,
126	>	};
127
128
129		/*
#	Line 111 | 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 137 | 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 196 | Line 220 | io_loop(void)
220		{
221		while (1)
222		{
199	–	/*
200	–	* Maybe we want a flags word?
201	–	* ie. if (REHASHED_KLINES(global_flags))
202	–	* SET_REHASHED_KLINES(global_flags)
203	–	* CLEAR_REHASHED_KLINES(global_flags)
204	–	*
205	–	* - Dianora
206	–	*/
207	–	if (rehashed_klines)
208	–	{
209	–	check_conf_klines();
210	–	rehashed_klines = 0;
211	–	}
212	–
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, then get the number of seconds to the next
231	<	* event
222	<	*/
223	<	while (eventNextTime() <= CurrentTime)
224	<	eventRun();
230	>	/* Run pending events */
231	>	event_run();
232
233		comm_select();
234		exit_aborted_clients();
#	Line 253 | Line 260 | io_loop(void)
260		static void
261		initialize_global_set_options(void)
262		{
256	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
257	–
263		GlobalSetOptions.autoconn  = 1;
264		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
265		GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
266
267	<	if (ConfigFileEntry.default_floodcount)
268	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
267	>	if (ConfigGeneral.default_floodcount)
268	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
269		else
270		GlobalSetOptions.floodcount = 10;
271
#	Line 279 | Line 284 | initialize_global_set_options(void)
284		}
285
286		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
282	–	/* End of global set options */
287		}
288
289		/* initialize_server_capabs()
#	Line 317 | Line 321 | write_pidfile(const char *filename)
321
322		snprintf(buff, sizeof(buff), "%u\n", pid);
323
324	<	if ((fputs(buff, fb) == -1))
324	>	if (fputs(buff, fb) == -1)
325		ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
326		pid, filename, strerror(errno));
327
#	Line 325 | Line 329 | write_pidfile(const char *filename)
329		}
330		else
331		{
332	<	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
332	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s (%s)",
333	>	filename, strerror(errno));
334		}
335		}
336
#	Line 347 | Line 352 | check_pidfile(const char *filename)
352		/* Don't do logging here, since we don't have log() initialised */
353		if ((fb = fopen(filename, "r")))
354		{
355	<	if (fgets(buff, 20, fb) == NULL)
355	>	if (!fgets(buff, 20, fb))
356		{
357		/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
358		* strerror(errno));
#	Line 413 | Line 418 | static void
418		ssl_init(void)
419		{
420		#ifdef HAVE_LIBCRYPTO
416	–	const unsigned char session_id[] = "ircd-hybrid";
417	–
421		SSL_load_error_strings();
422		SSLeay_add_ssl_algorithms();
423
424	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
424	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
425		{
426	<	const char *s;
426	>	const char *s = ERR_lib_error_string(ERR_get_error());
427
428	<	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
429	<	s = ERR_lib_error_string(ERR_get_error()));
430	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
428	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
429	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
430	>	exit(EXIT_FAILURE);
431	>	return;  /* Not reached */
432		}
433
434	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
435	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
436	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
434	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
435	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
436	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
437		always_accept_verify_cb);
438	<	SSL_CTX_set_session_id_context(ServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
438	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
439	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
440
441	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
441	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
442		{
443	<	const char *s;
443	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
444
445	<	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
446	<	s = ERR_lib_error_string(ERR_get_error()));
447	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
445	>	if (key)
446	>	{
447	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
448	>	EC_KEY_free(key);
449	>	}
450		}
451
452	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
453	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
454	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
452	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
453	>	#endif
454	>
455	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
456	>	{
457	>	const char *s = ERR_lib_error_string(ERR_get_error());
458	>
459	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
461	>	exit(EXIT_FAILURE);
462	>	return;  /* Not reached */
463	>	}
464	>
465	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
466	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
467	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
468		always_accept_verify_cb);
469	+	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
470		#endif /* HAVE_LIBCRYPTO */
471		}
472
#	Line 453 | Line 474 | int
474		main(int argc, char *argv[])
475		{
476		/* Check to see if the user is running us as root, which is a nono */
477	<	if (geteuid() == 0)
477	>	if (!geteuid())
478		{
479		fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
480		return -1;
#	Line 468 | Line 489 | main(int argc, char *argv[])
489		/* It ain't random, but it ought to be a little harder to guess */
490		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
491
492	<	me.localClient = &meLocalUser;
492	>	me.connection = &meConnection;
493		dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
494		of Client list */
495	<	ConfigFileEntry.dpath      = DPATH;
496	<	ConfigFileEntry.spath      = SPATH;
497	<	ConfigFileEntry.mpath      = MPATH;
498	<	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
499	<	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
500	<	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
501	<	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
502	<	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
503	<	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
495	>	ConfigLog.use_logging = 1;
496	>	ConfigGeneral.dpath      = DPATH;
497	>	ConfigGeneral.spath      = SPATH;
498	>	ConfigGeneral.mpath      = MPATH;
499	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
500	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
501	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
502	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
503	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
504	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
505
506		myargv = argv;
507		umask(077);                /* better safe than sorry --SRB */
#	Line 492 | Line 514 | main(int argc, char *argv[])
514		exit(EXIT_SUCCESS);
515		}
516
517	<	if (chdir(ConfigFileEntry.dpath))
517	>	if (chdir(ConfigGeneral.dpath))
518		{
519		perror("chdir");
520		exit(EXIT_FAILURE);
#	Line 510 | Line 532 | main(int argc, char *argv[])
532
533		setup_signals();
534
513	–	/* Init the event subsystem */
514	–	eventInit();
515	–
535		/* We need this to initialise the fd array before anything else */
536		fdlist_init();
537		log_set_file(LOG_TYPE_IRCD, 0, logFileName);
538	<	check_can_use_v6();
538	>
539		init_netio();         /* This needs to be setup early ! -- adrian */
540
541		/* Check if there is pidfile and daemon already running */
#	Line 527 | Line 546 | main(int argc, char *argv[])
546		init_isupport();
547		dbuf_init();
548		hash_init();
549	<	init_ip_hash_table();      /* client host ip hash table */
531	<	init_host_hash();          /* Host-hashtable. */
549	>	ipcache_init();
550		client_init();
551		class_init();
552		whowas_init();
#	Line 547 | Line 565 | main(int argc, char *argv[])
565		geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
566		#endif
567
568	<	if (EmptyString(ServerInfo.sid))
568	>	if (EmptyString(ConfigServerInfo.sid))
569		{
570		ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
571		exit(EXIT_FAILURE);
572		}
573
574	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
574	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
575
576	<	if (EmptyString(ServerInfo.name))
576	>	if (EmptyString(ConfigServerInfo.name))
577		{
578		ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
579		exit(EXIT_FAILURE);
580		}
581
582	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
582	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
583
584		/* serverinfo{} description must exist.  If not, error out.*/
585	<	if (EmptyString(ServerInfo.description))
585	>	if (EmptyString(ConfigServerInfo.description))
586		{
587		ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
588		exit(EXIT_FAILURE);
589		}
590
591	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
591	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
592
593		me.from                   = &me;
594		me.servptr                = &me;
595	<	me.localClient->lasttime  = CurrentTime;
596	<	me.localClient->since     = CurrentTime;
597	<	me.localClient->firsttime = CurrentTime;
595	>	me.connection->lasttime  = CurrentTime;
596	>	me.connection->since     = CurrentTime;
597	>	me.connection->firsttime = CurrentTime;
598
599		SetMe(&me);
600		make_server(&me);
#	Line 584 | Line 602 | main(int argc, char *argv[])
602		hash_add_id(&me);
603		hash_add_client(&me);
604
605	<	/* add ourselves to global_serv_list */
588	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
605	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
606
607		load_kline_database();
608		load_dline_database();
#	Line 604 | Line 621 | main(int argc, char *argv[])
621		load_core_modules(1);
622
623		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
624	<	if (chdir(ConfigFileEntry.dpath))
624	>	if (chdir(ConfigGeneral.dpath))
625		{
626		perror("chdir");
627		exit(EXIT_FAILURE);
#	Line 620 | Line 637 | main(int argc, char *argv[])
637
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);
640	>	event_addish(&event_cleanup_glines, NULL);
641	>	event_addish(&event_cleanup_tklines, NULL);
642
643		/* We want try_connections to be called as soon as possible now! -- adrian */
644		/* No, 'cause after a restart it would cause all sorts of nick collides */
645	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
645	>	event_addish(&event_try_connections, NULL);
646
647		/* Setup the timeout check. I'll shift it later :)  -- adrian */
648	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
648	>	event_add(&event_comm_checktimeouts, NULL);
649
650	<	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
650	>	event_addish(&event_save_all_databases, NULL);
651
652		if (ConfigServerHide.links_delay > 0)
653	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
653	>	{
654	>	event_write_links_file.when = ConfigServerHide.links_delay;
655	>	event_addish(&event_write_links_file, NULL);
656	>	}
657		else
658		ConfigServerHide.links_disabled = 1;
659
660		if (splitmode)
661	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
661	>	event_addish(&splitmode_event, NULL);
662
663		io_loop();
664		return 0;

Diff Legend

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