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 1798 by michael, Sun Mar 31 17:09:50 2013 UTC vs.
Revision 7330 by michael, Fri Feb 19 17:50:13 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  send.c: Functions for sending messages.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2016 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file send.c
23	>	* \brief Functions for sending messages.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 30 | Line 32
32		#include "dbuf.h"
33		#include "irc_string.h"
34		#include "ircd.h"
33	–	#include "numeric.h"
34	–	#include "fdlist.h"
35		#include "s_bsd.h"
36	<	#include "s_serv.h"
37	<	#include "conf.h"
36	>	#include "server.h"
37	>	#include "conf_class.h"
38		#include "log.h"
39	–	#include "memory.h"
40	–	#include "packet.h"
39
40
41	<	static unsigned int current_serial = 0;
41	>	static uintmax_t current_serial;
42
43
44		/* send_format()
45		*
46	<	* inputs       - buffer to format into
47	<	*              - size of the buffer
46	>	* inputs
47	>	*              - buffer
48		*              - format pattern to use
49		*              - var args
50		* output       - number of bytes formatted output
51		* side effects - modifies sendbuf
52		*/
53	<	static inline int
54	<	send_format(char *lsendbuf, int bufsize, const char *pattern, va_list args)
53	>	static void
54	>	send_format(struct dbuf_block *buffer, const char *pattern, va_list args)
55		{
58	–	int len;
59	–
56		/*
57		* from rfc1459
58		*
59		* IRC messages are always lines of characters terminated with a CR-LF
60		* (Carriage Return - Line Feed) pair, and these messages shall not
61	<	* exceed 512 characters in length,  counting all characters
61	>	* exceed 512 characters in length,  counting all characters
62		* including the trailing CR-LF.
63		* Thus, there are 510 characters maximum allowed
64		* for the command and its parameters.  There is no provision for
65		* continuation message lines.  See section 7 for more details about
66		* current implementations.
67		*/
68	<	len = vsnprintf(lsendbuf, bufsize - 1, pattern, args);
69	<	if (len > bufsize - 2)
70	<	len = bufsize - 2;  /* required by some versions of vsnprintf */
71	<
72	<	lsendbuf[len++] = '\r';
73	<	lsendbuf[len++] = '\n';
74	<	return len;
68	>	dbuf_put_args(buffer, pattern, args);
69	>
70	>	if (buffer->size > IRCD_BUFSIZE - 2)
71	>	buffer->size = IRCD_BUFSIZE - 2;
72	>
73	>	buffer->data[buffer->size++] = '\r';
74	>	buffer->data[buffer->size++] = '\n';
75		}
76
77		/*
#	Line 84 | Line 80 | send_format(char *lsendbuf, int bufsize,
80		**      sendq.
81		*/
82		static void
83	<	send_message(struct Client *to, char *buf, int len)
83	>	send_message(struct Client *to, struct dbuf_block *buf)
84		{
85		assert(!IsMe(to));
86		assert(to != &me);
87	+	assert(MyConnect(to));
88
89	<	if (dbuf_length(&to->localClient->buf_sendq) + len > get_sendq(&to->localClient->confs))
89	>	if (dbuf_length(&to->connection->buf_sendq) + buf->size > get_sendq(&to->connection->confs))
90		{
91		if (IsServer(to))
92	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
93	<	"Max SendQ limit exceeded for %s: %lu > %u",
92	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
93	>	"Max SendQ limit exceeded for %s: %zu > %u",
94		get_client_name(to, HIDE_IP),
95	<	(unsigned long)(dbuf_length(&to->localClient->buf_sendq) + len),
96	<	get_sendq(&to->localClient->confs));
95	>	(dbuf_length(&to->connection->buf_sendq) + buf->size),
96	>	get_sendq(&to->connection->confs));
97	>
98		if (IsClient(to))
99	<	SetSendQExceeded(to);
99	>	AddFlag(to, FLAGS_SENDQEX);
100	>
101		dead_link_on_write(to, 0);
102		return;
103		}
104	<
105	<	dbuf_put(&to->localClient->buf_sendq, buf, len);
104	>
105	>	dbuf_add(&to->connection->buf_sendq, buf);
106
107		/*
108	<	** Update statistics. The following is slightly incorrect
109	<	** because it counts messages even if queued, but bytes
110	<	** only really sent. Queued bytes get updated in SendQueued.
108	>	* Update statistics. The following is slightly incorrect because
109	>	* it counts messages even if queued, but bytes only really sent.
110	>	* Queued bytes get updated in send_queued_write().
111		*/
112	<	++to->localClient->send.messages;
113	<	++me.localClient->send.messages;
112	>	++to->connection->send.messages;
113	>	++me.connection->send.messages;
114
115	<	if (dbuf_length(&to->localClient->buf_sendq) >
117	<	(IsServer(to) ? (unsigned int) 1024 : (unsigned int) 4096))
118	<	send_queued_write(to);
115	>	send_queued_write(to);
116		}
117
118		/* send_message_remote()
119		*
120		* inputs       - pointer to client from message is being sent
121		*              - pointer to client to send to
122	<	*              - pointer to preformatted buffer
126	<	*              - length of input buffer
122	>	*              - pointer to buffer
123		* output       - none
124		* side effects - Despite the function name, this only sends to directly
125		*                connected clients.
126	<	*
126	>	*
127		*/
128		static void
129	<	send_message_remote(struct Client *to, struct Client *from,
134	<	char *buf, int len)
129	>	send_message_remote(struct Client *to, const struct Client *from, struct dbuf_block *buf)
130		{
131	<	if (!MyConnect(to))
132	<	{
133	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
134	<	"server send message to %s [%s] dropped from %s(Not local server)",
140	<	to->name, to->from->name, from->name);
141	<	return;
142	<	}
143	<
144	<	/* Optimize by checking if (from && to) before everything */
145	<	/* we set to->from up there.. */
131	>	assert(MyConnect(to));
132	>	assert(IsServer(to));
133	>	assert(!IsMe(to));
134	>	assert(to->from == to);
135
136	<	if (!MyClient(from) && IsClient(to) && (to == from->from))
136	>	if (to == from->from)
137		{
138	<	if (IsServer(from))
139	<	{
140	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
152	<	"Send message to %s [%s] dropped from %s(Fake Dir)",
153	<	to->name, to->from->name, from->name);
154	<	return;
155	<	}
156	<
157	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
158	<	"Ghosted: %s[%s@%s] from %s[%s@%s] (%s)",
159	<	to->name, to->username, to->host,
160	<	from->name, from->username, from->host,
161	<	to->from->name);
162	<
163	<	sendto_server(NULL, CAP_TS6, NOCAPS,
164	<	":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
165	<	me.id, to->name, me.name, to->name,
166	<	to->username, to->host, to->from->name);
167	<	sendto_server(NULL, NOCAPS, CAP_TS6,
168	<	":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
169	<	me.name, to->name, me.name, to->name,
170	<	to->username, to->host, to->from->name);
171	<
172	<	AddFlag(to, FLAGS_KILLED);
173	<
174	<	if (IsClient(from))
175	<	sendto_one(from, form_str(ERR_GHOSTEDCLIENT),
176	<	me.name, from->name, to->name, to->username,
177	<	to->host, to->from);
178	<
179	<	exit_client(to, &me, "Ghosted client");
180	<
138	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
139	>	"Send message to %s dropped from %s (Fake Dir)",
140	>	to->name, from->name);
141		return;
142	<	}
142	>	}
143
144	<	send_message(to, buf, len);
144	>	send_message(to, buf);
145		}
146
147		/*
#	Line 189 | Line 149 | send_message_remote(struct Client *to, s
149		**      Called when a socket is ready for writing.
150		*/
151		void
152	<	sendq_unblocked(fde_t *fd, struct Client *client_p)
152	>	sendq_unblocked(fde_t *fd, void *data)
153		{
154	<	ClearSendqBlocked(client_p);
155	<	/* let send_queued_write be executed by send_queued_all */
154	>	struct Client *const client_p = data;
155	>	assert(fd == &client_p->connection->fd);
156
157	<	#ifdef HAVE_LIBCRYPTO
158	<	if (fd->flags.pending_read)
199	<	{
200	<	fd->flags.pending_read = 0;
201	<	read_packet(fd, client_p);
202	<	}
203	<	#endif
157	>	DelFlag(client_p, FLAGS_BLOCKED);
158	>	send_queued_write(client_p);
159		}
160
161		/*
#	Line 212 | Line 167 | sendq_unblocked(fde_t *fd, struct Client
167		void
168		send_queued_write(struct Client *to)
169		{
170	<	int retlen;
171	<	struct dbuf_block *first;
170	>	int retlen = 0;
171	>	int want_read = 0;
172
173		/*
174		** Once socket is marked dead, we cannot start writing to it,
175		** even if the error is removed...
176		*/
177	<	if (IsDead(to) || IsSendqBlocked(to))
177	>	if (IsDead(to) || HasFlag(to, FLAGS_BLOCKED))
178		return;  /* no use calling send() now */
179
180		/* Next, lets try to write some data */
181	<
227	<	if (dbuf_length(&to->localClient->buf_sendq))
181	>	if (dbuf_length(&to->connection->buf_sendq))
182		{
183	<	do {
184	<	first = to->localClient->buf_sendq.blocks.head->data;
183	>	do
184	>	{
185	>	const struct dbuf_block *first = to->connection->buf_sendq.blocks.head->data;
186
187	<	#ifdef HAVE_LIBCRYPTO
233	<	if (to->localClient->fd.ssl)
187	>	if (tls_isusing(&to->connection->fd.ssl))
188		{
189	<	retlen = SSL_write(to->localClient->fd.ssl, first->data, first->size);
189	>	retlen = tls_write(&to->connection->fd.ssl, first->data + to->connection->buf_sendq.pos,
190	>	first->size - to->connection->buf_sendq.pos, &want_read);
191
192	<	/* translate openssl error codes, sigh */
193	<	if (retlen < 0)
239	<	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
240	<	{
241	<	case SSL_ERROR_WANT_READ:
242	<	return;  /* retry later, don't register for write events */
243	<
244	<	case SSL_ERROR_WANT_WRITE:
245	<	errno = EWOULDBLOCK;
246	<	case SSL_ERROR_SYSCALL:
247	<	break;
248	<	case SSL_ERROR_SSL:
249	<	if (errno == EAGAIN)
250	<	break;
251	<	default:
252	<	retlen = errno = 0;  /* either an SSL-specific error or EOF */
253	<	}
192	>	if (want_read)
193	>	return;  /* Retry later, don't register for write events */
194		}
195		else
196	<	#endif
197	<	retlen = send(to->localClient->fd.fd, first->data, first->size, 0);
196	>	retlen = send(to->connection->fd.fd, first->data + to->connection->buf_sendq.pos,
197	>	first->size - to->connection->buf_sendq.pos, 0);
198
199		if (retlen <= 0)
200		break;
201
202	<	dbuf_delete(&to->localClient->buf_sendq, retlen);
202	>	dbuf_delete(&to->connection->buf_sendq, retlen);
203
204		/* We have some data written .. update counters */
205	<	to->localClient->send.bytes += retlen;
206	<	me.localClient->send.bytes += retlen;
207	<	} while (dbuf_length(&to->localClient->buf_sendq));
205	>	to->connection->send.bytes += retlen;
206	>	me.connection->send.bytes += retlen;
207	>	} while (dbuf_length(&to->connection->buf_sendq));
208
209	<	if ((retlen < 0) && (ignoreErrno(errno)))
209	>	if (retlen < 0 && ignoreErrno(errno))
210		{
211	+	AddFlag(to, FLAGS_BLOCKED);
212	+
213		/* we have a non-fatal error, reschedule a write */
214	<	SetSendqBlocked(to);
273	<	comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE,
274	<	(PF *)sendq_unblocked, (void *)to, 0);
214	>	comm_setselect(&to->connection->fd, COMM_SELECT_WRITE, sendq_unblocked, to, 0);
215		}
216		else if (retlen <= 0)
217		{
#	Line 290 | Line 230 | send_queued_write(struct Client *to)
230		void
231		send_queued_all(void)
232		{
233	<	dlink_node *ptr;
233	>	dlink_node *node = NULL;
234
235		/* Servers are processed first, mainly because this can generate
236		* a notice to opers, which is to be delivered by this function.
237		*/
238	<	DLINK_FOREACH(ptr, serv_list.head)
239	<	send_queued_write((struct Client *) ptr->data);
238	>	DLINK_FOREACH(node, local_server_list.head)
239	>	send_queued_write(node->data);
240
241	<	DLINK_FOREACH(ptr, unknown_list.head)
242	<	send_queued_write((struct Client *) ptr->data);
241	>	DLINK_FOREACH(node, unknown_list.head)
242	>	send_queued_write(node->data);
243
244	<	DLINK_FOREACH(ptr, local_client_list.head)
245	<	send_queued_write((struct Client *) ptr->data);
244	>	DLINK_FOREACH(node, local_client_list.head)
245	>	send_queued_write(node->data);
246
247		/* NOTE: This can still put clients on aborted_list; unfortunately,
248		* exit_aborted_clients takes precedence over send_queued_all,
#	Line 323 | Line 263 | void
263		sendto_one(struct Client *to, const char *pattern, ...)
264		{
265		va_list args;
266	<	char buffer[IRCD_BUFSIZE];
267	<	int len;
266	>	struct dbuf_block *buffer = NULL;
267	>
268	>	if (IsDead(to->from))
269	>	return;  /* This socket has already been marked as dead */
270	>
271	>	buffer = dbuf_alloc();
272	>
273	>	va_start(args, pattern);
274	>	send_format(buffer, pattern, args);
275	>	va_end(args);
276	>
277	>	send_message(to->from, buffer);
278	>
279	>	dbuf_ref_free(buffer);
280	>	}
281	>
282	>	void
283	>	sendto_one_numeric(struct Client *to, const struct Client *from, enum irc_numerics numeric, ...)
284	>	{
285	>	struct dbuf_block *buffer = NULL;
286	>	const char *dest = NULL, *numstr = NULL;
287	>	va_list args;
288	>
289	>	if (IsDead(to->from))
290	>	return;
291	>
292	>	dest = ID_or_name(to, to);
293	>
294	>	if (EmptyString(dest))
295	>	dest = "*";
296	>
297	>	buffer = dbuf_alloc();
298	>
299	>	dbuf_put_fmt(buffer, ":%s %03d %s ", ID_or_name(from, to), numeric & ~SND_EXPLICIT, dest);
300	>
301	>	va_start(args, numeric);
302	>
303	>	if (numeric & SND_EXPLICIT)
304	>	numstr = va_arg(args, const char *);
305	>	else
306	>	numstr = numeric_form(numeric);
307	>
308	>	send_format(buffer, numstr, args);
309	>	va_end(args);
310	>
311	>	send_message(to->from, buffer);
312	>
313	>	dbuf_ref_free(buffer);
314	>	}
315	>
316	>	void
317	>	sendto_one_notice(struct Client *to, const struct Client *from, const char *pattern, ...)
318	>	{
319	>	struct dbuf_block *buffer = NULL;
320	>	const char *dest = NULL;
321	>	va_list args;
322	>
323	>	if (IsDead(to->from))
324	>	return;
325	>
326	>	dest = ID_or_name(to, to);
327
328	<	if (to->from != NULL)
329	<	to = to->from;
330	<	if (IsDead(to))
331	<	return; /* This socket has already been marked as dead */
328	>	if (EmptyString(dest))
329	>	dest = "*";
330	>
331	>	buffer = dbuf_alloc();
332	>
333	>	dbuf_put_fmt(buffer, ":%s NOTICE %s ", ID_or_name(from, to), dest);
334
335		va_start(args, pattern);
336	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
336	>	send_format(buffer, pattern, args);
337		va_end(args);
338
339	<	send_message(to, buffer, len);
339	>	send_message(to->from, buffer);
340	>
341	>	dbuf_ref_free(buffer);
342		}
343
344		/* sendto_channel_butone()
#	Line 350 | Line 353 | sendto_one(struct Client *to, const char
353		* WARNING - +D clients are ignored
354		*/
355		void
356	<	sendto_channel_butone(struct Client *one, struct Client *from,
356	>	sendto_channel_butone(struct Client *one, const struct Client *from,
357		struct Channel *chptr, unsigned int type,
358		const char *pattern, ...)
359		{
360	<	va_list alocal, aremote, auid;
361	<	char local_buf[IRCD_BUFSIZE];
362	<	char remote_buf[IRCD_BUFSIZE];
363	<	char uid_buf[IRCD_BUFSIZE];
364	<	int local_len, remote_len, uid_len;
365	<	dlink_node *ptr = NULL, *ptr_next = NULL;
366	<
367	<	if (IsServer(from))
365	<	local_len = sprintf(local_buf, ":%s ",
366	<	from->name);
360	>	va_list alocal, aremote;
361	>	struct dbuf_block *local_buf, *remote_buf;
362	>	dlink_node *node = NULL;
363	>
364	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
365	>
366	>	if (IsClient(from))
367	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
368		else
369	<	local_len = sprintf(local_buf, ":%s!%s@%s ",
370	<	from->name, from->username, from->host);
371	<	remote_len = sprintf(remote_buf, ":%s ",
371	<	from->name);
372	<	uid_len = sprintf(uid_buf, ":%s ",
373	<	ID(from));
369	>	dbuf_put_fmt(local_buf, ":%s ", from->name);
370	>
371	>	dbuf_put_fmt(remote_buf, ":%s ", from->id);
372
373		va_start(alocal, pattern);
374		va_start(aremote, pattern);
375	<	va_start(auid, pattern);
376	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
377	<	pattern, alocal);
380	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
381	<	pattern, aremote);
382	<	uid_len += send_format(&uid_buf[uid_len], IRCD_BUFSIZE - uid_len, pattern,
383	<	auid);
384	<	va_end(auid);
375	>	send_format(local_buf, pattern, alocal);
376	>	send_format(remote_buf, pattern, aremote);
377	>
378		va_end(aremote);
379		va_end(alocal);
380
381		++current_serial;
382
383	<	DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
383	>	DLINK_FOREACH(node, chptr->members.head)
384		{
385	<	struct Membership *ms = ptr->data;
386	<	struct Client *target_p = ms->client_p;
385	>	struct Membership *member = node->data;
386	>	struct Client *target_p = member->client_p;
387
388		assert(IsClient(target_p));
389
390	<	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) || target_p->from == one)
390	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) ||
391	>	(one && target_p->from == one->from))
392		continue;
393
394	<	if (type != 0 && (ms->flags & type) == 0)
394	>	if (type && (member->flags & type) == 0)
395		continue;
396
397		if (MyConnect(target_p))
398	<	{
399	<	if (target_p->localClient->serial != current_serial)
400	<	{
401	<	send_message(target_p, local_buf, local_len);
402	<	target_p->localClient->serial = current_serial;
409	<	}
410	<	}
411	<	else
412	<	{
413	<	/* Now check whether a message has been sent to this
414	<	* remote link already
415	<	*/
416	<	if (target_p->from->localClient->serial != current_serial)
417	<	{
418	<	if (IsCapable(target_p->from, CAP_TS6))
419	<	send_message_remote(target_p->from, from, uid_buf, uid_len);
420	<	else
421	<	send_message_remote(target_p->from, from, remote_buf, remote_len);
422	<	target_p->from->localClient->serial = current_serial;
423	<	}
424	<	}
398	>	send_message(target_p, local_buf);
399	>	else if (target_p->from->connection->serial != current_serial)
400	>	send_message_remote(target_p->from, from, remote_buf);
401	>
402	>	target_p->from->connection->serial = current_serial;
403		}
404	+
405	+	dbuf_ref_free(local_buf);
406	+	dbuf_ref_free(remote_buf);
407		}
408
409		/* sendto_server()
410	<	*
410	>	*
411		* inputs       - pointer to client to NOT send to
412		*              - pointer to channel
413		*              - caps or'd together which must ALL be present
#	Line 437 | Line 418 | sendto_channel_butone(struct Client *one
418		* side effects - Send a message to all connected servers, except the
419		*                client 'one' (if non-NULL), as long as the servers
420		*                support ALL capabs in 'caps', and NO capabs in 'nocaps'.
421	<	*
421	>	*
422		* This function was written in an attempt to merge together the other
423		* billion sendto_*serv*() functions, which sprung up with capabs,
424		* lazylinks, uids, etc.
425		* -davidt
426		*/
427	<	void
428	<	sendto_server(struct Client *one,
427	>	void
428	>	sendto_server(const struct Client *one,
429		const unsigned int caps,
430		const unsigned int nocaps,
431		const char *format, ...)
432		{
433		va_list args;
434	<	dlink_node *ptr = NULL;
435	<	char buffer[IRCD_BUFSIZE];
455	<	int len = 0;
434	>	dlink_node *node = NULL;
435	>	struct dbuf_block *buffer = dbuf_alloc();
436
437		va_start(args, format);
438	<	len = send_format(buffer, IRCD_BUFSIZE, format, args);
438	>	send_format(buffer, format, args);
439		va_end(args);
440
441	<	DLINK_FOREACH(ptr, serv_list.head)
441	>	DLINK_FOREACH(node, local_server_list.head)
442		{
443	<	struct Client *client_p = ptr->data;
443	>	struct Client *client_p = node->data;
444
445		/* If dead already skip */
446		if (IsDead(client_p))
447		continue;
448	+
449		/* check against 'one' */
450	<	if (one != NULL && (client_p == one->from))
450	>	if (one && (client_p == one->from))
451		continue;
452	+
453		/* check we have required capabs */
454	<	if ((client_p->localClient->caps & caps) != caps)
454	>	if ((client_p->connection->caps & caps) != caps)
455		continue;
456	+
457		/* check we don't have any forbidden capabs */
458	<	if ((client_p->localClient->caps & nocaps) != 0)
458	>	if ((client_p->connection->caps & nocaps))
459		continue;
460
461	<	send_message(client_p, buffer, len);
461	>	send_message(client_p, buffer);
462		}
463	+
464	+	dbuf_ref_free(buffer);
465		}
466
467		/* sendto_common_channels_local()
#	Line 485 | Line 470 | sendto_server(struct Client *one,
470		*              - pattern to send
471		* output       - NONE
472		* side effects - Sends a message to all people on local server who are
473	<	*                in same channel with user.
473	>	*                in same channel with user.
474		*                used by m_nick.c and exit_one_client.
475		*/
476		void
477	<	sendto_common_channels_local(struct Client *user, int touser, unsigned int cap,
478	<	const char *pattern, ...)
477	>	sendto_common_channels_local(struct Client *user, int touser, unsigned int poscap,
478	>	unsigned int negcap, const char *pattern, ...)
479		{
480		va_list args;
481		dlink_node *uptr;
482		dlink_node *cptr;
483		struct Channel *chptr;
484	<	struct Membership *ms;
484	>	struct Membership *member;
485		struct Client *target_p;
486	<	char buffer[IRCD_BUFSIZE];
502	<	int len;
486	>	struct dbuf_block *buffer = dbuf_alloc();
487
488		va_start(args, pattern);
489	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
489	>	send_format(buffer, pattern, args);
490		va_end(args);
491
492		++current_serial;
493
494		DLINK_FOREACH(cptr, user->channel.head)
495		{
496	<	chptr = ((struct Membership *) cptr->data)->chptr;
513	<	assert(chptr != NULL);
496	>	chptr = ((struct Membership *)cptr->data)->chptr;
497
498	<	DLINK_FOREACH(uptr, chptr->members.head)
498	>	DLINK_FOREACH(uptr, chptr->locmembers.head)
499		{
500	<	ms = uptr->data;
501	<	target_p = ms->client_p;
519	<	assert(target_p != NULL);
500	>	member = uptr->data;
501	>	target_p = member->client_p;
502
503	<	if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
504	<	target_p->localClient->serial == current_serial)
503	>	if (target_p == user || IsDefunct(target_p) ||
504	>	target_p->connection->serial == current_serial)
505		continue;
506
507	<	if (HasCap(target_p, cap) != cap)
507	>	if (poscap && HasCap(target_p, poscap) != poscap)
508		continue;
509
510	<	target_p->localClient->serial = current_serial;
511	<	send_message(target_p, buffer, len);
510	>	if (negcap && HasCap(target_p, negcap))
511	>	continue;
512	>
513	>	target_p->connection->serial = current_serial;
514	>	send_message(target_p, buffer);
515		}
516		}
517
518		if (touser && MyConnect(user) && !IsDead(user) &&
519	<	user->localClient->serial != current_serial)
520	<	if (HasCap(target_p, cap) == cap)
521	<	send_message(user, buffer, len);
519	>	user->connection->serial != current_serial)
520	>	if (HasCap(user, poscap) == poscap)
521	>	send_message(user, buffer);
522	>
523	>	dbuf_ref_free(buffer);
524		}
525
526	<	/* sendto_channel_local()
527	<	*
528	<	* inputs       - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
529	<	*              - whether to ignore +D clients (YES/NO)
530	<	*              - pointer to channel to send to
531	<	*              - var args pattern
532	<	* output       - NONE
546	<	* side effects - Send a message to all members of a channel that are
547	<	*                locally connected to this server.
526	>	/*! \brief Send a message to members of a channel that are locally connected to this server.
527	>	* \param one      Client to skip; can be NULL
528	>	* \param chptr    Destination channel
529	>	* \param status   Channel member status flags clients must have
530	>	* \param poscap   Positive client capabilities flags (CAP)
531	>	* \param negcap   Negative client capabilities flags (CAP)
532	>	* \param pattern  Format string for command arguments
533		*/
534		void
535	<	sendto_channel_local(int type, int nodeaf, struct Channel *chptr,
536	<	const char *pattern, ...)
535	>	sendto_channel_local(const struct Client *one, struct Channel *chptr, unsigned int status,
536	>	unsigned int poscap, unsigned int negcap, const char *pattern, ...)
537		{
538		va_list args;
539	<	char buffer[IRCD_BUFSIZE];
540	<	int len;
556	<	dlink_node *ptr;
557	<	struct Membership *ms;
558	<	struct Client *target_p;
539	>	dlink_node *node = NULL;
540	>	struct dbuf_block *buffer = dbuf_alloc();
541
542		va_start(args, pattern);
543	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
543	>	send_format(buffer, pattern, args);
544		va_end(args);
545
546	<	DLINK_FOREACH(ptr, chptr->members.head)
546	>	DLINK_FOREACH(node, chptr->locmembers.head)
547		{
548	<	ms = ptr->data;
549	<	target_p = ms->client_p;
548	>	struct Membership *member = node->data;
549	>	struct Client *target_p = member->client_p;
550
551	<	if (type != 0 && (ms->flags & type) == 0)
551	>	if (IsDefunct(target_p))
552		continue;
553
554	<	if (!MyConnect(target_p) || IsDefunct(target_p) ||
573	<	(nodeaf && HasUMode(target_p, UMODE_DEAF)))
554	>	if (one && target_p == one->from)
555		continue;
556
557	<	send_message(target_p, buffer, len);
577	<	}
578	<	}
579	<
580	<	/* sendto_channel_local_butone()
581	<	*
582	<	* inputs       - pointer to client to NOT send message to
583	<	*              - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
584	<	*              - pointer to channel to send to
585	<	*              - var args pattern
586	<	* output       - NONE
587	<	* side effects - Send a message to all members of a channel that are
588	<	*                locally connected to this server except one.
589	<	*
590	<	* WARNING - +D clients are omitted
591	<	*/
592	<	void
593	<	sendto_channel_local_butone(struct Client *one, int type, unsigned int cap,
594	<	struct Channel *chptr, const char *pattern, ...)
595	<	{
596	<	va_list args;
597	<	char buffer[IRCD_BUFSIZE];
598	<	int len;
599	<	struct Client *target_p;
600	<	struct Membership *ms;
601	<	dlink_node *ptr;
602	<
603	<	va_start(args, pattern);
604	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
605	<	va_end(args);
606	<
607	<	DLINK_FOREACH(ptr, chptr->members.head)
608	<	{
609	<	ms = ptr->data;
610	<	target_p = ms->client_p;
611	<
612	<	if (type != 0 && (ms->flags & type) == 0)
557	>	if (status && (member->flags & status) == 0)
558		continue;
559
560	<	if (!MyConnect(target_p) || target_p == one ||
616	<	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
560	>	if (poscap && HasCap(target_p, poscap) != poscap)
561		continue;
562
563	<	if (HasCap(target_p, cap) != cap)
620	<	continue;
621	<	send_message(target_p, buffer, len);
622	<	}
623	<	}
624	<
625	<
626	<	/* sendto_channel_remote()
627	<	*
628	<	* inputs       - Client not to send towards
629	<	*              - Client from whom message is from
630	<	*              - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
631	<	*              - pointer to channel to send to
632	<	*              - var args pattern
633	<	* output       - NONE
634	<	* side effects - Send a message to all members of a channel that are
635	<	*                remote to this server.
636	<	*/
637	<	void
638	<	sendto_channel_remote(struct Client *one, struct Client *from, int type,
639	<	const unsigned int caps, const unsigned int nocaps,
640	<	struct Channel *chptr, const char *pattern, ...)
641	<	{
642	<	va_list args;
643	<	char buffer[IRCD_BUFSIZE];
644	<	int len;
645	<	dlink_node *ptr;
646	<	struct Client *target_p;
647	<	struct Membership *ms;
648	<
649	<	va_start(args, pattern);
650	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
651	<	va_end(args);
652	<
653	<	++current_serial;
654	<
655	<	DLINK_FOREACH(ptr, chptr->members.head)
656	<	{
657	<	ms = ptr->data;
658	<	target_p = ms->client_p;
659	<
660	<	if (type != 0 && (ms->flags & type) == 0)
563	>	if (negcap && HasCap(target_p, negcap))
564		continue;
565
566	<	if (MyConnect(target_p))
567	<	continue;
665	<	target_p = target_p->from;
566	>	send_message(target_p, buffer);
567	>	}
568
569	<	if (target_p == one->from ||
668	<	((target_p->from->localClient->caps & caps) != caps) ||
669	<	((target_p->from->localClient->caps & nocaps) != 0))
670	<	continue;
671	<	if (target_p->from->localClient->serial != current_serial)
672	<	{
673	<	send_message(target_p, buffer, len);
674	<	target_p->from->localClient->serial = current_serial;
675	<	}
676	<	}
569	>	dbuf_ref_free(buffer);
570		}
571
572		/*
#	Line 694 | Line 587 | sendto_channel_remote(struct Client *one
587		* side effects - NONE
588		*/
589		static int
590	<	match_it(const struct Client *one, const char *mask, int what)
590	>	match_it(const struct Client *one, const char *mask, unsigned int what)
591		{
592		if (what == MATCH_HOST)
593		return !match(mask, one->host);
#	Line 710 | Line 603 | match_it(const struct Client *one, const
603		* ugh. ONLY used by m_message.c to send an "oper magic" message. ugh.
604		*/
605		void
606	<	sendto_match_butone(struct Client *one, struct Client *from, char *mask,
607	<	int what, const char *pattern, ...)
606	>	sendto_match_butone(const struct Client *one, const struct Client *from,
607	>	const char *mask, int what, const char *pattern, ...)
608		{
609		va_list alocal, aremote;
610	<	struct Client *client_p;
611	<	dlink_node *ptr, *ptr_next;
612	<	char local_buf[IRCD_BUFSIZE], remote_buf[IRCD_BUFSIZE];
613	<	int local_len = sprintf(local_buf, ":%s!%s@%s ", from->name,
614	<	from->username, from->host);
615	<	int remote_len = sprintf(remote_buf, ":%s ", from->name);
610	>	dlink_node *node = NULL;
611	>	struct dbuf_block *local_buf, *remote_buf;
612	>
613	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
614	>
615	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
616	>	dbuf_put_fmt(remote_buf, ":%s ", from->id);
617
618		va_start(alocal, pattern);
619		va_start(aremote, pattern);
620	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
621	<	pattern, alocal);
728	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
729	<	pattern, aremote);
620	>	send_format(local_buf, pattern, alocal);
621	>	send_format(remote_buf, pattern, aremote);
622		va_end(aremote);
623		va_end(alocal);
624
625		/* scan the local clients */
626	<	DLINK_FOREACH(ptr, local_client_list.head)
626	>	DLINK_FOREACH(node, local_client_list.head)
627		{
628	<	client_p = ptr->data;
628	>	struct Client *client_p = node->data;
629
630	<	if (client_p != one && !IsDefunct(client_p) &&
630	>	if ((!one || client_p != one->from) && !IsDefunct(client_p) &&
631		match_it(client_p, mask, what))
632	<	send_message(client_p, local_buf, local_len);
632	>	send_message(client_p, local_buf);
633		}
634
635		/* Now scan servers */
636	<	DLINK_FOREACH_SAFE(ptr, ptr_next, serv_list.head)
636	>	DLINK_FOREACH(node, local_server_list.head)
637		{
638	<	client_p = ptr->data;
638	>	struct Client *client_p = node->data;
639
640		/*
641		* The old code looped through every client on the
#	Line 769 | Line 661 | sendto_match_butone(struct Client *one,
661		* server deal with it.
662		* -wnder
663		*/
664	<	if (client_p != one && !IsDefunct(client_p))
665	<	send_message_remote(client_p, from, remote_buf, remote_len);
664	>	if ((!one || client_p != one->from) && !IsDefunct(client_p))
665	>	send_message_remote(client_p, from, remote_buf);
666		}
667	+
668	+	dbuf_ref_free(local_buf);
669	+	dbuf_ref_free(remote_buf);
670		}
671
672		/* sendto_match_servs()
#	Line 784 | Line 679 | sendto_match_butone(struct Client *one,
679		* side effects - data sent to servers matching with capab
680		*/
681		void
682	<	sendto_match_servs(struct Client *source_p, const char *mask, int cap,
682	>	sendto_match_servs(const struct Client *source_p, const char *mask, unsigned int cap,
683		const char *pattern, ...)
684		{
685		va_list args;
686	<	struct Client *target_p;
687	<	dlink_node *ptr;
793	<	char buffer[IRCD_BUFSIZE];
794	<	int found = 0;
686	>	dlink_node *node = NULL;
687	>	struct dbuf_block *buffer = dbuf_alloc();
688
689	+	dbuf_put_fmt(buffer, ":%s ", source_p->id);
690		va_start(args, pattern);
691	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
691	>	send_format(buffer, pattern, args);
692		va_end(args);
693
694		++current_serial;
695
696	<	DLINK_FOREACH(ptr, global_serv_list.head)
696	>	DLINK_FOREACH(node, global_server_list.head)
697		{
698	<	target_p = ptr->data;
698	>	struct Client *target_p = node->data;
699
700		/* Do not attempt to send to ourselves, or the source */
701		if (IsMe(target_p) || target_p->from == source_p->from)
702		continue;
703
704	<	if (target_p->from->localClient->serial == current_serial)
704	>	if (target_p->from->connection->serial == current_serial)
705		continue;
706
707	<	if (!match(mask, target_p->name))
708	<	{
815	<	/*
816	<	* if we set the serial here, then we'll never do a
817	<	* match() again, if !IsCapable()
818	<	*/
819	<	target_p->from->localClient->serial = current_serial;
820	<	found++;
707	>	if (match(mask, target_p->name))
708	>	continue;
709
710	<	if (!IsCapable(target_p->from, cap))
711	<	continue;
710	>	/*
711	>	* If we set the serial here, then we'll never do a
712	>	* match() again, if !IsCapable()
713	>	*/
714	>	target_p->from->connection->serial = current_serial;
715
716	<	sendto_anywhere(target_p, source_p, "%s", buffer);
717	<	}
716	>	if (cap && IsCapable(target_p->from, cap) != cap)
717	>	continue;
718	>
719	>	send_message_remote(target_p->from, source_p, buffer);
720		}
721	+
722	+	dbuf_ref_free(buffer);
723		}
724
725		/* sendto_anywhere()
#	Line 837 | Line 732 | sendto_match_servs(struct Client *source
732		*                but useful when one does not know where target "lives"
733		*/
734		void
735	<	sendto_anywhere(struct Client *to, struct Client *from,
735	>	sendto_anywhere(struct Client *to, const struct Client *from,
736	>	const char *command,
737		const char *pattern, ...)
738		{
739		va_list args;
740	<	char buffer[IRCD_BUFSIZE];
845	<	int len;
846	<	struct Client *send_to = (to->from != NULL ? to->from : to);
740	>	struct dbuf_block *buffer = NULL;
741
742	<	if (IsDead(send_to))
742	>	if (IsDead(to->from))
743		return;
744
745	<	if (MyClient(to))
746	<	{
747	<	if (IsServer(from))
748	<	{
749	<	if (IsCapable(to, CAP_TS6) && HasID(from))
750	<	len = sprintf(buffer, ":%s ", from->id);
751	<	else
752	<	len = sprintf(buffer, ":%s ", from->name);
859	<	}
860	<	else
861	<	len = sprintf(buffer, ":%s!%s@%s ",
862	<	from->name, from->username, from->host);
863	<	}
864	<	else len = sprintf(buffer, ":%s ", ID_or_name(from, send_to));
745	>	buffer = dbuf_alloc();
746	>
747	>	if (MyClient(to) && IsClient(from))
748	>	dbuf_put_fmt(buffer, ":%s!%s@%s %s %s ", from->name, from->username,
749	>	from->host, command, to->name);
750	>	else
751	>	dbuf_put_fmt(buffer, ":%s %s %s ", ID_or_name(from, to),
752	>	command, ID_or_name(to, to));
753
754		va_start(args, pattern);
755	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
755	>	send_format(buffer, pattern, args);
756		va_end(args);
757
758	<	if(MyClient(to))
759	<	send_message(send_to, buffer, len);
758	>	if (MyConnect(to))
759	>	send_message(to, buffer);
760		else
761	<	send_message_remote(send_to, from, buffer, len);
761	>	send_message_remote(to->from, from, buffer);
762	>
763	>	dbuf_ref_free(buffer);
764		}
765
766		/* sendto_realops_flags()
#	Line 885 | Line 775 | void
775		sendto_realops_flags(unsigned int flags, int level, int type, const char *pattern, ...)
776		{
777		const char *ntype = NULL;
778	<	dlink_node *ptr = NULL;
779	<	char nbuf[IRCD_BUFSIZE];
778	>	dlink_node *node = NULL;
779	>	char nbuf[IRCD_BUFSIZE] = "";
780		va_list args;
781
782		va_start(args, pattern);
#	Line 908 | Line 798 | sendto_realops_flags(unsigned int flags,
798		assert(0);
799		}
800
801	<	DLINK_FOREACH(ptr, oper_list.head)
801	>	DLINK_FOREACH(node, oper_list.head)
802		{
803	<	struct Client *client_p = ptr->data;
803	>	struct Client *client_p = node->data;
804		assert(HasUMode(client_p, UMODE_OPER));
805
806		/*
#	Line 918 | Line 808 | sendto_realops_flags(unsigned int flags,
808		* If we're sending it to admins, and they're not, skip.
809		*/
810		if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
811	<	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
811	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
812		continue;
813
814		if (HasUMode(client_p, flags))
#	Line 927 | Line 817 | sendto_realops_flags(unsigned int flags,
817		}
818		}
819
930	–	/* sendto_wallops_flags()
931	–	*
932	–	* inputs       - flag types of messages to show to real opers
933	–	*              - client sending request
934	–	*              - var args input message
935	–	* output       - NONE
936	–	* side effects - Send a wallops to local opers
937	–	*/
938	–	void
939	–	sendto_wallops_flags(unsigned int flags, struct Client *source_p,
940	–	const char *pattern, ...)
941	–	{
942	–	dlink_node *ptr = NULL;
943	–	va_list args;
944	–	char buffer[IRCD_BUFSIZE];
945	–	int len;
946	–
947	–	if (IsClient(source_p))
948	–	len = sprintf(buffer, ":%s!%s@%s WALLOPS :",
949	–	source_p->name, source_p->username, source_p->host);
950	–	else
951	–	len = sprintf(buffer, ":%s WALLOPS :", source_p->name);
952	–
953	–	va_start(args, pattern);
954	–	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
955	–	va_end(args);
956	–
957	–	DLINK_FOREACH(ptr, oper_list.head)
958	–	{
959	–	struct Client *client_p = ptr->data;
960	–	assert(client_p->umodes & UMODE_OPER);
961	–
962	–	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
963	–	send_message(client_p, buffer, len);
964	–	}
965	–	}
966	–
820		/* ts_warn()
821		*
822	<	* inputs       - var args message
823	<	* output       - NONE
824	<	* side effects - Call sendto_realops_flags, with some flood checking
825	<	*                (at most 5 warnings every 5 seconds)
822	>	* inputs       - var args message
823	>	* output       - NONE
824	>	* side effects - Call sendto_realops_flags, with some flood checking
825	>	*                (at most 5 warnings every 5 seconds)
826		*/
827		void
828	<	ts_warn(const char *pattern, ...)
828	>	sendto_realops_flags_ratelimited(uintmax_t *rate, const char *pattern, ...)
829		{
830		va_list args;
831	<	char buffer[IRCD_BUFSIZE];
979	<	static time_t last = 0;
980	<	static int warnings = 0;
831	>	char buffer[IRCD_BUFSIZE] = "";
832
833	<	/*
834	<	** if we're running with TS_WARNINGS enabled and someone does
984	<	** something silly like (remotely) connecting a nonTS server,
985	<	** we'll get a ton of warnings, so we make sure we don't send
986	<	** more than 5 every 5 seconds.  -orabidoo
987	<	*/
833	>	if ((CurrentTime - *rate) < 20)
834	>	return;
835
836	<	if (CurrentTime - last < 5)
990	<	{
991	<	if (++warnings > 5)
992	<	return;
993	<	}
994	<	else
995	<	{
996	<	last = CurrentTime;
997	<	warnings = 0;
998	<	}
836	>	*rate = CurrentTime;
837
838		va_start(args, pattern);
839		vsnprintf(buffer, sizeof(buffer), pattern, args);
840		va_end(args);
841
842	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
842	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%s", buffer);
843		ilog(LOG_TYPE_IRCD, "%s", buffer);
844		}
845
846	<	/* kill_client()
1009	<	*
1010	<	* inputs       - client to send kill towards
1011	<	*              - pointer to client to kill
1012	<	*              - reason for kill
1013	<	* output       - NONE
1014	<	* side effects - NONE
1015	<	*/
1016	<	void
1017	<	kill_client(struct Client *client_p, struct Client *diedie,
1018	<	const char *pattern, ...)
1019	<	{
1020	<	va_list args;
1021	<	char buffer[IRCD_BUFSIZE];
1022	<	int len;
1023	<
1024	<	if (client_p->from != NULL)
1025	<	client_p = client_p->from;
1026	<	if (IsDead(client_p))
1027	<	return;
1028	<
1029	<	len = sprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1030	<	ID_or_name(diedie, client_p));
1031	<
1032	<	va_start(args, pattern);
1033	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
1034	<	va_end(args);
1035	<
1036	<	send_message(client_p, buffer, len);
1037	<	}
1038	<
1039	<	/* kill_client_ll_serv_butone()
846	>	/* sendto_wallops_flags()
847		*
848	<	* inputs       - pointer to client to not send to
849	<	*              - pointer to client to kill
850	<	* output       - NONE
851	<	* side effects - Send a KILL for the given client
852	<	*                message to all connected servers
1046	<	*                except the client 'one'. Also deal with
1047	<	*                client being unknown to leaf, as in lazylink...
848	>	* inputs       - flag types of messages to show to real opers
849	>	*              - client sending request
850	>	*              - var args input message
851	>	* output       - NONE
852	>	* side effects - Send a wallops to local opers
853		*/
854		void
855	<	kill_client_ll_serv_butone(struct Client *one, struct Client *source_p,
856	<	const char *pattern, ...)
855	>	sendto_wallops_flags(unsigned int flags, const struct Client *source_p,
856	>	const char *pattern, ...)
857		{
858	+	dlink_node *node = NULL;
859		va_list args;
860	<	int have_uid = 0;
1055	<	dlink_node *ptr = NULL;
1056	<	char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1057	<	int len_uid = 0, len_nick = 0;
860	>	struct dbuf_block *buffer = dbuf_alloc();
861
862	<	if (HasID(source_p))
863	<	{
864	<	have_uid = 1;
865	<	va_start(args, pattern);
1063	<	len_uid = sprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1064	<	len_uid += send_format(&buf_uid[len_uid], IRCD_BUFSIZE - len_uid, pattern,
1065	<	args);
1066	<	va_end(args);
1067	<	}
862	>	if (IsClient(source_p))
863	>	dbuf_put_fmt(buffer, ":%s!%s@%s WALLOPS :", source_p->name, source_p->username, source_p->host);
864	>	else
865	>	dbuf_put_fmt(buffer, ":%s WALLOPS :", source_p->name);
866
867		va_start(args, pattern);
868	<	len_nick = sprintf(buf_nick, ":%s KILL %s :", me.name, source_p->name);
1071	<	len_nick += send_format(&buf_nick[len_nick], IRCD_BUFSIZE - len_nick, pattern,
1072	<	args);
868	>	send_format(buffer, pattern, args);
869		va_end(args);
870
871	<	DLINK_FOREACH(ptr, serv_list.head)
871	>	DLINK_FOREACH(node, oper_list.head)
872		{
873	<	struct Client *client_p = ptr->data;
874	<
1079	<	if (one != NULL && (client_p == one->from))
1080	<	continue;
1081	<	if (IsDefunct(client_p))
1082	<	continue;
873	>	struct Client *client_p = node->data;
874	>	assert(client_p->umodes & UMODE_OPER);
875
876	<	if (have_uid && IsCapable(client_p, CAP_TS6))
877	<	send_message(client_p, buf_uid, len_uid);
1086	<	else
1087	<	send_message(client_p, buf_nick, len_nick);
876	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
877	>	send_message(client_p, buffer);
878		}
879	<	}
879	>
880	>	dbuf_ref_free(buffer);
881	>	}

Diff Legend

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