ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/send.c (file contents):
Revision 3164 by michael, Sat Mar 15 20:19:15 2014 UTC vs.
Revision 3170 by michael, Sun Mar 16 10:58:17 2014 UTC

#	Line 639 | Line 639 | sendto_channel_local_butone(struct Clien
639		if (type != 0 && (ms->flags & type) == 0)
640		continue;
641
642	<	if (!MyConnect(target_p) || target_p == one ||
643	<	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
642	>	if (!MyConnect(target_p) || (one && target_p == one->from))
643	>	continue;
644	>
645	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
646		continue;
647
648		if (HasCap(target_p, cap) != cap)
#	Line 686 | Line 688 | match_it(const struct Client *one, const
688		* ugh. ONLY used by m_message.c to send an "oper magic" message. ugh.
689		*/
690		void
691	<	sendto_match_butone(struct Client *one, struct Client *from, char *mask,
691	>	sendto_match_butone(struct Client *one, struct Client *from, const char *mask,
692		int what, const char *pattern, ...)
693		{
694		va_list alocal, aremote;
#	Line 710 | Line 712 | sendto_match_butone(struct Client *one,
712		{
713		struct Client *client_p = ptr->data;
714
715	<	if (client_p != one && !IsDefunct(client_p) &&
715	>	if ((!one || client_p != one->from)&& !IsDefunct(client_p) &&
716		match_it(client_p, mask, what))
717		send_message(client_p, local_buf);
718		}
#	Line 744 | Line 746 | sendto_match_butone(struct Client *one,
746		* server deal with it.
747		* -wnder
748		*/
749	<	if (client_p != one && !IsDefunct(client_p))
749	>	if ((!one || client_p != one->from) && !IsDefunct(client_p))
750		send_message_remote(client_p, from, remote_buf);
751		}
752

Diff Legend

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