ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/s_bsd.c (file contents), Revision 1143 by michael, Mon Jul 25 18:58:51 2011 UTC vs.
ircd-hybrid-8/src/s_bsd.c (file contents), Revision 1377 by michael, Mon Apr 30 19:35:16 2012 UTC

#	Line 30 | Line 30
30		#include "fdlist.h"
31		#include "s_bsd.h"
32		#include "client.h"
33	–	#include "common.h"
33		#include "dbuf.h"
34		#include "event.h"
35		#include "irc_string.h"
#	Line 41 | Line 40
40		#include "irc_res.h"
41		#include "restart.h"
42		#include "s_auth.h"
43	<	#include "s_conf.h"
44	<	#include "s_log.h"
43	>	#include "conf.h"
44	>	#include "log.h"
45		#include "s_serv.h"
46		#include "send.h"
47		#include "memory.h"
#	Line 131 | Line 130 | report_error(int level, const char* text
130		who = (who) ? who : "";
131
132		sendto_realops_flags(UMODE_DEBUG, level, text, who, strerror(error));
133	<	log_oper_action(LOG_IOERR_TYPE, NULL, "%s %s %s\n", who, text, strerror(error));
135	<	ilog(L_ERROR, text, who, strerror(error));
133	>	ilog(LOG_TYPE_IRCD, text, who, strerror(error));
134		}
135
136		/*
#	Line 200 | Line 198 | close_connection(struct Client *client_p
198		++ServerStats.is_cl;
199		ServerStats.is_cbs += client_p->localClient->send.bytes;
200		ServerStats.is_cbr += client_p->localClient->recv.bytes;
201	<	ServerStats.is_cti += CurrentTime - client_p->firsttime;
201	>	ServerStats.is_cti += CurrentTime - client_p->localClient->firsttime;
202		}
203		else if (IsServer(client_p))
204		{
205		++ServerStats.is_sv;
206		ServerStats.is_sbs += client_p->localClient->send.bytes;
207		ServerStats.is_sbr += client_p->localClient->recv.bytes;
208	<	ServerStats.is_sti += CurrentTime - client_p->firsttime;
208	>	ServerStats.is_sti += CurrentTime - client_p->localClient->firsttime;
209
210		/* XXX Does this even make any sense at all anymore?
211		* scheduling a 'quick' reconnect could cause a pile of
#	Line 229 | Line 227 | close_connection(struct Client *client_p
227		aconf  = map_to_conf(conf);
228		aclass = map_to_conf(aconf->class_ptr);
229		aconf->hold = time(NULL);
230	<	aconf->hold += (aconf->hold - client_p->since > HANGONGOODLINK) ?
231	<	HANGONRETRYDELAY : ConFreq(aclass);
230	>	aconf->hold += (aconf->hold - client_p->localClient->since > HANGONGOODLINK) ?
231	>	HANGONRETRYDELAY : aclass->con_freq;
232		}
233		}
234		else
#	Line 248 | Line 246 | close_connection(struct Client *client_p
246		if (client_p->localClient->fd.flags.open)
247		fd_close(&client_p->localClient->fd);
248
251	–	if (HasServlink(client_p))
252	–	{
253	–	if (client_p->localClient->ctrlfd.flags.open)
254	–	fd_close(&client_p->localClient->ctrlfd);
255	–	}
256	–
249		dbuf_clear(&client_p->localClient->buf_sendq);
250		dbuf_clear(&client_p->localClient->buf_recvq);
251
#	Line 339 | Line 331 | add_connection(struct Listener *listener
331		{
332		if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
333		{
334	<	ilog(L_CRIT, "SSL_new() ERROR! -- %s",
334	>	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
335		ERR_error_string(ERR_get_error(), NULL));
336
337		SetDead(new_client);

Diff Legend

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