ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/modules/m_connect.c

Comparing ircd-hybrid/branches/8.2.x/modules/m_connect.c (file contents):
Revision 7057 by michael, Sat Jan 16 19:51:09 2016 UTC vs.
Revision 7065 by michael, Tue Jan 19 17:18:28 2016 UTC

#	Line 93 | Line 93 | mo_connect(struct Client *source_p, int
93
94		if ((target_p = hash_find_server(conf->name)))
95		{
96	<	sendto_one_notice(source_p, &me, ":Connect: Server %s already exists from %s.",
96	>	sendto_one_notice(source_p, &me, ":Connect: Server %s already exists from %s",
97		target_p->name, target_p->from->name);
98		return 0;
99		}
#	Line 114 | Line 114 | mo_connect(struct Client *source_p, int
114
115		if (find_servconn_in_progress(conf->name))
116		{
117	<	sendto_one_notice(source_p, &me, ":Connect: a connection to %s "
118	<	"is already in progress.", conf->name);
117	>	sendto_one_notice(source_p, &me, ":Connect: a connection to %s is already in progress.",
118	>	conf->name);
119		return 0;
120		}
121
122		/*
123		* Notify all operators about remote connect requests
124		*/
125	<	ilog(LOG_TYPE_IRCD, "CONNECT From %s : %s %s",
126	<	source_p->name, parv[1], parv[2] ? parv[2] : "");
125	>	ilog(LOG_TYPE_IRCD, "CONNECT %s %d from %s",
126	>	parv[1], port, get_oper_name(source_p));
127
128		const int tmpport = conf->port;
129		conf->port = port;
#	Line 194 | Line 194 | ms_connect(struct Client *source_p, int
194
195		if ((target_p = hash_find_server(conf->name)))
196		{
197	<	sendto_one_notice(source_p, &me, ":Connect: Server %s already exists from %s.",
197	>	sendto_one_notice(source_p, &me, ":Connect: Server %s already exists from %s",
198		target_p->name, target_p->from->name);
199		return 0;
200		}
#	Line 215 | Line 215 | ms_connect(struct Client *source_p, int
215
216		if (find_servconn_in_progress(conf->name))
217		{
218	<	sendto_one_notice(source_p, &me, ":Connect: a connection to %s "
219	<	"is already in progress.", conf->name);
218	>	sendto_one_notice(source_p, &me, ":Connect: a connection to %s is already in progress",
219	>	conf->name);
220		return 0;
221		}
222
#	Line 224 | Line 224 | ms_connect(struct Client *source_p, int
224		* Notify all operators about remote connect requests
225		*/
226		sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_GLOBAL, "from %s: Remote CONNECT %s %d from %s",
227	<	me.name, parv[1], port, source_p->name);
228	<	sendto_server(NULL, 0, 0,
229	<	":%s GLOBOPS :Remote CONNECT %s %d from %s",
230	<	me.id, parv[1], port, source_p->name);
227	>	me.name, parv[1], port, get_oper_name(source_p));
228	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :Remote CONNECT %s %d from %s",
229	>	me.id, parv[1], port, get_oper_name(source_p));
230
231	<	ilog(LOG_TYPE_IRCD, "CONNECT From %s : %s %d",
232	<	source_p->name, parv[1], port);
231	>	ilog(LOG_TYPE_IRCD, "Remote CONNECT %s %d from %s",
232	>	parv[1], port, get_oper_name(source_p));
233
234		const int tmpport = conf->port;
235		conf->port = port;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines