ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/server.c

Comparing ircd-hybrid-7.2/src/s_serv.c (file contents):
Revision 386 by adx, Tue Jan 31 12:40:56 2006 UTC vs.
Revision 1011 by michael, Fri Sep 18 10:14:09 2009 UTC

#	Line 27 | Line 27
27		#include <openssl/rsa.h>
28		#include "rsa.h"
29		#endif
30	<	#include "tools.h"
30	>	#include "list.h"
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
#	Line 43 | Line 43
43		#include "ircd_defs.h"
44		#include "s_bsd.h"
45		#include "irc_getnameinfo.h"
46	–	#include "list.h"
46		#include "numeric.h"
47		#include "packet.h"
48		#include "irc_res.h"
49		#include "s_conf.h"
50		#include "s_serv.h"
51		#include "s_log.h"
53	–	#include "s_stats.h"
52		#include "s_user.h"
53		#include "send.h"
54		#include "memory.h"
#	Line 58 | Line 56
56
57		#define MIN_CONN_FREQ 300
58
61	–	struct Client *uplink  = NULL;
62	–
63	–
59		static dlink_list cap_list = { NULL, NULL, 0 };
65	–	static unsigned long freeMask;
60		static void server_burst(struct Client *);
61		static int fork_server(struct Client *);
62		static void burst_all(struct Client *);
69	–	static void cjoin_all(struct Client *);
63		static void send_tb(struct Client *client_p, struct Channel *chptr);
64
65		static CNCB serv_connect_callback;
66
67		static void start_io(struct Client *);
68		static void burst_members(struct Client *, struct Channel *);
76	–	static void burst_ll_members(struct Client *, struct Channel *);
77	–	static void add_lazylinkchannel(struct Client *, struct Channel *);
69
70		static SlinkRplHnd slink_error;
71		static SlinkRplHnd slink_zipstats;
#	Line 135 | Line 126 | slink_zipstats(unsigned int rpl, unsigne
126		struct Client *server_p)
127		{
128		struct ZipStats zipstats;
129	<	unsigned long in = 0, in_wire = 0, out = 0, out_wire = 0;
129	>	uint64_t in = 0, in_wire = 0, out = 0, out_wire = 0;
130		int i = 0;
131
132		assert(rpl == SLINKRPL_ZIPSTATS);
#	Line 195 | Line 186 | slink_zipstats(unsigned int rpl, unsigne
186		else
187		zipstats.out_ratio = 0;
188
189	<	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof (struct ZipStats));
189	>	memcpy(&server_p->localClient->zipstats, &zipstats, sizeof(struct ZipStats));
190		}
191
192		void
193		collect_zipstats(void *unused)
194		{
195	<	dlink_node *ptr;
205	<	struct Client *target_p;
195	>	dlink_node *ptr = NULL;
196
197		DLINK_FOREACH(ptr, serv_list.head)
198		{
199	<	target_p = ptr->data;
199	>	struct Client *target_p = ptr->data;
200
201		if (IsCapable(target_p, CAP_ZIP))
202		{
#	Line 257 | Line 247 | my_name_for_link(struct ConfItem *conf)
247
248		aconf = (struct AccessItem *)map_to_conf(conf);
249		if (aconf->fakename != NULL)
250	<	return(aconf->fakename);
250	>	return aconf->fakename;
251		else
252	<	return(me.name);
252	>	return me.name;
253		}
254
255		/*
#	Line 458 | Line 448 | hunt_server(struct Client *client_p, str
448		if (!match(target_p->name, parv[server]))
449		parv[server] = target_p->name;
450
461	–	/* Deal with lazylinks */
462	–	client_burst_if_needed(target_p, source_p);
463	–
451		/* This is a little kludgy but should work... */
452		if (IsClient(source_p) &&
453		((MyConnect(target_p) && IsCapable(target_p, CAP_TS6)) ||
#	Line 666 | Line 653 | check_server(const char *name, struct Cl
653		attach_conf(client_p, conf);
654		}
655
656	<	server_aconf = (struct AccessItem *)map_to_conf(server_conf);
656	>	server_aconf = map_to_conf(server_conf);
657
671	–	if (!IsConfLazyLink(server_aconf))
672	–	ClearCap(client_p, CAP_LL);
658		#ifdef HAVE_LIBZ /* otherwise, clear it unconditionally */
659		if (!IsConfCompressed(server_aconf))
660		#endif
#	Line 726 | Line 711 | check_server(const char *name, struct Cl
711		void
712		add_capability(const char *capab_name, int cap_flag, int add_to_default)
713		{
714	<	struct Capability *cap;
714	>	struct Capability *cap = MyMalloc(sizeof(*cap));
715
731	–	cap = (struct Capability *)MyMalloc(sizeof(*cap));
716		DupString(cap->name, capab_name);
717		cap->cap = cap_flag;
718		dlinkAdd(cap, &cap->node, &cap_list);
719	+
720		if (add_to_default)
721		default_server_capabs |= cap_flag;
722		}
#	Line 766 | Line 751 | delete_capability(const char *capab_name
751		}
752		}
753
754	<	return(0);
754	>	return 0;
755		}
756
757		/*
#	Line 779 | Line 764 | delete_capability(const char *capab_name
764		int
765		find_capability(const char *capab)
766		{
767	<	dlink_node *ptr;
783	<	struct Capability *cap;
767	>	const dlink_node *ptr = NULL;
768
769		DLINK_FOREACH(ptr, cap_list.head)
770		{
771	<	cap = ptr->data;
771	>	const struct Capability *cap = ptr->data;
772
773	<	if (cap->cap != 0)
774	<	{
791	<	if (irccmp(cap->name, capab) == 0)
792	<	return(cap->cap);
793	<	}
773	>	if (cap->cap && !irccmp(cap->name, capab))
774	>	return cap->cap;
775		}
776	<	return(0);
776	>
777	>	return 0;
778		}
779
780		/* send_capabilities()
#	Line 893 | Line 875 | sendnick_TS(struct Client *client_p, str
875		(unsigned long) target_p->tsinfo,
876		ubuf, target_p->username, target_p->host,
877		(MyClient(target_p) && IsIPSpoof(target_p)) ?
878	<	"0" : target_p->sockhost), target_p->id, target_p->info);
878	>	"0" : target_p->sockhost, target_p->id, target_p->info);
879		else
880		sendto_one(client_p, "NICK %s %d %lu %s %s %s %s :%s",
881		target_p->name, target_p->hopcount + 1,
#	Line 908 | Line 890 | sendnick_TS(struct Client *client_p, str
890
891		}
892
911	–	/* client_burst_if_needed()
912	–	*
913	–	* inputs       - pointer to server
914	–	*              - pointer to client to add
915	–	* output       - NONE
916	–	* side effects - If this client is not known by this lazyleaf, send it
917	–	*/
918	–	void
919	–	client_burst_if_needed(struct Client *client_p, struct Client *target_p)
920	–	{
921	–	if (!ServerInfo.hub)
922	–	return;
923	–	if (!MyConnect(client_p))
924	–	return;
925	–	if (!IsCapable(client_p,CAP_LL))
926	–	return;
927	–
928	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
929	–	{
930	–	sendnick_TS(client_p, target_p);
931	–	add_lazylinkclient(client_p,target_p);
932	–	}
933	–	}
934	–
893		/*
894		* show_capabilities - show current server capabilities
895		*
#	Line 978 | Line 936 | struct Server *
936		make_server(struct Client *client_p)
937		{
938		if (client_p->serv == NULL)
981	–	{
939		client_p->serv = MyMalloc(sizeof(struct Server));
983	–	client_p->serv->dep_servers = 1;
984	–	}
940
941		return client_p->serv;
942		}
#	Line 1034 | Line 989 | server_estab(struct Client *client_p)
989		{
990		if (client_p != serv_list.head->data || serv_list.head->next)
991		{
992	<	ServerStats->is_ref++;
992	>	++ServerStats.is_ref;
993		sendto_one(client_p, "ERROR :I'm a leaf not a hub");
994		exit_client(client_p, &me, "I'm a leaf");
995		return;
#	Line 1061 | Line 1016 | server_estab(struct Client *client_p)
1016
1017		/* Pass my info to the new server
1018		*
1064	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1019		* If this is a HUB, pass on CAP_HUB
1020		* Pass on ZIP if supported
1021		* Pass on TB if supported.
#	Line 1069 | Line 1023 | server_estab(struct Client *client_p)
1023		*/
1024
1025		send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
1072	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1026		| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1027		| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1028
#	Line 1144 | Line 1097 | server_estab(struct Client *client_p)
1097		set_chcap_usage_counts(client_p);
1098
1099		/* Some day, all these lists will be consolidated *sigh* */
1100	<	dlinkAdd(client_p, &client_p->lnode, &me.serv->servers);
1100	>	dlinkAdd(client_p, &client_p->lnode, &me.serv->server_list);
1101
1102		m = dlinkFind(&unknown_list, client_p);
1103		assert(NULL != m);
#	Line 1263 | Line 1216 | server_estab(struct Client *client_p)
1216		IsHidden(target_p) ? "(H) " : "", target_p->info);
1217		}
1218
1266	–	if ((ServerInfo.hub == 0) && MyConnect(client_p))
1267	–	uplink = client_p;
1268	–
1219		server_burst(client_p);
1220		}
1221
#	Line 1463 | Line 1413 | server_burst(struct Client *client_p)
1413		** -orabidoo
1414		*/
1415
1416	<	/* On a "lazy link" hubs send nothing.
1467	<	* Leafs always have to send nicks plus channels
1468	<	*/
1469	<	if (IsCapable(client_p, CAP_LL))
1470	<	{
1471	<	if (!ServerInfo.hub)
1472	<	{
1473	<	/* burst all our info */
1474	<	burst_all(client_p);
1475	<
1476	<	/* Now, ask for channel info on all our current channels */
1477	<	cjoin_all(client_p);
1478	<	}
1479	<	}
1480	<	else
1481	<	{
1482	<	burst_all(client_p);
1483	<	}
1416	>	burst_all(client_p);
1417
1418		/* EOB stuff is now in burst_all */
1419		/* Always send a PING after connect burst is done */
#	Line 1586 | Line 1519 | send_tb(struct Client *client_p, struct
1519		}
1520		}
1521
1589	–	/* cjoin_all()
1590	–	*
1591	–	* inputs       - server to ask for channel info from
1592	–	* output       - NONE
1593	–	* side effects - CJOINS for all the leafs known channels is sent
1594	–	*/
1595	–	static void
1596	–	cjoin_all(struct Client *client_p)
1597	–	{
1598	–	const dlink_node *gptr = NULL;
1599	–
1600	–	DLINK_FOREACH(gptr, global_channel_list.head)
1601	–	{
1602	–	const struct Channel *chptr = gptr->data;
1603	–	sendto_one(client_p, ":%s CBURST %s",
1604	–	me.name, chptr->chname);
1605	–	}
1606	–	}
1607	–
1608	–	/* burst_channel()
1609	–	*
1610	–	* inputs       - pointer to server to send sjoins to
1611	–	*              - channel pointer
1612	–	* output       - none
1613	–	* side effects - All sjoins for channel(s) given by chptr are sent
1614	–	*                for all channel members. ONLY called by hub on
1615	–	*                behalf of a lazylink so client_p is always guarunteed
1616	–	*                to be a LL leaf.
1617	–	*/
1618	–	void
1619	–	burst_channel(struct Client *client_p, struct Channel *chptr)
1620	–	{
1621	–	burst_ll_members(client_p, chptr);
1622	–
1623	–	send_channel_modes(client_p, chptr);
1624	–	add_lazylinkchannel(client_p,chptr);
1625	–
1626	–	if (chptr->topic != NULL && chptr->topic_info != NULL)
1627	–	{
1628	–	sendto_one(client_p, ":%s TOPIC %s %s %lu :%s",
1629	–	me.name, chptr->chname, chptr->topic_info,
1630	–	(unsigned long)chptr->topic_time, chptr->topic);
1631	–	}
1632	–	}
1633	–
1634	–	/* add_lazlinkchannel()
1635	–	*
1636	–	* inputs       - pointer to directly connected leaf server
1637	–	*                being introduced to this hub
1638	–	*              - pointer to channel structure being introduced
1639	–	* output       - NONE
1640	–	* side effects - The channel pointed to by chptr is now known
1641	–	*                to be on lazyleaf server given by local_server_p.
1642	–	*                mark that in the bit map and add to the list
1643	–	*                of channels to examine after this newly introduced
1644	–	*                server is squit off.
1645	–	*/
1646	–	static void
1647	–	add_lazylinkchannel(struct Client *local_server_p, struct Channel *chptr)
1648	–	{
1649	–	assert(MyConnect(local_server_p));
1650	–
1651	–	chptr->lazyLinkChannelExists |= local_server_p->localClient->serverMask;
1652	–	dlinkAdd(chptr, make_dlink_node(), &lazylink_channels);
1653	–	}
1654	–
1655	–	/* add_lazylinkclient()
1656	–	*
1657	–	* inputs       - pointer to directly connected leaf server
1658	–	*                being introduced to this hub
1659	–	*              - pointer to client being introduced
1660	–	* output       - NONE
1661	–	* side effects - The client pointed to by client_p is now known
1662	–	*                to be on lazyleaf server given by local_server_p.
1663	–	*                mark that in the bit map and add to the list
1664	–	*                of clients to examine after this newly introduced
1665	–	*                server is squit off.
1666	–	*/
1667	–	void
1668	–	add_lazylinkclient(struct Client *local_server_p, struct Client *client_p)
1669	–	{
1670	–	assert(MyConnect(local_server_p));
1671	–	client_p->lazyLinkClientExists |= local_server_p->localClient->serverMask;
1672	–	}
1673	–
1674	–	/* remove_lazylink_flags()
1675	–	*
1676	–	* inputs       - pointer to server quitting
1677	–	* output       - NONE
1678	–	* side effects - All the channels on the lazylink channel list are examined
1679	–	*                If they hold a bit corresponding to the servermask
1680	–	*                attached to client_p, clear that bit. If this bitmask
1681	–	*                goes to 0, then the channel is no longer known to
1682	–	*                be on any lazylink server, and can be removed from the
1683	–	*                link list.
1684	–	*
1685	–	*                Similar is done for lazylink clients
1686	–	*
1687	–	*                This function must be run by the HUB on any exiting
1688	–	*                lazylink leaf server, while the pointer is still valid.
1689	–	*                Hence must be run from client.c in exit_one_client()
1690	–	*
1691	–	*                The old code scanned all channels, this code only
1692	–	*                scans channels/clients on the lazylink_channels
1693	–	*                lazylink_clients lists.
1694	–	*/
1695	–	void
1696	–	remove_lazylink_flags(unsigned long mask)
1697	–	{
1698	–	dlink_node *ptr;
1699	–	dlink_node *next_ptr;
1700	–	struct Channel *chptr;
1701	–	struct Client *target_p;
1702	–	unsigned long clear_mask;
1703	–
1704	–	if (!mask) /* On 0 mask, don't do anything */
1705	–	return;
1706	–
1707	–	clear_mask = ~mask;
1708	–	freeMask |= mask;
1709	–
1710	–	DLINK_FOREACH_SAFE(ptr, next_ptr, lazylink_channels.head)
1711	–	{
1712	–	chptr = ptr->data;
1713	–
1714	–	chptr->lazyLinkChannelExists &= clear_mask;
1715	–
1716	–	if (chptr->lazyLinkChannelExists == 0)
1717	–	{
1718	–	dlinkDelete(ptr, &lazylink_channels);
1719	–	free_dlink_node(ptr);
1720	–	}
1721	–	}
1722	–
1723	–	DLINK_FOREACH(ptr, global_client_list.head)
1724	–	{
1725	–	target_p = ptr->data;
1726	–	target_p->lazyLinkClientExists &= clear_mask;
1727	–	}
1728	–	}
1729	–
1522		/* burst_members()
1523		*
1524		* inputs       - pointer to server to send members to
#	Line 1756 | Line 1548 | burst_members(struct Client *client_p, s
1548		}
1549		}
1550
1759	–	/* burst_ll_members()
1760	–	*
1761	–	* inputs       - pointer to server to send members to
1762	–	*              - dlink_list pointer to membership list to send
1763	–	* output       - NONE
1764	–	* side effects - This version also has to check the bitmap for lazylink
1765	–	*/
1766	–	static void
1767	–	burst_ll_members(struct Client *client_p, struct Channel *chptr)
1768	–	{
1769	–	struct Client *target_p;
1770	–	struct Membership *ms;
1771	–	dlink_node *ptr;
1772	–
1773	–	DLINK_FOREACH(ptr, chptr->members.head)
1774	–	{
1775	–	ms       = ptr->data;
1776	–	target_p = ms->client_p;
1777	–
1778	–	if ((target_p->lazyLinkClientExists & client_p->localClient->serverMask) == 0)
1779	–	{
1780	–	if (target_p->from != client_p)
1781	–	{
1782	–	add_lazylinkclient(client_p,target_p);
1783	–	sendnick_TS(client_p, target_p);
1784	–	}
1785	–	}
1786	–	}
1787	–	}
1788	–
1789	–	/* set_autoconn()
1790	–	*
1791	–	* inputs       - struct Client pointer to oper requesting change
1792	–	* output       - none
1793	–	* side effects - set autoconnect mode
1794	–	*/
1795	–	void
1796	–	set_autoconn(struct Client *source_p, const char *name, int newval)
1797	–	{
1798	–	struct ConfItem *conf;
1799	–	struct AccessItem *aconf;
1800	–
1801	–	if (name != NULL)
1802	–	{
1803	–	conf = find_exact_name_conf(SERVER_TYPE, name, NULL, NULL);
1804	–	if (conf != NULL)
1805	–	{
1806	–	aconf = (struct AccessItem *)map_to_conf(conf);
1807	–	if (newval)
1808	–	SetConfAllowAutoConn(aconf);
1809	–	else
1810	–	ClearConfAllowAutoConn(aconf);
1811	–
1812	–	sendto_realops_flags(UMODE_ALL, L_ALL,
1813	–	"%s has changed AUTOCONN for %s to %i",
1814	–	source_p->name, name, newval);
1815	–	sendto_one(source_p,
1816	–	":%s NOTICE %s :AUTOCONN for %s is now set to %i",
1817	–	me.name, source_p->name, name, newval);
1818	–	}
1819	–	else
1820	–	{
1821	–	sendto_one(source_p, ":%s NOTICE %s :Can't find %s",
1822	–	me.name, source_p->name, name);
1823	–	}
1824	–	}
1825	–	else
1826	–	{
1827	–	sendto_one(source_p, ":%s NOTICE %s :Please specify a server name!",
1828	–	me.name, source_p->name);
1829	–	}
1830	–	}
1831	–
1832	–	void
1833	–	initServerMask(void)
1834	–	{
1835	–	freeMask = 0xFFFFFFFFUL;
1836	–	}
1837	–
1838	–	/* nextFreeMask()
1839	–	*
1840	–	* inputs       - NONE
1841	–	* output       - unsigned long next unused mask for use in LL
1842	–	* side effects -
1843	–	*/
1844	–	unsigned long
1845	–	nextFreeMask(void)
1846	–	{
1847	–	int i;
1848	–	unsigned long mask = 1;
1849	–
1850	–	for (i = 0; i < 32; i++)
1851	–	{
1852	–	if (mask & freeMask)
1853	–	{
1854	–	freeMask &= ~mask;
1855	–	return(mask);
1856	–	}
1857	–
1858	–	mask <<= 1;
1859	–	}
1860	–
1861	–	return(0L); /* watch this special case ... */
1862	–	}
1863	–
1551		/* New server connection code
1552		* Based upon the stuff floating about in s_bsd.c
1553		*   -- adrian
#	Line 1907 | Line 1594 | serv_connect(struct AccessItem *aconf, s
1594		buf);
1595
1596		/* Still processing a DNS lookup? -> exit */
1597	<	if (aconf->dns_query != NULL)
1597	>	if (aconf->dns_pending)
1598		{
1599	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1600	<	"Error connecting to %s: Error during DNS lookup", conf->name);
1599	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1600	>	"Error connecting to %s: DNS lookup for connect{} in progress.",
1601	>	conf->name);
1602	>	return (0);
1603	>	}
1604	>
1605	>	if (aconf->dns_failed)
1606	>	{
1607	>	sendto_realops_flags(UMODE_ALL, L_ALL,
1608	>	"Error connecting to %s: DNS lookup for connect{} failed.",
1609	>	conf->name);
1610		return (0);
1611		}
1612
#	Line 2160 | Line 1856 | serv_connect_callback(fde_t *fd, int sta
1856
1857		/* Pass my info to the new server
1858		*
2163	–	* If trying to negotiate LazyLinks, pass on CAP_LL
1859		* If this is a HUB, pass on CAP_HUB
1860		* Pass on ZIP if supported
1861		* Pass on TB if supported.
1862		* - Dianora
1863		*/
1864		send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2170	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1865		| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1866		| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), 0);
1867
#	Line 2278 | Line 1972 | cryptlink_init(struct Client *client_p,
1972		}
1973
1974		send_capabilities(client_p, aconf, (ServerInfo.hub ? CAP_HUB : 0)
2281	–	| (IsConfLazyLink(aconf) ? CAP_LL : 0)
1975		| (IsConfCompressed(aconf) ? CAP_ZIP : 0)
1976		| (IsConfTopicBurst(aconf) ? CAP_TBURST|CAP_TB : 0), CAP_ENC_MASK);
1977

Diff Legend

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