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 683 by michael, Thu Jun 15 14:28:59 2006 UTC vs.
ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 1858 by michael, Thu Apr 25 15:00:52 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	–	#ifndef _WIN32
26		#include <netinet/in_systm.h>
27		#include <netinet/ip.h>
28		#include <netinet/tcp.h>
29	<	#endif
29	>	#include "list.h"
30		#include "fdlist.h"
31		#include "s_bsd.h"
32		#include "client.h"
34	–	#include "common.h"
33		#include "dbuf.h"
34		#include "event.h"
35		#include "irc_string.h"
38	–	#include "irc_getnameinfo.h"
39	–	#include "irc_getaddrinfo.h"
36		#include "ircd.h"
41	–	#include "list.h"
37		#include "listener.h"
38		#include "numeric.h"
39		#include "packet.h"
40		#include "irc_res.h"
46	–	#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"
52	–	#include "s_stats.h"
46		#include "send.h"
47		#include "memory.h"
48		#include "s_user.h"
#	Line 61 | 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 *vptr, struct DNSReply *reply);
59	>	static void comm_connect_dns_callback(void *, const struct irc_ssaddr *, const char *);
60		static PF comm_connect_tryconnect;
61
69	–	extern void init_netio(void);
62
63		/* check_can_use_v6()
64		*  Check if the system can open AF_INET6 sockets
#	Line 82 | Line 74 | check_can_use_v6(void)
74		else
75		{
76		ServerInfo.can_use_v6 = 1;
85	–	#ifdef _WIN32
86	–	closesocket(v6);
87	–	#else
77		close(v6);
89	–	#endif
78		}
79		#else
80		ServerInfo.can_use_v6 = 0;
#	Line 102 | Line 90 | check_can_use_v6(void)
90		int
91		get_sockerr(int fd)
92		{
105	–	#ifndef _WIN32
93		int errtmp = errno;
107	–	#else
108	–	int errtmp = WSAGetLastError();
109	–	#endif
94		#ifdef SO_ERROR
95		int err = 0;
96		socklen_t len = sizeof(err);
97
98	<	if (-1 < fd && !getsockopt(fd, SOL_SOCKET, SO_ERROR, (char*) &err, (socklen_t *)&len))
98	>	if (-1 < fd && !getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len))
99		{
100		if (err)
101		errtmp = err;
#	Line 145 | 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 161 | Line 145 | setup_socket(va_list args)
145		int fd = va_arg(args, int);
146		int opt = 1;
147
148	<	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *) &opt, sizeof(opt));
148	>	setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
149
150		#ifdef IPTOS_LOWDELAY
151		opt = IPTOS_LOWDELAY;
152	<	setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &opt, sizeof(opt));
152	>	setsockopt(fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt));
153		#endif
154
171	–	#ifndef _WIN32
155		fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
173	–	#endif
156
157		return NULL;
158		}
#	Line 195 | Line 177 | init_comm(void)
177		void
178		close_connection(struct Client *client_p)
179		{
180	<	struct ConfItem *conf;
199	<	struct AccessItem *aconf;
200	<	struct ClassItem *aclass;
180	>	dlink_node *ptr = NULL;
181
182	<	assert(NULL != client_p);
182	>	assert(client_p);
183
184		if (!IsDead(client_p))
185		{
#	Line 212 | Line 192 | close_connection(struct Client *client_p
192		send_queued_write(client_p);
193		}
194
195	<	if (IsServer(client_p))
195	>	if (IsClient(client_p))
196		{
197	<	ServerStats->is_sv++;
198	<	ServerStats->is_sbs += client_p->localClient->send.bytes;
199	<	ServerStats->is_sbr += client_p->localClient->recv.bytes;
200	<	ServerStats->is_sti += CurrentTime - client_p->firsttime;
201	<
202	<	/* XXX Does this even make any sense at all anymore?
203	<	* scheduling a 'quick' reconnect could cause a pile of
204	<	* nick collides under TSora protocol... -db
205	<	*/
206	<	/*
207	<	* If the connection has been up for a long amount of time, schedule
208	<	* a 'quick' reconnect, else reset the next-connect cycle.
209	<	*/
230	<	if ((conf = find_conf_exact(SERVER_TYPE,
231	<	client_p->name, client_p->username,
232	<	client_p->host)))
197	>	++ServerStats.is_cl;
198	>	ServerStats.is_cbs += client_p->localClient->send.bytes;
199	>	ServerStats.is_cbr += client_p->localClient->recv.bytes;
200	>	ServerStats.is_cti += CurrentTime - client_p->localClient->firsttime;
201	>	}
202	>	else if (IsServer(client_p))
203	>	{
204	>	++ServerStats.is_sv;
205	>	ServerStats.is_sbs += client_p->localClient->send.bytes;
206	>	ServerStats.is_sbr += client_p->localClient->recv.bytes;
207	>	ServerStats.is_sti += CurrentTime - client_p->localClient->firsttime;
208	>
209	>	DLINK_FOREACH(ptr, server_items.head)
210		{
211	+	struct MaskItem *conf = ptr->data;
212	+
213	+	if (irccmp(conf->name, client_p->name))
214	+	continue;
215	+
216		/*
217	<	* Reschedule a faster reconnect, if this was a automatically
218	<	* connected configuration entry. (Note that if we have had
237	<	* a rehash in between, the status has been changed to
238	<	* CONF_ILLEGAL). But only do this if it was a "good" link.
217	>	* Reset next-connect cycle of all connect{} blocks that match
218	>	* this servername.
219		*/
220	<	aconf = (struct AccessItem *)map_to_conf(conf);
241	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
242	<	aconf->hold = time(NULL);
243	<	aconf->hold += (aconf->hold - client_p->since > HANGONGOODLINK) ?
244	<	HANGONRETRYDELAY : ConFreq(aclass);
245	<	if (nextconnect > aconf->hold)
246	<	nextconnect = aconf->hold;
220	>	conf->until = CurrentTime + conf->class->con_freq;
221		}
222		}
249	–	else if (IsClient(client_p))
250	–	{
251	–	ServerStats->is_cl++;
252	–	ServerStats->is_cbs += client_p->localClient->send.bytes;
253	–	ServerStats->is_cbr += client_p->localClient->recv.bytes;
254	–	ServerStats->is_cti += CurrentTime - client_p->firsttime;
255	–	}
223		else
224	<	ServerStats->is_ni++;
224	>	++ServerStats.is_ni;
225
226		#ifdef HAVE_LIBCRYPTO
227		if (client_p->localClient->fd.ssl)
#	Line 268 | Line 235 | close_connection(struct Client *client_p
235		if (client_p->localClient->fd.flags.open)
236		fd_close(&client_p->localClient->fd);
237
271	–	if (HasServlink(client_p))
272	–	{
273	–	if (client_p->localClient->ctrlfd.flags.open)
274	–	fd_close(&client_p->localClient->ctrlfd);
275	–	}
276	–
238		dbuf_clear(&client_p->localClient->buf_sendq);
239		dbuf_clear(&client_p->localClient->buf_recvq);
240
241		MyFree(client_p->localClient->passwd);
242	<	detach_conf(client_p, CONF_TYPE);
242	>	detach_conf(client_p, CONF_CLIENT|CONF_OPER|CONF_SERVER);
243		client_p->from = NULL; /* ...this should catch them! >:) --msa */
244		}
245
#	Line 324 | Line 285 | ssl_handshake(int fd, struct Client *cli
285		void
286		add_connection(struct Listener *listener, struct irc_ssaddr *irn, int fd)
287		{
288	<	struct Client *new_client;
328	<
329	<	assert(NULL != listener);
330	<
331	<	new_client = make_client(NULL);
288	>	struct Client *new_client = make_client(NULL);
289
290		fd_open(&new_client->localClient->fd, fd, 1,
291		(listener->flags & LISTENER_SSL) ?
292		"Incoming SSL connection" : "Incoming connection");
293
294	<	/*
294	>	/*
295		* copy address to 'sockhost' as a string, copy it to host too
296		* so we have something valid to put into error messages...
297		*/
298		memcpy(&new_client->localClient->ip, irn, sizeof(struct irc_ssaddr));
299
300	<	irc_getnameinfo((struct sockaddr*)&new_client->localClient->ip,
301	<	new_client->localClient->ip.ss_len,  new_client->sockhost,
302	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
300	>	getnameinfo((struct sockaddr *)&new_client->localClient->ip,
301	>	new_client->localClient->ip.ss_len, new_client->sockhost,
302	>	sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
303		new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
347	–	#ifdef IPV6
348	–	if (new_client->sockhost[0] == ':')
349	–	strlcat(new_client->host, "0", HOSTLEN+1);
304
305	<	if (new_client->localClient->aftype == AF_INET6 &&
306	<	ConfigFileEntry.dot_in_ip6_addr == 1)
305	>	#ifdef HAVE_LIBGEOIP
306	>	/* XXX IPV6 SUPPORT XXX */
307	>	if (irn->ss.ss_family == AF_INET && geoip_ctx)
308		{
309	<	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
310	<	strlcat(new_client->host, ".", HOSTLEN+1);
309	>	const struct sockaddr_in *v4 = (const struct sockaddr_in *)&new_client->localClient->ip;
310	>	new_client->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
311		}
357	–	else
312		#endif
359	–	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
313
314	<	new_client->connect_id = ++connect_id;
314	>	if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
315	>	{
316	>	strlcpy(new_client->host, "0", sizeof(new_client->host));
317	>	strlcpy(new_client->host+1, new_client->sockhost, sizeof(new_client->host)-1);
318	>	memmove(new_client->sockhost+1, new_client->sockhost, sizeof(new_client->sockhost)-1);
319	>	new_client->sockhost[0] = '0';
320	>	}
321	>	else
322	>	strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
323	>
324		new_client->localClient->listener = listener;
325		++listener->ref_count;
326
327		#ifdef HAVE_LIBCRYPTO
328		if (listener->flags & LISTENER_SSL)
329		{
330	<	if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.ctx)) == NULL)
330	>	if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
331		{
332	<	ilog(L_CRIT, "SSL_new() ERROR! -- %s",
332	>	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
333		ERR_error_string(ERR_get_error(), NULL));
334
335		SetDead(new_client);
#	Line 510 | Line 472 | comm_connect_tcp(fde_t *fd, const char *
472		void *data, int aftype, int timeout)
473		{
474		struct addrinfo hints, *res;
475	<	char portname[PORTNAMELEN+1];
475	>	char portname[PORTNAMELEN + 1];
476
477		assert(callback);
478		fd->connect.callback = callback;
#	Line 542 | Line 504 | comm_connect_tcp(fde_t *fd, const char *
504		hints.ai_socktype = SOCK_STREAM;
505		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
506
507	<	snprintf(portname, PORTNAMELEN, "%d", port);
507	>	snprintf(portname, sizeof(portname), "%d", port);
508
509	<	if (irc_getaddrinfo(host, portname, &hints, &res))
509	>	if (getaddrinfo(host, portname, &hints, &res))
510		{
511		/* Send the DNS request, for the next level */
512	<	fd->dns_query = MyMalloc(sizeof(struct DNSQuery));
513	<	fd->dns_query->ptr = fd;
514	<	fd->dns_query->callback = comm_connect_dns_callback;
515	<	gethost_byname(host, fd->dns_query);
512	>	if (aftype == AF_INET6)
513	>	gethost_byname_type(comm_connect_dns_callback, fd, host, T_AAAA);
514	>	else
515	>	gethost_byname_type(comm_connect_dns_callback, fd, host, T_A);
516		}
517		else
518		{
#	Line 560 | Line 522 | comm_connect_tcp(fde_t *fd, const char *
522		memcpy(&fd->connect.hostaddr, res->ai_addr, res->ai_addrlen);
523		fd->connect.hostaddr.ss_len = res->ai_addrlen;
524		fd->connect.hostaddr.ss.ss_family = res->ai_family;
525	<	irc_freeaddrinfo(res);
525	>	freeaddrinfo(res);
526		comm_settimeout(fd, timeout*1000, comm_connect_timeout, NULL);
527		comm_connect_tryconnect(fd, NULL);
528		}
#	Line 608 | Line 570 | comm_connect_timeout(fde_t *fd, void *no
570		* otherwise we initiate the connect()
571		*/
572		static void
573	<	comm_connect_dns_callback(void *vptr, struct DNSReply *reply)
573	>	comm_connect_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
574		{
575		fde_t *F = vptr;
576
577	<	if (reply == NULL)
577	>	if (name == NULL)
578		{
617	–	MyFree(F->dns_query);
618	–	F->dns_query = NULL;
579		comm_connect_callback(F, COMM_ERR_DNS);
580		return;
581		}
#	Line 629 | Line 589 | comm_connect_dns_callback(void *vptr, st
589		* the DNS record around, and the DNS cache is gone anyway..
590		*     -- adrian
591		*/
592	<	memcpy(&F->connect.hostaddr, &reply->addr, reply->addr.ss_len);
592	>	memcpy(&F->connect.hostaddr, addr, addr->ss_len);
593		/* The cast is hacky, but safe - port offset is same on v4 and v6 */
594		((struct sockaddr_in *) &F->connect.hostaddr)->sin_port =
595		F->connect.hostaddr.ss_port;
596	<	F->connect.hostaddr.ss_len = reply->addr.ss_len;
596	>	F->connect.hostaddr.ss_len = addr->ss_len;
597
598		/* Now, call the tryconnect() routine to try a connect() */
639	–	MyFree(F->dns_query);
640	–	F->dns_query = NULL;
599		comm_connect_tryconnect(F, NULL);
600		}
601
#	Line 665 | Line 623 | comm_connect_tryconnect(fde_t *fd, void
623		/* Error? */
624		if (retval < 0)
625		{
668	–	#ifdef _WIN32
669	–	errno = WSAGetLastError();
670	–	#endif
626		/*
627		* If we get EISCONN, then we've already connect()ed the socket,
628		* which is a good thing.
#	Line 726 | Line 681 | comm_open(fde_t *F, int family, int sock
681		*/
682		fd = socket(family, sock_type, proto);
683		if (fd < 0)
729	–	{
730	–	#ifdef _WIN32
731	–	errno = WSAGetLastError();
732	–	#endif
684		return -1; /* errno will be passed through, yay.. */
734	–	}
685
686		execute_callback(setup_socket_cb, fd);
687
#	Line 764 | Line 714 | comm_accept(struct Listener *lptr, struc
714		* reserved fd limit, but we can deal with that when comm_open()
715		* also does it. XXX -- adrian
716		*/
717	<	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, (socklen_t *)&addrlen);
717	>	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, &addrlen);
718		if (newfd < 0)
769	–	{
770	–	#ifdef _WIN32
771	–	errno = WSAGetLastError();
772	–	#endif
719		return -1;
774	–	}
720
721		#ifdef IPV6
722		remove_ipv6_mapping(pn);
#	Line 787 | Line 732 | comm_accept(struct Listener *lptr, struc
732
733		/*
734		* remove_ipv6_mapping() - Removes IPv4-In-IPv6 mapping from an address
735	<	* This function should really inspect the struct itself rather than relying
791	<	* on inet_pton and inet_ntop.  OSes with IPv6 mapping listening on both
735	>	* OSes with IPv6 mapping listening on both
736		* AF_INET and AF_INET6 map AF_INET connections inside AF_INET6 structures
737		*
738		*/
#	Line 798 | Line 742 | remove_ipv6_mapping(struct irc_ssaddr *a
742		{
743		if (addr->ss.ss_family == AF_INET6)
744		{
745	<	struct sockaddr_in6 *v6;
802	<
803	<	v6 = (struct sockaddr_in6*)addr;
804	<	if (IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr))
745	>	if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr))
746		{
747	<	char v4ip[HOSTIPLEN];
748	<	struct sockaddr_in *v4 = (struct sockaddr_in*)addr;
749	<	inetntop(AF_INET6, &v6->sin6_addr, v4ip, HOSTIPLEN);
750	<	inet_pton(AF_INET, v4ip, &v4->sin_addr);
747	>	struct sockaddr_in6 v6;
748	>	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
749	>
750	>	memcpy(&v6, addr, sizeof(v6));
751	>	memset(v4, 0, sizeof(struct sockaddr_in));
752	>	memcpy(&v4->sin_addr, &v6.sin6_addr.s6_addr[12], sizeof(v4->sin_addr));
753	>
754		addr->ss.ss_family = AF_INET;
755		addr->ss_len = sizeof(struct sockaddr_in);
756		}

Diff Legend

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