ViewVC Help

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

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

Comparing:
ircd-hybrid/src/send.c (file contents), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid/trunk/src/send.c (file contents), Revision 3110 by michael, Thu Mar 6 20:33:17 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: send.c,v 7.307 2005/10/02 12:45:07 adx Exp $
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		*
#	Line 64 | Line 54 | static unsigned long current_serial = 0L
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()
#	Line 145 | Line 125 | send_message(struct Client *to, char *bu
125		* output       - none
126		* side effects - Despite the function name, this only sends to directly
127		*                connected clients.
128	<	*
128	>	*
129		*/
130		static void
131	<	send_message_remote(struct Client *to, struct Client *from,
152	<	char *buf, int len)
131	>	send_message_remote(struct Client *to, struct Client *from, struct dbuf_block *buf)
132		{
133	+	if (to->from)
134	+	to = to->from;
135	+
136		if (!MyConnect(to))
137		{
138	<	sendto_realops_flags(UMODE_ALL, L_ALL,
139	<	"server send message to %s [%s] dropped from %s(Not local server)",
140	<	to->name, to->from->name, from->name);
138	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
139	>	"Server send message to %s [%s] dropped from %s(Not local server)",
140	>	to->name, to->from->name, from->name);
141		return;
142		}
143
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	–
144		/* Optimize by checking if (from && to) before everything */
145		/* we set to->from up there.. */
146
#	Line 173 | Line 148 | send_message_remote(struct Client *to, s
148		{
149		if (IsServer(from))
150		{
151	<	sendto_realops_flags(UMODE_ALL, L_ALL,
151	>	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,
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, to, NULL, CAP_TS6, NOCAPS, NOFLAGS,
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, to, NULL, NOCAPS, CAP_TS6, NOFLAGS,
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	<	SetKilled(to);
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,
202	<	to->host, to->from);
175	>	sendto_one_numeric(from, &me, ERR_GHOSTEDCLIENT, to->name,
176	>	to->username, to->host, to->from);
177
178		exit_client(to, &me, "Ghosted client");
205	–
179		return;
180	<	}
180	>	}
181
182	<	send_message(to, buf, len);
182	>	send_message(to, buf);
183		}
184
185		/*
#	Line 216 | Line 189 | send_message_remote(struct Client *to, s
189		void
190		sendq_unblocked(fde_t *fd, struct Client *client_p)
191		{
192	<	ClearSendqBlocked(client_p);
193	<	/* 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);
192	>	assert(fd == &client_p->localClient->fd);
193	>	send_queued_write(client_p);
194		}
195
196		/*
#	Line 248 | Line 202 | slinkq_unblocked(fde_t *fd, struct Clien
202		void
203		send_queued_write(struct Client *to)
204		{
205	<	int retlen;
206	<	struct dbuf_block *first;
205	>	int retlen = 0;
206	>	struct dbuf_queue *sendq = &to->localClient->buf_sendq;
207
208		/*
209		** Once socket is marked dead, we cannot start writing to it,
210		** even if the error is removed...
211		*/
212	<	if (IsDead(to) || IsSendqBlocked(to))
212	>	if (IsDead(to))
213		return;  /* no use calling send() now */
214
215		/* Next, lets try to write some data */
216	<
263	<	if (dbuf_length(&to->localClient->buf_sendq))
216	>	if (dbuf_length(sendq))
217		{
218	<	do {
219	<	first = to->localClient->buf_sendq.blocks.head->data;
218	>	do
219	>	{
220	>	struct dbuf_block *first = sendq->blocks.head->data;
221
222		#ifdef HAVE_LIBCRYPTO
223		if (to->localClient->fd.ssl)
224		{
225	<	retlen = SSL_write(to->localClient->fd.ssl, first->data, first->size);
225	>	retlen = SSL_write(to->localClient->fd.ssl, first->data + sendq->pos, first->size - sendq->pos);
226
227		/* translate openssl error codes, sigh */
228	<	if (retlen < 0)
229	<	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
230	<	{
228	>	if (retlen < 0)
229	>	{
230	>	switch (SSL_get_error(to->localClient->fd.ssl, retlen))
231	>	{
232		case SSL_ERROR_WANT_READ:
233	<	return;  /* retry later, don't register for write events */
234	<
235	<	case SSL_ERROR_WANT_WRITE:
281	<	errno = EWOULDBLOCK;
233	>	return;  /* retry later, don't register for write events */
234	>	case SSL_ERROR_WANT_WRITE:
235	>	errno = EWOULDBLOCK;
236		case SSL_ERROR_SYSCALL:
237	<	break;
238	<
237	>	break;
238	>	case SSL_ERROR_SSL:
239	>	if (errno == EAGAIN)
240	>	break;
241		default:
242	<	retlen = errno = 0;  /* either an SSL-specific error or EOF */
243	<	}
242	>	retlen = errno = 0;  /* either an SSL-specific error or EOF */
243	>	}
244	>	}
245		}
246		else
247		#endif
248	<	retlen = send(to->localClient->fd.fd, first->data, first->size, 0);
248	>	retlen = send(to->localClient->fd.fd, first->data + sendq->pos, first->size - sendq->pos, 0);
249
250		if (retlen <= 0)
294	–	{
295	–	#ifdef _WIN32
296	–	errno = WSAGetLastError();
297	–	#endif
251		break;
299	–	}
252
301	–	execute_callback(iosend_cb, to, retlen, first->data);
253		dbuf_delete(&to->localClient->buf_sendq, retlen);
254
255		/* We have some data written .. update counters */
#	Line 309 | Line 260 | send_queued_write(struct Client *to)
260		if ((retlen < 0) && (ignoreErrno(errno)))
261		{
262		/* we have a non-fatal error, reschedule a write */
263	<	SetSendqBlocked(to);
313	<	comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE,
314	<	(PF *)sendq_unblocked, (void *)to, 0);
263	>	comm_setselect(&to->localClient->fd, COMM_SELECT_WRITE, (PF *)sendq_unblocked, to, 0);
264		}
265		else if (retlen <= 0)
266		{
#	Line 321 | Line 270 | send_queued_write(struct Client *to)
270		}
271		}
272
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	–
273		/* send_queued_all()
274		*
275		* input        - NONE
#	Line 402 | Line 285 | send_queued_all(void)
285		* a notice to opers, which is to be delivered by this function.
286		*/
287		DLINK_FOREACH(ptr, serv_list.head)
288	<	send_queued_write((struct Client *) ptr->data);
288	>	send_queued_write(ptr->data);
289
290		DLINK_FOREACH(ptr, unknown_list.head)
291	<	send_queued_write((struct Client *) ptr->data);
291	>	send_queued_write(ptr->data);
292
293		DLINK_FOREACH(ptr, local_client_list.head)
294	<	send_queued_write((struct Client *) ptr->data);
294	>	send_queued_write(ptr->data);
295
296		/* NOTE: This can still put clients on aborted_list; unfortunately,
297		* exit_aborted_clients takes precedence over send_queued_all,
#	Line 429 | Line 312 | void
312		sendto_one(struct Client *to, const char *pattern, ...)
313		{
314		va_list args;
315	<	char buffer[IRCD_BUFSIZE];
433	<	int len;
315	>	struct dbuf_block *buffer;
316
317		if (to->from != NULL)
318		to = to->from;
319		if (IsDead(to))
320	<	return; /* This socket has already been marked as dead */
320	>	return;  /* This socket has already been marked as dead */
321	>
322	>	buffer = dbuf_alloc();
323
324		va_start(args, pattern);
325	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
325	>	send_format(buffer, pattern, args);
326		va_end(args);
327
328	<	send_message(to, buffer, len);
328	>	send_message(to, buffer);
329	>
330	>	dbuf_ref_free(buffer);
331	>	}
332	>
333	>	void
334	>	sendto_one_numeric(struct Client *to, struct Client *from, enum irc_numerics numeric, ...)
335	>	{
336	>	struct dbuf_block *buffer;
337	>	va_list args;
338	>	const char *dest;
339	>
340	>	if (to->from != NULL)
341	>	to = to->from;
342	>	if (IsDead(to))
343	>	return;
344	>
345	>	dest = ID_or_name(to, to);
346	>	if (EmptyString(dest))
347	>	dest = "*";
348	>
349	>	buffer = dbuf_alloc();
350	>
351	>	dbuf_put(buffer, ":%s %03d %s ", ID_or_name(from, to), numeric, dest);
352	>
353	>	va_start(args, numeric);
354	>	send_format(buffer, numeric_form(numeric), args);
355	>	va_end(args);
356	>
357	>	send_message(to, buffer);
358	>
359	>	dbuf_ref_free(buffer);
360	>	}
361	>
362	>	void
363	>	sendto_one_notice(struct Client *to, struct Client *from, const char *pattern, ...)
364	>	{
365	>	struct dbuf_block *buffer;
366	>	va_list args;
367	>	const char *dest;
368	>
369	>	if (to->from != NULL)
370	>	to = to->from;
371	>	if (IsDead(to))
372	>	return;
373	>
374	>	dest = ID_or_name(to, to);
375	>	if (EmptyString(dest))
376	>	dest = "*";
377	>
378	>	buffer = dbuf_alloc();
379	>
380	>	dbuf_put(buffer, ":%s NOTICE %s ", ID_or_name(from, to), dest);
381	>
382	>	va_start(args, pattern);
383	>	send_format(buffer, pattern, args);
384	>	va_end(args);
385	>
386	>	send_message(to, buffer);
387	>
388	>	dbuf_ref_free(buffer);
389		}
390
391		/* sendto_channel_butone()
#	Line 457 | Line 401 | sendto_one(struct Client *to, const char
401		*/
402		void
403		sendto_channel_butone(struct Client *one, struct Client *from,
404	<	struct Channel *chptr, const char *command,
404	>	struct Channel *chptr, unsigned int type,
405		const char *pattern, ...)
406		{
407	<	va_list args;
408	<	char local_buf[IRCD_BUFSIZE];
409	<	char remote_buf[IRCD_BUFSIZE];
410	<	char uid_buf[IRCD_BUFSIZE];
411	<	int local_len, remote_len, uid_len;
468	<	dlink_node *ptr;
469	<	dlink_node *ptr_next;
470	<	struct Client *target_p;
407	>	va_list alocal, aremote, auid;
408	>	struct dbuf_block *local_buf, *remote_buf, *uid_buf;
409	>	dlink_node *ptr = NULL, *ptr_next = NULL;
410	>
411	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc(), uid_buf = dbuf_alloc();
412
413		if (IsServer(from))
414	<	local_len = ircsprintf(local_buf, ":%s %s %s ",
474	<	from->name, command, chptr->chname);
414	>	dbuf_put(local_buf, ":%s ", from->name);
415		else
416	<	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);
416	>	dbuf_put(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
417
418	<	va_start(args, pattern);
419	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
420	<	pattern, args);
421	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
422	<	pattern, args);
423	<	uid_len += send_format(&uid_buf[uid_len], IRCD_BUFSIZE - uid_len, pattern,
424	<	args);
425	<	va_end(args);
418	>	dbuf_put(remote_buf, ":%s ", from->name);
419	>	dbuf_put(uid_buf, ":%s ", ID(from));
420	>
421	>	va_start(alocal, pattern);
422	>	va_start(aremote, pattern);
423	>	va_start(auid, pattern);
424	>	send_format(local_buf, pattern, alocal);
425	>	send_format(remote_buf, pattern, aremote);
426	>	send_format(uid_buf, pattern, auid);
427	>	va_end(auid);
428	>	va_end(aremote);
429	>	va_end(alocal);
430
431		++current_serial;
432
433		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
434		{
435	<	target_p = ((struct Membership *)ptr->data)->client_p;
436	<	assert(target_p != NULL);
435	>	struct Membership *ms = ptr->data;
436	>	struct Client *target_p = ms->client_p;
437
438	<	if (IsDefunct(target_p) || IsDeaf(target_p) || target_p->from == one)
438	>	assert(IsClient(target_p));
439	>
440	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) || target_p->from == one)
441		continue;
442
443	<	if (MyClient(target_p))
444	<	{
445	<	if (target_p->serial != current_serial)
446	<	{
447	<	send_message(target_p, local_buf, local_len);
448	<	target_p->serial = current_serial;
449	<	}
450	<	}
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	<	}
443	>	if (type != 0 && (ms->flags & type) == 0)
444	>	continue;
445	>
446	>	if (MyConnect(target_p))
447	>	send_message(target_p, local_buf);
448	>	else if (target_p->from->localClient->serial != current_serial)
449	>	send_message_remote(target_p->from, from, remote_buf);
450	>	target_p->from->localClient->serial = current_serial;
451		}
452	+
453	+	dbuf_ref_free(local_buf);
454	+	dbuf_ref_free(remote_buf);
455	+	dbuf_ref_free(uid_buf);
456		}
457
458		/* sendto_server()
459	<	*
459	>	*
460		* inputs       - pointer to client to NOT send to
461	<	*              - pointer to source client required by LL (if any)
532	<	*              - pointer to channel required by LL (if any)
461	>	*              - pointer to channel
462		*              - caps or'd together which must ALL be present
463		*              - caps or'd together which must ALL NOT be present
535	–	*              - LL flags: LL_ICLIENT | LL_ICHAN
464		*              - printf style format string
465		*              - args to format string
466		* output       - NONE
467		* side effects - Send a message to all connected servers, except the
468		*                client 'one' (if non-NULL), as long as the servers
469		*                support ALL capabs in 'caps', and NO capabs in 'nocaps'.
470	<	*                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	<	*
470	>	*
471		* This function was written in an attempt to merge together the other
472		* billion sendto_*serv*() functions, which sprung up with capabs,
473		* lazylinks, uids, etc.
474		* -davidt
475		*/
476	<	void
477	<	sendto_server(struct Client *one, struct Client *source_p,
478	<	struct Channel *chptr, unsigned long caps,
479	<	unsigned long nocaps, unsigned long llflags,
476	>	void
477	>	sendto_server(struct Client *one,
478	>	const unsigned int caps,
479	>	const unsigned int nocaps,
480		const char *format, ...)
481		{
482		va_list args;
483	<	struct Client *client_p;
484	<	dlink_node *ptr;
564	<	char buffer[IRCD_BUFSIZE];
565	<	int len;
483	>	dlink_node *ptr = NULL;
484	>	struct dbuf_block *buffer;
485
486	<	if (chptr != NULL)
568	<	{
569	<	if (chptr->chname[0] != '#')
570	<	return;
571	<	}
486	>	buffer = dbuf_alloc();
487
488		va_start(args, format);
489	<	len = send_format(buffer, IRCD_BUFSIZE, format, args);
489	>	send_format(buffer, format, args);
490		va_end(args);
491
492		DLINK_FOREACH(ptr, serv_list.head)
493		{
494	<	client_p = ptr->data;
494	>	struct Client *client_p = ptr->data;
495
496		/* If dead already skip */
497		if (IsDead(client_p))
#	Line 591 | Line 506 | sendto_server(struct Client *one, struct
506		if ((client_p->localClient->caps & nocaps) != 0)
507		continue;
508
509	<	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);
509	>	send_message(client_p, buffer);
510		}
511	+
512	+	dbuf_ref_free(buffer);
513		}
514
515		/* sendto_common_channels_local()
#	Line 630 | Line 518 | sendto_server(struct Client *one, struct
518		*              - pattern to send
519		* output       - NONE
520		* side effects - Sends a message to all people on local server who are
521	<	*                in same channel with user.
521	>	*                in same channel with user.
522		*                used by m_nick.c and exit_one_client.
523		*/
524		void
525	<	sendto_common_channels_local(struct Client *user, int touser,
525	>	sendto_common_channels_local(struct Client *user, int touser, unsigned int cap,
526		const char *pattern, ...)
527		{
528		va_list args;
#	Line 643 | Line 531 | sendto_common_channels_local(struct Clie
531		struct Channel *chptr;
532		struct Membership *ms;
533		struct Client *target_p;
534	<	char buffer[IRCD_BUFSIZE];
535	<	int len;
534	>	struct dbuf_block *buffer;
535	>
536	>	buffer = dbuf_alloc();
537
538		va_start(args, pattern);
539	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
539	>	send_format(buffer, pattern, args);
540		va_end(args);
541
542		++current_serial;
543
544		DLINK_FOREACH(cptr, user->channel.head)
545		{
546	<	chptr = ((struct Membership *) cptr->data)->chptr;
546	>	chptr = ((struct Membership *)cptr->data)->chptr;
547		assert(chptr != NULL);
548
549	<	DLINK_FOREACH(uptr, chptr->locmembers.head)
549	>	DLINK_FOREACH(uptr, chptr->members.head)
550		{
551		ms = uptr->data;
552		target_p = ms->client_p;
553		assert(target_p != NULL);
554
555	<	if (target_p == user || IsDefunct(target_p) ||
556	<	target_p->serial == current_serial)
555	>	if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
556	>	target_p->localClient->serial == current_serial)
557		continue;
558
559	<	target_p->serial = current_serial;
560	<	send_message(target_p, buffer, len);
559	>	if (HasCap(target_p, cap) != cap)
560	>	continue;
561	>
562	>	target_p->localClient->serial = current_serial;
563	>	send_message(target_p, buffer);
564		}
565		}
566
567		if (touser && MyConnect(user) && !IsDead(user) &&
568	<	user->serial != current_serial)
569	<	send_message(user, buffer, len);
568	>	user->localClient->serial != current_serial)
569	>	if (HasCap(user, cap) == cap)
570	>	send_message(user, buffer);
571	>
572	>	dbuf_ref_free(buffer);
573		}
574
575		/* sendto_channel_local()
#	Line 688 | Line 583 | sendto_common_channels_local(struct Clie
583		*                locally connected to this server.
584		*/
585		void
586	<	sendto_channel_local(int type, int nodeaf, struct Channel *chptr,
586	>	sendto_channel_local(unsigned int type, int nodeaf, struct Channel *chptr,
587		const char *pattern, ...)
588		{
589		va_list args;
590	<	char buffer[IRCD_BUFSIZE];
591	<	int len;
592	<	dlink_node *ptr;
593	<	struct Membership *ms;
699	<	struct Client *target_p;
590	>	dlink_node *ptr = NULL;
591	>	struct dbuf_block *buffer;
592	>
593	>	buffer = dbuf_alloc();
594
595		va_start(args, pattern);
596	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
596	>	send_format(buffer, pattern, args);
597		va_end(args);
598
599	<	DLINK_FOREACH(ptr, chptr->locmembers.head)
599	>	DLINK_FOREACH(ptr, chptr->members.head)
600		{
601	<	ms = ptr->data;
602	<	target_p = ms->client_p;
601	>	struct Membership *ms = ptr->data;
602	>	struct Client *target_p = ms->client_p;
603
604		if (type != 0 && (ms->flags & type) == 0)
605		continue;
606
607	<	if (IsDefunct(target_p) || (nodeaf && IsDeaf(target_p)))
607	>	if (!MyConnect(target_p) || IsDefunct(target_p) ||
608	>	(nodeaf && HasUMode(target_p, UMODE_DEAF)))
609		continue;
610
611	<	send_message(target_p, buffer, len);
611	>	send_message(target_p, buffer);
612		}
613	+
614	+	dbuf_ref_free(buffer);
615		}
616
617		/* sendto_channel_local_butone()
#	Line 729 | Line 626 | sendto_channel_local(int type, int nodea
626		*
627		* WARNING - +D clients are omitted
628		*/
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	–	*/
629		void
630	<	sendto_channel_remote(struct Client *one, struct Client *from, int type, int caps,
631	<	int nocaps, struct Channel *chptr, const char *pattern, ...)
630	>	sendto_channel_local_butone(struct Client *one, unsigned int type, unsigned int cap,
631	>	struct Channel *chptr, const char *pattern, ...)
632		{
633		va_list args;
634	<	char buffer[IRCD_BUFSIZE];
635	<	int len;
636	<	dlink_node *ptr;
637	<	struct Client *target_p;
782	<	struct Membership *ms;
634	>	dlink_node *ptr = NULL;
635	>	struct dbuf_block *buffer;
636	>
637	>	buffer = dbuf_alloc();
638
639		va_start(args, pattern);
640	<	len = send_format(buffer, IRCD_BUFSIZE, pattern, args);
640	>	send_format(buffer, pattern, args);
641		va_end(args);
642
643		DLINK_FOREACH(ptr, chptr->members.head)
644		{
645	<	ms = ptr->data;
646	<	target_p = ms->client_p;
645	>	struct Membership *ms = ptr->data;
646	>	struct Client *target_p = ms->client_p;
647
648		if (type != 0 && (ms->flags & type) == 0)
649		continue;
650
651	<	if (MyConnect(target_p))
651	>	if (!MyConnect(target_p) || target_p == one ||
652	>	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
653		continue;
798	–	target_p = target_p->from;
654
655	<	if (target_p == one->from ||
801	<	((target_p->from->localClient->caps & caps) != caps) ||
802	<	((target_p->from->localClient->caps & nocaps) != 0))
655	>	if (HasCap(target_p, cap) != cap)
656		continue;
657
658	<	send_message(target_p, buffer, len);
659	<	}
658	>	send_message(target_p, buffer);
659	>	}
660	>
661	>	dbuf_ref_free(buffer);
662		}
663
664		/*
#	Line 824 | Line 679 | sendto_channel_remote(struct Client *one
679		* side effects - NONE
680		*/
681		static int
682	<	match_it(const struct Client *one, const char *mask, int what)
682	>	match_it(const struct Client *one, const char *mask, unsigned int what)
683		{
684		if (what == MATCH_HOST)
685	<	return(match(mask, one->host));
685	>	return !match(mask, one->host);
686
687	<	return(match(mask, one->servptr->name));
687	>	return !match(mask, one->servptr->name);
688		}
689
690		/* sendto_match_butone()
#	Line 843 | Line 698 | void
698		sendto_match_butone(struct Client *one, struct Client *from, char *mask,
699		int what, const char *pattern, ...)
700		{
701	<	va_list args;
702	<	struct Client *client_p;
703	<	dlink_node *ptr, *ptr_next;
704	<	char local_buf[IRCD_BUFSIZE], remote_buf[IRCD_BUFSIZE];
705	<	int local_len = ircsprintf(local_buf, ":%s!%s@%s ", from->name,
706	<	from->username, from->host);
707	<	int remote_len = ircsprintf(remote_buf, ":%s ", from->name);
708	<
709	<	va_start(args, pattern);
710	<	local_len += send_format(&local_buf[local_len], IRCD_BUFSIZE - local_len,
711	<	pattern, args);
712	<	remote_len += send_format(&remote_buf[remote_len], IRCD_BUFSIZE - remote_len,
713	<	pattern, args);
714	<	va_end(args);
701	>	va_list alocal, aremote;
702	>	dlink_node *ptr = NULL, *ptr_next = NULL;
703	>	struct dbuf_block *local_buf, *remote_buf;
704	>
705	>	local_buf = dbuf_alloc(), remote_buf = dbuf_alloc();
706	>
707	>	dbuf_put(local_buf, ":%s!%s@%s ", from->name, from->username, from->host);
708	>	dbuf_put(remote_buf, ":%s ", from->name);
709	>
710	>	va_start(alocal, pattern);
711	>	va_start(aremote, pattern);
712	>	send_format(local_buf, pattern, alocal);
713	>	send_format(remote_buf, pattern, aremote);
714	>	va_end(aremote);
715	>	va_end(alocal);
716
717		/* scan the local clients */
718		DLINK_FOREACH(ptr, local_client_list.head)
719		{
720	<	client_p = ptr->data;
720	>	struct Client *client_p = ptr->data;
721
722		if (client_p != one && !IsDefunct(client_p) &&
723		match_it(client_p, mask, what))
724	<	send_message(client_p, local_buf, local_len);
724	>	send_message(client_p, local_buf);
725		}
726
727		/* Now scan servers */
728		DLINK_FOREACH_SAFE(ptr, ptr_next, serv_list.head)
729		{
730	<	client_p = ptr->data;
730	>	struct Client *client_p = ptr->data;
731
732		/*
733		* The old code looped through every client on the
#	Line 898 | Line 754 | sendto_match_butone(struct Client *one,
754		* -wnder
755		*/
756		if (client_p != one && !IsDefunct(client_p))
757	<	send_message_remote(client_p, from, remote_buf, remote_len);
757	>	send_message_remote(client_p, from, remote_buf);
758		}
759	+
760	+	dbuf_ref_free(local_buf);
761	+	dbuf_ref_free(remote_buf);
762		}
763
764		/* sendto_match_servs()
#	Line 912 | Line 771 | sendto_match_butone(struct Client *one,
771		* side effects - data sent to servers matching with capab
772		*/
773		void
774	<	sendto_match_servs(struct Client *source_p, const char *mask, int cap,
774	>	sendto_match_servs(struct Client *source_p, const char *mask, unsigned int cap,
775		const char *pattern, ...)
776		{
777		va_list args;
778	<	struct Client *target_p;
779	<	dlink_node *ptr;
780	<	char buffer[IRCD_BUFSIZE];
781	<	int found = 0;
778	>	dlink_node *ptr = NULL;
779	>	struct dbuf_block *buff_suid, *buff_name;
780	>
781	>	buff_suid = dbuf_alloc(), buff_name = dbuf_alloc();
782
783		va_start(args, pattern);
784	<	vsnprintf(buffer, sizeof(buffer), pattern, args);
784	>	dbuf_put(buff_suid, ":%s ", ID(source_p));
785	>	dbuf_put_args(buff_suid, pattern, args);
786		va_end(args);
787
788	<	current_serial++;
788	>	va_start(args, pattern);
789	>	dbuf_put(buff_name, ":%s ", source_p->name);
790	>	dbuf_put_args(buff_name, pattern, args);
791	>	va_end(args);
792	>
793	>	++current_serial;
794
795		DLINK_FOREACH(ptr, global_serv_list.head)
796		{
797	<	target_p = ptr->data;
797	>	struct Client *target_p = ptr->data;
798
799		/* Do not attempt to send to ourselves, or the source */
800		if (IsMe(target_p) || target_p->from == source_p->from)
801		continue;
802
803	<	if (target_p->from->serial == current_serial)
803	>	if (target_p->from->localClient->serial == current_serial)
804		continue;
805
806	<	if (match(mask, target_p->name))
806	>	if (!match(mask, target_p->name))
807		{
808		/*
809		* if we set the serial here, then we'll never do a
810		* match() again, if !IsCapable()
811		*/
812	<	target_p->from->serial = current_serial;
948	<	found++;
812	>	target_p->from->localClient->serial = current_serial;
813
814		if (!IsCapable(target_p->from, cap))
815		continue;
816
817	<	sendto_anywhere(target_p, source_p, "%s", buffer);
817	>	if (HasID(target_p->from))
818	>	send_message_remote(target_p->from, source_p, buff_suid);
819	>	else
820	>	send_message_remote(target_p->from, source_p, buff_name);
821		}
822		}
823	+
824	+	dbuf_ref_free(buff_suid);
825	+	dbuf_ref_free(buff_name);
826		}
827
828		/* sendto_anywhere()
#	Line 966 | Line 836 | sendto_match_servs(struct Client *source
836		*/
837		void
838		sendto_anywhere(struct Client *to, struct Client *from,
839	+	const char *command,
840		const char *pattern, ...)
841		{
842		va_list args;
843	<	char buffer[IRCD_BUFSIZE];
973	<	int len;
974	<	struct Client *send_to = (to->from != NULL ? to->from : to);
843	>	struct dbuf_block *buffer;
844
845	<	if (IsDead(send_to))
845	>	if (IsDead(to->from))
846		return;
847
848	+	buffer = dbuf_alloc();
849	+
850		if (MyClient(to))
851		{
852		if (IsServer(from))
853	<	{
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	<	}
853	>	dbuf_put(buffer, ":%s %s %s ", from->name, command, to->name);
854		else
855	<	len = ircsprintf(buffer, ":%s!%s@%s ",
990	<	from->name, from->username, from->host);
855	>	dbuf_put(buffer, ":%s!%s@%s %s %s ", from->name, from->username, from->host, command, to->name);
856		}
857	<	else len = ircsprintf(buffer, ":%s ", ID_or_name(from, send_to));
857	>	else
858	>	dbuf_put(buffer, ":%s %s %s ", ID_or_name(from, to), command, ID_or_name(to, to));
859
860		va_start(args, pattern);
861	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
861	>	send_format(buffer, pattern, args);
862		va_end(args);
863
864	<	if(MyClient(to))
865	<	send_message(send_to, buffer, len);
864	>	if (MyClient(to))
865	>	send_message(to, buffer);
866		else
867	<	send_message_remote(send_to, from, buffer, len);
867	>	send_message_remote(to, from, buffer);
868	>
869	>	dbuf_ref_free(buffer);
870		}
871
872		/* sendto_realops_flags()
#	Line 1010 | Line 878 | sendto_anywhere(struct Client *to, struc
878		* side effects - Send to *local* ops only but NOT +s nonopers.
879		*/
880		void
881	<	sendto_realops_flags(unsigned int flags, int level, const char *pattern, ...)
881	>	sendto_realops_flags(unsigned int flags, int level, int type, const char *pattern, ...)
882		{
883	<	struct Client *client_p;
883	>	const char *ntype = NULL;
884	>	dlink_node *ptr = NULL;
885		char nbuf[IRCD_BUFSIZE];
1017	–	dlink_node *ptr;
886		va_list args;
887
888		va_start(args, pattern);
889	<	vsnprintf(nbuf, IRCD_BUFSIZE, pattern, args);
889	>	vsnprintf(nbuf, sizeof(nbuf), pattern, args);
890		va_end(args);
891
892	+	switch (type)
893	+	{
894	+	case SEND_NOTICE:
895	+	ntype = "Notice";
896	+	break;
897	+	case SEND_GLOBAL:
898	+	ntype = "Global";
899	+	break;
900	+	case SEND_LOCOPS:
901	+	ntype = "LocOps";
902	+	break;
903	+	default:
904	+	assert(0);
905	+	}
906	+
907		DLINK_FOREACH(ptr, oper_list.head)
908		{
909	<	client_p = ptr->data;
910	<	assert(client_p->umodes & UMODE_OPER);
909	>	struct Client *client_p = ptr->data;
910	>	assert(HasUMode(client_p, UMODE_OPER));
911
912	<	/* If we're sending it to opers and theyre an admin, skip.
913	<	* If we're sending it to admins, and theyre not, skip.
912	>	/*
913	>	* If we're sending it to opers and they're an admin, skip.
914	>	* If we're sending it to admins, and they're not, skip.
915		*/
916	<	if (((level == L_ADMIN) && !IsAdmin(client_p)) ||
917	<	((level == L_OPER) && IsAdmin(client_p)))
916	>	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
917	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
918		continue;
919
920	<	if (client_p->umodes & flags)
921	<	sendto_one(client_p, ":%s NOTICE %s :*** Notice -- %s",
922	<	me.name, client_p->name, nbuf);
920	>	if (HasUMode(client_p, flags))
921	>	sendto_one(client_p, ":%s NOTICE %s :*** %s -- %s",
922	>	me.name, client_p->name, ntype, nbuf);
923		}
924		}
925
#	Line 1051 | Line 935 | void
935		sendto_wallops_flags(unsigned int flags, struct Client *source_p,
936		const char *pattern, ...)
937		{
938	<	struct Client *client_p;
1055	<	dlink_node *ptr;
938	>	dlink_node *ptr = NULL;
939		va_list args;
940	<	char buffer[IRCD_BUFSIZE];
941	<	int len;
940	>	struct dbuf_block *buffer;
941	>
942	>	buffer = dbuf_alloc();
943
944		if (IsClient(source_p))
945	<	len = ircsprintf(buffer, ":%s!%s@%s WALLOPS :",
1062	<	source_p->name, source_p->username, source_p->host);
945	>	dbuf_put(buffer, ":%s!%s@%s WALLOPS :", source_p->name, source_p->username, source_p->host);
946		else
947	<	len = ircsprintf(buffer, ":%s WALLOPS :", source_p->name);
947	>	dbuf_put(buffer, ":%s WALLOPS :", source_p->name);
948
949		va_start(args, pattern);
950	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
950	>	send_format(buffer, pattern, args);
951		va_end(args);
952
953		DLINK_FOREACH(ptr, oper_list.head)
954		{
955	<	client_p = ptr->data;
955	>	struct Client *client_p = ptr->data;
956		assert(client_p->umodes & UMODE_OPER);
957
958	<	if ((client_p->umodes & flags) && !IsDefunct(client_p))
959	<	send_message(client_p, buffer, len);
958	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
959	>	send_message(client_p, buffer);
960		}
961	+
962	+	dbuf_ref_free(buffer);
963		}
964
965		/* ts_warn()
#	Line 1085 | Line 970 | sendto_wallops_flags(unsigned int flags,
970		*                (at most 5 warnings every 5 seconds)
971		*/
972		void
973	<	ts_warn(const char *pattern, ...)
973	>	sendto_realops_flags_ratelimited(const char *pattern, ...)
974		{
975		va_list args;
976	<	char buffer[LOG_BUFSIZE];
976	>	char buffer[IRCD_BUFSIZE];
977		static time_t last = 0;
978		static int warnings = 0;
979
#	Line 1111 | Line 996 | ts_warn(const char *pattern, ...)
996		}
997
998		va_start(args, pattern);
999	<	vsprintf_irc(buffer, pattern, args);
999	>	vsnprintf(buffer, sizeof(buffer), pattern, args);
1000		va_end(args);
1001
1002	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s", buffer);
1003	<	ilog(L_CRIT, "%s", buffer);
1002	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
1003	>	ilog(LOG_TYPE_IRCD, "%s", buffer);
1004		}
1005
1006		/* kill_client()
#	Line 1131 | Line 1016 | kill_client(struct Client *client_p, str
1016		const char *pattern, ...)
1017		{
1018		va_list args;
1019	<	char buffer[IRCD_BUFSIZE];
1135	<	int len;
1019	>	struct dbuf_block *buffer;
1020
1021		if (client_p->from != NULL)
1022		client_p = client_p->from;
1023		if (IsDead(client_p))
1024		return;
1025
1026	<	len = ircsprintf(buffer, ":%s KILL %s :", ID_or_name(&me, client_p->from),
1027	<	ID_or_name(diedie, client_p));
1026	>	buffer = dbuf_alloc();
1027	>
1028	>	dbuf_put(buffer, ":%s KILL %s :",
1029	>	ID_or_name(&me, client_p),
1030	>	ID_or_name(diedie, client_p));
1031
1032		va_start(args, pattern);
1033	<	len += send_format(&buffer[len], IRCD_BUFSIZE - len, pattern, args);
1033	>	send_format(buffer, pattern, args);
1034		va_end(args);
1035
1036	<	send_message(client_p, buffer, len);
1036	>	send_message(client_p, buffer);
1037	>
1038	>	dbuf_ref_free(buffer);
1039		}
1040
1041		/* kill_client_ll_serv_butone()
#	Line 1160 | Line 1049 | kill_client(struct Client *client_p, str
1049		*                client being unknown to leaf, as in lazylink...
1050		*/
1051		void
1052	<	kill_client_ll_serv_butone(struct Client *one, struct Client *source_p,
1053	<	const char *pattern, ...)
1052	>	kill_client_serv_butone(struct Client *one, struct Client *source_p,
1053	>	const char *pattern, ...)
1054		{
1055		va_list args;
1056		int have_uid = 0;
1057	<	struct Client *client_p;
1058	<	dlink_node *ptr;
1170	<	char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1171	<	int len_uid = 0, len_nick;
1057	>	dlink_node *ptr = NULL;
1058	>	struct dbuf_block *uid_buffer, *nick_buffer;
1059
1060	<	va_start(args, pattern);
1061	<	if (HasID(source_p) && (me.id[0] != '\0'))
1060	>	uid_buffer = dbuf_alloc(), nick_buffer = dbuf_alloc();
1061	>
1062	>	if (HasID(source_p))
1063		{
1064		have_uid = 1;
1065	<	len_uid = ircsprintf(buf_uid, ":%s KILL %s :", me.id, ID(source_p));
1066	<	len_uid += send_format(&buf_uid[len_uid], IRCD_BUFSIZE - len_uid, pattern,
1067	<	args);
1065	>	va_start(args, pattern);
1066	>	dbuf_put(uid_buffer, ":%s KILL %s :", me.id, ID(source_p));
1067	>	send_format(uid_buffer, pattern, args);
1068	>	va_end(args);
1069		}
1070	<	len_nick = ircsprintf(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);
1070	>
1071	>	va_start(args, pattern);
1072	>	dbuf_put(nick_buffer, ":%s KILL %s :", me.name, source_p->name);
1073	>	send_format(nick_buffer, pattern, args);
1074		va_end(args);
1075
1076		DLINK_FOREACH(ptr, serv_list.head)
1077		{
1078	<	client_p = ptr->data;
1078	>	struct Client *client_p = ptr->data;
1079
1080		if (one != NULL && (client_p == one->from))
1081		continue;
1082		if (IsDefunct(client_p))
1083		continue;
1084
1085	<	/* XXX perhaps IsCapable should test for localClient itself ? -db */
1086	<	if (client_p->localClient == NULL || !IsCapable(client_p, CAP_LL) ||
1087	<	!ServerInfo.hub ||
1088	<	(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	<	}
1085	>	if (have_uid && IsCapable(client_p, CAP_TS6))
1086	>	send_message(client_p, uid_buffer);
1087	>	else
1088	>	send_message(client_p, nick_buffer);
1089		}
1090	<	}
1090	>
1091	>	dbuf_ref_free(uid_buffer);
1092	>	dbuf_ref_free(nick_buffer);
1093	>	}

Comparing:
ircd-hybrid/src/send.c (property svn:keywords), Revision 30 by adx, Sun Oct 2 20:03:27 2005 UTC vs.
ircd-hybrid/trunk/src/send.c (property svn:keywords), Revision 3110 by michael, Thu Mar 6 20:33:17 2014 UTC

#	Line 1 | Line 1
1	<	"Id Revision"
1	>	Id Revision

Diff Legend

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