ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 2143 by michael, Thu May 30 01:12:38 2013 UTC vs.
Revision 2175 by michael, Mon Jun 3 23:45:39 2013 UTC

#	Line 52 | Line 52
52		#include "parse.h"
53		#include "watch.h"
54
55	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
#	Line 73 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79		const unsigned int user_modes[256] =
#	Line 243 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 1057 | Line 1060 | user_set_hostmask(struct Client *target_
1060		{
1061		dlink_node *ptr = NULL;
1062
1063	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1064	<	target_p->name, target_p->username, target_p->host);
1062	<
1063	<	if (IsUserHostIp(target_p))
1064	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1065	<
1066	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1067	<
1068	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1069	<	SetUserHost(target_p);
1063	>	if (!strcmp(target_p->host, hostname))
1064	>	return;
1065
1066		switch (what)
1067		{
#	Line 1080 | Line 1075 | user_set_hostmask(struct Client *target_
1075		if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1076		DelFlag(target_p, FLAGS_IP_SPOOFING);
1077		break;
1078	<	default: break;
1078	>	default: return;
1079		}
1080
1081	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1082	+	target_p->name, target_p->username, target_p->host);
1083	+
1084	+	if (IsUserHostIp(target_p))
1085	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1086	+
1087	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1088	+
1089	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1090	+	SetUserHost(target_p);
1091	+
1092		if (MyClient(target_p))
1093		{
1094		sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1095	<	target_p->name, target_p->username,
1090	<	target_p->host);
1095	>	target_p->name, target_p->host);
1096		clear_ban_cache_client(target_p);
1097		}
1098
#	Line 1169 | Line 1174 | user_welcome(struct Client *source_p)
1174		source_p->name, source_p->id);
1175
1176		show_lusers(source_p);
1177	<
1173	<	if (ConfigFileEntry.short_motd)
1174	<	{
1175	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1176	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1177	<	sendto_one(source_p,
1178	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1179	<	"read it", me.name, source_p->name);
1180	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1181	<	me.name, source_p->name, me.name);
1182	<	sendto_one(source_p, form_str(RPL_MOTD),
1183	<	me.name, source_p->name,
1184	<	"*** This is the short motd ***");
1185	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1186	<	me.name, source_p->name);
1187	<	}
1188	<	else
1189	<	send_message_file(source_p, &ConfigFileEntry.motd);
1177	>	motd_signon(source_p);
1178		}
1179
1180		/* check_xline()
#	Line 1368 | Line 1356 | uid_get(void)
1356		void
1357		init_isupport(void)
1358		{
1371	–	isupportFile = init_MessageLine();
1372	–
1359		add_isupport("CALLERID", NULL, -1);
1360		add_isupport("CASEMAPPING", CASEMAP, -1);
1361		add_isupport("DEAF", "D", -1);
#	Line 1382 | Line 1368 | init_isupport(void)
1368		add_isupport("PREFIX", "(ov)@+", -1);
1369		add_isupport("STATUSMSG", "@+", -1);
1370		#endif
1371	+	add_isupport("EXCEPTS", "e", -1);
1372	+	add_isupport("INVEX", "I", -1);
1373		}
1374
1375		/*
#	Line 1465 | Line 1453 | rebuild_isupport_message_line(void)
1453		{
1454		char isupportbuffer[IRCD_BUFSIZE];
1455		char *p = isupportbuffer;
1456	<	dlink_node *ptr = NULL;
1456	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1457		int n = 0;
1458		int tokens = 0;
1459		size_t len = 0;
1460		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1461
1462	<	destroy_MessageLine(isupportFile);
1462	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1463	>	{
1464	>	dlinkDelete(ptr, &support_list_lines);
1465	>	MyFree(ptr->data);
1466	>	free_dlink_node(ptr);
1467	>	}
1468
1469		DLINK_FOREACH(ptr, support_list.head)
1470		{
#	Line 1501 | Line 1494 | rebuild_isupport_message_line(void)
1494		if (*--p == ' ')
1495		*p = '\0';
1496
1497	<	addto_MessageLine(isupportFile, isupportbuffer);
1497	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1498		p = isupportbuffer;
1499		len = 0;
1500		n = tokens = 0;
#	Line 1512 | Line 1505 | rebuild_isupport_message_line(void)
1505		{
1506		if (*--p == ' ')
1507		*p = '\0';
1508	<	addto_MessageLine(isupportFile, isupportbuffer);
1508	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1509		}
1510		}

Diff Legend

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