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 2293 by michael, Wed Jun 19 10:54:16 2013 UTC vs.
Revision 4815 by michael, Sat Nov 1 15:28:42 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  ircd.c: Starts up and runs the ircd.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file ircd.c
23	>	* \brief Starts up and runs the ircd.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28	<	#include "s_user.h"
28	>	#include "user.h"
29		#include "list.h"
30		#include "ircd.h"
31		#include "channel.h"
30	–	#include "channel_mode.h"
32		#include "client.h"
33		#include "event.h"
34		#include "fdlist.h"
35		#include "hash.h"
36		#include "irc_string.h"
37		#include "ircd_signal.h"
38	<	#include "s_gline.h"
38	>	#include "gline.h"
39		#include "motd.h"
40		#include "conf.h"
41		#include "hostmask.h"
41	–	#include "numeric.h"
42	–	#include "packet.h"
42		#include "parse.h"
43	<	#include "irc_res.h"
43	>	#include "res.h"
44		#include "restart.h"
45		#include "rng_mt.h"
46	<	#include "s_auth.h"
46	>	#include "auth.h"
47		#include "s_bsd.h"
48		#include "log.h"
49	<	#include "s_misc.h"
51	<	#include "s_serv.h"      /* try_connections */
49	>	#include "server.h"      /* try_connections */
50		#include "send.h"
51		#include "whowas.h"
52		#include "modules.h"
53		#include "memory.h"
54		#include "mempool.h"
57	–	#include "hook.h"
55		#include "ircd_getopt.h"
59	–	#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
68	–	/* /quote set variables */
69	–	struct SetOptions GlobalSetOptions;
65
71	–	/* configuration set from ircd.conf */
72	–	struct config_file_entry ConfigFileEntry;
73	–	/* server info set from ircd.conf */
74	–	struct server_info ServerInfo;
75	–	/* admin info set from ircd.conf */
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 = { .use_logging = 1 };
80	–	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 93 | 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?)
93	<	*
94	<	* - Dianora
95	<	*/
87	>	static struct event event_cleanup_glines =
88	>	{
89	>	.name = "cleanup_glines",
90	>	.handler = cleanup_glines,
91	>	.when = CLEANUP_GLINES_TIME
92	>	};
93	>
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	<	int rehashed_klines = 0;
122	>	struct event event_write_links_file =
123	>	{
124	>	.name = "write_links_file",
125	>	.handler = write_links_file,
126	>	};
127
128
129		/*
#	Line 118 | Line 132 | int rehashed_klines = 0;
132		static void
133		print_startup(int pid)
134		{
135	<	printf("ircd: version %s\n", ircd_version);
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 145 | Line 159 | make_daemon(void)
159
160		static int printVersion = 0;
161
162	<	static struct lgetopt myopts[] = {
163	<	{"configfile", &ConfigFileEntry.configfile,
162	>	static struct lgetopt myopts[] =
163	>	{
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,
176	>	{"logfile",    &logFileName,
177		STRING, "File to use for ircd.log"},
178		{"pidfile",    &pidFileName,
179		STRING, "File to use for process ID"},
180	<	{"foreground", &server_state.foreground,
180	>	{"foreground", &server_state.foreground,
181		YESNO, "Run in foreground (don't detach)"},
182	<	{"version",    &printVersion,
182	>	{"version",    &printVersion,
183		YESNO, "Print version and exit"},
184		{"help", NULL, USAGE, "Print this text"},
185		{NULL, NULL, STRING, NULL},
#	Line 173 | Line 188 | static struct lgetopt myopts[] = {
188		void
189		set_time(void)
190		{
191	<	static char to_send[200];
177	<	struct timeval newtime;
178	<	newtime.tv_sec  = 0;
179	<	newtime.tv_usec = 0;
191	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
192
193		if (gettimeofday(&newtime, NULL) == -1)
194		{
#	Line 185 | Line 197 | set_time(void)
197		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
198		"Clock Failure (%s), TS can be corrupted",
199		strerror(errno));
200	<	restart("Clock Failure");
200	>	server_die("Clock Failure", 1);
201		}
202
203		if (newtime.tv_sec < CurrentTime)
204		{
205	<	snprintf(to_send, sizeof(to_send),
206	<	"System clock is running backwards - (%lu < %lu)",
207	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
208	<	report_error(L_ALL, to_send, me.name, 0);
205	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
206	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
207	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
208	>	"System clock is running backwards - (%lu < %lu)",
209	>	(unsigned long)newtime.tv_sec,
210	>	(unsigned long)CurrentTime);
211		set_back_events(CurrentTime - newtime.tv_sec);
212		}
213
#	Line 204 | Line 218 | set_time(void)
218		static void
219		io_loop(void)
220		{
221	<	while (1 == 1)
221	>	while (1)
222		{
209	–	/*
210	–	* Maybe we want a flags word?
211	–	* ie. if (REHASHED_KLINES(global_flags))
212	–	* SET_REHASHED_KLINES(global_flags)
213	–	* CLEAR_REHASHED_KLINES(global_flags)
214	–	*
215	–	* - Dianora
216	–	*/
217	–	if (rehashed_klines)
218	–	{
219	–	check_conf_klines();
220	–	rehashed_klines = 0;
221	–	}
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	<	{
228	<	struct Client *client_p = ptr->data;
229	<	assert(client_p->localClient->list_task);
230	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
231	<	}
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
236	<	*/
237	<	while (eventNextTime() <= CurrentTime)
238	<	eventRun();
230	>	/* Run pending events */
231	>	event_run();
232
233		comm_select();
234		exit_aborted_clients();
235		free_exited_clients();
243	–	send_queued_all();
236
237		/* Check to see whether we have to rehash the configuration .. */
238		if (dorehash)
#	Line 248 | Line 240 | io_loop(void)
240		rehash(1);
241		dorehash = 0;
242		}
243	+
244		if (doremotd)
245		{
246		motd_recache();
247		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
248	<	"Got signal SIGUSR1, reloading motd files");
248	>	"Got signal SIGUSR1, reloading motd file(s)");
249		doremotd = 0;
250		}
251		}
#	Line 262 | Line 255 | io_loop(void)
255		*
256		* inputs       - none
257		* output       - none
258	<	* side effects - This sets all global set options needed
258	>	* side effects - This sets all global set options needed
259		*/
260		static void
261		initialize_global_set_options(void)
262		{
270	–	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
271	–
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 293 | Line 284 | initialize_global_set_options(void)
284		}
285
286		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
296	–	/* End of global set options */
287		}
288
289		/* initialize_server_capabs()
#	Line 308 | Line 298 | initialize_server_capabs(void)
298		add_capability("EOB", CAP_EOB, 1);
299		add_capability("TS6", CAP_TS6, 0);
300		add_capability("CLUSTER", CAP_CLUSTER, 1);
311	–	add_capability("FAKEHOST", CAP_FAKEHOST, 1);
301		add_capability("SVS", CAP_SVS, 1);
302	<	#ifdef HALFOPS
302	>	add_capability("CHW", CAP_CHW, 1);
303		add_capability("HOPS", CAP_HOPS, 1);
315	–	#endif
304		}
305
306		/* write_pidfile()
#	Line 328 | Line 316 | write_pidfile(const char *filename)
316
317		if ((fb = fopen(filename, "w")))
318		{
319	<	char buff[32];
319	>	char buff[IRCD_BUFSIZE];
320		unsigned int pid = (unsigned int)getpid();
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 341 | 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 357 | Line 346 | static void
346		check_pidfile(const char *filename)
347		{
348		FILE *fb;
349	<	char buff[32];
349	>	char buff[IRCD_BUFSIZE];
350		pid_t pidfromfile;
351
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 432 | Line 421 | ssl_init(void)
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_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
439
440	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
440	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
441		{
442	<	const char *s;
442	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
443
444	<	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
445	<	s = ERR_lib_error_string(ERR_get_error()));
446	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
444	>	if (key)
445	>	{
446	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
447	>	EC_KEY_free(key);
448	>	}
449		}
450
451	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
452	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
453	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
451	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
452	>	#endif
453	>
454	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
455	>	{
456	>	const char *s = ERR_lib_error_string(ERR_get_error());
457	>
458	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
459	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
460	>	exit(EXIT_FAILURE);
461	>	return;  /* Not reached */
462	>	}
463	>
464	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
465	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
466	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
467		always_accept_verify_cb);
468	+	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
469		#endif /* HAVE_LIBCRYPTO */
470		}
471
#	Line 466 | Line 473 | int
473		main(int argc, char *argv[])
474		{
475		/* Check to see if the user is running us as root, which is a nono */
476	<	if (geteuid() == 0)
476	>	if (!geteuid())
477		{
478	<	fprintf(stderr, "Don't run ircd as root!!!\n");
478	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
479		return -1;
480		}
481
#	Line 481 | Line 488 | main(int argc, char *argv[])
488		/* It ain't random, but it ought to be a little harder to guess */
489		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
490
491	<	me.localClient = &meLocalUser;
491	>	me.connection = &meConnection;
492		dlinkAdd(&me, &me.node, &global_client_list);  /* Pointer to beginning
493		of Client list */
494	<	/* Initialise the channel capability usage counts... */
495	<	init_chcap_usage_counts();
496	<
497	<	ConfigFileEntry.dpath      = DPATH;
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                 */
494	>	ConfigLog.use_logging = 1;
495	>	ConfigGeneral.dpath      = DPATH;
496	>	ConfigGeneral.spath      = SPATH;
497	>	ConfigGeneral.mpath      = MPATH;
498	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
499	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
500	>	ConfigGeneral.glinefile  = GPATH;    /* Server gline file         */
501	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
502	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
503	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
504
505		myargv = argv;
506		umask(077);                /* better safe than sorry --SRB */
#	Line 502 | Line 509 | main(int argc, char *argv[])
509
510		if (printVersion)
511		{
512	<	printf("ircd: version %s\n", ircd_version);
512	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
513		exit(EXIT_SUCCESS);
514		}
515
516	<	if (chdir(ConfigFileEntry.dpath))
516	>	if (chdir(ConfigGeneral.dpath))
517		{
518		perror("chdir");
519		exit(EXIT_FAILURE);
#	Line 524 | Line 531 | main(int argc, char *argv[])
531
532		setup_signals();
533
527	–	/* Init the event subsystem */
528	–	eventInit();
529	–
534		/* We need this to initialise the fd array before anything else */
535		fdlist_init();
536		log_set_file(LOG_TYPE_IRCD, 0, logFileName);
537	<	check_can_use_v6();
538	<	init_comm();         /* This needs to be setup early ! -- adrian */
537	>
538	>	init_netio();         /* This needs to be setup early ! -- adrian */
539
540		/* Check if there is pidfile and daemon already running */
541		check_pidfile(pidFileName);
#	Line 541 | Line 545 | main(int argc, char *argv[])
545		init_isupport();
546		dbuf_init();
547		hash_init();
548	<	init_ip_hash_table();      /* client host ip hash table */
548	>	ipcache_init();
549		init_host_hash();          /* Host-hashtable. */
550		client_init();
551		class_init();
#	Line 561 | 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);
601
602		hash_add_id(&me);
603		hash_add_client(&me);
604	<
605	<	/* add ourselves to global_serv_list */
602	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
604	>
605	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
606
607		load_kline_database();
608		load_dline_database();
#	Line 618 | 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 634 | 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)