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 4325 by michael, Fri Aug 1 18:06:07 2014 UTC vs.
Revision 4340 by michael, Sat Aug 2 16:53:22 2014 UTC

#	Line 136 | Line 136 | print_startup(int pid)
136		printf("ircd: version %s(%s)\n", ircd_version, serno);
137		printf("ircd: pid %d\n", pid);
138		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
139	<	: "foreground", ConfigFileEntry.dpath);
139	>	: "foreground", ConfigGeneral.dpath);
140		}
141
142		static void
#	Line 162 | Line 162 | static int printVersion = 0;
162
163		static struct lgetopt myopts[] =
164		{
165	<	{"configfile", &ConfigFileEntry.configfile,
165	>	{"configfile", &ConfigGeneral.configfile,
166		STRING, "File to use for ircd.conf"},
167	<	{"glinefile",  &ConfigFileEntry.glinefile,
167	>	{"glinefile",  &ConfigGeneral.glinefile,
168		STRING, "File to use for gline database"},
169	<	{"klinefile",  &ConfigFileEntry.klinefile,
169	>	{"klinefile",  &ConfigGeneral.klinefile,
170		STRING, "File to use for kline database"},
171	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
171	>	{"dlinefile",  &ConfigGeneral.dlinefile,
172		STRING, "File to use for dline database"},
173	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
173	>	{"xlinefile",  &ConfigGeneral.xlinefile,
174		STRING, "File to use for xline database"},
175	<	{"resvfile",  &ConfigFileEntry.resvfile,
175	>	{"resvfile",  &ConfigGeneral.resvfile,
176		STRING, "File to use for resv database"},
177		{"logfile",    &logFileName,
178		STRING, "File to use for ircd.log"},
#	Line 265 | Line 265 | initialize_global_set_options(void)
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;
268	>	if (ConfigGeneral.default_floodcount)
269	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
270		else
271		GlobalSetOptions.floodcount = 10;
272
#	Line 423 | Line 423 | ssl_init(void)
423		SSL_load_error_strings();
424		SSLeay_add_ssl_algorithms();
425
426	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
426	>	if ((ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
427		{
428		const char *s = ERR_lib_error_string(ERR_get_error());
429
#	Line 431 | Line 431 | ssl_init(void)
431		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
432		}
433
434	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
435	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
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);
435	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE);
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_id_context(ConfigServerInfo.server_ctx, session_id, sizeof(session_id) - 1);
439
440		#if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
441		{
#	Line 443 | Line 443 | ssl_init(void)
443
444		if (key)
445		{
446	<	SSL_CTX_set_tmp_ecdh(ServerInfo.server_ctx, key);
446	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
447		EC_KEY_free(key);
448		}
449		}
450
451	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
451	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
452		#endif
453
454	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
454	>	if ((ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
455		{
456		const char *s = ERR_lib_error_string(ERR_get_error());
457
#	Line 459 | Line 459 | ssl_init(void)
459		ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460		}
461
462	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
463	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
464	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
462	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
463	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
464	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
465		always_accept_verify_cb);
466		#endif /* HAVE_LIBCRYPTO */
467		}
#	Line 488 | Line 488 | main(int argc, char *argv[])
488		me.localClient = &meLocalUser;
489		dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
490		of Client list */
491	<	ConfigLoggingEntry.use_logging = 1;
492	<	ConfigFileEntry.dpath      = DPATH;
493	<	ConfigFileEntry.spath      = SPATH;
494	<	ConfigFileEntry.mpath      = MPATH;
495	<	ConfigFileEntry.configfile = CPATH;    /* Server configuration file */
496	<	ConfigFileEntry.klinefile  = KPATH;    /* Server kline file         */
497	<	ConfigFileEntry.glinefile  = GPATH;    /* Server gline file         */
498	<	ConfigFileEntry.xlinefile  = XPATH;    /* Server xline file         */
499	<	ConfigFileEntry.dlinefile  = DLPATH;   /* dline file                */
500	<	ConfigFileEntry.resvfile   = RESVPATH; /* resv file                 */
491	>	ConfigLog.use_logging = 1;
492	>	ConfigGeneral.dpath      = DPATH;
493	>	ConfigGeneral.spath      = SPATH;
494	>	ConfigGeneral.mpath      = MPATH;
495	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
496	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
497	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
498	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
499	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
500	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
501
502		myargv = argv;
503		umask(077);                /* better safe than sorry --SRB */
#	Line 510 | Line 510 | main(int argc, char *argv[])
510		exit(EXIT_SUCCESS);
511		}
512
513	<	if (chdir(ConfigFileEntry.dpath))
513	>	if (chdir(ConfigGeneral.dpath))
514		{
515		perror("chdir");
516		exit(EXIT_FAILURE);
#	Line 562 | Line 562 | main(int argc, char *argv[])
562		geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
563		#endif
564
565	<	if (EmptyString(ServerInfo.sid))
565	>	if (EmptyString(ConfigServerInfo.sid))
566		{
567		ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
568		exit(EXIT_FAILURE);
569		}
570
571	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
571	>	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
572
573	<	if (EmptyString(ServerInfo.name))
573	>	if (EmptyString(ConfigServerInfo.name))
574		{
575		ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
576		exit(EXIT_FAILURE);
577		}
578
579	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
579	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
580
581		/* serverinfo{} description must exist.  If not, error out.*/
582	<	if (EmptyString(ServerInfo.description))
582	>	if (EmptyString(ConfigServerInfo.description))
583		{
584		ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
585		exit(EXIT_FAILURE);
586		}
587
588	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
588	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
589
590		me.from                   = &me;
591		me.servptr                = &me;
#	Line 618 | Line 618 | main(int argc, char *argv[])
618		load_core_modules(1);
619
620		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
621	<	if (chdir(ConfigFileEntry.dpath))
621	>	if (chdir(ConfigGeneral.dpath))
622		{
623		perror("chdir");
624		exit(EXIT_FAILURE);

Diff Legend

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