ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 4709 by michael, Mon Oct 6 16:52:29 2014 UTC vs.
Revision 4967 by michael, Mon Dec 1 14:34:29 2014 UTC

#	Line 162 | Line 162 | void
162		show_lusers(struct Client *source_p)
163		{
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166		Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total - Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171		if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 210 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219
#	Line 232 | Line 232 | report_and_set_user_flags(struct Client
232		if (IsConfDoSpoofIp(conf))
233		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234
235	<	/* If this user is in the exception class, Set it "E lined" */
235	>	/* If this user is in the exception class, set it "E lined" */
236		if (IsConfExemptKline(conf))
237		{
238		SetExemptKline(source_p);
#	Line 281 | Line 281 | report_and_set_user_flags(struct Client
281		static void
282		introduce_client(struct Client *source_p)
283		{
284	<	dlink_node *ptr = NULL;
284	>	dlink_node *node = NULL;
285		char ubuf[IRCD_BUFSIZE] = "";
286
287		if (MyClient(source_p))
#	Line 297 | Line 297 | introduce_client(struct Client *source_p
297		ubuf[1] = '\0';
298		}
299
300	<	DLINK_FOREACH(ptr, local_server_list.head)
300	>	DLINK_FOREACH(node, local_server_list.head)
301		{
302	<	struct Client *server = ptr->data;
302	>	struct Client *server = node->data;
303
304		if (server == source_p->from)
305		continue;
#	Line 310 | Line 310 | introduce_client(struct Client *source_p
310		source_p->name, source_p->hopcount+1,
311		(unsigned long)source_p->tsinfo,
312		ubuf, source_p->username, source_p->host,
313	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	<	"0" : source_p->sockhost, source_p->id,
315	<	source_p->svid,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315		source_p->info);
316		else
317		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
#	Line 320 | Line 319 | introduce_client(struct Client *source_p
319		source_p->name, source_p->hopcount+1,
320		(unsigned long)source_p->tsinfo,
321		ubuf, source_p->username, source_p->host,
322	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	<	"0" : source_p->sockhost, source_p->id, source_p->info);
322	>	source_p->sockhost, source_p->id, source_p->info);
323
324		if (!EmptyString(source_p->certfp))
325		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 375 | Line 373 | static int
373		check_xline(struct Client *source_p)
374		{
375		struct MaskItem *conf = NULL;
378	–	const char *reason = NULL;
376
377		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378		{
379		++conf->count;
383	–
384	–	if (conf->reason)
385	–	reason = conf->reason;
386	–	else
387	–	reason = CONF_NOREASON;
388	–
380		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381		"X-line Rejecting [%s] [%s], user %s [%s]",
382	<	source_p->info, reason,
382	>	source_p->info, conf->reason,
383		get_client_name(source_p, HIDE_IP),
384		source_p->sockhost);
385
#	Line 425 | Line 416 | register_local_user(struct Client *sourc
416		source_p->connection->random_ping = genrand_int32();
417		while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
429	<	source_p->connection->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 446 | Line 436 | register_local_user(struct Client *sourc
436		{
437		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438		"character in your hostname");
439	<	strlcpy(source_p->host, source_p->sockhost,
450	<	sizeof(source_p->host));
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442		conf = source_p->connection->confs.head->data;
#	Line 493 | Line 482 | register_local_user(struct Client *sourc
482
483		/*
484		* Don't free source_p->connection->password here - it can be required
485	<	* by masked /stats I if there are auth{} blocks with need_password = no;
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
#	Line 549 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553	<	"255.255.255.255" : source_p->sockhost,
541	>	source_p->sockhost,
542		get_client_class(&source_p->connection->confs),
543		source_p->info, source_p->id);
544
#	Line 832 | Line 820 | send_umode_out(struct Client *source_p,
820		send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
821
822		if (buf[0])
823	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
823	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
824		source_p->id, source_p->id, buf);
825		}
826
827		void
828		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
829		{
830	<	dlink_node *ptr = NULL;
830	>	dlink_node *node = NULL;
831
832		if (!strcmp(target_p->host, hostname))
833		return;
#	Line 848 | Line 836 | user_set_hostmask(struct Client *target_
836		{
837		case MODE_ADD:
838		AddUMode(target_p, UMODE_HIDDENHOST);
851	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
839		break;
840		case MODE_DEL:
841		DelUMode(target_p, UMODE_HIDDENHOST);
855	–
856	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
857	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
842		break;
843		default: return;
844		}
#	Line 880 | Line 864 | user_set_hostmask(struct Client *target_
864		if (!ConfigGeneral.cycle_on_host_change)
865		return;
866
867	<	DLINK_FOREACH(ptr, target_p->channel.head)
867	>	DLINK_FOREACH(node, target_p->channel.head)
868		{
869		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
870		char *p = modebuf;
871		int len = 0;
872	<	const struct Membership *ms = ptr->data;
872	>	const struct Membership *member = node->data;
873
874	<	if (has_member_flags(ms, CHFL_CHANOP))
874	>	if (has_member_flags(member, CHFL_CHANOP))
875		{
876		*p++ = 'o';
877		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
878		}
879
880	<	if (has_member_flags(ms, CHFL_HALFOP))
880	>	if (has_member_flags(member, CHFL_HALFOP))
881		{
882		*p++ = 'h';
883		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
884		}
885
886	<	if (has_member_flags(ms, CHFL_VOICE))
886	>	if (has_member_flags(member, CHFL_VOICE))
887		{
888		*p++ = 'v';
889		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 907 | Line 891 | user_set_hostmask(struct Client *target_
891
892		*p = '\0';
893
894	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
895	<	target_p->name, target_p->username, target_p->host,
896	<	ms->chptr->name);
894	>
895	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
896	>	target_p->name, target_p->username,
897	>	target_p->host, member->chptr->name,
898	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
899	>	target_p->info);
900	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
901	>	target_p->name, target_p->username,
902	>	target_p->host, member->chptr->name);
903	>
904		if (nickbuf[0])
905	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
906	<	target_p->servptr->name, ms->chptr->name,
905	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
906	>	target_p->servptr->name, member->chptr->name,
907		modebuf, nickbuf);
908
909		}
#	Line 932 | Line 923 | void
923		oper_up(struct Client *source_p)
924		{
925		const unsigned int old = source_p->umodes;
926	<	const struct MaskItem *conf = source_p->connection->confs.head->data;
926	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
927
928		assert(source_p->connection->confs.head);
929
#	Line 959 | Line 950 | oper_up(struct Client *source_p)
950
951		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
952		get_oper_name(source_p));
953	<	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
953	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
954		me.id, get_oper_name(source_p));
955		send_umode_out(source_p, old);
956		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
#	Line 1067 | Line 1058 | init_isupport(void)
1058		add_isupport("MODES", NULL, MAXMODEPARAMS);
1059		add_isupport("PREFIX", "(ohv)@%+", -1);
1060		add_isupport("STATUSMSG", "@%+", -1);
1061	<	add_isupport("EXCEPTS", "e", -1);
1062	<	add_isupport("INVEX", "I", -1);
1061	>	add_isupport("EXCEPTS", NULL, -1);
1062	>	add_isupport("INVEX", NULL, -1);
1063		}
1064
1065		/*
#	Line 1083 | Line 1074 | init_isupport(void)
1074		void
1075		add_isupport(const char *name, const char *options, int n)
1076		{
1077	<	dlink_node *ptr;
1077	>	dlink_node *node = NULL;
1078		struct Isupport *support = NULL;
1079
1080	<	DLINK_FOREACH(ptr, support_list.head)
1080	>	DLINK_FOREACH(node, support_list.head)
1081		{
1082	<	support = ptr->data;
1082	>	support = node->data;
1083		if (irccmp(support->name, name) == 0)
1084		{
1085		MyFree(support->name);
#	Line 1097 | Line 1088 | add_isupport(const char *name, const cha
1088		}
1089		}
1090
1091	<	if (ptr == NULL)
1091	>	if (node == NULL)
1092		{
1093		support = MyCalloc(sizeof(*support));
1094		dlinkAddTail(support, &support->node, &support_list);
#	Line 1121 | Line 1112 | add_isupport(const char *name, const cha
1112		void
1113		delete_isupport(const char *name)
1114		{
1115	<	dlink_node *ptr;
1125	<	struct Isupport *support;
1115	>	dlink_node *node = NULL;
1116
1117	<	DLINK_FOREACH(ptr, support_list.head)
1117	>	DLINK_FOREACH(node, support_list.head)
1118		{
1119	<	support = ptr->data;
1119	>	struct Isupport *support = node->data;
1120	>
1121		if (irccmp(support->name, name) == 0)
1122		{
1123	<	dlinkDelete(ptr, &support_list);
1123	>	dlinkDelete(node, &support_list);
1124		MyFree(support->name);
1125		MyFree(support->options);
1126		MyFree(support);
#	Line 1152 | Line 1143 | rebuild_isupport_message_line(void)
1143		{
1144		char isupportbuffer[IRCD_BUFSIZE];
1145		char *p = isupportbuffer;
1146	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1146	>	dlink_node *node = NULL, *node_next = NULL;
1147		int n = 0;
1148		int tokens = 0;
1149		size_t len = 0;
1150		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1151
1152	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1152	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1153		{
1154	<	dlinkDelete(ptr, &support_list_lines);
1155	<	MyFree(ptr->data);
1156	<	free_dlink_node(ptr);
1154	>	dlinkDelete(node, &support_list_lines);
1155	>	MyFree(node->data);
1156	>	free_dlink_node(node);
1157		}
1158
1159	<	DLINK_FOREACH(ptr, support_list.head)
1159	>	DLINK_FOREACH(node, support_list.head)
1160		{
1161	<	struct Isupport *support = ptr->data;
1161	>	struct Isupport *support = node->data;
1162
1163		p += (n = sprintf(p, "%s", support->name));
1164		len += n;

Diff Legend

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