ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/send.c (file contents), Revision 939 by db, Sat May 2 01:41:47 2009 UTC vs.
ircd-hybrid/trunk/src/send.c (file contents), Revision 6313 by michael, Sat Aug 1 18:03:39 2015 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-2015 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"
28	<	#include "tools.h"
28	>	#include "list.h"
29		#include "send.h"
30		#include "channel.h"
31		#include "client.h"
30	–	#include "common.h"
32		#include "dbuf.h"
33		#include "irc_string.h"
34		#include "ircd.h"
34	–	#include "handlers.h"
35	–	#include "numeric.h"
36	–	#include "fdlist.h"
35		#include "s_bsd.h"
36	<	#include "s_serv.h"
37	<	#include "sprintf_irc.h"
38	<	#include "s_conf.h"
41	<	#include "list.h"
42	<	#include "s_log.h"
43	<	#include "memory.h"
44	<	#include "hook.h"
45	<	#include "irc_getnameinfo.h"
46	<	#include "packet.h"
36	>	#include "server.h"
37	>	#include "conf_class.h"
38	>	#include "log.h"
39
48	–	#define LOG_BUFSIZE 2048
40
41	<	struct Callback *iosend_cb = NULL;
51	<	struct Callback *iosendctrl_cb = NULL;
41	>	static uint64_t current_serial;
42
53	–	static void send_message(struct Client *, char *, int);
54	–	static void send_message_remote(struct Client *, struct Client *, char *, int);
55	–
56	–	static unsigned long current_serial = 0L;
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		{
70	–	int len;
71	–
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);
85	<	if (len > bufsize - 2)
86	<	len = bufsize - 2;  /* required by some versions of vsnprintf */
87	<
88	<	lsendbuf[len++] = '\r';
89	<	lsendbuf[len++] = '\n';
90	<	return (len);
91	<	}
68	>	dbuf_put_args(buffer, pattern, args);
69
70	<	/*
71	<	* iosend_default - append a packet to the client's sendq.
95	<	*/
96	<	void *
97	<	iosend_default(va_list args)
98	<	{
99	<	struct Client *to = va_arg(args, struct Client *);
100	<	int length = va_arg(args, int);
101	<	char *buf = va_arg(args, char *);
70	>	if (buffer->size > IRCD_BUFSIZE - 2)
71	>	buffer->size = IRCD_BUFSIZE - 2;
72
73	<	dbuf_put(&to->localClient->buf_sendq, buf, length);
74	<	return NULL;
73	>	buffer->data[buffer->size++] = '\r';
74	>	buffer->data[buffer->size++] = '\n';
75		}
76
77		/*
#	Line 110 | Line 80 | iosend_default(va_list args)
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))
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,
93	<	"Max SendQ limit exceeded for %s: %lu > %lu",
92	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
93	>	"Max SendQ limit exceeded for %s: %lu > %u",
94		get_client_name(to, HIDE_IP),
95	<	(unsigned long)(dbuf_length(&to->localClient->buf_sendq) + len),
96	<	get_sendq(to));
95	>	(unsigned long)(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	<	execute_callback(iosend_cb, to, len, buf);
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) >
143	<	(IsServer(to) ? (unsigned int) 1024 : (unsigned int) 4096))
144	<	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
152	<	*              - 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,
160	<	char *buf, int len)
129	>	send_message_remote(struct Client *to, struct Client *from, struct dbuf_block *buf)
130		{
131	<	if (!MyConnect(to))
132	<	{
133	<	sendto_realops_flags(UMODE_ALL, L_ALL,
134	<	"server send message to %s [%s] dropped from %s(Not local server)",
166	<	to->name, to->from->name, from->name);
167	<	return;
168	<	}
169	<
170	<	/* Optimize by checking if (from && to) before everything */
171	<	/* 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,
178	<	"Send message to %s [%s] dropped from %s(Fake Dir)",
179	<	to->name, to->from->name, from->name);
180	<	return;
181	<	}
182	<
183	<	sendto_realops_flags(UMODE_ALL, L_ALL,
184	<	"Ghosted: %s[%s@%s] from %s[%s@%s] (%s)",
185	<	to->name, to->username, to->host,
186	<	from->name, from->username, from->host,
187	<	to->from->name);
188	<
189	<	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
190	<	":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
191	<	me.id, to->name, me.name, to->name,
192	<	to->username, to->host, to->from->name);
193	<	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
194	<	":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
195	<	me.name, to->name, me.name, to->name,
196	<	to->username, to->host, to->from->name);
197	<
198	<	SetKilled(to);
199	<
200	<	if (IsClient(from))
201	<	sendto_one(from, form_str(ERR_GHOSTEDCLIENT),
202	<	me.name, from->name, to->name, to->username,
203	<	to->host, to->from);
204	<
205	<	exit_client(to, &me, "Ghosted client");
206	<
138	>	sendto_realops_flags(UMODE_ALL, 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 215 | 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)
225	<	{
226	<	fd->flags.pending_read = 0;
227	<	read_packet(fd, client_p);
228	<	}
229	<	#endif
230	<	}
231	<
232	<	/*
233	<	** slinkq_unblocked
234	<	**      Called when a server control socket is ready for writing.
235	<	*/
236	<	static void
237	<	slinkq_unblocked(fde_t *fd, struct Client *client_p)
238	<	{
239	<	ClearSlinkqBlocked(client_p);
240	<	send_queued_slink_write(client_p);
157	>	DelFlag(client_p, FLAGS_BLOCKED);
158	>	send_queued_write(client_p);
159		}
160
161		/*
#	Line 249 | Line 167 | slinkq_unblocked(fde_t *fd, struct Clien
167		void
168		send_queued_write(struct Client *to)
169		{
170	<	int retlen;
253	<	struct dbuf_block *first;
170	>	int retlen = 0;
171
172		/*
173		** Once socket is marked dead, we cannot start writing to it,
174		** even if the error is removed...
175		*/
176	<	if (IsDead(to) || IsSendqBlocked(to))
176	>	if (IsDead(to) || HasFlag(to, FLAGS_BLOCKED))
177		return;  /* no use calling send() now */
178
179		/* Next, lets try to write some data */
180	<
264	<	if (dbuf_length(&to->localClient->buf_sendq))
180	>	if (dbuf_length(&to->connection->buf_sendq))
181		{
182	<	do {
183	<	first = to->localClient->buf_sendq.blocks.head->data;
182	>	do
183	>	{
184	>	struct dbuf_block *first = to->connection->buf_sendq.blocks.head->data;
185
186		#ifdef HAVE_LIBCRYPTO
187	<	if (to->localClient->fd.ssl)
187	>	if (to->connection->fd.ssl)
188		{
189	<	retlen = SSL_write(to->localClient->fd.ssl, first->data, first->size);
189	>	retlen = SSL_write(to->connection->fd.ssl, first->data + to->connection->buf_sendq.pos, first->size - to->connection->buf_sendq.pos);
190
191		/* translate openssl error codes, sigh */
192	<	if (retlen < 0)
193	<	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
194	<	{
192	>	if (retlen < 0)
193	>	{
194	>	switch (SSL_get_error(to->connection->fd.ssl, retlen))
195	>	{
196		case SSL_ERROR_WANT_READ:
197	<	return;  /* retry later, don't register for write events */
198	<
199	<	case SSL_ERROR_WANT_WRITE:
282	<	errno = EWOULDBLOCK;
197	>	return;  /* retry later, don't register for write events */
198	>	case SSL_ERROR_WANT_WRITE:
199	>	errno = EWOULDBLOCK;
200		case SSL_ERROR_SYSCALL:
201	<	break;
201	>	break;
202		case SSL_ERROR_SSL:
203		if (errno == EAGAIN)
204		break;
205		default:
206	<	retlen = errno = 0;  /* either an SSL-specific error or EOF */
207	<	}
206	>	retlen = errno = 0;  /* either an SSL-specific error or EOF */
207	>	}
208	>	}
209		}
210		else
211		#endif
212	<	retlen = send(to->localClient->fd.fd, first->data, first->size, 0);
212	>	retlen = send(to->connection->fd.fd, first->data + to->connection->buf_sendq.pos, first->size - to->connection->buf_sendq.pos, 0);
213
214		if (retlen <= 0)
297	–	{
298	–	#ifdef _WIN32
299	–	errno = WSAGetLastError();
300	–	#endif
215		break;
302	–	}
216
217	<	dbuf_delete(&to->localClient->buf_sendq, retlen);
217	>	dbuf_delete(&to->connection->buf_sendq, retlen);
218
219		/* We have some data written .. update counters */
220	<	to->localClient->send.bytes += retlen;
221	<	me.localClient->send.bytes += retlen;
222	<	} while (dbuf_length(&to->localClient->buf_sendq));
220	>	to->connection->send.bytes += retlen;
221	>	me.connection->send.bytes += retlen;
222	>	} while (dbuf_length(&to->connection->buf_sendq));
223
224	<	if ((retlen < 0) && (ignoreErrno(errno)))
224	>	if (retlen < 0 && ignoreErrno(errno))
225		{
226	+	AddFlag(to, FLAGS_BLOCKED);
227	+
228		/* we have a non-fatal error, reschedule a write */
229	<	SetSendqBlocked(to);
230	<	comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE,
316	<	(PF *)sendq_unblocked, (void *)to, 0);
229	>	comm_setselect(&to->connection->fd, COMM_SELECT_WRITE,
230	>	sendq_unblocked, to, 0);
231		}
232		else if (retlen <= 0)
233		{
#	Line 323 | Line 237 | send_queued_write(struct Client *to)
237		}
238		}
239
326	–	/*
327	–	** send_queued_slink_write
328	–	**      This is called when there is a chance the some output would
329	–	**      be possible. This attempts to empty the send queue as far as
330	–	**      possible, and then if any data is left, a write is rescheduled.
331	–	*/
332	–	void
333	–	send_queued_slink_write(struct Client *to)
334	–	{
335	–	int retlen;
336	–
337	–	/*
338	–	** Once socket is marked dead, we cannot start writing to it,
339	–	** even if the error is removed...
340	–	*/
341	–	if (IsDead(to) || IsSlinkqBlocked(to))
342	–	return;  /* no use calling send() now */
343	–
344	–	/* Next, lets try to write some data */
345	–	if (to->localClient->slinkq != NULL)
346	–	{
347	–	retlen = send(to->localClient->ctrlfd.fd,
348	–	to->localClient->slinkq + to->localClient->slinkq_ofs,
349	–	to->localClient->slinkq_len, 0);
350	–	if (retlen < 0)
351	–	{
352	–	/* If we have a fatal error */
353	–	if (!ignoreErrno(errno))
354	–	{
355	–	dead_link_on_write(to, errno);
356	–	return;
357	–	}
358	–	}
359	–	else if (retlen == 0)
360	–	{
361	–	/* 0 bytes is an EOF .. */
362	–	dead_link_on_write(to, 0);
363	–	return;
364	–	}
365	–	else
366	–	{
367	–	execute_callback(iosendctrl_cb, to, retlen,
368	–	to->localClient->slinkq + to->localClient->slinkq_ofs);
369	–	to->localClient->slinkq_len -= retlen;
370	–
371	–	assert(to->localClient->slinkq_len >= 0);
372	–	if (to->localClient->slinkq_len)
373	–	to->localClient->slinkq_ofs += retlen;
374	–	else
375	–	{
376	–	to->localClient->slinkq_ofs = 0;
377	–	MyFree(to->localClient->slinkq);
378	–	to->localClient->slinkq = NULL;
379	–	}
380	–	}
381	–
382	–	/* Finally, if we have any more data, reschedule a write */
383	–	if (to->localClient->slinkq_len)
384	–	{
385	–	SetSlinkqBlocked(to);
386	–	comm_setselect(&to->localClient->ctrlfd, COMM_SELECT_WRITE,
387	–	(PF *)slinkq_unblocked, (void *)to, 0);
388	–	}
389	–	}
390	–	}
391	–
240		/* send_queued_all()
241		*
242		* input        - NONE
#	Line 398 | Line 246 | send_queued_slink_write(struct Client *t
246		void
247		send_queued_all(void)
248		{
249	<	dlink_node *ptr;
249	>	dlink_node *node = NULL;
250
251		/* Servers are processed first, mainly because this can generate
252		* a notice to opers, which is to be delivered by this function.
253		*/
254	<	DLINK_FOREACH(ptr, serv_list.head)
255	<	send_queued_write((struct Client *) ptr->data);
254	>	DLINK_FOREACH(node, local_server_list.head)
255	>	send_queued_write(node->data);
256
257	<	DLINK_FOREACH(ptr, unknown_list.head)
258	<	send_queued_write((struct Client *) ptr->data);
257	>	DLINK_FOREACH(node, unknown_list.head)
258	>	send_queued_write(node->data);
259
260	<	DLINK_FOREACH(ptr, local_client_list.head)
261	<	send_queued_write((struct Client *) ptr->data);
260	>	DLINK_FOREACH(node, local_client_list.head)
261	>	send_queued_write(node->data);
262
263		/* NOTE: This can still put clients on aborted_list; unfortunately,
264		* exit_aborted_clients takes precedence over send_queued_all,
#	Line 431 | Line 279 | void
279		sendto_one(struct Client *to, const char *pattern, ...)
280		{
281		va_list args;
282	<	char buffer[IRCD_BUFSIZE];
283	<	int len;
282	>	struct dbuf_block *buffer = NULL;
283	>
284	>	if (IsDead(to->from))
285	>	return;  /* This socket has already been marked as dead */
286
287	<	if (to->from != NULL)
438	<	to = to->from;
439	<	if (IsDead(to))
440	<	return; /* This socket has already been marked as dead */
287	>	buffer = dbuf_alloc();
288
289		va_start(args, pattern);
290	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
290	>	send_format(buffer, pattern, args);
291		va_end(args);
292
293	<	send_message(to, buffer, len);
293	>	send_message(to->from, buffer);
294	>
295	>	dbuf_ref_free(buffer);
296	>	}
297	>
298	>	void
299	>	sendto_one_numeric(struct Client *to, struct Client *from, enum irc_numerics numeric, ...)
300	>	{
301	>	struct dbuf_block *buffer = NULL;
302	>	const char *dest = NULL, *numstr = NULL;
303	>	va_list args;
304	>
305	>	if (IsDead(to->from))
306	>	return;
307	>
308	>	dest = ID_or_name(to, to);
309	>
310	>	if (EmptyString(dest))
311	>	dest = "*";
312	>
313	>	buffer = dbuf_alloc();
314	>
315	>	dbuf_put_fmt(buffer, ":%s %03d %s ", ID_or_name(from, to), numeric & ~SND_EXPLICIT, dest);
316	>
317	>	va_start(args, numeric);
318	>
319	>	if (numeric & SND_EXPLICIT)
320	>	numstr = va_arg(args, const char *);
321	>	else
322	>	numstr = numeric_form(numeric);
323	>
324	>	send_format(buffer, numstr, args);
325	>	va_end(args);
326	>
327	>	send_message(to->from, buffer);
328	>
329	>	dbuf_ref_free(buffer);
330	>	}
331	>
332	>	void
333	>	sendto_one_notice(struct Client *to, struct Client *from, const char *pattern, ...)
334	>	{
335	>	struct dbuf_block *buffer = NULL;
336	>	const char *dest = NULL;
337	>	va_list args;
338	>
339	>	if (IsDead(to->from))
340	>	return;
341	>
342	>	dest = ID_or_name(to, to);
343	>
344	>	if (EmptyString(dest))
345	>	dest = "*";
346	>
347	>	buffer = dbuf_alloc();
348	>
349	>	dbuf_put_fmt(buffer, ":%s NOTICE %s ", ID_or_name(from, to), dest);
350	>
351	>	va_start(args, pattern);
352	>	send_format(buffer, pattern, args);
353	>	va_end(args);
354	>
355	>	send_message(to->from, buffer);
356	>
357	>	dbuf_ref_free(buffer);
358		}
359
360		/* sendto_channel_butone()
#	Line 459 | Line 370 | sendto_one(struct Client *to, const char
370		*/
371		void
372		sendto_channel_butone(struct Client *one, struct Client *from,
373	<	struct Channel *chptr, const char *command,
373	>	struct Channel *chptr, unsigned int type,
374		const char *pattern, ...)
375		{
376	<	va_list alocal, aremote, auid;
377	<	char local_buf[IRCD_BUFSIZE];
378	<	char remote_buf[IRCD_BUFSIZE];
468	<	char uid_buf[IRCD_BUFSIZE];
469	<	int local_len, remote_len, uid_len;
470	<	dlink_node *ptr;
471	<	dlink_node *ptr_next;
472	<	struct Client *target_p;
376	>	va_list alocal, aremote;
377	>	struct dbuf_block *local_buf, *remote_buf;
378	>	dlink_node *node = NULL;
379
380	<	if (IsServer(from))
381	<	local_len = ircsprintf(local_buf, ":%s %s %s ",
382	<	from->name, command, chptr->chname);
380	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
381	>
382	>	if (IsClient(from))
383	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
384		else
385	<	local_len = ircsprintf(local_buf, ":%s!%s@%s %s %s ",
386	<	from->name, from->username, from->host,
387	<	command, chptr->chname);
481	<	remote_len = ircsprintf(remote_buf, ":%s %s %s ",
482	<	from->name, command, chptr->chname);
483	<	uid_len = ircsprintf(uid_buf, ":%s %s %s ",
484	<	ID(from), command, chptr->chname);
385	>	dbuf_put_fmt(local_buf, ":%s ", from->name);
386	>
387	>	dbuf_put_fmt(remote_buf, ":%s ", from->id);
388
389		va_start(alocal, pattern);
390		va_start(aremote, pattern);
391	<	va_start(auid, pattern);
392	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
393	<	pattern, alocal);
491	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
492	<	pattern, aremote);
493	<	uid_len += send_format(&uid_buf[uid_len], IRCD_BUFSIZE - uid_len, pattern,
494	<	auid);
495	<	va_end(auid);
391	>	send_format(local_buf, pattern, alocal);
392	>	send_format(remote_buf, pattern, aremote);
393	>
394		va_end(aremote);
395		va_end(alocal);
396
397		++current_serial;
398
399	<	DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
399	>	DLINK_FOREACH(node, chptr->members.head)
400		{
401	<	target_p = ((struct Membership *)ptr->data)->client_p;
402	<	assert(target_p != NULL);
401	>	struct Membership *member = node->data;
402	>	struct Client *target_p = member->client_p;
403	>
404	>	assert(IsClient(target_p));
405
406	<	if (IsDefunct(target_p) || IsDeaf(target_p) || target_p->from == one)
406	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) ||
407	>	(one && target_p->from == one->from))
408		continue;
409
410	<	if (MyClient(target_p))
411	<	{
412	<	if (target_p->serial != current_serial)
413	<	{
414	<	send_message(target_p, local_buf, local_len);
415	<	target_p->serial = current_serial;
416	<	}
417	<	}
418	<	else
518	<	{
519	<	/* Now check whether a message has been sent to this
520	<	* remote link already
521	<	*/
522	<	if (target_p->from->serial != current_serial)
523	<	{
524	<	if (IsCapable(target_p->from, CAP_TS6))
525	<	send_message_remote(target_p->from, from, uid_buf, uid_len);
526	<	else
527	<	send_message_remote(target_p->from, from, remote_buf, remote_len);
528	<	target_p->from->serial = current_serial;
529	<	}
530	<	}
410	>	if (type && (member->flags & type) == 0)
411	>	continue;
412	>
413	>	if (MyConnect(target_p))
414	>	send_message(target_p, local_buf);
415	>	else if (target_p->from->connection->serial != current_serial)
416	>	send_message_remote(target_p->from, from, remote_buf);
417	>
418	>	target_p->from->connection->serial = current_serial;
419		}
420	+
421	+	dbuf_ref_free(local_buf);
422	+	dbuf_ref_free(remote_buf);
423		}
424
425		/* sendto_server()
426	<	*
426	>	*
427		* inputs       - pointer to client to NOT send to
428		*              - pointer to channel
429		*              - caps or'd together which must ALL be present
#	Line 543 | Line 434 | sendto_channel_butone(struct Client *one
434		* side effects - Send a message to all connected servers, except the
435		*                client 'one' (if non-NULL), as long as the servers
436		*                support ALL capabs in 'caps', and NO capabs in 'nocaps'.
437	<	*
437	>	*
438		* This function was written in an attempt to merge together the other
439		* billion sendto_*serv*() functions, which sprung up with capabs,
440		* lazylinks, uids, etc.
441		* -davidt
442		*/
443	<	void
443	>	void
444		sendto_server(struct Client *one,
445	<	struct Channel *chptr, unsigned long caps,
446	<	unsigned long nocaps,
445	>	const unsigned int caps,
446	>	const unsigned int nocaps,
447		const char *format, ...)
448		{
449		va_list args;
450	<	dlink_node *ptr = NULL;
451	<	char buffer[IRCD_BUFSIZE];
561	<	int len = 0;
562	<
563	<	if (chptr && chptr->chname[0] != '#')
564	<	return;
450	>	dlink_node *node = NULL;
451	>	struct dbuf_block *buffer = dbuf_alloc();
452
453		va_start(args, format);
454	<	len = send_format(buffer, IRCD_BUFSIZE, format, args);
454	>	send_format(buffer, format, args);
455		va_end(args);
456
457	<	DLINK_FOREACH(ptr, serv_list.head)
457	>	DLINK_FOREACH(node, local_server_list.head)
458		{
459	<	struct Client *client_p = ptr->data;
459	>	struct Client *client_p = node->data;
460
461		/* If dead already skip */
462		if (IsDead(client_p))
463		continue;
464	+
465		/* check against 'one' */
466	<	if (one != NULL && (client_p == one->from))
466	>	if (one && (client_p == one->from))
467		continue;
468	+
469		/* check we have required capabs */
470	<	if ((client_p->localClient->caps & caps) != caps)
470	>	if ((client_p->connection->caps & caps) != caps)
471		continue;
472	+
473		/* check we don't have any forbidden capabs */
474	<	if ((client_p->localClient->caps & nocaps) != 0)
474	>	if ((client_p->connection->caps & nocaps))
475		continue;
476
477	<	send_message(client_p, buffer, len);
477	>	send_message(client_p, buffer);
478		}
479	+
480	+	dbuf_ref_free(buffer);
481		}
482
483		/* sendto_common_channels_local()
#	Line 594 | Line 486 | sendto_server(struct Client *one,
486		*              - pattern to send
487		* output       - NONE
488		* side effects - Sends a message to all people on local server who are
489	<	*                in same channel with user.
489	>	*                in same channel with user.
490		*                used by m_nick.c and exit_one_client.
491		*/
492		void
493	<	sendto_common_channels_local(struct Client *user, int touser,
493	>	sendto_common_channels_local(struct Client *user, int touser, unsigned int cap,
494		const char *pattern, ...)
495		{
496		va_list args;
497		dlink_node *uptr;
498		dlink_node *cptr;
499		struct Channel *chptr;
500	<	struct Membership *ms;
500	>	struct Membership *member;
501		struct Client *target_p;
502	<	char buffer[IRCD_BUFSIZE];
611	<	int len;
502	>	struct dbuf_block *buffer = dbuf_alloc();
503
504		va_start(args, pattern);
505	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
505	>	send_format(buffer, pattern, args);
506		va_end(args);
507
508		++current_serial;
509
510		DLINK_FOREACH(cptr, user->channel.head)
511		{
512	<	chptr = ((struct Membership *) cptr->data)->chptr;
622	<	assert(chptr != NULL);
512	>	chptr = ((struct Membership *)cptr->data)->chptr;
513
514	<	DLINK_FOREACH(uptr, chptr->members.head)
514	>	DLINK_FOREACH(uptr, chptr->locmembers.head)
515		{
516	<	ms = uptr->data;
517	<	target_p = ms->client_p;
518	<	assert(target_p != NULL);
516	>	member = uptr->data;
517	>	target_p = member->client_p;
518	>
519	>	if (target_p == user || IsDefunct(target_p) ||
520	>	target_p->connection->serial == current_serial)
521	>	continue;
522
523	<	if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
631	<	target_p->serial == current_serial)
523	>	if (HasCap(target_p, cap) != cap)
524		continue;
525
526	<	target_p->serial = current_serial;
527	<	send_message(target_p, buffer, len);
526	>	target_p->connection->serial = current_serial;
527	>	send_message(target_p, buffer);
528		}
529		}
530
531		if (touser && MyConnect(user) && !IsDead(user) &&
532	<	user->serial != current_serial)
533	<	send_message(user, buffer, len);
532	>	user->connection->serial != current_serial)
533	>	if (HasCap(user, cap) == cap)
534	>	send_message(user, buffer);
535	>
536	>	dbuf_ref_free(buffer);
537		}
538
539		/* sendto_channel_local()
540		*
541		* inputs       - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
647	–	*              - whether to ignore +D clients (YES/NO)
542		*              - pointer to channel to send to
543		*              - var args pattern
544		* output       - NONE
#	Line 652 | Line 546 | sendto_common_channels_local(struct Clie
546		*                locally connected to this server.
547		*/
548		void
549	<	sendto_channel_local(int type, int nodeaf, struct Channel *chptr,
549	>	sendto_channel_local(unsigned int type, struct Channel *chptr,
550		const char *pattern, ...)
551		{
552		va_list args;
553	<	char buffer[IRCD_BUFSIZE];
554	<	int len;
661	<	dlink_node *ptr;
662	<	struct Membership *ms;
663	<	struct Client *target_p;
553	>	dlink_node *node = NULL;
554	>	struct dbuf_block *buffer = dbuf_alloc();
555
556		va_start(args, pattern);
557	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
557	>	send_format(buffer, pattern, args);
558		va_end(args);
559
560	<	DLINK_FOREACH(ptr, chptr->members.head)
560	>	DLINK_FOREACH(node, chptr->locmembers.head)
561		{
562	<	ms = ptr->data;
563	<	target_p = ms->client_p;
562	>	struct Membership *member = node->data;
563	>	struct Client *target_p = member->client_p;
564
565	<	if (type != 0 && (ms->flags & type) == 0)
565	>	if (type && (member->flags & type) == 0)
566		continue;
567
568	<	if (!MyConnect(target_p) || IsDefunct(target_p) ||
678	<	(nodeaf && IsDeaf(target_p)))
568	>	if (IsDefunct(target_p))
569		continue;
570
571	<	send_message(target_p, buffer, len);
571	>	send_message(target_p, buffer);
572		}
573	+
574	+	dbuf_ref_free(buffer);
575		}
576
577		/* sendto_channel_local_butone()
#	Line 694 | Line 586 | sendto_channel_local(int type, int nodea
586		*
587		* WARNING - +D clients are omitted
588		*/
697	–	void
698	–	sendto_channel_local_butone(struct Client *one, int type,
699	–	struct Channel *chptr, const char *pattern, ...)
700	–	{
701	–	va_list args;
702	–	char buffer[IRCD_BUFSIZE];
703	–	int len;
704	–	struct Client *target_p;
705	–	struct Membership *ms;
706	–	dlink_node *ptr;
707	–
708	–	va_start(args, pattern);
709	–	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
710	–	va_end(args);
711	–
712	–	DLINK_FOREACH(ptr, chptr->members.head)
713	–	{
714	–	ms = ptr->data;
715	–	target_p = ms->client_p;
716	–
717	–	if (type != 0 && (ms->flags & type) == 0)
718	–	continue;
719	–
720	–	if (!MyConnect(target_p) || target_p == one ||
721	–	IsDefunct(target_p) || IsDeaf(target_p))
722	–	continue;
723	–	send_message(target_p, buffer, len);
724	–	}
725	–	}
726	–
727	–
728	–	/* sendto_channel_remote()
729	–	*
730	–	* inputs       - Client not to send towards
731	–	*              - Client from whom message is from
732	–	*              - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
733	–	*              - pointer to channel to send to
734	–	*              - var args pattern
735	–	* output       - NONE
736	–	* side effects - Send a message to all members of a channel that are
737	–	*                remote to this server.
738	–	*/
589		void
590	<	sendto_channel_remote(struct Client *one, struct Client *from, int type, int caps,
591	<	int nocaps, struct Channel *chptr, const char *pattern, ...)
590	>	sendto_channel_local_butone(struct Client *one, unsigned int poscap, unsigned int negcap,
591	>	struct Channel *chptr, const char *pattern, ...)
592		{
593		va_list args;
594	<	char buffer[IRCD_BUFSIZE];
595	<	int len;
746	<	dlink_node *ptr;
747	<	struct Client *target_p;
748	<	struct Membership *ms;
594	>	dlink_node *node = NULL;
595	>	struct dbuf_block *buffer = dbuf_alloc();
596
597		va_start(args, pattern);
598	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
598	>	send_format(buffer, pattern, args);
599		va_end(args);
600
601	<	++current_serial;
755	<
756	<	DLINK_FOREACH(ptr, chptr->members.head)
601	>	DLINK_FOREACH(node, chptr->locmembers.head)
602		{
603	<	ms = ptr->data;
604	<	target_p = ms->client_p;
603	>	struct Membership *member = node->data;
604	>	struct Client *target_p = member->client_p;
605
606	<	if (type != 0 && (ms->flags & type) == 0)
606	>	if (one && target_p == one->from)
607		continue;
608
609	<	if (MyConnect(target_p))
609	>	if (IsDefunct(target_p))
610		continue;
766	–	target_p = target_p->from;
611
612	<	if (target_p == one->from ||
769	<	((target_p->from->localClient->caps & caps) != caps) ||
770	<	((target_p->from->localClient->caps & nocaps) != 0))
612	>	if (poscap && HasCap(target_p, poscap) != poscap)
613		continue;
614	<	if (target_p->from->serial != current_serial)
615	<	{
616	<	send_message(target_p, buffer, len);
617	<	target_p->from->serial = current_serial;
618	<	}
619	<	}
614	>
615	>	if (negcap && HasCap(target_p, negcap))
616	>	continue;
617	>
618	>	send_message(target_p, buffer);
619	>	}
620	>
621	>	dbuf_ref_free(buffer);
622		}
623
624		/*
#	Line 795 | Line 639 | sendto_channel_remote(struct Client *one
639		* side effects - NONE
640		*/
641		static int
642	<	match_it(const struct Client *one, const char *mask, int what)
642	>	match_it(const struct Client *one, const char *mask, unsigned int what)
643		{
644		if (what == MATCH_HOST)
645	<	return(match(mask, one->host));
645	>	return !match(mask, one->host);
646
647	<	return(match(mask, one->servptr->name));
647	>	return !match(mask, one->servptr->name);
648		}
649
650		/* sendto_match_butone()
#	Line 811 | Line 655 | match_it(const struct Client *one, const
655		* ugh. ONLY used by m_message.c to send an "oper magic" message. ugh.
656		*/
657		void
658	<	sendto_match_butone(struct Client *one, struct Client *from, char *mask,
658	>	sendto_match_butone(struct Client *one, struct Client *from, const char *mask,
659		int what, const char *pattern, ...)
660		{
661		va_list alocal, aremote;
662	<	struct Client *client_p;
663	<	dlink_node *ptr, *ptr_next;
664	<	char local_buf[IRCD_BUFSIZE], remote_buf[IRCD_BUFSIZE];
665	<	int local_len = ircsprintf(local_buf, ":%s!%s@%s ", from->name,
666	<	from->username, from->host);
667	<	int remote_len = ircsprintf(remote_buf, ":%s ", from->name);
662	>	dlink_node *node = NULL;
663	>	struct dbuf_block *local_buf, *remote_buf;
664	>
665	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
666	>
667	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
668	>	dbuf_put_fmt(remote_buf, ":%s ", from->id);
669
670		va_start(alocal, pattern);
671		va_start(aremote, pattern);
672	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
673	<	pattern, alocal);
829	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
830	<	pattern, aremote);
672	>	send_format(local_buf, pattern, alocal);
673	>	send_format(remote_buf, pattern, aremote);
674		va_end(aremote);
675		va_end(alocal);
676
677		/* scan the local clients */
678	<	DLINK_FOREACH(ptr, local_client_list.head)
678	>	DLINK_FOREACH(node, local_client_list.head)
679		{
680	<	client_p = ptr->data;
680	>	struct Client *client_p = node->data;
681
682	<	if (client_p != one && !IsDefunct(client_p) &&
682	>	if ((!one || client_p != one->from) && !IsDefunct(client_p) &&
683		match_it(client_p, mask, what))
684	<	send_message(client_p, local_buf, local_len);
684	>	send_message(client_p, local_buf);
685		}
686
687		/* Now scan servers */
688	<	DLINK_FOREACH_SAFE(ptr, ptr_next, serv_list.head)
688	>	DLINK_FOREACH(node, local_server_list.head)
689		{
690	<	client_p = ptr->data;
690	>	struct Client *client_p = node->data;
691
692		/*
693		* The old code looped through every client on the
#	Line 870 | Line 713 | sendto_match_butone(struct Client *one,
713		* server deal with it.
714		* -wnder
715		*/
716	<	if (client_p != one && !IsDefunct(client_p))
717	<	send_message_remote(client_p, from, remote_buf, remote_len);
716	>	if ((!one || client_p != one->from) && !IsDefunct(client_p))
717	>	send_message_remote(client_p, from, remote_buf);
718		}
719	+
720	+	dbuf_ref_free(local_buf);
721	+	dbuf_ref_free(remote_buf);
722		}
723
724		/* sendto_match_servs()
#	Line 885 | Line 731 | sendto_match_butone(struct Client *one,
731		* side effects - data sent to servers matching with capab
732		*/
733		void
734	<	sendto_match_servs(struct Client *source_p, const char *mask, int cap,
734	>	sendto_match_servs(struct Client *source_p, const char *mask, unsigned int cap,
735		const char *pattern, ...)
736		{
737		va_list args;
738	<	struct Client *target_p;
739	<	dlink_node *ptr;
894	<	char buffer[IRCD_BUFSIZE];
895	<	int found = 0;
738	>	dlink_node *node = NULL;
739	>	struct dbuf_block *buffer = dbuf_alloc();
740
741	+	dbuf_put_fmt(buffer, ":%s ", source_p->id);
742		va_start(args, pattern);
743	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
743	>	send_format(buffer, pattern, args);
744		va_end(args);
745
746	<	current_serial++;
746	>	++current_serial;
747
748	<	DLINK_FOREACH(ptr, global_serv_list.head)
748	>	DLINK_FOREACH(node, global_server_list.head)
749		{
750	<	target_p = ptr->data;
750	>	struct Client *target_p = node->data;
751
752		/* Do not attempt to send to ourselves, or the source */
753		if (IsMe(target_p) || target_p->from == source_p->from)
754		continue;
755
756	<	if (target_p->from->serial == current_serial)
756	>	if (target_p->from->connection->serial == current_serial)
757		continue;
758
759		if (match(mask, target_p->name))
760	<	{
916	<	/*
917	<	* if we set the serial here, then we'll never do a
918	<	* match() again, if !IsCapable()
919	<	*/
920	<	target_p->from->serial = current_serial;
921	<	found++;
760	>	continue;
761
762	<	if (!IsCapable(target_p->from, cap))
763	<	continue;
762	>	/*
763	>	* If we set the serial here, then we'll never do a
764	>	* match() again, if !IsCapable()
765	>	*/
766	>	target_p->from->connection->serial = current_serial;
767
768	<	sendto_anywhere(target_p, source_p, "%s", buffer);
769	<	}
768	>	if (!IsCapable(target_p->from, cap))
769	>	continue;
770	>
771	>	send_message_remote(target_p->from, source_p, buffer);
772		}
773	+
774	+	dbuf_ref_free(buffer);
775		}
776
777		/* sendto_anywhere()
#	Line 939 | Line 785 | sendto_match_servs(struct Client *source
785		*/
786		void
787		sendto_anywhere(struct Client *to, struct Client *from,
788	+	const char *command,
789		const char *pattern, ...)
790		{
791		va_list args;
792	<	char buffer[IRCD_BUFSIZE];
946	<	int len;
947	<	struct Client *send_to = (to->from != NULL ? to->from : to);
792	>	struct dbuf_block *buffer = NULL;
793
794	<	if (IsDead(send_to))
794	>	if (IsDead(to->from))
795		return;
796
797	<	if (MyClient(to))
798	<	{
799	<	if (IsServer(from))
800	<	{
801	<	if (IsCapable(to, CAP_TS6) && HasID(from))
802	<	len = ircsprintf(buffer, ":%s ", from->id);
803	<	else
804	<	len = ircsprintf(buffer, ":%s ", from->name);
960	<	}
961	<	else
962	<	len = ircsprintf(buffer, ":%s!%s@%s ",
963	<	from->name, from->username, from->host);
964	<	}
965	<	else len = ircsprintf(buffer, ":%s ", ID_or_name(from, send_to));
797	>	buffer = dbuf_alloc();
798	>
799	>	if (MyClient(to) && IsClient(from))
800	>	dbuf_put_fmt(buffer, ":%s!%s@%s %s %s ", from->name, from->username,
801	>	from->host, command, to->name);
802	>	else
803	>	dbuf_put_fmt(buffer, ":%s %s %s ", ID_or_name(from, to),
804	>	command, ID_or_name(to, to));
805
806		va_start(args, pattern);
807	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
807	>	send_format(buffer, pattern, args);
808		va_end(args);
809
810	<	if(MyClient(to))
811	<	send_message(send_to, buffer, len);
810	>	if (MyConnect(to))
811	>	send_message(to, buffer);
812		else
813	<	send_message_remote(send_to, from, buffer, len);
813	>	send_message_remote(to->from, from, buffer);
814	>
815	>	dbuf_ref_free(buffer);
816		}
817
818		/* sendto_realops_flags()
#	Line 983 | Line 824 | sendto_anywhere(struct Client *to, struc
824		* side effects - Send to *local* ops only but NOT +s nonopers.
825		*/
826		void
827	<	sendto_realops_flags(unsigned int flags, int level, const char *pattern, ...)
827	>	sendto_realops_flags(unsigned int flags, int level, int type, const char *pattern, ...)
828		{
829	<	struct Client *client_p;
830	<	char nbuf[IRCD_BUFSIZE];
831	<	dlink_node *ptr;
829	>	const char *ntype = NULL;
830	>	dlink_node *node = NULL;
831	>	char nbuf[IRCD_BUFSIZE] = "";
832		va_list args;
833
834		va_start(args, pattern);
835	<	vsnprintf(nbuf, IRCD_BUFSIZE, pattern, args);
835	>	vsnprintf(nbuf, sizeof(nbuf), pattern, args);
836		va_end(args);
837
838	<	DLINK_FOREACH(ptr, oper_list.head)
838	>	switch (type)
839		{
840	<	client_p = ptr->data;
841	<	assert(client_p->umodes & UMODE_OPER);
842	<
843	<	/* If we're sending it to opers and theyre an admin, skip.
844	<	* If we're sending it to admins, and theyre not, skip.
845	<	*/
846	<	if (((level == L_ADMIN) && !IsAdmin(client_p)) ||
847	<	((level == L_OPER) && IsAdmin(client_p)))
848	<	continue;
849	<
850	<	if (client_p->umodes & flags)
1010	<	sendto_one(client_p, ":%s NOTICE %s :*** Notice -- %s",
1011	<	me.name, client_p->name, nbuf);
840	>	case SEND_NOTICE:
841	>	ntype = "Notice";
842	>	break;
843	>	case SEND_GLOBAL:
844	>	ntype = "Global";
845	>	break;
846	>	case SEND_LOCOPS:
847	>	ntype = "LocOps";
848	>	break;
849	>	default:
850	>	assert(0);
851		}
1013	–	}
1014	–
1015	–	/* sendto_wallops_flags()
1016	–	*
1017	–	* inputs       - flag types of messages to show to real opers
1018	–	*              - client sending request
1019	–	*              - var args input message
1020	–	* output       - NONE
1021	–	* side effects - Send a wallops to local opers
1022	–	*/
1023	–	void
1024	–	sendto_wallops_flags(unsigned int flags, struct Client *source_p,
1025	–	const char *pattern, ...)
1026	–	{
1027	–	struct Client *client_p;
1028	–	dlink_node *ptr;
1029	–	va_list args;
1030	–	char buffer[IRCD_BUFSIZE];
1031	–	int len;
852
853	<	if (IsClient(source_p))
1034	<	len = ircsprintf(buffer, ":%s!%s@%s WALLOPS :",
1035	<	source_p->name, source_p->username, source_p->host);
1036	<	else
1037	<	len = ircsprintf(buffer, ":%s WALLOPS :", source_p->name);
1038	<
1039	<	va_start(args, pattern);
1040	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
1041	<	va_end(args);
1042	<
1043	<	DLINK_FOREACH(ptr, oper_list.head)
853	>	DLINK_FOREACH(node, oper_list.head)
854		{
855	<	client_p = ptr->data;
856	<	assert(client_p->umodes & UMODE_OPER);
1047	<
1048	<	if ((client_p->umodes & flags) && !IsDefunct(client_p))
1049	<	send_message(client_p, buffer, len);
1050	<	}
1051	<	}
855	>	struct Client *client_p = node->data;
856	>	assert(HasUMode(client_p, UMODE_OPER));
857
858	<	/* ts_warn()
859	<	*
860	<	* inputs       - var args message
861	<	* output       - NONE
862	<	* side effects - Call sendto_realops_flags, with some flood checking
863	<	*                (at most 5 warnings every 5 seconds)
864	<	*/
1060	<	void
1061	<	ts_warn(const char *pattern, ...)
1062	<	{
1063	<	va_list args;
1064	<	char buffer[LOG_BUFSIZE];
1065	<	static time_t last = 0;
1066	<	static int warnings = 0;
1067	<
1068	<	/*
1069	<	** if we're running with TS_WARNINGS enabled and someone does
1070	<	** something silly like (remotely) connecting a nonTS server,
1071	<	** we'll get a ton of warnings, so we make sure we don't send
1072	<	** more than 5 every 5 seconds.  -orabidoo
1073	<	*/
858	>	/*
859	>	* If we're sending it to opers and they're an admin, skip.
860	>	* If we're sending it to admins, and they're not, skip.
861	>	*/
862	>	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
863	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
864	>	continue;
865
866	<	if (CurrentTime - last < 5)
867	<	{
868	<	if (++warnings > 5)
1078	<	return;
866	>	if (HasUMode(client_p, flags))
867	>	sendto_one(client_p, ":%s NOTICE %s :*** %s -- %s",
868	>	me.name, client_p->name, ntype, nbuf);
869		}
1080	–	else
1081	–	{
1082	–	last = CurrentTime;
1083	–	warnings = 0;
1084	–	}
1085	–
1086	–	va_start(args, pattern);
1087	–	vsprintf_irc(buffer, pattern, args);
1088	–	va_end(args);
1089	–
1090	–	sendto_realops_flags(UMODE_ALL, L_ALL, "%s", buffer);
1091	–	ilog(L_CRIT, "%s", buffer);
870		}
871
872	<	/* kill_client()
872	>	/* ts_warn()
873		*
874	<	* inputs       - client to send kill towards
875	<	*              - pointer to client to kill
876	<	*              - reason for kill
877	<	* output       - NONE
1100	<	* side effects - NONE
874	>	* inputs       - var args message
875	>	* output       - NONE
876	>	* side effects - Call sendto_realops_flags, with some flood checking
877	>	*                (at most 5 warnings every 5 seconds)
878		*/
879		void
880	<	kill_client(struct Client *client_p, struct Client *diedie,
1104	<	const char *pattern, ...)
880	>	sendto_realops_flags_ratelimited(time_t *rate, const char *pattern, ...)
881		{
882		va_list args;
883	<	char buffer[IRCD_BUFSIZE];
1108	<	int len;
883	>	char buffer[IRCD_BUFSIZE] = "";
884
885	<	if (client_p->from != NULL)
1111	<	client_p = client_p->from;
1112	<	if (IsDead(client_p))
885	>	if ((CurrentTime - *rate) < 20)
886		return;
887
888	<	len = ircsprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1116	<	ID_or_name(diedie, client_p));
888	>	*rate = CurrentTime;
889
890		va_start(args, pattern);
891	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
891	>	vsnprintf(buffer, sizeof(buffer), pattern, args);
892		va_end(args);
893
894	<	send_message(client_p, buffer, len);
894	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
895	>	ilog(LOG_TYPE_IRCD, "%s", buffer);
896		}
897
898	<	/* kill_client_ll_serv_butone()
898	>	/* sendto_wallops_flags()
899		*
900	<	* inputs       - pointer to client to not send to
901	<	*              - pointer to client to kill
902	<	* output       - NONE
903	<	* side effects - Send a KILL for the given client
904	<	*                message to all connected servers
1132	<	*                except the client 'one'. Also deal with
1133	<	*                client being unknown to leaf, as in lazylink...
900	>	* inputs       - flag types of messages to show to real opers
901	>	*              - client sending request
902	>	*              - var args input message
903	>	* output       - NONE
904	>	* side effects - Send a wallops to local opers
905		*/
906		void
907	<	kill_client_ll_serv_butone(struct Client *one, struct Client *source_p,
908	<	const char *pattern, ...)
907	>	sendto_wallops_flags(unsigned int flags, struct Client *source_p,
908	>	const char *pattern, ...)
909		{
910	+	dlink_node *node = NULL;
911		va_list args;
912	<	int have_uid = 0;
1141	<	dlink_node *ptr = NULL;
1142	<	char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1143	<	int len_uid = 0, len_nick = 0;
912	>	struct dbuf_block *buffer = dbuf_alloc();
913
914	<	if (HasID(source_p) && (me.id[0] != '\0'))
915	<	{
916	<	have_uid = 1;
917	<	va_start(args, pattern);
1149	<	len_uid = ircsprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1150	<	len_uid += send_format(&buf_uid[len_uid], IRCD_BUFSIZE - len_uid, pattern,
1151	<	args);
1152	<	va_end(args);
1153	<	}
914	>	if (IsClient(source_p))
915	>	dbuf_put_fmt(buffer, ":%s!%s@%s WALLOPS :", source_p->name, source_p->username, source_p->host);
916	>	else
917	>	dbuf_put_fmt(buffer, ":%s WALLOPS :", source_p->name);
918
919		va_start(args, pattern);
920	<	len_nick = ircsprintf(buf_nick, ":%s KILL %s :", me.name, source_p->name);
1157	<	len_nick += send_format(&buf_nick[len_nick], IRCD_BUFSIZE - len_nick, pattern,
1158	<	args);
920	>	send_format(buffer, pattern, args);
921		va_end(args);
922
923	<	DLINK_FOREACH(ptr, serv_list.head)
923	>	DLINK_FOREACH(node, oper_list.head)
924		{
925	<	struct Client *client_p = ptr->data;
926	<
1165	<	if (one != NULL && (client_p == one->from))
1166	<	continue;
1167	<	if (IsDefunct(client_p))
1168	<	continue;
925	>	struct Client *client_p = node->data;
926	>	assert(client_p->umodes & UMODE_OPER);
927
928	<	if (have_uid && IsCapable(client_p, CAP_TS6))
929	<	send_message(client_p, buf_uid, len_uid);
1172	<	else
1173	<	send_message(client_p, buf_nick, len_nick);
928	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
929	>	send_message(client_p, buffer);
930		}
931	<	}
931	>
932	>	dbuf_ref_free(buffer);
933	>	}

Diff Legend

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