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 1625 by michael, Thu Nov 1 13:49:25 2012 UTC vs.
Revision 6464 by michael, Sun Aug 30 16:46:32 2015 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-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 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 "id.h"
37		#include "irc_string.h"
38		#include "ircd_signal.h"
37	–	#include "s_gline.h"
39		#include "motd.h"
40	+	#include "conf.h"
41		#include "hostmask.h"
40	–	#include "numeric.h"
41	–	#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 "conf.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 "hook.h"
54	>	#include "mempool.h"
55		#include "ircd_getopt.h"
58	–	#include "balloc.h"
59	–	#include "motd.h"
60	–	#include "supported.h"
56		#include "watch.h"
57		#include "conf_db.h"
58	+	#include "conf_class.h"
59	+	#include "ipcache.h"
60	+	#include "isupport.h"
61	+	#include "userhost.h"
62
64	–	/* /quote set variables */
65	–	struct SetOptions GlobalSetOptions;
63
64	<	/* configuration set from ircd.conf */
65	<	struct config_file_entry ConfigFileEntry;
66	<	/* server info set from ircd.conf */
67	<	struct server_info ServerInfo;
68	<	/* admin info set from ircd.conf */
69	<	struct admin_info AdminInfo = { NULL, NULL, NULL };
70	<	struct Counter Count = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
74	<	struct ServerState_t server_state = { 0 };
75	<	struct logging_entry ConfigLoggingEntry = { .use_logging = 1 };
64	>	#ifdef HAVE_LIBGEOIP
65	>	GeoIP *geoip_ctx;
66	>	#endif
67	>
68	>	struct SetOptions GlobalSetOptions;  /* /quote set variables */
69	>	struct Counter Count;
70	>	struct ServerState_t server_state;
71		struct ServerStatistics ServerStats;
72		struct timeval SystemTime;
73	<	struct Client me;             /* That's me */
74	<	struct LocalUser meLocalUser; /* That's also part of me */
73	>	struct Connection meConnection;  /* That's also part of me */
74	>	struct Client me = { .connection = &meConnection };  /* That's me */
75
76	+	char **myargv;
77		const char *logFileName = LPATH;
78		const char *pidFileName = PPATH;
79
80	<	char **myargv;
80	>	unsigned int dorehash;
81	>	unsigned int doremotd;
82
83	<	int dorehash = 0;
84	<	int doremotd = 0;
83	>	static struct event event_cleanup_tklines =
84	>	{
85	>	.name = "cleanup_tklines",
86	>	.handler = cleanup_tklines,
87	>	.when = CLEANUP_TKLINES_TIME
88	>	};
89
90	<	/* Set to zero because it should be initialized later using
91	<	* initialize_server_capabs
92	<	*/
93	<	int default_server_capabs = 0;
94	<	unsigned int splitmode;
95	<	unsigned int splitchecking;
96	<	unsigned int split_users;
97	<	unsigned int split_servers;
98	<
99	<	/* Do klines the same way hybrid-6 did them, i.e. at the
100	<	* top of the next io_loop instead of in the same loop as
101	<	* the klines are being applied.
102	<	*
103	<	* This should fix strange CPU starvation as very indirectly reported.
104	<	* (Why do you people not email bug reports? WHY? WHY?)
105	<	*
106	<	* - Dianora
107	<	*/
90	>	static struct event event_try_connections =
91	>	{
92	>	.name = "try_connections",
93	>	.handler = try_connections,
94	>	.when = STARTUP_CONNECTIONS_TIME
95	>	};
96	>
97	>	static struct event event_comm_checktimeouts =
98	>	{
99	>	.name = "comm_checktimeouts",
100	>	.handler = comm_checktimeouts,
101	>	.when = 1
102	>	};
103	>
104	>	static struct event event_save_all_databases =
105	>	{
106	>	.name = "save_all_databases",
107	>	.handler = save_all_databases,
108	>	.when = DATABASE_UPDATE_TIMEOUT
109	>	};
110
111	<	int rehashed_klines = 0;
111	>	struct event event_write_links_file =
112	>	{
113	>	.name = "write_links_file",
114	>	.handler = write_links_file,
115	>	};
116
117
118		/*
#	Line 114 | Line 121 | int rehashed_klines = 0;
121		static void
122		print_startup(int pid)
123		{
124	<	printf("ircd: version %s\n", ircd_version);
124	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
125		printf("ircd: pid %d\n", pid);
126		printf("ircd: running in %s mode from %s\n", !server_state.foreground ? "background"
127	<	: "foreground", ConfigFileEntry.dpath);
127	>	: "foreground", ConfigGeneral.dpath);
128		}
129
130		static void
#	Line 141 | Line 148 | make_daemon(void)
148
149		static int printVersion = 0;
150
151	<	static struct lgetopt myopts[] = {
152	<	{"dlinefile",  &ConfigFileEntry.dlinefile,
153	<	STRING, "File to use for dline.conf"},
147	<	{"configfile", &ConfigFileEntry.configfile,
151	>	static struct lgetopt myopts[] =
152	>	{
153	>	{"configfile", &ConfigGeneral.configfile,
154		STRING, "File to use for ircd.conf"},
155	<	{"klinefile",  &ConfigFileEntry.klinefile,
156	<	STRING, "File to use for kline.conf"},
157	<	{"xlinefile",  &ConfigFileEntry.xlinefile,
158	<	STRING, "File to use for xline.conf"},
159	<	{"logfile",    &logFileName,
155	>	{"klinefile",  &ConfigGeneral.klinefile,
156	>	STRING, "File to use for kline database"},
157	>	{"dlinefile",  &ConfigGeneral.dlinefile,
158	>	STRING, "File to use for dline database"},
159	>	{"xlinefile",  &ConfigGeneral.xlinefile,
160	>	STRING, "File to use for xline database"},
161	>	{"resvfile",  &ConfigGeneral.resvfile,
162	>	STRING, "File to use for resv database"},
163	>	{"logfile",    &logFileName,
164		STRING, "File to use for ircd.log"},
165		{"pidfile",    &pidFileName,
166		STRING, "File to use for process ID"},
167	<	{"foreground", &server_state.foreground,
167	>	{"foreground", &server_state.foreground,
168		YESNO, "Run in foreground (don't detach)"},
169	<	{"version",    &printVersion,
169	>	{"version",    &printVersion,
170		YESNO, "Print version and exit"},
171		{"help", NULL, USAGE, "Print this text"},
172		{NULL, NULL, STRING, NULL},
#	Line 165 | Line 175 | static struct lgetopt myopts[] = {
175		void
176		set_time(void)
177		{
178	<	static char to_send[200];
169	<	struct timeval newtime;
170	<	newtime.tv_sec  = 0;
171	<	newtime.tv_usec = 0;
178	>	struct timeval newtime = { .tv_sec = 0, .tv_usec = 0 };
179
180		if (gettimeofday(&newtime, NULL) == -1)
181		{
182		ilog(LOG_TYPE_IRCD, "Clock Failure (%s), TS can be corrupted",
183		strerror(errno));
184	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
184	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
185		"Clock Failure (%s), TS can be corrupted",
186		strerror(errno));
187	<	restart("Clock Failure");
187	>	server_die("Clock Failure", SERVER_SHUTDOWN);
188		}
189
190		if (newtime.tv_sec < CurrentTime)
191		{
192	<	snprintf(to_send, sizeof(to_send),
193	<	"System clock is running backwards - (%lu < %lu)",
194	<	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
195	<	report_error(L_ALL, to_send, me.name, 0);
196	<	set_back_events(CurrentTime - newtime.tv_sec);
192	>	ilog(LOG_TYPE_IRCD, "System clock is running backwards - (%lu < %lu)",
193	>	(unsigned long)newtime.tv_sec, (unsigned long)CurrentTime);
194	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
195	>	"System clock is running backwards - (%lu < %lu)",
196	>	(unsigned long)newtime.tv_sec,
197	>	(unsigned long)CurrentTime);
198	>	event_set_back_events(CurrentTime - newtime.tv_sec);
199		}
200
201		SystemTime.tv_sec  = newtime.tv_sec;
#	Line 196 | Line 205 | set_time(void)
205		static void
206		io_loop(void)
207		{
208	<	while (1 == 1)
208	>	while (1)
209		{
201	–	/*
202	–	* Maybe we want a flags word?
203	–	* ie. if (REHASHED_KLINES(global_flags))
204	–	* SET_REHASHED_KLINES(global_flags)
205	–	* CLEAR_REHASHED_KLINES(global_flags)
206	–	*
207	–	* - Dianora
208	–	*/
209	–	if (rehashed_klines)
210	–	{
211	–	check_conf_klines();
212	–	rehashed_klines = 0;
213	–	}
214	–
210		if (listing_client_list.head)
211		{
212	<	dlink_node *ptr = NULL, *ptr_next = NULL;
213	<	DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
214	<	{
220	<	struct Client *client_p = ptr->data;
221	<	assert(client_p->localClient->list_task);
222	<	safe_list_channels(client_p, client_p->localClient->list_task, 0);
223	<	}
212	>	dlink_node *node = NULL, *node_next = NULL;
213	>	DLINK_FOREACH_SAFE(node, node_next, listing_client_list.head)
214	>	safe_list_channels(node->data, 0);
215		}
216
217	<	/* Run pending events, then get the number of seconds to the next
218	<	* event
228	<	*/
229	<	while (eventNextTime() <= CurrentTime)
230	<	eventRun();
217	>	/* Run pending events */
218	>	event_run();
219
220		comm_select();
221		exit_aborted_clients();
222		free_exited_clients();
235	–	send_queued_all();
223
224		/* Check to see whether we have to rehash the configuration .. */
225		if (dorehash)
226		{
227	<	rehash(1);
227	>	conf_rehash(1);
228		dorehash = 0;
229		}
230	+
231		if (doremotd)
232		{
233	<	read_message_file(&ConfigFileEntry.motd);
234	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
235	<	"Got signal SIGUSR1, reloading ircd motd file");
233	>	motd_recache();
234	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
235	>	"Got signal SIGUSR1, reloading motd file(s)");
236		doremotd = 0;
237		}
238		}
#	Line 254 | Line 242 | io_loop(void)
242		*
243		* inputs       - none
244		* output       - none
245	<	* side effects - This sets all global set options needed
245	>	* side effects - This sets all global set options needed
246		*/
247		static void
248		initialize_global_set_options(void)
249		{
250	<	memset(&GlobalSetOptions, 0, sizeof(GlobalSetOptions));
251	<
264	<	GlobalSetOptions.autoconn  = 1;
250	>	GlobalSetOptions.maxclients = ConfigServerInfo.default_max_clients;
251	>	GlobalSetOptions.autoconn = 1;
252		GlobalSetOptions.spam_time = MIN_JOIN_LEAVE_TIME;
253	<	GlobalSetOptions.spam_num  = MAX_JOIN_LEAVE_COUNT;
254	<
255	<	if (ConfigFileEntry.default_floodcount)
256	<	GlobalSetOptions.floodcount = ConfigFileEntry.default_floodcount;
270	<	else
271	<	GlobalSetOptions.floodcount = 10;
272	<
273	<	/* XXX I have no idea what to try here - Dianora */
274	<	GlobalSetOptions.joinfloodcount = 16;
275	<	GlobalSetOptions.joinfloodtime = 8;
276	<
277	<	split_servers = ConfigChannel.default_split_server_count;
278	<	split_users   = ConfigChannel.default_split_user_count;
279	<
280	<	if (split_users && split_servers && (ConfigChannel.no_create_on_split ||
281	<	ConfigChannel.no_join_on_split))
282	<	{
283	<	splitmode     = 1;
284	<	splitchecking = 1;
285	<	}
286	<
253	>	GlobalSetOptions.spam_num = MAX_JOIN_LEAVE_COUNT;
254	>	GlobalSetOptions.floodcount = ConfigGeneral.default_floodcount;
255	>	GlobalSetOptions.joinfloodcount = ConfigChannel.default_join_flood_count;
256	>	GlobalSetOptions.joinfloodtime = ConfigChannel.default_join_flood_time;
257		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
288	–	/* End of global set options */
289	–	}
290	–
291	–	/* initialize_message_files()
292	–	*
293	–	* inputs       - none
294	–	* output       - none
295	–	* side effects - Set up all message files needed, motd etc.
296	–	*/
297	–	static void
298	–	initialize_message_files(void)
299	–	{
300	–	init_message_file(USER_MOTD, MPATH, &ConfigFileEntry.motd);
301	–	init_message_file(USER_LINKS, LIPATH, &ConfigFileEntry.linksfile);
302	–
303	–	read_message_file(&ConfigFileEntry.motd);
304	–	read_message_file(&ConfigFileEntry.linksfile);
305	–
306	–	init_isupport();
258		}
259
260		/* initialize_server_capabs()
#	Line 314 | Line 265 | initialize_message_files(void)
265		static void
266		initialize_server_capabs(void)
267		{
268	<	add_capability("QS", CAP_QS, 1);
269	<	add_capability("EOB", CAP_EOB, 1);
270	<	add_capability("TS6", CAP_TS6, 0);
271	<	add_capability("CLUSTER", CAP_CLUSTER, 1);
272	<	add_capability("SVS", CAP_SVS, 1);
273	<	#ifdef HALFOPS
323	<	add_capability("HOPS", CAP_HOPS, 1);
324	<	#endif
268	>	add_capability("QS", CAPAB_QS);
269	>	add_capability("EOB", CAPAB_EOB);
270	>	add_capability("CLUSTER", CAPAB_CLUSTER);
271	>	add_capability("SVS", CAPAB_SVS);
272	>	add_capability("CHW", CAPAB_CHW);
273	>	add_capability("HOPS", CAPAB_HOPS);
274		}
275
276		/* write_pidfile()
#	Line 337 | Line 286 | write_pidfile(const char *filename)
286
287		if ((fb = fopen(filename, "w")))
288		{
289	<	char buff[32];
289	>	char buff[IRCD_BUFSIZE];
290		unsigned int pid = (unsigned int)getpid();
291
292		snprintf(buff, sizeof(buff), "%u\n", pid);
293
294	<	if ((fputs(buff, fb) == -1))
295	<	ilog(LOG_TYPE_IRCD, "Error writing %u to pid file %s (%s)",
296	<	pid, filename, strerror(errno));
294	>	if (fputs(buff, fb) == -1)
295	>	ilog(LOG_TYPE_IRCD, "Error writing to pid file %s: %s",
296	>	filename, strerror(errno));
297
298		fclose(fb);
299		}
300		else
301	<	{
302	<	ilog(LOG_TYPE_IRCD, "Error opening pid file %s", filename);
354	<	}
301	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s: %s",
302	>	filename, strerror(errno));
303		}
304
305		/* check_pidfile()
#	Line 366 | Line 314 | static void
314		check_pidfile(const char *filename)
315		{
316		FILE *fb;
317	<	char buff[32];
317	>	char buff[IRCD_BUFSIZE];
318		pid_t pidfromfile;
319
372	–	/* Don't do logging here, since we don't have log() initialised */
320		if ((fb = fopen(filename, "r")))
321		{
322	<	if (fgets(buff, 20, fb) == NULL)
323	<	{
324	<	/* log(L_ERROR, "Error reading from pid file %s (%s)", filename,
378	<	* strerror(errno));
379	<	*/
380	<	}
322	>	if (!fgets(buff, 20, fb))
323	>	ilog(LOG_TYPE_IRCD, "Error reading from pid file %s: %s",
324	>	filename, strerror(errno));
325		else
326		{
327		pidfromfile = atoi(buff);
#	Line 393 | Line 337 | check_pidfile(const char *filename)
337		fclose(fb);
338		}
339		else if (errno != ENOENT)
340	<	{
341	<	/* log(L_ERROR, "Error opening pid file %s", filename); */
398	<	}
340	>	ilog(LOG_TYPE_IRCD, "Error opening pid file %s: %s",
341	>	filename, strerror(errno));
342		}
343
344		/* setup_corefile()
#	Line 420 | Line 363 | setup_corefile(void)
363		#endif
364		}
365
366	+	#ifdef HAVE_LIBCRYPTO
367	+	static int
368	+	always_accept_verify_cb(int preverify_ok, X509_STORE_CTX *x509_ctx)
369	+	{
370	+	return 1;
371	+	}
372	+	#endif
373	+
374		/* init_ssl()
375		*
376		* inputs       - nothing
#	Line 427 | Line 378 | setup_corefile(void)
378		* side effects - setups SSL context.
379		*/
380		static void
381	<	init_ssl(void)
381	>	ssl_init(void)
382		{
383		#ifdef HAVE_LIBCRYPTO
384		SSL_load_error_strings();
385		SSLeay_add_ssl_algorithms();
386
387	<	if ((ServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())) == NULL)
387	>	if (!(ConfigServerInfo.server_ctx = SSL_CTX_new(SSLv23_server_method())))
388		{
389	<	const char *s;
389	>	const char *s = ERR_lib_error_string(ERR_get_error());
390
391	<	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n",
392	<	s = ERR_lib_error_string(ERR_get_error()));
393	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
391	>	fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
392	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
393	>	exit(EXIT_FAILURE);
394	>	return;  /* Not reached */
395		}
396
397	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
398	<	SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
399	<	SSL_CTX_set_verify(ServerInfo.server_ctx, SSL_VERIFY_NONE, NULL);
397	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
398	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_DH_USE|SSL_OP_CIPHER_SERVER_PREFERENCE);
399	>	SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
400	>	always_accept_verify_cb);
401	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
402	>	SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
403
404	<	if ((ServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
404	>	#if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
405		{
406	<	const char *s;
406	>	EC_KEY *key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
407
408	<	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n",
409	<	s = ERR_lib_error_string(ERR_get_error()));
410	<	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
408	>	if (key)
409	>	{
410	>	SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
411	>	EC_KEY_free(key);
412	>	}
413		}
414
415	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1);
416	<	SSL_CTX_set_options(ServerInfo.client_ctx, SSL_OP_TLS_ROLLBACK_BUG|SSL_OP_ALL);
460	<	SSL_CTX_set_verify(ServerInfo.client_ctx, SSL_VERIFY_NONE, NULL);
461	<	#endif /* HAVE_LIBCRYPTO */
462	<	}
415	>	SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_SINGLE_ECDH_USE);
416	>	#endif
417
418	<	/* init_callbacks()
419	<	*
420	<	* inputs       - nothing
421	<	* output       - nothing
422	<	* side effects - setups standard hook points
423	<	*/
424	<	static void
425	<	init_callbacks(void)
426	<	{
427	<	iorecv_cb = register_callback("iorecv", iorecv_default);
428	<	iosend_cb = register_callback("iosend", iosend_default);
418	>	if (!(ConfigServerInfo.client_ctx = SSL_CTX_new(SSLv23_client_method())))
419	>	{
420	>	const char *s = ERR_lib_error_string(ERR_get_error());
421	>
422	>	fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
423	>	ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
424	>	exit(EXIT_FAILURE);
425	>	return;  /* Not reached */
426	>	}
427	>
428	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
429	>	SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_SINGLE_DH_USE);
430	>	SSL_CTX_set_verify(ConfigServerInfo.client_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
431	>	always_accept_verify_cb);
432	>	SSL_CTX_set_session_cache_mode(ConfigServerInfo.client_ctx, SSL_SESS_CACHE_OFF);
433	>	#endif /* HAVE_LIBCRYPTO */
434		}
435
436		int
437		main(int argc, char *argv[])
438		{
439	<	/* Check to see if the user is running
440	<	* us as root, which is a nono
482	<	*/
483	<	if (geteuid() == 0)
439	>	/* Check to see if the user is running us as root, which is a nono */
440	>	if (!geteuid())
441		{
442	<	fprintf(stderr, "Don't run ircd as root!!!\n");
442	>	fprintf(stderr, "ERROR: This server won't run as root/superuser\n");
443		return -1;
444		}
445
446		/* Setup corefile size immediately after boot -kre */
447		setup_corefile();
448
449	<	/* save server boot time right away, so getrusage works correctly */
449	>	/* Save server boot time right away, so getrusage works correctly */
450		set_time();
451
452	<	/* It ain't random, but it ought to be a little harder to guess */
452	>	/* It's not random, but it ought to be a little harder to guess */
453		init_genrand(SystemTime.tv_sec ^ (SystemTime.tv_usec | (getpid() << 20)));
454
455	<	me.localClient = &meLocalUser;
456	<	dlinkAdd(&me, &me.node, &global_client_list); /* Pointer to beginning
457	<	of Client list */
458	<	/* Initialise the channel capability usage counts... */
459	<	init_chcap_usage_counts();
460	<
461	<	ConfigFileEntry.dpath      = DPATH;
462	<	ConfigFileEntry.configfile = CPATH;  /* Server configuration file */
463	<	ConfigFileEntry.klinefile  = KPATH;  /* Server kline file         */
507	<	ConfigFileEntry.xlinefile  = XPATH;  /* Server xline file         */
508	<	ConfigFileEntry.dlinefile  = DLPATH; /* dline file                */
509	<	//  ConfigFileEntry.cresvfile  = CRESVPATH; /* channel resv file      */
510	<	//  ConfigFileEntry.nresvfile  = NRESVPATH; /* nick resv file         */
455	>	ConfigGeneral.dpath      = DPATH;
456	>	ConfigGeneral.spath      = SPATH;
457	>	ConfigGeneral.mpath      = MPATH;
458	>	ConfigGeneral.configfile = CPATH;    /* Server configuration file */
459	>	ConfigGeneral.klinefile  = KPATH;    /* Server kline file         */
460	>	ConfigGeneral.xlinefile  = XPATH;    /* Server xline file         */
461	>	ConfigGeneral.dlinefile  = DLPATH;   /* dline file                */
462	>	ConfigGeneral.resvfile   = RESVPATH; /* resv file                 */
463	>
464		myargv = argv;
465	<	umask(077);                /* better safe than sorry --SRB */
465	>	umask(077);  /* umask 077: u=rwx,g=,o= */
466
467		parseargs(&argc, &argv, myopts);
468
469		if (printVersion)
470		{
471	<	printf("ircd: version %s\n", ircd_version);
471	>	printf("ircd: version %s(%s)\n", ircd_version, serno);
472		exit(EXIT_SUCCESS);
473		}
474
475	<	if (chdir(ConfigFileEntry.dpath))
475	>	if (chdir(ConfigGeneral.dpath))
476		{
477		perror("chdir");
478		exit(EXIT_FAILURE);
479		}
480
481	<	init_ssl();
481	>	ssl_init();
482
483		if (!server_state.foreground)
484		{
#	Line 537 | Line 490 | main(int argc, char *argv[])
490
491		setup_signals();
492
540	–	/* Init the event subsystem */
541	–	eventInit();
493		/* We need this to initialise the fd array before anything else */
494		fdlist_init();
495	<	log_add_file(LOG_TYPE_IRCD, 0, logFileName);
496	<	check_can_use_v6();
497	<	init_comm();         /* This needs to be setup early ! -- adrian */
495	>	log_set_file(LOG_TYPE_IRCD, 0, logFileName);
496	>
497	>	init_netio();         /* This needs to be setup early ! -- adrian */
498	>
499		/* Check if there is pidfile and daemon already running */
500		check_pidfile(pidFileName);
501
502	<	initBlockHeap();
502	>	mp_pool_init();
503		init_dlink_nodes();
504	<	init_callbacks();
553	<	initialize_message_files();
504	>	isupport_init();
505		dbuf_init();
506	<	init_hash();
507	<	init_ip_hash_table();      /* client host ip hash table */
508	<	init_host_hash();          /* Host-hashtable. */
509	<	init_client();
510	<	init_class();
506	>	hash_init();
507	>	userhost_init();
508	>	ipcache_init();
509	>	client_init();
510	>	class_init();
511		whowas_init();
512		watch_init();
513	<	init_auth();          /* Initialise the auth code */
513	>	auth_init();          /* Initialise the auth code */
514		init_resolver();      /* Needs to be setup before the io loop */
515		modules_init();
516		read_conf_files(1);   /* cold start init conf files */
566	–	init_uid();
517		initialize_server_capabs();   /* Set up default_server_capabs */
518	<	initialize_global_set_options();
519	<	init_channels();
518	>	initialize_global_set_options();  /* Has to be called after read_conf_files() */
519	>	channel_init();
520	>	read_links_file();
521	>	motd_init();
522	>	user_modes_init();
523	>	#ifdef HAVE_LIBGEOIP
524	>	geoip_ctx = GeoIP_new(GEOIP_MEMORY_CACHE);
525	>	#endif
526
527	<	if (EmptyString(ServerInfo.sid))
527	>	if (EmptyString(ConfigServerInfo.name))
528		{
529	<	ilog(LOG_TYPE_IRCD, "ERROR: No server id specified in serverinfo block.");
529	>	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
530		exit(EXIT_FAILURE);
531		}
532
533	<	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
533	>	strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
534
535	<	if (EmptyString(ServerInfo.name))
535	>	/* serverinfo{} description must exist.  If not, error out.*/
536	>	if (EmptyString(ConfigServerInfo.description))
537		{
538	<	ilog(LOG_TYPE_IRCD, "ERROR: No server name specified in serverinfo block.");
538	>	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
539		exit(EXIT_FAILURE);
540		}
541
542	<	strlcpy(me.name, ServerInfo.name, sizeof(me.name));
542	>	strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
543
544	<	/* serverinfo{} description must exist.  If not, error out.*/
588	<	if (EmptyString(ServerInfo.description))
544	>	if (EmptyString(ConfigServerInfo.sid))
545		{
546	<	ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
547	<	exit(EXIT_FAILURE);
546	>	ilog(LOG_TYPE_IRCD, "Generating server ID");
547	>	generate_sid();
548		}
549	+	else
550	+	strlcpy(me.id, ConfigServerInfo.sid, sizeof(me.id));
551
552	<	strlcpy(me.info, ServerInfo.description, sizeof(me.info));
552	>	init_uid();
553
554	<	me.from                   = &me;
555	<	me.servptr                = &me;
556	<	me.localClient->lasttime  = CurrentTime;
557	<	me.localClient->since     = CurrentTime;
558	<	me.localClient->firsttime = CurrentTime;
554	>	me.from = &me;
555	>	me.servptr = &me;
556	>	me.connection->lasttime = CurrentTime;
557	>	me.connection->since = CurrentTime;
558	>	me.connection->firsttime = CurrentTime;
559
560		SetMe(&me);
561		make_server(&me);
562
563		hash_add_id(&me);
564		hash_add_client(&me);
565	<
566	<	/* add ourselves to global_serv_list */
567	<	dlinkAdd(&me, make_dlink_node(), &global_serv_list);
565	>
566	>	dlinkAdd(&me, make_dlink_node(), &global_server_list);
567	>	dlinkAdd(&me, &me.node, &global_client_list);
568
569		load_kline_database();
570		load_dline_database();
613	–	load_gline_database();
571		load_xline_database();
572		load_resv_database();
573
617	–	if (chdir(MODPATH))
618	–	{
619	–	ilog(LOG_TYPE_IRCD, "Could not load core modules. Terminating!");
620	–	exit(EXIT_FAILURE);
621	–	}
622	–
574		load_all_modules(1);
575		load_conf_modules();
576		load_core_modules(1);
577
627	–	/* Go back to DPATH after checking to see if we can chdir to MODPATH */
628	–	if (chdir(ConfigFileEntry.dpath))
629	–	{
630	–	perror("chdir");
631	–	exit(EXIT_FAILURE);
632	–	}
633	–
634	–	/*
635	–	* assemble_umode_buffer() has to be called after
636	–	* reading conf/loading modules.
637	–	*/
638	–	assemble_umode_buffer();
639	–
578		write_pidfile(pidFileName);
579
580	<	ilog(LOG_TYPE_IRCD, "Server Ready");
643	<
644	<	eventAddIsh("cleanup_glines", cleanup_glines, NULL, CLEANUP_GLINES_TIME);
645	<	eventAddIsh("cleanup_tklines", cleanup_tklines, NULL, CLEANUP_TKLINES_TIME);
580	>	event_addish(&event_cleanup_tklines, NULL);
581
582		/* We want try_connections to be called as soon as possible now! -- adrian */
583		/* No, 'cause after a restart it would cause all sorts of nick collides */
584	<	eventAddIsh("try_connections", try_connections, NULL, STARTUP_CONNECTIONS_TIME);
584	>	event_addish(&event_try_connections, NULL);
585
586		/* Setup the timeout check. I'll shift it later :)  -- adrian */
587	<	eventAddIsh("comm_checktimeouts", comm_checktimeouts, NULL, 1);
587	>	event_add(&event_comm_checktimeouts, NULL);
588
589	<	eventAddIsh("save_all_databases", save_all_databases, NULL, DATABASE_UPDATE_TIMEOUT);
589	>	event_addish(&event_save_all_databases, NULL);
590
591		if (ConfigServerHide.links_delay > 0)
592	<	eventAddIsh("write_links_file", write_links_file, NULL, ConfigServerHide.links_delay);
592	>	{
593	>	event_write_links_file.when = ConfigServerHide.links_delay;
594	>	event_addish(&event_write_links_file, NULL);
595	>	}
596		else
597		ConfigServerHide.links_disabled = 1;
598
599	<	if (splitmode)
662	<	eventAddIsh("check_splitmode", check_splitmode, NULL, 60);
663	<
599	>	ilog(LOG_TYPE_IRCD, "Server Ready");
600		io_loop();
601	+
602		return 0;
603		}

Diff Legend

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