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.2/src/s_bsd.c (file contents), Revision 1011 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 1618 by michael, Tue Oct 30 21:04:38 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"
37	–	#include "irc_getnameinfo.h"
38	–	#include "irc_getaddrinfo.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "numeric.h"
39		#include "packet.h"
40		#include "irc_res.h"
44	–	#include "inet_misc.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 58 | Line 54 | static const char *comm_err_str[] = { "C
54
55		struct Callback *setup_socket_cb = NULL;
56
57	<	static void comm_connect_callback(fde_t *fd, int status);
57	>	static void comm_connect_callback(fde_t *, int);
58		static PF comm_connect_timeout;
59		static void comm_connect_dns_callback(void *, const struct irc_ssaddr *, const char *);
60		static PF comm_connect_tryconnect;
#	Line 133 | Line 129 | report_error(int level, const char* text
129		{
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));
134	<	ilog(L_ERROR, text, who, strerror(error));
132	>	sendto_realops_flags(UMODE_DEBUG, level, SEND_NOTICE,
133	>	text, who, strerror(error));
134	>	ilog(LOG_TYPE_IRCD, text, who, strerror(error));
135		}
136
137		/*
#	Line 181 | Line 177 | init_comm(void)
177		void
178		close_connection(struct Client *client_p)
179		{
184	–	struct ConfItem *conf;
180		struct AccessItem *aconf;
181		struct ClassItem *aclass;
182	+	dlink_node *ptr = NULL;
183
184	<	assert(NULL != client_p);
184	>	assert(client_p);
185
186		if (!IsDead(client_p))
187		{
#	Line 198 | Line 194 | close_connection(struct Client *client_p
194		send_queued_write(client_p);
195		}
196
197	<	if (IsServer(client_p))
197	>	if (IsClient(client_p))
198	>	{
199	>	++ServerStats.is_cl;
200	>	ServerStats.is_cbs += client_p->localClient->send.bytes;
201	>	ServerStats.is_cbr += client_p->localClient->recv.bytes;
202	>	ServerStats.is_cti += CurrentTime - client_p->localClient->firsttime;
203	>	}
204	>	else if (IsServer(client_p))
205		{
206		++ServerStats.is_sv;
207		ServerStats.is_sbs += client_p->localClient->send.bytes;
208		ServerStats.is_sbr += client_p->localClient->recv.bytes;
209	<	ServerStats.is_sti += CurrentTime - client_p->firsttime;
209	>	ServerStats.is_sti += CurrentTime - client_p->localClient->firsttime;
210
211	<	/* XXX Does this even make any sense at all anymore?
209	<	* scheduling a 'quick' reconnect could cause a pile of
210	<	* nick collides under TSora protocol... -db
211	<	*/
212	<	/*
213	<	* If the connection has been up for a long amount of time, schedule
214	<	* a 'quick' reconnect, else reset the next-connect cycle.
215	<	*/
216	<	if ((conf = find_conf_exact(SERVER_TYPE,
217	<	client_p->name, client_p->username,
218	<	client_p->host)))
211	>	DLINK_FOREACH(ptr, server_items.head)
212		{
213	+	struct ConfItem *conf = ptr->data;
214	+
215	+	if (irccmp(conf->name, client_p->name))
216	+	continue;
217	+
218		/*
219	<	* Reschedule a faster reconnect, if this was a automatically
220	<	* connected configuration entry. (Note that if we have had
223	<	* a rehash in between, the status has been changed to
224	<	* CONF_ILLEGAL). But only do this if it was a "good" link.
219	>	* Reset next-connect cycle of all connect{} blocks that match
220	>	* this servername.
221		*/
222	<	aconf = (struct AccessItem *)map_to_conf(conf);
223	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
224	<	aconf->hold = time(NULL);
229	<	aconf->hold += (aconf->hold - client_p->since > HANGONGOODLINK) ?
230	<	HANGONRETRYDELAY : ConFreq(aclass);
231	<	if (nextconnect > aconf->hold)
232	<	nextconnect = aconf->hold;
222	>	aconf  = map_to_conf(conf);
223	>	aclass = map_to_conf(aconf->class_ptr);
224	>	aconf->hold = CurrentTime + aclass->con_freq;
225		}
226		}
235	–	else if (IsClient(client_p))
236	–	{
237	–	++ServerStats.is_cl;
238	–	ServerStats.is_cbs += client_p->localClient->send.bytes;
239	–	ServerStats.is_cbr += client_p->localClient->recv.bytes;
240	–	ServerStats.is_cti += CurrentTime - client_p->firsttime;
241	–	}
227		else
228		++ServerStats.is_ni;
229
#	Line 254 | Line 239 | close_connection(struct Client *client_p
239		if (client_p->localClient->fd.flags.open)
240		fd_close(&client_p->localClient->fd);
241
257	–	if (HasServlink(client_p))
258	–	{
259	–	if (client_p->localClient->ctrlfd.flags.open)
260	–	fd_close(&client_p->localClient->ctrlfd);
261	–	}
262	–
242		dbuf_clear(&client_p->localClient->buf_sendq);
243		dbuf_clear(&client_p->localClient->buf_recvq);
244
#	Line 310 | Line 289 | ssl_handshake(int fd, struct Client *cli
289		void
290		add_connection(struct Listener *listener, struct irc_ssaddr *irn, int fd)
291		{
292	<	struct Client *new_client;
314	<
315	<	assert(NULL != listener);
316	<
317	<	new_client = make_client(NULL);
292	>	struct Client *new_client = make_client(NULL);
293
294		fd_open(&new_client->localClient->fd, fd, 1,
295		(listener->flags & LISTENER_SSL) ?
296		"Incoming SSL connection" : "Incoming connection");
297
298	<	/*
298	>	/*
299		* copy address to 'sockhost' as a string, copy it to host too
300		* so we have something valid to put into error messages...
301		*/
302		memcpy(&new_client->localClient->ip, irn, sizeof(struct irc_ssaddr));
303
304	<	irc_getnameinfo((struct sockaddr*)&new_client->localClient->ip,
305	<	new_client->localClient->ip.ss_len,  new_client->sockhost,
306	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
304	>	getnameinfo((struct sockaddr *)&new_client->localClient->ip,
305	>	new_client->localClient->ip.ss_len, new_client->sockhost,
306	>	sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
307		new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
333	–	#ifdef IPV6
334	–	if (new_client->sockhost[0] == ':')
335	–	strlcat(new_client->host, "0", HOSTLEN+1);
308
309	<	if (new_client->localClient->aftype == AF_INET6 &&
338	<	ConfigFileEntry.dot_in_ip6_addr == 1)
309	>	if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
310		{
311	<	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
312	<	strlcat(new_client->host, ".", HOSTLEN+1);
311	>	strlcpy(new_client->host, "0", sizeof(new_client->host));
312	>	strlcpy(new_client->host+1, new_client->sockhost, sizeof(new_client->host)-1);
313	>	memmove(new_client->sockhost+1, new_client->sockhost, sizeof(new_client->sockhost)-1);
314	>	new_client->sockhost[0] = '0';
315		}
316		else
317	<	#endif
345	<	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
317	>	strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
318
319		new_client->localClient->listener = listener;
320		++listener->ref_count;
#	Line 352 | Line 324 | add_connection(struct Listener *listener
324		{
325		if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
326		{
327	<	ilog(L_CRIT, "SSL_new() ERROR! -- %s",
327	>	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
328		ERR_error_string(ERR_get_error(), NULL));
329
330		SetDead(new_client);
#	Line 529 | Line 501 | comm_connect_tcp(fde_t *fd, const char *
501
502		snprintf(portname, sizeof(portname), "%d", port);
503
504	<	if (irc_getaddrinfo(host, portname, &hints, &res))
504	>	if (getaddrinfo(host, portname, &hints, &res))
505		{
506		/* Send the DNS request, for the next level */
507		if (aftype == AF_INET6)
#	Line 545 | Line 517 | comm_connect_tcp(fde_t *fd, const char *
517		memcpy(&fd->connect.hostaddr, res->ai_addr, res->ai_addrlen);
518		fd->connect.hostaddr.ss_len = res->ai_addrlen;
519		fd->connect.hostaddr.ss.ss_family = res->ai_family;
520	<	irc_freeaddrinfo(res);
520	>	freeaddrinfo(res);
521		comm_settimeout(fd, timeout*1000, comm_connect_timeout, NULL);
522		comm_connect_tryconnect(fd, NULL);
523		}
#	Line 737 | Line 709 | comm_accept(struct Listener *lptr, struc
709		* reserved fd limit, but we can deal with that when comm_open()
710		* also does it. XXX -- adrian
711		*/
712	<	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, (socklen_t *)&addrlen);
712	>	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, &addrlen);
713		if (newfd < 0)
714		return -1;
715
#	Line 755 | Line 727 | comm_accept(struct Listener *lptr, struc
727
728		/*
729		* remove_ipv6_mapping() - Removes IPv4-In-IPv6 mapping from an address
730	<	* This function should really inspect the struct itself rather than relying
759	<	* on inet_pton and inet_ntop.  OSes with IPv6 mapping listening on both
730	>	* OSes with IPv6 mapping listening on both
731		* AF_INET and AF_INET6 map AF_INET connections inside AF_INET6 structures
732		*
733		*/
#	Line 766 | Line 737 | remove_ipv6_mapping(struct irc_ssaddr *a
737		{
738		if (addr->ss.ss_family == AF_INET6)
739		{
740	<	struct sockaddr_in6 *v6;
770	<
771	<	v6 = (struct sockaddr_in6*)addr;
772	<	if (IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr))
740	>	if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr))
741		{
742	<	char v4ip[HOSTIPLEN];
743	<	struct sockaddr_in *v4 = (struct sockaddr_in*)addr;
744	<	inetntop(AF_INET6, &v6->sin6_addr, v4ip, HOSTIPLEN);
745	<	inet_pton(AF_INET, v4ip, &v4->sin_addr);
742	>	struct sockaddr_in6 v6;
743	>	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
744	>
745	>	memcpy(&v6, addr, sizeof(v6));
746	>	memset(v4, 0, sizeof(struct sockaddr_in));
747	>	memcpy(&v4->sin_addr, &v6.sin6_addr.s6_addr[12], sizeof(v4->sin_addr));
748	>
749		addr->ss.ss_family = AF_INET;
750		addr->ss_len = sizeof(struct sockaddr_in);
751		}

Diff Legend

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