ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/send.c (file contents), Revision 939 by db, Sat May 2 01:41:47 2009 UTC vs.
ircd-hybrid/trunk/src/send.c (file contents), Revision 1632 by michael, Sun Nov 4 15:37:10 2012 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "send.h"
28		#include "channel.h"
29		#include "client.h"
30	–	#include "common.h"
30		#include "dbuf.h"
31		#include "irc_string.h"
32		#include "ircd.h"
34	–	#include "handlers.h"
33		#include "numeric.h"
34		#include "fdlist.h"
35		#include "s_bsd.h"
36		#include "s_serv.h"
37		#include "sprintf_irc.h"
38	<	#include "s_conf.h"
39	<	#include "list.h"
42	<	#include "s_log.h"
38	>	#include "conf.h"
39	>	#include "log.h"
40		#include "memory.h"
41		#include "hook.h"
45	–	#include "irc_getnameinfo.h"
42		#include "packet.h"
43
48	–	#define LOG_BUFSIZE 2048
44
45		struct Callback *iosend_cb = NULL;
46	<	struct Callback *iosendctrl_cb = NULL;
52	<
53	<	static void send_message(struct Client *, char *, int);
54	<	static void send_message_remote(struct Client *, struct Client *, char *, int);
46	>	static unsigned int current_serial = 0;
47
56	–	static unsigned long current_serial = 0L;
48
49		/* send_format()
50		*
#	Line 87 | Line 78 | send_format(char *lsendbuf, int bufsize,
78
79		lsendbuf[len++] = '\r';
80		lsendbuf[len++] = '\n';
81	<	return (len);
81	>	return len;
82		}
83
84		/*
#	Line 115 | Line 106 | send_message(struct Client *to, char *bu
106		assert(!IsMe(to));
107		assert(to != &me);
108
109	<	if (dbuf_length(&to->localClient->buf_sendq) + len > get_sendq(to))
109	>	if (dbuf_length(&to->localClient->buf_sendq) + len > get_sendq(&to->localClient->confs))
110		{
111		if (IsServer(to))
112	<	sendto_realops_flags(UMODE_ALL, L_ALL,
112	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
113		"Max SendQ limit exceeded for %s: %lu > %lu",
114		get_client_name(to, HIDE_IP),
115		(unsigned long)(dbuf_length(&to->localClient->buf_sendq) + len),
116	<	get_sendq(to));
116	>	get_sendq(&to->localClient->confs));
117		if (IsClient(to))
118		SetSendQExceeded(to);
119		dead_link_on_write(to, 0);
#	Line 161 | Line 152 | send_message_remote(struct Client *to, s
152		{
153		if (!MyConnect(to))
154		{
155	<	sendto_realops_flags(UMODE_ALL, L_ALL,
155	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
156		"server send message to %s [%s] dropped from %s(Not local server)",
157		to->name, to->from->name, from->name);
158		return;
#	Line 174 | Line 165 | send_message_remote(struct Client *to, s
165		{
166		if (IsServer(from))
167		{
168	<	sendto_realops_flags(UMODE_ALL, L_ALL,
168	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
169		"Send message to %s [%s] dropped from %s(Fake Dir)",
170		to->name, to->from->name, from->name);
171		return;
172		}
173
174	<	sendto_realops_flags(UMODE_ALL, L_ALL,
174	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
175		"Ghosted: %s[%s@%s] from %s[%s@%s] (%s)",
176		to->name, to->username, to->host,
177		from->name, from->username, from->host,
178		to->from->name);
179
180	<	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
180	>	sendto_server(NULL, CAP_TS6, NOCAPS,
181		":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
182		me.id, to->name, me.name, to->name,
183		to->username, to->host, to->from->name);
184	<	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
184	>	sendto_server(NULL, NOCAPS, CAP_TS6,
185		":%s KILL %s :%s (%s[%s@%s] Ghosted %s)",
186		me.name, to->name, me.name, to->name,
187		to->username, to->host, to->from->name);
188
189	<	SetKilled(to);
189	>	AddFlag(to, FLAGS_KILLED);
190
191		if (IsClient(from))
192		sendto_one(from, form_str(ERR_GHOSTEDCLIENT),
#	Line 230 | Line 221 | sendq_unblocked(fde_t *fd, struct Client
221		}
222
223		/*
233	–	** slinkq_unblocked
234	–	**      Called when a server control socket is ready for writing.
235	–	*/
236	–	static void
237	–	slinkq_unblocked(fde_t *fd, struct Client *client_p)
238	–	{
239	–	ClearSlinkqBlocked(client_p);
240	–	send_queued_slink_write(client_p);
241	–	}
242	–
243	–	/*
224		** send_queued_write
225		**      This is called when there is a chance that some output would
226		**      be possible. This attempts to empty the send queue as far as
#	Line 294 | Line 274 | send_queued_write(struct Client *to)
274		retlen = send(to->localClient->fd.fd, first->data, first->size, 0);
275
276		if (retlen <= 0)
297	–	{
298	–	#ifdef _WIN32
299	–	errno = WSAGetLastError();
300	–	#endif
277		break;
302	–	}
278
279		dbuf_delete(&to->localClient->buf_sendq, retlen);
280
#	Line 323 | Line 298 | send_queued_write(struct Client *to)
298		}
299		}
300
326	–	/*
327	–	** send_queued_slink_write
328	–	**      This is called when there is a chance the some output would
329	–	**      be possible. This attempts to empty the send queue as far as
330	–	**      possible, and then if any data is left, a write is rescheduled.
331	–	*/
332	–	void
333	–	send_queued_slink_write(struct Client *to)
334	–	{
335	–	int retlen;
336	–
337	–	/*
338	–	** Once socket is marked dead, we cannot start writing to it,
339	–	** even if the error is removed...
340	–	*/
341	–	if (IsDead(to) || IsSlinkqBlocked(to))
342	–	return;  /* no use calling send() now */
343	–
344	–	/* Next, lets try to write some data */
345	–	if (to->localClient->slinkq != NULL)
346	–	{
347	–	retlen = send(to->localClient->ctrlfd.fd,
348	–	to->localClient->slinkq + to->localClient->slinkq_ofs,
349	–	to->localClient->slinkq_len, 0);
350	–	if (retlen < 0)
351	–	{
352	–	/* If we have a fatal error */
353	–	if (!ignoreErrno(errno))
354	–	{
355	–	dead_link_on_write(to, errno);
356	–	return;
357	–	}
358	–	}
359	–	else if (retlen == 0)
360	–	{
361	–	/* 0 bytes is an EOF .. */
362	–	dead_link_on_write(to, 0);
363	–	return;
364	–	}
365	–	else
366	–	{
367	–	execute_callback(iosendctrl_cb, to, retlen,
368	–	to->localClient->slinkq + to->localClient->slinkq_ofs);
369	–	to->localClient->slinkq_len -= retlen;
370	–
371	–	assert(to->localClient->slinkq_len >= 0);
372	–	if (to->localClient->slinkq_len)
373	–	to->localClient->slinkq_ofs += retlen;
374	–	else
375	–	{
376	–	to->localClient->slinkq_ofs = 0;
377	–	MyFree(to->localClient->slinkq);
378	–	to->localClient->slinkq = NULL;
379	–	}
380	–	}
381	–
382	–	/* Finally, if we have any more data, reschedule a write */
383	–	if (to->localClient->slinkq_len)
384	–	{
385	–	SetSlinkqBlocked(to);
386	–	comm_setselect(&to->localClient->ctrlfd, COMM_SELECT_WRITE,
387	–	(PF *)slinkq_unblocked, (void *)to, 0);
388	–	}
389	–	}
390	–	}
391	–
301		/* send_queued_all()
302		*
303		* input        - NONE
#	Line 459 | Line 368 | sendto_one(struct Client *to, const char
368		*/
369		void
370		sendto_channel_butone(struct Client *one, struct Client *from,
371	<	struct Channel *chptr, const char *command,
371	>	struct Channel *chptr, unsigned int type,
372		const char *pattern, ...)
373		{
374		va_list alocal, aremote, auid;
#	Line 467 | Line 376 | sendto_channel_butone(struct Client *one
376		char remote_buf[IRCD_BUFSIZE];
377		char uid_buf[IRCD_BUFSIZE];
378		int local_len, remote_len, uid_len;
379	<	dlink_node *ptr;
471	<	dlink_node *ptr_next;
472	<	struct Client *target_p;
379	>	dlink_node *ptr = NULL, *ptr_next = NULL;
380
381		if (IsServer(from))
382	<	local_len = ircsprintf(local_buf, ":%s %s %s ",
383	<	from->name, command, chptr->chname);
382	>	local_len = ircsprintf(local_buf, ":%s ",
383	>	from->name);
384		else
385	<	local_len = ircsprintf(local_buf, ":%s!%s@%s %s %s ",
386	<	from->name, from->username, from->host,
387	<	command, chptr->chname);
388	<	remote_len = ircsprintf(remote_buf, ":%s %s %s ",
389	<	from->name, command, chptr->chname);
390	<	uid_len = ircsprintf(uid_buf, ":%s %s %s ",
484	<	ID(from), command, chptr->chname);
385	>	local_len = ircsprintf(local_buf, ":%s!%s@%s ",
386	>	from->name, from->username, from->host);
387	>	remote_len = ircsprintf(remote_buf, ":%s ",
388	>	from->name);
389	>	uid_len = ircsprintf(uid_buf, ":%s ",
390	>	ID(from));
391
392		va_start(alocal, pattern);
393		va_start(aremote, pattern);
#	Line 500 | Line 406 | sendto_channel_butone(struct Client *one
406
407		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
408		{
409	<	target_p = ((struct Membership *)ptr->data)->client_p;
410	<	assert(target_p != NULL);
409	>	struct Membership *ms = ptr->data;
410	>	struct Client *target_p = ms->client_p;
411	>
412	>	assert(IsClient(target_p));
413
414	<	if (IsDefunct(target_p) || IsDeaf(target_p) || target_p->from == one)
414	>	if (IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF) || target_p->from == one)
415		continue;
416
417	<	if (MyClient(target_p))
417	>	if (type != 0 && (ms->flags & type) == 0)
418	>	continue;
419	>
420	>	if (MyConnect(target_p))
421		{
422	<	if (target_p->serial != current_serial)
422	>	if (target_p->localClient->serial != current_serial)
423		{
424		send_message(target_p, local_buf, local_len);
425	<	target_p->serial = current_serial;
425	>	target_p->localClient->serial = current_serial;
426		}
427		}
428		else
#	Line 519 | Line 430 | sendto_channel_butone(struct Client *one
430		/* Now check whether a message has been sent to this
431		* remote link already
432		*/
433	<	if (target_p->from->serial != current_serial)
433	>	if (target_p->from->localClient->serial != current_serial)
434		{
435		if (IsCapable(target_p->from, CAP_TS6))
436		send_message_remote(target_p->from, from, uid_buf, uid_len);
437		else
438		send_message_remote(target_p->from, from, remote_buf, remote_len);
439	<	target_p->from->serial = current_serial;
439	>	target_p->from->localClient->serial = current_serial;
440		}
441		}
442		}
#	Line 551 | Line 462 | sendto_channel_butone(struct Client *one
462		*/
463		void
464		sendto_server(struct Client *one,
465	<	struct Channel *chptr, unsigned long caps,
466	<	unsigned long nocaps,
465	>	const unsigned int caps,
466	>	const unsigned int nocaps,
467		const char *format, ...)
468		{
469		va_list args;
#	Line 560 | Line 471 | sendto_server(struct Client *one,
471		char buffer[IRCD_BUFSIZE];
472		int len = 0;
473
563	–	if (chptr && chptr->chname[0] != '#')
564	–	return;
565	–
474		va_start(args, format);
475		len = send_format(buffer, IRCD_BUFSIZE, format, args);
476		va_end(args);
#	Line 628 | Line 536 | sendto_common_channels_local(struct Clie
536		assert(target_p != NULL);
537
538		if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
539	<	target_p->serial == current_serial)
539	>	target_p->localClient->serial == current_serial)
540		continue;
541
542	<	target_p->serial = current_serial;
542	>	target_p->localClient->serial = current_serial;
543		send_message(target_p, buffer, len);
544		}
545		}
546
547		if (touser && MyConnect(user) && !IsDead(user) &&
548	<	user->serial != current_serial)
548	>	user->localClient->serial != current_serial)
549		send_message(user, buffer, len);
550		}
551
#	Line 675 | Line 583 | sendto_channel_local(int type, int nodea
583		continue;
584
585		if (!MyConnect(target_p) || IsDefunct(target_p) ||
586	<	(nodeaf && IsDeaf(target_p)))
586	>	(nodeaf && HasUMode(target_p, UMODE_DEAF)))
587		continue;
588
589		send_message(target_p, buffer, len);
#	Line 718 | Line 626 | sendto_channel_local_butone(struct Clien
626		continue;
627
628		if (!MyConnect(target_p) || target_p == one ||
629	<	IsDefunct(target_p) || IsDeaf(target_p))
629	>	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
630		continue;
631		send_message(target_p, buffer, len);
632		}
#	Line 737 | Line 645 | sendto_channel_local_butone(struct Clien
645		*                remote to this server.
646		*/
647		void
648	<	sendto_channel_remote(struct Client *one, struct Client *from, int type, int caps,
649	<	int nocaps, struct Channel *chptr, const char *pattern, ...)
648	>	sendto_channel_remote(struct Client *one, struct Client *from, int type,
649	>	const unsigned int caps, const unsigned int nocaps,
650	>	struct Channel *chptr, const char *pattern, ...)
651		{
652		va_list args;
653		char buffer[IRCD_BUFSIZE];
#	Line 769 | Line 678 | sendto_channel_remote(struct Client *one
678		((target_p->from->localClient->caps & caps) != caps) ||
679		((target_p->from->localClient->caps & nocaps) != 0))
680		continue;
681	<	if (target_p->from->serial != current_serial)
681	>	if (target_p->from->localClient->serial != current_serial)
682		{
683		send_message(target_p, buffer, len);
684	<	target_p->from->serial = current_serial;
684	>	target_p->from->localClient->serial = current_serial;
685		}
686		}
687		}
#	Line 798 | Line 707 | static int
707		match_it(const struct Client *one, const char *mask, int what)
708		{
709		if (what == MATCH_HOST)
710	<	return(match(mask, one->host));
710	>	return match(mask, one->host);
711
712	<	return(match(mask, one->servptr->name));
712	>	return match(mask, one->servptr->name);
713		}
714
715		/* sendto_match_butone()
#	Line 898 | Line 807 | sendto_match_servs(struct Client *source
807		vsnprintf(buffer, sizeof(buffer), pattern, args);
808		va_end(args);
809
810	<	current_serial++;
810	>	++current_serial;
811
812		DLINK_FOREACH(ptr, global_serv_list.head)
813		{
#	Line 908 | Line 817 | sendto_match_servs(struct Client *source
817		if (IsMe(target_p) || target_p->from == source_p->from)
818		continue;
819
820	<	if (target_p->from->serial == current_serial)
820	>	if (target_p->from->localClient->serial == current_serial)
821		continue;
822
823		if (match(mask, target_p->name))
#	Line 917 | Line 826 | sendto_match_servs(struct Client *source
826		* if we set the serial here, then we'll never do a
827		* match() again, if !IsCapable()
828		*/
829	<	target_p->from->serial = current_serial;
829	>	target_p->from->localClient->serial = current_serial;
830		found++;
831
832		if (!IsCapable(target_p->from, cap))
#	Line 983 | Line 892 | sendto_anywhere(struct Client *to, struc
892		* side effects - Send to *local* ops only but NOT +s nonopers.
893		*/
894		void
895	<	sendto_realops_flags(unsigned int flags, int level, const char *pattern, ...)
895	>	sendto_realops_flags(unsigned int flags, int level, int type, const char *pattern, ...)
896		{
897	<	struct Client *client_p;
897	>	const char *ntype = NULL;
898	>	dlink_node *ptr = NULL;
899		char nbuf[IRCD_BUFSIZE];
990	–	dlink_node *ptr;
900		va_list args;
901
902		va_start(args, pattern);
903	<	vsnprintf(nbuf, IRCD_BUFSIZE, pattern, args);
903	>	vsnprintf(nbuf, sizeof(nbuf), pattern, args);
904		va_end(args);
905
906	+	switch (type)
907	+	{
908	+	case SEND_NOTICE:
909	+	ntype = "Notice";
910	+	break;
911	+	case SEND_GLOBAL:
912	+	ntype = "Global";
913	+	break;
914	+	case SEND_LOCOPS:
915	+	ntype = "LocOps";
916	+	break;
917	+	default:
918	+	assert(0);
919	+	}
920	+
921		DLINK_FOREACH(ptr, oper_list.head)
922		{
923	<	client_p = ptr->data;
924	<	assert(client_p->umodes & UMODE_OPER);
923	>	struct Client *client_p = ptr->data;
924	>	assert(HasUMode(client_p, UMODE_OPER));
925
926	<	/* If we're sending it to opers and theyre an admin, skip.
927	<	* If we're sending it to admins, and theyre not, skip.
926	>	/*
927	>	* If we're sending it to opers and they're an admin, skip.
928	>	* If we're sending it to admins, and they're not, skip.
929		*/
930	<	if (((level == L_ADMIN) && !IsAdmin(client_p)) ||
931	<	((level == L_OPER) && IsAdmin(client_p)))
930	>	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
931	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
932		continue;
933
934	<	if (client_p->umodes & flags)
935	<	sendto_one(client_p, ":%s NOTICE %s :*** Notice -- %s",
936	<	me.name, client_p->name, nbuf);
934	>	if (HasUMode(client_p, flags))
935	>	sendto_one(client_p, ":%s NOTICE %s :*** %s -- %s",
936	>	me.name, client_p->name, ntype, nbuf);
937		}
938		}
939
#	Line 1024 | Line 949 | void
949		sendto_wallops_flags(unsigned int flags, struct Client *source_p,
950		const char *pattern, ...)
951		{
952	<	struct Client *client_p;
1028	<	dlink_node *ptr;
952	>	dlink_node *ptr = NULL;
953		va_list args;
954		char buffer[IRCD_BUFSIZE];
955		int len;
#	Line 1042 | Line 966 | sendto_wallops_flags(unsigned int flags,
966
967		DLINK_FOREACH(ptr, oper_list.head)
968		{
969	<	client_p = ptr->data;
969	>	struct Client *client_p = ptr->data;
970		assert(client_p->umodes & UMODE_OPER);
971
972	<	if ((client_p->umodes & flags) && !IsDefunct(client_p))
972	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
973		send_message(client_p, buffer, len);
974		}
975		}
#	Line 1061 | Line 985 | void
985		ts_warn(const char *pattern, ...)
986		{
987		va_list args;
988	<	char buffer[LOG_BUFSIZE];
988	>	char buffer[IRCD_BUFSIZE];
989		static time_t last = 0;
990		static int warnings = 0;
991
#	Line 1084 | Line 1008 | ts_warn(const char *pattern, ...)
1008		}
1009
1010		va_start(args, pattern);
1011	<	vsprintf_irc(buffer, pattern, args);
1011	>	vsnprintf(buffer, sizeof(buffer), pattern, args);
1012		va_end(args);
1013
1014	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s", buffer);
1015	<	ilog(L_CRIT, "%s", buffer);
1014	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s", buffer);
1015	>	ilog(LOG_TYPE_IRCD, "%s", buffer);
1016		}
1017
1018		/* kill_client()
#	Line 1142 | Line 1066 | kill_client_ll_serv_butone(struct Client
1066		char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1067		int len_uid = 0, len_nick = 0;
1068
1069	<	if (HasID(source_p) && (me.id[0] != '\0'))
1069	>	if (HasID(source_p))
1070		{
1071		have_uid = 1;
1072		va_start(args, pattern);

Diff Legend

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