ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/ircd.c (file contents), Revision 1011 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
ircd-hybrid-7.3/src/ircd.c (file contents), Revision 1121 by michael, Sun Jan 9 11:03:03 2011 UTC

#	Line 93 | Line 93 | char ircd_platform[PLATFORMLEN];
93
94		int dorehash = 0;
95		int doremotd = 0;
96	–	time_t nextconnect = 1;       /* time for next try_connections call */
96
97		/* Set to zero because it should be initialized later using
98		* initialize_server_capabs
#	Line 104 | Line 103 | int default_server_capabs = 0;
103		int bio_spare_fd = -1;
104		#endif
105
106	<	int splitmode;
107	<	int splitchecking;
108	<	int split_users;
106	>	unsigned int splitmode;
107	>	unsigned int splitchecking;
108	>	unsigned int split_users;
109		unsigned int split_servers;
110
111		/* Do klines the same way hybrid-6 did them, i.e. at the
#	Line 332 | Line 331 | initialize_server_capabs(void)
331		{
332		add_capability("QS", CAP_QS, 1);
333		add_capability("EOB", CAP_EOB, 1);
334	<
336	<	if (ServerInfo.sid != NULL)   /* only enable TS6 if we have an SID */
337	<	add_capability("TS6", CAP_TS6, 0);
338	<
334	>	add_capability("TS6", CAP_TS6, 0);
335		add_capability("ZIP", CAP_ZIP, 0);
336		add_capability("CLUSTER", CAP_CLUSTER, 1);
337		#ifdef HALFOPS
#	Line 568 | Line 564 | main(int argc, char *argv[])
564		/* Check if there is pidfile and daemon already running */
565		check_pidfile(pidFileName);
566
571	–	#ifndef NOBALLOC
567		initBlockHeap();
573	–	#endif
568		init_dlink_nodes();
569		init_callbacks();
570		initialize_message_files();
#	Line 586 | Line 580 | main(int argc, char *argv[])
580		init_auth();          /* Initialise the auth code */
581		init_resolver();      /* Needs to be setup before the io loop */
582		read_conf_files(1);   /* cold start init conf files */
589	–	me.id[0] = '\0';
583		init_uid();
584		initialize_server_capabs();   /* Set up default_server_capabs */
585		initialize_global_set_options();
586		init_channels();
587
588	<	if (ServerInfo.name == NULL)
588	>	if (EmptyString(ServerInfo.sid))
589	>	{
590	>	ilog(L_CRIT, "ERROR: No server id specified in serverinfo block.");
591	>	exit(EXIT_FAILURE);
592	>	}
593	>
594	>	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
595	>
596	>	if (EmptyString(ServerInfo.name))
597		{
598	<	ilog(L_CRIT, "No server name specified in serverinfo block.");
598	>	ilog(L_CRIT, "ERROR: No server name specified in serverinfo block.");
599		exit(EXIT_FAILURE);
600		}
601
602		strlcpy(me.name, ServerInfo.name, sizeof(me.name));
603
604		/* serverinfo{} description must exist.  If not, error out.*/
605	<	if (ServerInfo.description == NULL)
605	>	if (EmptyString(ServerInfo.description))
606		{
607	<	ilog(L_CRIT,
607	<	"ERROR: No server description specified in serverinfo block.");
607	>	ilog(L_CRIT, "ERROR: No server description specified in serverinfo block.");
608		exit(EXIT_FAILURE);
609		}
610
#	Line 617 | Line 617 | main(int argc, char *argv[])
617		make_server(&me);
618
619		me.lasttime = me.since = me.firsttime = CurrentTime;
620	+
621	+	hash_add_id(&me);
622		hash_add_client(&me);
623
624		/* add ourselves to global_serv_list */
625		dlinkAdd(&me, make_dlink_node(), &global_serv_list);
626
625	–	check_class();
626	–
627	–	#ifndef STATIC_MODULES
627		if (chdir(MODPATH))
628		{
629	<	ilog (L_CRIT, "Could not load core modules. Terminating!");
629	>	ilog(L_CRIT, "Could not load core modules. Terminating!");
630		exit(EXIT_FAILURE);
631		}
632
633		load_all_modules(1);
634		load_conf_modules();
635		load_core_modules(1);
636	+
637		/* Go back to DPATH after checking to see if we can chdir to MODPATH */
638	<	chdir(ConfigFileEntry.dpath);
639	<	#else
640	<	load_all_modules(1);
641	<	#endif
638	>	if (chdir(ConfigFileEntry.dpath))
639	>	{
640	>	perror("chdir");
641	>	exit(EXIT_FAILURE);
642	>	}
643	>
644		/*
645		* assemble_umode_buffer() has to be called after
646		* reading conf/loading modules.

Diff Legend

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