ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/server.c (file contents):
Revision 6427 by michael, Sun Aug 23 15:15:53 2015 UTC vs.
Revision 6428 by michael, Thu Aug 27 09:59:42 2015 UTC

#	Line 758 | Line 758 | finish_ssl_server_handshake(struct Clien
758		if (conf == NULL)
759		{
760		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
761	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
761	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
762		sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
763		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
764
#	Line 774 | Line 774 | finish_ssl_server_handshake(struct Clien
774		me.name, ConfigServerHide.hidden ? "(H) " : "",
775		me.info);
776
777	<	/* If we've been marked dead because a send failed, just exit
777	>	/*
778	>	* If we've been marked dead because a send failed, just exit
779		* here now and save everyone the trouble of us ever existing.
780		*/
781		if (IsDead(client_p))
782		{
783	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
784	<	"%s[%s] went dead during handshake",
785	<	client_p->name,
786	<	client_p->host);
787	<	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
787	<	"%s went dead during handshake", client_p->name);
788	<	return;
783	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
784	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
785	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
786	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
787	>	return;
788		}
789
790		/* don't move to serv_list yet -- we haven't sent a burst! */
#	Line 905 | Line 904 | serv_connect_callback(fde_t *fd, int sta
904		/* Check the status */
905		if (status != COMM_OK)
906		{
907	<	/* We have an error, so report it and quit
908	<	* Admins get to see any IP, mere opers don't *sigh*
907	>	/* We have an error, so report it and quit */
908	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
909	>	"Error connecting to %s: %s",
910	>	get_client_name(client_p, SHOW_IP), comm_errstr(status));
911	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
912	>	"Error connecting to %s: %s",
913	>	get_client_name(client_p, MASK_IP), comm_errstr(status));
914	>
915	>	/*
916	>	* If a fd goes bad, call dead_link() the socket is no
917	>	* longer valid for reading or writing.
918		*/
919	<	if (ConfigServerHide.hide_server_ips)
920	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
913	<	"Error connecting to %s: %s",
914	<	client_p->name, comm_errstr(status));
915	<	else
916	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
917	<	"Error connecting to %s[%s]: %s", client_p->name,
918	<	client_p->host, comm_errstr(status));
919	<
920	<	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
921	<	"Error connecting to %s: %s",
922	<	client_p->name, comm_errstr(status));
923	<
924	<	/* If a fd goes bad, call dead_link() the socket is no
925	<	* longer valid for reading or writing.
926	<	*/
927	<	dead_link_on_write(client_p, 0);
928	<	return;
919	>	dead_link_on_write(client_p, 0);
920	>	return;
921		}
922
923		/* COMM_OK, so continue the connection procedure */
#	Line 935 | Line 927 | serv_connect_callback(fde_t *fd, int sta
927		if (conf == NULL)
928		{
929		sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
930	<	"Lost connect{} block for %s", get_client_name(client_p, HIDE_IP));
930	>	"Lost connect{} block for %s", get_client_name(client_p, SHOW_IP));
931		sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
932		"Lost connect{} block for %s", get_client_name(client_p, MASK_IP));
933
#	Line 961 | Line 953 | serv_connect_callback(fde_t *fd, int sta
953		sendto_one(client_p, "SERVER %s 1 :%s%s", me.name,
954		ConfigServerHide.hidden ? "(H) " : "", me.info);
955
956	<	/* If we've been marked dead because a send failed, just exit
956	>	/*
957	>	* If we've been marked dead because a send failed, just exit
958		* here now and save everyone the trouble of us ever existing.
959		*/
960		if (IsDead(client_p))
961		{
962	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
963	<	"%s[%s] went dead during handshake",
964	<	client_p->name,
965	<	client_p->host);
966	<	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
974	<	"%s went dead during handshake", client_p->name);
975	<	return;
962	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
963	>	"%s went dead during handshake", get_client_name(client_p, SHOW_IP));
964	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
965	>	"%s went dead during handshake", get_client_name(client_p, MASK_IP));
966	>	return;
967		}
968
969		/* don't move to serv_list yet -- we haven't sent a burst! */

Diff Legend

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