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 34 by lusky, Sun Oct 2 21:05:51 2005 UTC vs.
ircd-hybrid/trunk/src/send.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 2014 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-2014 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
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"
37		#include "s_bsd.h"
38		#include "s_serv.h"
39	<	#include "sprintf_irc.h"
40	<	#include "s_conf.h"
41	<	#include "list.h"
42	<	#include "s_log.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41		#include "memory.h"
44	–	#include "hook.h"
45	–	#include "irc_getnameinfo.h"
42		#include "packet.h"
43
48	–	#define LOG_BUFSIZE 2048
49	–
50	–	struct Callback *iosend_cb = NULL;
51	–	struct Callback *iosendctrl_cb = NULL;
44
45	<	static void send_message(struct Client *, char *, int);
54	<	static void send_message_remote(struct Client *, struct Client *, char *, int);
45	>	static unsigned int current_serial = 0;
46
56	–	static unsigned long current_serial = 0L;
47
48		/* send_format()
49		*
50	<	* inputs       - buffer to format into
51	<	*              - size of the buffer
50	>	* inputs
51	>	*              - buffer
52		*              - format pattern to use
53		*              - var args
54		* output       - number of bytes formatted output
55		* side effects - modifies sendbuf
56		*/
57	<	static inline int
58	<	send_format(char *lsendbuf, int bufsize, const char *pattern, va_list args)
57	>	static void
58	>	send_format(struct dbuf_block *buffer, const char *pattern, va_list args)
59		{
70	–	int len;
71	–
60		/*
61		* from rfc1459
62		*
63		* IRC messages are always lines of characters terminated with a CR-LF
64		* (Carriage Return - Line Feed) pair, and these messages shall not
65	<	* exceed 512 characters in length,  counting all characters
65	>	* exceed 512 characters in length,  counting all characters
66		* including the trailing CR-LF.
67		* Thus, there are 510 characters maximum allowed
68		* for the command and its parameters.  There is no provision for
69		* continuation message lines.  See section 7 for more details about
70		* current implementations.
71		*/
72	<	len = vsnprintf(lsendbuf, bufsize - 1, pattern, args);
73	<	if (len > bufsize - 2)
74	<	len = bufsize - 2;  /* required by some versions of vsnprintf */
75	<
76	<	lsendbuf[len++] = '\r';
77	<	lsendbuf[len++] = '\n';
78	<	return (len);
72	>	dbuf_put_args(buffer, pattern, args);
73	>
74	>	if (buffer->size > sizeof(buffer->data) - 2)
75	>	buffer->size = sizeof(buffer->data) - 2;
76	>
77	>	buffer->data[buffer->size++] = '\r';
78	>	buffer->data[buffer->size++] = '\n';
79		}
80
81		/*
#	Line 96 | Line 84 | send_format(char *lsendbuf, int bufsize,
84		**      sendq.
85		*/
86		static void
87	<	send_message(struct Client *to, char *buf, int len)
87	>	send_message(struct Client *to, struct dbuf_block *buf)
88		{
89	<	#ifdef INVARIANTS
90	<	if (IsMe(to))
103	<	{
104	<	sendto_realops_flags(UMODE_ALL, L_ALL,
105	<	"Trying to send message to myself!");
106	<	return;
107	<	}
108	<	#endif
89	>	assert(!IsMe(to));
90	>	assert(to != &me);
91
92	<	if (dbuf_length(&to->localClient->buf_sendq) + len > get_sendq(to))
92	>	if (dbuf_length(&to->localClient->buf_sendq) + buf->size > get_sendq(&to->localClient->confs))
93		{
94		if (IsServer(to))
95	<	sendto_realops_flags(UMODE_ALL, L_ALL,
96	<	"Max SendQ limit exceeded for %s: %lu > %lu",
95	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
96	>	"Max SendQ limit exceeded for %s: %lu > %u",
97		get_client_name(to, HIDE_IP),
98	<	(unsigned long)(dbuf_length(&to->localClient->buf_sendq) + len),
99	<	get_sendq(to));
98	>	(unsigned long)(dbuf_length(&to->localClient->buf_sendq) + buf->size),
99	>	get_sendq(&to->localClient->confs));
100		if (IsClient(to))
101		SetSendQExceeded(to);
102		dead_link_on_write(to, 0);
103		return;
104		}
105
106	<	dbuf_put(&to->localClient->buf_sendq, buf, len);
106	>	dbuf_add(&to->localClient->buf_sendq, buf);
107
108		/*
109		** Update statistics. The following is slightly incorrect
#	Line 131 | Line 113 | send_message(struct Client *to, char *bu
113		++to->localClient->send.messages;
114		++me.localClient->send.messages;
115
116	<	if (dbuf_length(&to->localClient->buf_sendq) >
135	<	(IsServer(to) ? (unsigned int) 1024 : (unsigned int) 4096))
136	<	send_queued_write(to);
116	>	send_queued_write(to);
117		}
118
119		/* send_message_remote()
120		*
121		* inputs       - pointer to client from message is being sent
122		*              - pointer to client to send to
123	<	*              - pointer to preformatted buffer
144	<	*              - length of input buffer
123	>	*              - pointer to buffer
124		* output       - none
125		* side effects - Despite the function name, this only sends to directly
126		*                connected clients.
127	<	*
127	>	*
128		*/
129		static void
130	<	send_message_remote(struct Client *to, struct Client *from,
152	<	char *buf, int len)
130	>	send_message_remote(struct Client *to, struct Client *from, struct dbuf_block *buf)
131		{
132	+	to = to->from;
133	+
134		if (!MyConnect(to))
135		{
136	<	sendto_realops_flags(UMODE_ALL, L_ALL,
137	<	"server send message to %s [%s] dropped from %s(Not local server)",
138	<	to->name, to->from->name, from->name);
136	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
137	>	"Server send message to %s [%s] dropped from %s(Not local server)",
138	>	to->name, to->from->name, from->name);
139		return;
140		}
141
162	–	if (ServerInfo.hub && IsCapable(to, CAP_LL))
163	–	{
164	–	if (((from->lazyLinkClientExists &
165	–	to->localClient->serverMask) == 0))
166	–	client_burst_if_needed(to, from);
167	–	}
168	–
142		/* Optimize by checking if (from && to) before everything */
143		/* we set to->from up there.. */
144
#	Line 173 | Line 146 | send_message_remote(struct Client *to, s
146		{
147		if (IsServer(from))
148		{
149	<	sendto_realops_flags(UMODE_ALL, L_ALL,
149	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
150		"Send message to %s [%s] dropped from %s(Fake Dir)",
151		to->name, to->from->name, from->name);
152		return;
153		}
154
155	<	sendto_realops_flags(UMODE_ALL, L_ALL,
155	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
156		"Ghosted: %s[%s@%s] from %s[%s@%s] (%s)",
157		to->name, to->username, to->host,
158		from->name, from->username, from->host,
159		to->from->name);
160
161	<	sendto_server(NULL, to, NULL, CAP_TS6, NOCAPS, NOFLAGS,
161	>	sendto_server(NULL, NOCAPS, NOCAPS,
162		":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
163		me.id, to->name, me.name, to->name,
164		to->username, to->host, to->from->name);
192	–	sendto_server(NULL, to, NULL, NOCAPS, CAP_TS6, NOFLAGS,
193	–	":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
194	–	me.name, to->name, me.name, to->name,
195	–	to->username, to->host, to->from->name);
165
166	<	SetKilled(to);
166	>	AddFlag(to, FLAGS_KILLED);
167
168		if (IsClient(from))
169	<	sendto_one(from, form_str(ERR_GHOSTEDCLIENT),
170	<	me.name, from->name, to->name, to->username,
202	<	to->host, to->from);
169	>	sendto_one_numeric(from, &me, ERR_GHOSTEDCLIENT, to->name,
170	>	to->username, to->host, to->from);
171
172		exit_client(to, &me, "Ghosted client");
205	–
173		return;
174	<	}
174	>	}
175
176	<	send_message(to, buf, len);
176	>	send_message(to, buf);
177		}
178
179		/*
#	Line 216 | Line 183 | send_message_remote(struct Client *to, s
183		void
184		sendq_unblocked(fde_t *fd, struct Client *client_p)
185		{
186	<	ClearSendqBlocked(client_p);
187	<	/* let send_queued_write be executed by send_queued_all */
221	<
222	<	#ifdef HAVE_LIBCRYPTO
223	<	if (fd->flags.pending_read)
224	<	{
225	<	fd->flags.pending_read = 0;
226	<	read_packet(fd, client_p);
227	<	}
228	<	#endif
229	<	}
230	<
231	<	/*
232	<	** slinkq_unblocked
233	<	**      Called when a server control socket is ready for writing.
234	<	*/
235	<	static void
236	<	slinkq_unblocked(fde_t *fd, struct Client *client_p)
237	<	{
238	<	ClearSlinkqBlocked(client_p);
239	<	send_queued_slink_write(client_p);
186	>	assert(fd == &client_p->localClient->fd);
187	>	send_queued_write(client_p);
188		}
189
190		/*
#	Line 248 | Line 196 | slinkq_unblocked(fde_t *fd, struct Clien
196		void
197		send_queued_write(struct Client *to)
198		{
199	<	int retlen;
252	<	struct dbuf_block *first;
199	>	int retlen = 0;
200
201		/*
202		** Once socket is marked dead, we cannot start writing to it,
203		** even if the error is removed...
204		*/
205	<	if (IsDead(to) || IsSendqBlocked(to))
205	>	if (IsDead(to))
206		return;  /* no use calling send() now */
207
208		/* Next, lets try to write some data */
262	–
209		if (dbuf_length(&to->localClient->buf_sendq))
210		{
211	<	do {
212	<	first = to->localClient->buf_sendq.blocks.head->data;
211	>	do
212	>	{
213	>	struct dbuf_block *first = to->localClient->buf_sendq.blocks.head->data;
214
215		#ifdef HAVE_LIBCRYPTO
216		if (to->localClient->fd.ssl)
217		{
218	<	retlen = SSL_write(to->localClient->fd.ssl, first->data, first->size);
218	>	retlen = SSL_write(to->localClient->fd.ssl, first->data + to->localClient->buf_sendq.pos, first->size - to->localClient->buf_sendq.pos);
219
220		/* translate openssl error codes, sigh */
221	<	if (retlen < 0)
222	<	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
223	<	{
221	>	if (retlen < 0)
222	>	{
223	>	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
224	>	{
225		case SSL_ERROR_WANT_READ:
226	<	return;  /* retry later, don't register for write events */
227	<
228	<	case SSL_ERROR_WANT_WRITE:
281	<	errno = EWOULDBLOCK;
226	>	return;  /* retry later, don't register for write events */
227	>	case SSL_ERROR_WANT_WRITE:
228	>	errno = EWOULDBLOCK;
229		case SSL_ERROR_SYSCALL:
230	<	break;
231	<
230	>	break;
231	>	case SSL_ERROR_SSL:
232	>	if (errno == EAGAIN)
233	>	break;
234		default:
235	<	retlen = errno = 0;  /* either an SSL-specific error or EOF */
236	<	}
235	>	retlen = errno = 0;  /* either an SSL-specific error or EOF */
236	>	}
237	>	}
238		}
239		else
240		#endif
241	<	retlen = send(to->localClient->fd.fd, first->data, first->size, 0);
241	>	retlen = send(to->localClient->fd.fd, first->data + to->localClient->buf_sendq.pos, first->size - to->localClient->buf_sendq.pos, 0);
242
243		if (retlen <= 0)
294	–	{
295	–	#ifdef _WIN32
296	–	errno = WSAGetLastError();
297	–	#endif
244		break;
299	–	}
245
301	–	execute_callback(iosend_cb, to, retlen, first->data);
246		dbuf_delete(&to->localClient->buf_sendq, retlen);
247
248		/* We have some data written .. update counters */
#	Line 309 | Line 253 | send_queued_write(struct Client *to)
253		if ((retlen < 0) && (ignoreErrno(errno)))
254		{
255		/* we have a non-fatal error, reschedule a write */
312	–	SetSendqBlocked(to);
256		comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE,
257	<	(PF *)sendq_unblocked, (void *)to, 0);
257	>	(PF *)sendq_unblocked, to, 0);
258		}
259		else if (retlen <= 0)
260		{
#	Line 321 | Line 264 | send_queued_write(struct Client *to)
264		}
265		}
266
324	–	/*
325	–	** send_queued_slink_write
326	–	**      This is called when there is a chance the some output would
327	–	**      be possible. This attempts to empty the send queue as far as
328	–	**      possible, and then if any data is left, a write is rescheduled.
329	–	*/
330	–	void
331	–	send_queued_slink_write(struct Client *to)
332	–	{
333	–	int retlen;
334	–
335	–	/*
336	–	** Once socket is marked dead, we cannot start writing to it,
337	–	** even if the error is removed...
338	–	*/
339	–	if (IsDead(to) || IsSlinkqBlocked(to))
340	–	return;  /* no use calling send() now */
341	–
342	–	/* Next, lets try to write some data */
343	–	if (to->localClient->slinkq != NULL)
344	–	{
345	–	retlen = send(to->localClient->ctrlfd.fd,
346	–	to->localClient->slinkq + to->localClient->slinkq_ofs,
347	–	to->localClient->slinkq_len, 0);
348	–	if (retlen < 0)
349	–	{
350	–	/* If we have a fatal error */
351	–	if (!ignoreErrno(errno))
352	–	{
353	–	dead_link_on_write(to, errno);
354	–	return;
355	–	}
356	–	}
357	–	else if (retlen == 0)
358	–	{
359	–	/* 0 bytes is an EOF .. */
360	–	dead_link_on_write(to, 0);
361	–	return;
362	–	}
363	–	else
364	–	{
365	–	execute_callback(iosendctrl_cb, to, retlen,
366	–	to->localClient->slinkq + to->localClient->slinkq_ofs);
367	–	to->localClient->slinkq_len -= retlen;
368	–
369	–	assert(to->localClient->slinkq_len >= 0);
370	–	if (to->localClient->slinkq_len)
371	–	to->localClient->slinkq_ofs += retlen;
372	–	else
373	–	{
374	–	to->localClient->slinkq_ofs = 0;
375	–	MyFree(to->localClient->slinkq);
376	–	to->localClient->slinkq = NULL;
377	–	}
378	–	}
379	–
380	–	/* Finally, if we have any more data, reschedule a write */
381	–	if (to->localClient->slinkq_len)
382	–	{
383	–	SetSlinkqBlocked(to);
384	–	comm_setselect(&to->localClient->ctrlfd, COMM_SELECT_WRITE,
385	–	(PF *)slinkq_unblocked, (void *)to, 0);
386	–	}
387	–	}
388	–	}
389	–
267		/* send_queued_all()
268		*
269		* input        - NONE
#	Line 402 | Line 279 | send_queued_all(void)
279		* a notice to opers, which is to be delivered by this function.
280		*/
281		DLINK_FOREACH(ptr, serv_list.head)
282	<	send_queued_write((struct Client *) ptr->data);
282	>	send_queued_write(ptr->data);
283
284		DLINK_FOREACH(ptr, unknown_list.head)
285	<	send_queued_write((struct Client *) ptr->data);
285	>	send_queued_write(ptr->data);
286
287		DLINK_FOREACH(ptr, local_client_list.head)
288	<	send_queued_write((struct Client *) ptr->data);
288	>	send_queued_write(ptr->data);
289
290		/* NOTE: This can still put clients on aborted_list; unfortunately,
291		* exit_aborted_clients takes precedence over send_queued_all,
#	Line 429 | Line 306 | void
306		sendto_one(struct Client *to, const char *pattern, ...)
307		{
308		va_list args;
309	<	char buffer[IRCD_BUFSIZE];
310	<	int len;
309	>	struct dbuf_block *buffer;
310	>
311	>	to = to->from;
312	>
313	>	if (IsDead(to))
314	>	return;  /* This socket has already been marked as dead */
315	>
316	>	buffer = dbuf_alloc();
317	>
318	>	va_start(args, pattern);
319	>	send_format(buffer, pattern, args);
320	>	va_end(args);
321	>
322	>	send_message(to, buffer);
323	>
324	>	dbuf_ref_free(buffer);
325	>	}
326	>
327	>	void
328	>	sendto_one_numeric(struct Client *to, struct Client *from, enum irc_numerics numeric, ...)
329	>	{
330	>	struct dbuf_block *buffer;
331	>	va_list args;
332	>	const char *dest;
333	>
334	>	to = to->from;
335	>
336	>	if (IsDead(to))
337	>	return;
338	>
339	>	dest = ID_or_name(to, to);
340	>	if (EmptyString(dest))
341	>	dest = "*";
342	>
343	>	buffer = dbuf_alloc();
344	>
345	>	dbuf_put_fmt(buffer, ":%s %03d %s ", ID_or_name(from, to), numeric, dest);
346	>
347	>	va_start(args, numeric);
348	>	send_format(buffer, numeric_form(numeric), args);
349	>	va_end(args);
350	>
351	>	send_message(to, buffer);
352	>
353	>	dbuf_ref_free(buffer);
354	>	}
355	>
356	>	void
357	>	sendto_one_notice(struct Client *to, struct Client *from, const char *pattern, ...)
358	>	{
359	>	struct dbuf_block *buffer;
360	>	va_list args;
361	>	const char *dest;
362	>
363	>	to = to->from;
364
435	–	if (to->from != NULL)
436	–	to = to->from;
365		if (IsDead(to))
366	<	return; /* This socket has already been marked as dead */
366	>	return;
367	>
368	>	dest = ID_or_name(to, to);
369	>	if (EmptyString(dest))
370	>	dest = "*";
371	>
372	>	buffer = dbuf_alloc();
373	>
374	>	dbuf_put_fmt(buffer, ":%s NOTICE %s ", ID_or_name(from, to), dest);
375
376		va_start(args, pattern);
377	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
377	>	send_format(buffer, pattern, args);
378		va_end(args);
379
380	<	send_message(to, buffer, len);
380	>	send_message(to, buffer);
381	>
382	>	dbuf_ref_free(buffer);
383		}
384
385		/* sendto_channel_butone()
#	Line 457 | Line 395 | sendto_one(struct Client *to, const char
395		*/
396		void
397		sendto_channel_butone(struct Client *one, struct Client *from,
398	<	struct Channel *chptr, const char *command,
398	>	struct Channel *chptr, unsigned int type,
399		const char *pattern, ...)
400		{
401	<	va_list args;
402	<	char local_buf[IRCD_BUFSIZE];
403	<	char remote_buf[IRCD_BUFSIZE];
404	<	char uid_buf[IRCD_BUFSIZE];
405	<	int local_len, remote_len, uid_len;
468	<	dlink_node *ptr;
469	<	dlink_node *ptr_next;
470	<	struct Client *target_p;
401	>	va_list alocal, aremote, auid;
402	>	struct dbuf_block *local_buf, *remote_buf, *uid_buf;
403	>	dlink_node *ptr = NULL, *ptr_next = NULL;
404	>
405	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc(), uid_buf = dbuf_alloc();
406
407		if (IsServer(from))
408	<	local_len = ircsprintf(local_buf, ":%s %s %s ",
474	<	from->name, command, chptr->chname);
408	>	dbuf_put_fmt(local_buf, ":%s ", from->name);
409		else
410	<	local_len = ircsprintf(local_buf, ":%s!%s@%s %s %s ",
477	<	from->name, from->username, from->host,
478	<	command, chptr->chname);
479	<	remote_len = ircsprintf(remote_buf, ":%s %s %s ",
480	<	from->name, command, chptr->chname);
481	<	uid_len = ircsprintf(uid_buf, ":%s %s %s ",
482	<	ID(from), command, chptr->chname);
410	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
411
412	<	va_start(args, pattern);
413	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
414	<	pattern, args);
415	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
416	<	pattern, args);
417	<	uid_len += send_format(&uid_buf[uid_len], IRCD_BUFSIZE - uid_len, pattern,
418	<	args);
419	<	va_end(args);
412	>	dbuf_put_fmt(remote_buf, ":%s ", from->name);
413	>	dbuf_put_fmt(uid_buf, ":%s ", ID(from));
414	>
415	>	va_start(alocal, pattern);
416	>	va_start(aremote, pattern);
417	>	va_start(auid, pattern);
418	>	send_format(local_buf, pattern, alocal);
419	>	send_format(remote_buf, pattern, aremote);
420	>	send_format(uid_buf, pattern, auid);
421	>	va_end(auid);
422	>	va_end(aremote);
423	>	va_end(alocal);
424
425		++current_serial;
426
427		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
428		{
429	<	target_p = ((struct Membership *)ptr->data)->client_p;
430	<	assert(target_p != NULL);
429	>	struct Membership *ms = ptr->data;
430	>	struct Client *target_p = ms->client_p;
431
432	<	if (IsDefunct(target_p) || IsDeaf(target_p) || target_p->from == one)
432	>	assert(IsClient(target_p));
433	>
434	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) || target_p->from == one)
435		continue;
436
437	<	if (MyClient(target_p))
438	<	{
439	<	if (target_p->serial != current_serial)
440	<	{
441	<	send_message(target_p, local_buf, local_len);
442	<	target_p->serial = current_serial;
443	<	}
444	<	}
511	<	else
512	<	{
513	<	/* Now check whether a message has been sent to this
514	<	* remote link already
515	<	*/
516	<	if (target_p->from->serial != current_serial)
517	<	{
518	<	if (IsCapable(target_p->from, CAP_TS6))
519	<	send_message_remote(target_p->from, from, uid_buf, uid_len);
520	<	else
521	<	send_message_remote(target_p->from, from, remote_buf, remote_len);
522	<	target_p->from->serial = current_serial;
523	<	}
524	<	}
437	>	if (type != 0 && (ms->flags & type) == 0)
438	>	continue;
439	>
440	>	if (MyConnect(target_p))
441	>	send_message(target_p, local_buf);
442	>	else if (target_p->from->localClient->serial != current_serial)
443	>	send_message_remote(target_p->from, from, remote_buf);
444	>	target_p->from->localClient->serial = current_serial;
445		}
446	+
447	+	dbuf_ref_free(local_buf);
448	+	dbuf_ref_free(remote_buf);
449	+	dbuf_ref_free(uid_buf);
450		}
451
452		/* sendto_server()
453	<	*
453	>	*
454		* inputs       - pointer to client to NOT send to
455	<	*              - pointer to source client required by LL (if any)
532	<	*              - pointer to channel required by LL (if any)
455	>	*              - pointer to channel
456		*              - caps or'd together which must ALL be present
457		*              - caps or'd together which must ALL NOT be present
535	–	*              - LL flags: LL_ICLIENT | LL_ICHAN
458		*              - printf style format string
459		*              - args to format string
460		* output       - NONE
461		* side effects - Send a message to all connected servers, except the
462		*                client 'one' (if non-NULL), as long as the servers
463		*                support ALL capabs in 'caps', and NO capabs in 'nocaps'.
464	<	*                If the server is a lazylink client, then it must know
543	<	*                about source_p if non-NULL (unless LL_ICLIENT is specified,
544	<	*                when source_p will be introduced where required) and
545	<	*                chptr if non-NULL (unless LL_ICHANNEL is specified, when
546	<	*                chptr will be introduced where required).
547	<	*                Note: nothing will be introduced to a LazyLeaf unless
548	<	*                the message is actually sent.
549	<	*
464	>	*
465		* This function was written in an attempt to merge together the other
466		* billion sendto_*serv*() functions, which sprung up with capabs,
467		* lazylinks, uids, etc.
468		* -davidt
469		*/
470	<	void
471	<	sendto_server(struct Client *one, struct Client *source_p,
472	<	struct Channel *chptr, unsigned long caps,
473	<	unsigned long nocaps, unsigned long llflags,
470	>	void
471	>	sendto_server(struct Client *one,
472	>	const unsigned int caps,
473	>	const unsigned int nocaps,
474		const char *format, ...)
475		{
476		va_list args;
477	<	struct Client *client_p;
478	<	dlink_node *ptr;
564	<	char buffer[IRCD_BUFSIZE];
565	<	int len;
477	>	dlink_node *ptr = NULL;
478	>	struct dbuf_block *buffer;
479
480	<	if (chptr != NULL)
568	<	{
569	<	if (chptr->chname[0] != '#')
570	<	return;
571	<	}
480	>	buffer = dbuf_alloc();
481
482		va_start(args, format);
483	<	len = send_format(buffer, IRCD_BUFSIZE, format, args);
483	>	send_format(buffer, format, args);
484		va_end(args);
485
486		DLINK_FOREACH(ptr, serv_list.head)
487		{
488	<	client_p = ptr->data;
488	>	struct Client *client_p = ptr->data;
489
490		/* If dead already skip */
491		if (IsDead(client_p))
#	Line 591 | Line 500 | sendto_server(struct Client *one, struct
500		if ((client_p->localClient->caps & nocaps) != 0)
501		continue;
502
503	<	if (ServerInfo.hub && IsCapable(client_p, CAP_LL))
595	<	{
596	<	/* check LL channel */
597	<	if (chptr != NULL &&
598	<	((chptr->lazyLinkChannelExists &
599	<	client_p->localClient->serverMask) == 0))
600	<	{
601	<	/* Only introduce the channel if we really will send this message */
602	<	if (!(llflags & LL_ICLIENT) && source_p &&
603	<	((source_p->lazyLinkClientExists &
604	<	client_p->localClient->serverMask) == 0))
605	<	continue; /* we can't introduce the unknown source_p, skip */
606	<
607	<	if (llflags & LL_ICHAN)
608	<	burst_channel(client_p, chptr);
609	<	else
610	<	continue; /* we can't introduce the unknown chptr, skip */
611	<	}
612	<	/* check LL client */
613	<	if (source_p &&
614	<	((source_p->lazyLinkClientExists &
615	<	client_p->localClient->serverMask) == 0))
616	<	{
617	<	if (llflags & LL_ICLIENT)
618	<	client_burst_if_needed(client_p,source_p);
619	<	else
620	<	continue; /* we can't introduce the unknown source_p, skip */
621	<	}
622	<	}
623	<	send_message(client_p, buffer, len);
503	>	send_message(client_p, buffer);
504		}
505	+
506	+	dbuf_ref_free(buffer);
507		}
508
509		/* sendto_common_channels_local()
#	Line 630 | Line 512 | sendto_server(struct Client *one, struct
512		*              - pattern to send
513		* output       - NONE
514		* side effects - Sends a message to all people on local server who are
515	<	*                in same channel with user.
515	>	*                in same channel with user.
516		*                used by m_nick.c and exit_one_client.
517		*/
518		void
519	<	sendto_common_channels_local(struct Client *user, int touser,
519	>	sendto_common_channels_local(struct Client *user, int touser, unsigned int cap,
520		const char *pattern, ...)
521		{
522		va_list args;
#	Line 643 | Line 525 | sendto_common_channels_local(struct Clie
525		struct Channel *chptr;
526		struct Membership *ms;
527		struct Client *target_p;
528	<	char buffer[IRCD_BUFSIZE];
529	<	int len;
528	>	struct dbuf_block *buffer;
529	>
530	>	buffer = dbuf_alloc();
531
532		va_start(args, pattern);
533	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
533	>	send_format(buffer, pattern, args);
534		va_end(args);
535
536		++current_serial;
537
538		DLINK_FOREACH(cptr, user->channel.head)
539		{
540	<	chptr = ((struct Membership *) cptr->data)->chptr;
540	>	chptr = ((struct Membership *)cptr->data)->chptr;
541		assert(chptr != NULL);
542
543	<	DLINK_FOREACH(uptr, chptr->locmembers.head)
543	>	DLINK_FOREACH(uptr, chptr->members.head)
544		{
545		ms = uptr->data;
546		target_p = ms->client_p;
547		assert(target_p != NULL);
548
549	<	if (target_p == user || IsDefunct(target_p) ||
550	<	target_p->serial == current_serial)
549	>	if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
550	>	target_p->localClient->serial == current_serial)
551	>	continue;
552	>
553	>	if (HasCap(target_p, cap) != cap)
554		continue;
555
556	<	target_p->serial = current_serial;
557	<	send_message(target_p, buffer, len);
556	>	target_p->localClient->serial = current_serial;
557	>	send_message(target_p, buffer);
558		}
559		}
560
561		if (touser && MyConnect(user) && !IsDead(user) &&
562	<	user->serial != current_serial)
563	<	send_message(user, buffer, len);
562	>	user->localClient->serial != current_serial)
563	>	if (HasCap(user, cap) == cap)
564	>	send_message(user, buffer);
565	>
566	>	dbuf_ref_free(buffer);
567		}
568
569		/* sendto_channel_local()
#	Line 688 | Line 577 | sendto_common_channels_local(struct Clie
577		*                locally connected to this server.
578		*/
579		void
580	<	sendto_channel_local(int type, int nodeaf, struct Channel *chptr,
580	>	sendto_channel_local(unsigned int type, int nodeaf, struct Channel *chptr,
581		const char *pattern, ...)
582		{
583		va_list args;
584	<	char buffer[IRCD_BUFSIZE];
585	<	int len;
586	<	dlink_node *ptr;
587	<	struct Membership *ms;
699	<	struct Client *target_p;
584	>	dlink_node *ptr = NULL;
585	>	struct dbuf_block *buffer;
586	>
587	>	buffer = dbuf_alloc();
588
589		va_start(args, pattern);
590	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
590	>	send_format(buffer, pattern, args);
591		va_end(args);
592
593	<	DLINK_FOREACH(ptr, chptr->locmembers.head)
593	>	DLINK_FOREACH(ptr, chptr->members.head)
594		{
595	<	ms = ptr->data;
596	<	target_p = ms->client_p;
595	>	struct Membership *ms = ptr->data;
596	>	struct Client *target_p = ms->client_p;
597
598		if (type != 0 && (ms->flags & type) == 0)
599		continue;
600
601	<	if (IsDefunct(target_p) || (nodeaf && IsDeaf(target_p)))
601	>	if (!MyConnect(target_p) || IsDefunct(target_p) ||
602	>	(nodeaf && HasUMode(target_p, UMODE_DEAF)))
603		continue;
604
605	<	send_message(target_p, buffer, len);
605	>	send_message(target_p, buffer);
606		}
607	+
608	+	dbuf_ref_free(buffer);
609		}
610
611		/* sendto_channel_local_butone()
#	Line 729 | Line 620 | sendto_channel_local(int type, int nodea
620		*
621		* WARNING - +D clients are omitted
622		*/
732	–	void
733	–	sendto_channel_local_butone(struct Client *one, int type,
734	–	struct Channel *chptr, const char *pattern, ...)
735	–	{
736	–	va_list args;
737	–	char buffer[IRCD_BUFSIZE];
738	–	int len;
739	–	struct Client *target_p;
740	–	struct Membership *ms;
741	–	dlink_node *ptr;
742	–
743	–	va_start(args, pattern);
744	–	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
745	–	va_end(args);
746	–
747	–	DLINK_FOREACH(ptr, chptr->locmembers.head)
748	–	{
749	–	ms = ptr->data;
750	–	target_p = ms->client_p;
751	–
752	–	if (type != 0 && (ms->flags & type) == 0)
753	–	continue;
754	–
755	–	if (target_p == one || IsDefunct(target_p) || IsDeaf(target_p))
756	–	continue;
757	–	send_message(target_p, buffer, len);
758	–	}
759	–	}
760	–
761	–
762	–	/* sendto_channel_remote()
763	–	*
764	–	* inputs       - Client not to send towards
765	–	*              - Client from whom message is from
766	–	*              - member status mask, e.g. CHFL_CHANOP | CHFL_VOICE
767	–	*              - pointer to channel to send to
768	–	*              - var args pattern
769	–	* output       - NONE
770	–	* side effects - Send a message to all members of a channel that are
771	–	*                remote to this server.
772	–	*/
623		void
624	<	sendto_channel_remote(struct Client *one, struct Client *from, int type, int caps,
625	<	int nocaps, struct Channel *chptr, const char *pattern, ...)
624	>	sendto_channel_local_butone(struct Client *one, unsigned int type, unsigned int cap,
625	>	struct Channel *chptr, const char *pattern, ...)
626		{
627		va_list args;
628	<	char buffer[IRCD_BUFSIZE];
629	<	int len;
630	<	dlink_node *ptr;
631	<	struct Client *target_p;
782	<	struct Membership *ms;
628	>	dlink_node *ptr = NULL;
629	>	struct dbuf_block *buffer;
630	>
631	>	buffer = dbuf_alloc();
632
633		va_start(args, pattern);
634	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
634	>	send_format(buffer, pattern, args);
635		va_end(args);
636
637		DLINK_FOREACH(ptr, chptr->members.head)
638		{
639	<	ms = ptr->data;
640	<	target_p = ms->client_p;
639	>	struct Membership *ms = ptr->data;
640	>	struct Client *target_p = ms->client_p;
641
642		if (type != 0 && (ms->flags & type) == 0)
643		continue;
644
645	<	if (MyConnect(target_p))
645	>	if (!MyConnect(target_p) || target_p == one ||
646	>	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
647		continue;
798	–	target_p = target_p->from;
648
649	<	if (target_p == one->from ||
801	<	((target_p->from->localClient->caps & caps) != caps) ||
802	<	((target_p->from->localClient->caps & nocaps) != 0))
649	>	if (HasCap(target_p, cap) != cap)
650		continue;
651
652	<	send_message(target_p, buffer, len);
653	<	}
652	>	send_message(target_p, buffer);
653	>	}
654	>
655	>	dbuf_ref_free(buffer);
656		}
657
658		/*
#	Line 824 | Line 673 | sendto_channel_remote(struct Client *one
673		* side effects - NONE
674		*/
675		static int
676	<	match_it(const struct Client *one, const char *mask, int what)
676	>	match_it(const struct Client *one, const char *mask, unsigned int what)
677		{
678		if (what == MATCH_HOST)
679	<	return(match(mask, one->host));
679	>	return !match(mask, one->host);
680
681	<	return(match(mask, one->servptr->name));
681	>	return !match(mask, one->servptr->name);
682		}
683
684		/* sendto_match_butone()
#	Line 843 | Line 692 | void
692		sendto_match_butone(struct Client *one, struct Client *from, char *mask,
693		int what, const char *pattern, ...)
694		{
695	<	va_list args;
696	<	struct Client *client_p;
697	<	dlink_node *ptr, *ptr_next;
698	<	char local_buf[IRCD_BUFSIZE], remote_buf[IRCD_BUFSIZE];
699	<	int local_len = ircsprintf(local_buf, ":%s!%s@%s ", from->name,
700	<	from->username, from->host);
701	<	int remote_len = ircsprintf(remote_buf, ":%s ", from->name);
702	<
703	<	va_start(args, pattern);
704	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
705	<	pattern, args);
706	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
707	<	pattern, args);
708	<	va_end(args);
695	>	va_list alocal, aremote;
696	>	dlink_node *ptr = NULL, *ptr_next = NULL;
697	>	struct dbuf_block *local_buf, *remote_buf;
698	>
699	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
700	>
701	>	dbuf_put_fmt(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
702	>	dbuf_put_fmt(remote_buf, ":%s ", from->name);
703	>
704	>	va_start(alocal, pattern);
705	>	va_start(aremote, pattern);
706	>	send_format(local_buf, pattern, alocal);
707	>	send_format(remote_buf, pattern, aremote);
708	>	va_end(aremote);
709	>	va_end(alocal);
710
711		/* scan the local clients */
712		DLINK_FOREACH(ptr, local_client_list.head)
713		{
714	<	client_p = ptr->data;
714	>	struct Client *client_p = ptr->data;
715
716		if (client_p != one && !IsDefunct(client_p) &&
717		match_it(client_p, mask, what))
718	<	send_message(client_p, local_buf, local_len);
718	>	send_message(client_p, local_buf);
719		}
720
721		/* Now scan servers */
722		DLINK_FOREACH_SAFE(ptr, ptr_next, serv_list.head)
723		{
724	<	client_p = ptr->data;
724	>	struct Client *client_p = ptr->data;
725
726		/*
727		* The old code looped through every client on the
#	Line 898 | Line 748 | sendto_match_butone(struct Client *one,
748		* -wnder
749		*/
750		if (client_p != one && !IsDefunct(client_p))
751	<	send_message_remote(client_p, from, remote_buf, remote_len);
751	>	send_message_remote(client_p, from, remote_buf);
752		}
753	+
754	+	dbuf_ref_free(local_buf);
755	+	dbuf_ref_free(remote_buf);
756		}
757
758		/* sendto_match_servs()
#	Line 912 | Line 765 | sendto_match_butone(struct Client *one,
765		* side effects - data sent to servers matching with capab
766		*/
767		void
768	<	sendto_match_servs(struct Client *source_p, const char *mask, int cap,
768	>	sendto_match_servs(struct Client *source_p, const char *mask, unsigned int cap,
769		const char *pattern, ...)
770		{
771		va_list args;
772	<	struct Client *target_p;
773	<	dlink_node *ptr;
774	<	char buffer[IRCD_BUFSIZE];
775	<	int found = 0;
772	>	dlink_node *ptr = NULL;
773	>	struct dbuf_block *buff_suid;
774	>
775	>	buff_suid = dbuf_alloc();
776
777		va_start(args, pattern);
778	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
778	>	dbuf_put_fmt(buff_suid, ":%s ", ID(source_p));
779	>	dbuf_put_args(buff_suid, pattern, args);
780		va_end(args);
781
782	<	current_serial++;
782	>	++current_serial;
783
784		DLINK_FOREACH(ptr, global_serv_list.head)
785		{
786	<	target_p = ptr->data;
786	>	struct Client *target_p = ptr->data;
787
788		/* Do not attempt to send to ourselves, or the source */
789		if (IsMe(target_p) || target_p->from == source_p->from)
790		continue;
791
792	<	if (target_p->from->serial == current_serial)
792	>	if (target_p->from->localClient->serial == current_serial)
793		continue;
794
795	<	if (match(mask, target_p->name))
795	>	if (!match(mask, target_p->name))
796		{
797		/*
798		* if we set the serial here, then we'll never do a
799		* match() again, if !IsCapable()
800		*/
801	<	target_p->from->serial = current_serial;
948	<	found++;
801	>	target_p->from->localClient->serial = current_serial;
802
803		if (!IsCapable(target_p->from, cap))
804		continue;
805
806	<	sendto_anywhere(target_p, source_p, "%s", buffer);
806	>	send_message_remote(target_p->from, source_p, buff_suid);
807		}
808		}
809	+
810	+	dbuf_ref_free(buff_suid);
811		}
812
813		/* sendto_anywhere()
#	Line 966 | Line 821 | sendto_match_servs(struct Client *source
821		*/
822		void
823		sendto_anywhere(struct Client *to, struct Client *from,
824	+	const char *command,
825		const char *pattern, ...)
826		{
827		va_list args;
828	<	char buffer[IRCD_BUFSIZE];
973	<	int len;
974	<	struct Client *send_to = (to->from != NULL ? to->from : to);
828	>	struct dbuf_block *buffer;
829
830	<	if (IsDead(send_to))
830	>	if (IsDead(to->from))
831		return;
832
833	+	buffer = dbuf_alloc();
834	+
835		if (MyClient(to))
836		{
837		if (IsServer(from))
838	<	{
983	<	if (IsCapable(to, CAP_TS6) && HasID(from))
984	<	len = ircsprintf(buffer, ":%s ", from->id);
985	<	else
986	<	len = ircsprintf(buffer, ":%s ", from->name);
987	<	}
838	>	dbuf_put_fmt(buffer, ":%s %s %s ", from->name, command, to->name);
839		else
840	<	len = ircsprintf(buffer, ":%s!%s@%s ",
990	<	from->name, from->username, from->host);
840	>	dbuf_put_fmt(buffer, ":%s!%s@%s %s %s ", from->name, from->username, from->host, command, to->name);
841		}
842	<	else len = ircsprintf(buffer, ":%s ", ID_or_name(from, send_to));
842	>	else
843	>	dbuf_put_fmt(buffer, ":%s %s %s ", ID_or_name(from, to), command, ID_or_name(to, to));
844
845		va_start(args, pattern);
846	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
846	>	send_format(buffer, pattern, args);
847		va_end(args);
848
849	<	if(MyClient(to))
850	<	send_message(send_to, buffer, len);
849	>	if (MyClient(to))
850	>	send_message(to, buffer);
851		else
852	<	send_message_remote(send_to, from, buffer, len);
852	>	send_message_remote(to, from, buffer);
853	>
854	>	dbuf_ref_free(buffer);
855		}
856
857		/* sendto_realops_flags()
#	Line 1010 | Line 863 | sendto_anywhere(struct Client *to, struc
863		* side effects - Send to *local* ops only but NOT +s nonopers.
864		*/
865		void
866	<	sendto_realops_flags(unsigned int flags, int level, const char *pattern, ...)
866	>	sendto_realops_flags(unsigned int flags, int level, int type, const char *pattern, ...)
867		{
868	<	struct Client *client_p;
868	>	const char *ntype = NULL;
869	>	dlink_node *ptr = NULL;
870		char nbuf[IRCD_BUFSIZE];
1017	–	dlink_node *ptr;
871		va_list args;
872
873		va_start(args, pattern);
874	<	vsnprintf(nbuf, IRCD_BUFSIZE, pattern, args);
874	>	vsnprintf(nbuf, sizeof(nbuf), pattern, args);
875		va_end(args);
876
877	+	switch (type)
878	+	{
879	+	case SEND_NOTICE:
880	+	ntype = "Notice";
881	+	break;
882	+	case SEND_GLOBAL:
883	+	ntype = "Global";
884	+	break;
885	+	case SEND_LOCOPS:
886	+	ntype = "LocOps";
887	+	break;
888	+	default:
889	+	assert(0);
890	+	}
891	+
892		DLINK_FOREACH(ptr, oper_list.head)
893		{
894	<	client_p = ptr->data;
895	<	assert(client_p->umodes & UMODE_OPER);
894	>	struct Client *client_p = ptr->data;
895	>	assert(HasUMode(client_p, UMODE_OPER));
896
897	<	/* If we're sending it to opers and theyre an admin, skip.
898	<	* If we're sending it to admins, and theyre not, skip.
897	>	/*
898	>	* If we're sending it to opers and they're an admin, skip.
899	>	* If we're sending it to admins, and they're not, skip.
900		*/
901	<	if (((level == L_ADMIN) && !IsAdmin(client_p)) ||
902	<	((level == L_OPER) && IsAdmin(client_p)))
901	>	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
902	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
903		continue;
904
905	<	if (client_p->umodes & flags)
906	<	sendto_one(client_p, ":%s NOTICE %s :*** Notice -- %s",
907	<	me.name, client_p->name, nbuf);
905	>	if (HasUMode(client_p, flags))
906	>	sendto_one(client_p, ":%s NOTICE %s :*** %s -- %s",
907	>	me.name, client_p->name, ntype, nbuf);
908		}
909		}
910
#	Line 1051 | Line 920 | void
920		sendto_wallops_flags(unsigned int flags, struct Client *source_p,
921		const char *pattern, ...)
922		{
923	<	struct Client *client_p;
1055	<	dlink_node *ptr;
923	>	dlink_node *ptr = NULL;
924		va_list args;
925	<	char buffer[IRCD_BUFSIZE];
926	<	int len;
925	>	struct dbuf_block *buffer;
926	>
927	>	buffer = dbuf_alloc();
928
929		if (IsClient(source_p))
930	<	len = ircsprintf(buffer, ":%s!%s@%s WALLOPS :",
1062	<	source_p->name, source_p->username, source_p->host);
930	>	dbuf_put_fmt(buffer, ":%s!%s@%s WALLOPS :", source_p->name, source_p->username, source_p->host);
931		else
932	<	len = ircsprintf(buffer, ":%s WALLOPS :", source_p->name);
932	>	dbuf_put_fmt(buffer, ":%s WALLOPS :", source_p->name);
933
934		va_start(args, pattern);
935	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
935	>	send_format(buffer, pattern, args);
936		va_end(args);
937
938		DLINK_FOREACH(ptr, oper_list.head)
939		{
940	<	client_p = ptr->data;
940	>	struct Client *client_p = ptr->data;
941		assert(client_p->umodes & UMODE_OPER);
942
943	<	if ((client_p->umodes & flags) && !IsDefunct(client_p))
944	<	send_message(client_p, buffer, len);
943	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
944	>	send_message(client_p, buffer);
945		}
946	+
947	+	dbuf_ref_free(buffer);
948		}
949
950		/* ts_warn()
#	Line 1085 | Line 955 | sendto_wallops_flags(unsigned int flags,
955		*                (at most 5 warnings every 5 seconds)
956		*/
957		void
958	<	ts_warn(const char *pattern, ...)
958	>	sendto_realops_flags_ratelimited(const char *pattern, ...)
959		{
960		va_list args;
961	<	char buffer[LOG_BUFSIZE];
961	>	char buffer[IRCD_BUFSIZE];
962		static time_t last = 0;
963		static int warnings = 0;
964
#	Line 1111 | Line 981 | ts_warn(const char *pattern, ...)
981		}
982
983		va_start(args, pattern);
984	<	vsprintf_irc(buffer, pattern, args);
984	>	vsnprintf(buffer, sizeof(buffer), pattern, args);
985		va_end(args);
986
987	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s", buffer);
988	<	ilog(L_CRIT, "%s", buffer);
987	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
988	>	ilog(LOG_TYPE_IRCD, "%s", buffer);
989		}
990
991		/* kill_client()
#	Line 1131 | Line 1001 | kill_client(struct Client *client_p, str
1001		const char *pattern, ...)
1002		{
1003		va_list args;
1004	<	char buffer[IRCD_BUFSIZE];
1005	<	int len;
1004	>	struct dbuf_block *buffer;
1005	>
1006	>	client_p = client_p->from;
1007
1137	–	if (client_p->from != NULL)
1138	–	client_p = client_p->from;
1008		if (IsDead(client_p))
1009		return;
1010
1011	<	len = ircsprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1012	<	ID_or_name(diedie, client_p));
1011	>	buffer = dbuf_alloc();
1012	>
1013	>	dbuf_put_fmt(buffer, ":%s KILL %s :",
1014	>	ID_or_name(&me, client_p),
1015	>	ID_or_name(diedie, client_p));
1016
1017		va_start(args, pattern);
1018	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
1018	>	send_format(buffer, pattern, args);
1019		va_end(args);
1020
1021	<	send_message(client_p, buffer, len);
1021	>	send_message(client_p, buffer);
1022	>
1023	>	dbuf_ref_free(buffer);
1024		}
1025
1026		/* kill_client_ll_serv_butone()
#	Line 1160 | Line 1034 | kill_client(struct Client *client_p, str
1034		*                client being unknown to leaf, as in lazylink...
1035		*/
1036		void
1037	<	kill_client_ll_serv_butone(struct Client *one, struct Client *source_p,
1038	<	const char *pattern, ...)
1037	>	kill_client_serv_butone(struct Client *one, struct Client *source_p,
1038	>	const char *pattern, ...)
1039		{
1040		va_list args;
1041	<	int have_uid = 0;
1042	<	struct Client *client_p;
1169	<	dlink_node *ptr;
1170	<	char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1171	<	int len_uid = 0, len_nick;
1041	>	dlink_node *ptr = NULL;
1042	>	struct dbuf_block *uid_buffer = dbuf_alloc();
1043
1044		va_start(args, pattern);
1045	<	if (HasID(source_p) && (me.id[0] != '\0'))
1046	<	{
1176	<	have_uid = 1;
1177	<	len_uid = ircsprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1178	<	len_uid += send_format(&buf_uid[len_uid], IRCD_BUFSIZE - len_uid, pattern,
1179	<	args);
1180	<	}
1181	<	len_nick = ircsprintf(buf_nick, ":%s KILL %s :", me.name, source_p->name);
1182	<	len_nick += send_format(&buf_nick[len_nick], IRCD_BUFSIZE - len_nick, pattern,
1183	<	args);
1045	>	dbuf_put_fmt(uid_buffer, ":%s KILL %s :", ID(&me), ID(source_p));
1046	>	send_format(uid_buffer, pattern, args);
1047		va_end(args);
1048
1049		DLINK_FOREACH(ptr, serv_list.head)
1050		{
1051	<	client_p = ptr->data;
1051	>	struct Client *client_p = ptr->data;
1052
1053		if (one != NULL && (client_p == one->from))
1054		continue;
1055		if (IsDefunct(client_p))
1056		continue;
1057
1058	<	/* XXX perhaps IsCapable should test for localClient itself ? -db */
1196	<	if (client_p->localClient == NULL || !IsCapable(client_p, CAP_LL) ||
1197	<	!ServerInfo.hub ||
1198	<	(source_p->lazyLinkClientExists & client_p->localClient->serverMask))
1199	<	{
1200	<	if (have_uid && IsCapable(client_p, CAP_TS6))
1201	<	send_message(client_p, buf_uid, len_uid);
1202	<	else
1203	<	send_message(client_p, buf_nick, len_nick);
1204	<	}
1058	>	send_message(client_p, uid_buffer);
1059		}
1060	<	}
1060	>
1061	>	dbuf_ref_free(uid_buffer);
1062	>	}

Diff Legend

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