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 948 by michael, Tue Jul 21 17:34:06 2009 UTC vs.
ircd-hybrid-8/src/send.c (file contents), Revision 1474 by michael, Sun Jul 22 14:44:07 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;
51	–	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);
55	–
46		static unsigned int current_serial = 0;
47
48	+
49		/* send_format()
50		*
51		* inputs       - buffer to format into
#	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 186 | Line 177 | send_message_remote(struct Client *to, s
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 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 ",
#	Line 500 | Line 407 | sendto_channel_butone(struct Client *one
407
408		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->members.head)
409		{
410	<	target_p = ((struct Membership *)ptr->data)->client_p;
411	<	assert(target_p != NULL);
410	>	struct Client *target_p = ((struct Membership *)ptr->data)->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 (MyConnect(target_p))
418		{
419	<	if (target_p->serial != current_serial)
419	>	if (target_p->localClient->serial != current_serial)
420		{
421		send_message(target_p, local_buf, local_len);
422	<	target_p->serial = current_serial;
422	>	target_p->localClient->serial = current_serial;
423		}
424		}
425		else
#	Line 519 | Line 427 | sendto_channel_butone(struct Client *one
427		/* Now check whether a message has been sent to this
428		* remote link already
429		*/
430	<	if (target_p->from->serial != current_serial)
430	>	if (target_p->from->localClient->serial != current_serial)
431		{
432		if (IsCapable(target_p->from, CAP_TS6))
433		send_message_remote(target_p->from, from, uid_buf, uid_len);
434		else
435		send_message_remote(target_p->from, from, remote_buf, remote_len);
436	<	target_p->from->serial = current_serial;
436	>	target_p->from->localClient->serial = current_serial;
437		}
438		}
439		}
#	Line 551 | Line 459 | sendto_channel_butone(struct Client *one
459		*/
460		void
461		sendto_server(struct Client *one,
462	<	struct Channel *chptr, unsigned long caps,
463	<	unsigned long nocaps,
462	>	const unsigned int caps,
463	>	const unsigned int nocaps,
464		const char *format, ...)
465		{
466		va_list args;
#	Line 560 | Line 468 | sendto_server(struct Client *one,
468		char buffer[IRCD_BUFSIZE];
469		int len = 0;
470
563	–	if (chptr && chptr->chname[0] != '#')
564	–	return;
565	–
471		va_start(args, format);
472		len = send_format(buffer, IRCD_BUFSIZE, format, args);
473		va_end(args);
#	Line 628 | Line 533 | sendto_common_channels_local(struct Clie
533		assert(target_p != NULL);
534
535		if (!MyConnect(target_p) || target_p == user || IsDefunct(target_p) ||
536	<	target_p->serial == current_serial)
536	>	target_p->localClient->serial == current_serial)
537		continue;
538
539	<	target_p->serial = current_serial;
539	>	target_p->localClient->serial = current_serial;
540		send_message(target_p, buffer, len);
541		}
542		}
543
544		if (touser && MyConnect(user) && !IsDead(user) &&
545	<	user->serial != current_serial)
545	>	user->localClient->serial != current_serial)
546		send_message(user, buffer, len);
547		}
548
#	Line 675 | Line 580 | sendto_channel_local(int type, int nodea
580		continue;
581
582		if (!MyConnect(target_p) || IsDefunct(target_p) ||
583	<	(nodeaf && IsDeaf(target_p)))
583	>	(nodeaf && HasUMode(target_p, UMODE_DEAF)))
584		continue;
585
586		send_message(target_p, buffer, len);
#	Line 718 | Line 623 | sendto_channel_local_butone(struct Clien
623		continue;
624
625		if (!MyConnect(target_p) || target_p == one ||
626	<	IsDefunct(target_p) || IsDeaf(target_p))
626	>	IsDefunct(target_p) || HasUMode(target_p, UMODE_DEAF))
627		continue;
628		send_message(target_p, buffer, len);
629		}
#	Line 737 | Line 642 | sendto_channel_local_butone(struct Clien
642		*                remote to this server.
643		*/
644		void
645	<	sendto_channel_remote(struct Client *one, struct Client *from, int type, int caps,
646	<	int nocaps, struct Channel *chptr, const char *pattern, ...)
645	>	sendto_channel_remote(struct Client *one, struct Client *from, int type,
646	>	const unsigned int caps, const unsigned int nocaps,
647	>	struct Channel *chptr, const char *pattern, ...)
648		{
649		va_list args;
650		char buffer[IRCD_BUFSIZE];
#	Line 769 | Line 675 | sendto_channel_remote(struct Client *one
675		((target_p->from->localClient->caps & caps) != caps) ||
676		((target_p->from->localClient->caps & nocaps) != 0))
677		continue;
678	<	if (target_p->from->serial != current_serial)
678	>	if (target_p->from->localClient->serial != current_serial)
679		{
680		send_message(target_p, buffer, len);
681	<	target_p->from->serial = current_serial;
681	>	target_p->from->localClient->serial = current_serial;
682		}
683		}
684		}
#	Line 798 | Line 704 | static int
704		match_it(const struct Client *one, const char *mask, int what)
705		{
706		if (what == MATCH_HOST)
707	<	return(match(mask, one->host));
707	>	return match(mask, one->host);
708
709	<	return(match(mask, one->servptr->name));
709	>	return match(mask, one->servptr->name);
710		}
711
712		/* sendto_match_butone()
#	Line 908 | Line 814 | sendto_match_servs(struct Client *source
814		if (IsMe(target_p) || target_p->from == source_p->from)
815		continue;
816
817	<	if (target_p->from->serial == current_serial)
817	>	if (target_p->from->localClient->serial == current_serial)
818		continue;
819
820		if (match(mask, target_p->name))
#	Line 917 | Line 823 | sendto_match_servs(struct Client *source
823		* if we set the serial here, then we'll never do a
824		* match() again, if !IsCapable()
825		*/
826	<	target_p->from->serial = current_serial;
826	>	target_p->from->localClient->serial = current_serial;
827		found++;
828
829		if (!IsCapable(target_p->from, cap))
#	Line 985 | Line 891 | sendto_anywhere(struct Client *to, struc
891		void
892		sendto_realops_flags(unsigned int flags, int level, const char *pattern, ...)
893		{
894	<	struct Client *client_p;
894	>	dlink_node *ptr = NULL;
895		char nbuf[IRCD_BUFSIZE];
990	–	dlink_node *ptr;
896		va_list args;
897
898		va_start(args, pattern);
#	Line 996 | Line 901 | sendto_realops_flags(unsigned int flags,
901
902		DLINK_FOREACH(ptr, oper_list.head)
903		{
904	<	client_p = ptr->data;
905	<	assert(client_p->umodes & UMODE_OPER);
904	>	struct Client *client_p = ptr->data;
905	>	assert(HasUMode(client_p, UMODE_OPER));
906
907		/* If we're sending it to opers and theyre an admin, skip.
908		* If we're sending it to admins, and theyre not, skip.
909		*/
910	<	if (((level == L_ADMIN) && !IsAdmin(client_p)) ||
911	<	((level == L_OPER) && IsAdmin(client_p)))
910	>	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
911	>	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
912		continue;
913
914	<	if (client_p->umodes & flags)
914	>	if (HasUMode(client_p, flags))
915		sendto_one(client_p, ":%s NOTICE %s :*** Notice -- %s",
916		me.name, client_p->name, nbuf);
917		}
918		}
919
920	+	void
921	+	sendto_globops_flags(unsigned int flags, int level, const char *pattern, ...)
922	+	{
923	+	dlink_node *ptr = NULL;
924	+	char nbuf[IRCD_BUFSIZE];
925	+	va_list args;
926	+
927	+	va_start(args, pattern);
928	+	vsnprintf(nbuf, IRCD_BUFSIZE, pattern, args);
929	+	va_end(args);
930	+
931	+	DLINK_FOREACH(ptr, oper_list.head)
932	+	{
933	+	struct Client *client_p = ptr->data;
934	+	assert(client_p->umodes & UMODE_OPER);
935	+
936	+	/* If we're sending it to opers and theyre an admin, skip.
937	+	* If we're sending it to admins, and theyre not, skip.
938	+	*/
939	+	if (((level == L_ADMIN) && !HasUMode(client_p, UMODE_ADMIN)) ||
940	+	((level == L_OPER) && HasUMode(client_p, UMODE_ADMIN)))
941	+	continue;
942	+
943	+	if (HasUMode(client_p, flags))
944	+	sendto_one(client_p, ":%s NOTICE %s :*** Global -- %s",
945	+	me.name, client_p->name, nbuf);
946	+	}
947	+	}
948	+
949		/* sendto_wallops_flags()
950		*
951		* inputs       - flag types of messages to show to real opers
#	Line 1024 | Line 958 | void
958		sendto_wallops_flags(unsigned int flags, struct Client *source_p,
959		const char *pattern, ...)
960		{
961	<	struct Client *client_p;
1028	<	dlink_node *ptr;
961	>	dlink_node *ptr = NULL;
962		va_list args;
963		char buffer[IRCD_BUFSIZE];
964		int len;
#	Line 1042 | Line 975 | sendto_wallops_flags(unsigned int flags,
975
976		DLINK_FOREACH(ptr, oper_list.head)
977		{
978	<	client_p = ptr->data;
978	>	struct Client *client_p = ptr->data;
979		assert(client_p->umodes & UMODE_OPER);
980
981	<	if ((client_p->umodes & flags) && !IsDefunct(client_p))
981	>	if (HasUMode(client_p, flags) && !IsDefunct(client_p))
982		send_message(client_p, buffer, len);
983		}
984		}
#	Line 1061 | Line 994 | void
994		ts_warn(const char *pattern, ...)
995		{
996		va_list args;
997	<	char buffer[LOG_BUFSIZE];
997	>	char buffer[IRCD_BUFSIZE];
998		static time_t last = 0;
999		static int warnings = 0;
1000
#	Line 1084 | Line 1017 | ts_warn(const char *pattern, ...)
1017		}
1018
1019		va_start(args, pattern);
1020	<	vsprintf_irc(buffer, pattern, args);
1020	>	vsnprintf(buffer, sizeof(buffer), pattern, args);
1021		va_end(args);
1022
1023		sendto_realops_flags(UMODE_ALL, L_ALL, "%s", buffer);
1024	<	ilog(L_CRIT, "%s", buffer);
1024	>	ilog(LOG_TYPE_IRCD, "%s", buffer);
1025		}
1026
1027		/* kill_client()
#	Line 1142 | Line 1075 | kill_client_ll_serv_butone(struct Client
1075		char buf_uid[IRCD_BUFSIZE], buf_nick[IRCD_BUFSIZE];
1076		int len_uid = 0, len_nick = 0;
1077
1078	<	if (HasID(source_p) && (me.id[0] != '\0'))
1078	>	if (HasID(source_p))
1079		{
1080		have_uid = 1;
1081		va_start(args, pattern);

Diff Legend

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