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

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 3120 by michael, Fri Mar 7 21:52:54 2014 UTC

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

Diff Legend

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