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 896 by michael, Sat Nov 3 08:54:09 2007 UTC vs.
ircd-hybrid/trunk/src/s_bsd.c (file contents), Revision 2246 by michael, Sun Jun 16 10:48:39 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"
46		#include "send.h"
47		#include "memory.h"
#	Line 60 | 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
68	–	extern void init_netio(void);
62
63		/* check_can_use_v6()
64		*  Check if the system can open AF_INET6 sockets
#	Line 81 | Line 74 | check_can_use_v6(void)
74		else
75		{
76		ServerInfo.can_use_v6 = 1;
84	–	#ifdef _WIN32
85	–	closesocket(v6);
86	–	#else
77		close(v6);
88	–	#endif
78		}
79		#else
80		ServerInfo.can_use_v6 = 0;
#	Line 101 | Line 90 | check_can_use_v6(void)
90		int
91		get_sockerr(int fd)
92		{
104	–	#ifndef _WIN32
93		int errtmp = errno;
106	–	#else
107	–	int errtmp = WSAGetLastError();
108	–	#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 144 | 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 160 | 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
170	–	#ifndef _WIN32
155		fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
172	–	#endif
156
157		return NULL;
158		}
#	Line 194 | Line 177 | init_comm(void)
177		void
178		close_connection(struct Client *client_p)
179		{
180	<	struct ConfItem *conf;
198	<	struct AccessItem *aconf;
199	<	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 211 | 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_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->firsttime;
207	>	ServerStats.is_sti += CurrentTime - client_p->localClient->firsttime;
208
209	<	/* XXX Does this even make any sense at all anymore?
222	<	* scheduling a 'quick' reconnect could cause a pile of
223	<	* nick collides under TSora protocol... -db
224	<	*/
225	<	/*
226	<	* If the connection has been up for a long amount of time, schedule
227	<	* a 'quick' reconnect, else reset the next-connect cycle.
228	<	*/
229	<	if ((conf = find_conf_exact(SERVER_TYPE,
230	<	client_p->name, client_p->username,
231	<	client_p->host)))
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
236	<	* a rehash in between, the status has been changed to
237	<	* 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);
240	<	aclass = (struct ClassItem *)map_to_conf(aconf->class_ptr);
241	<	aconf->hold = time(NULL);
242	<	aconf->hold += (aconf->hold - client_p->since > HANGONGOODLINK) ?
243	<	HANGONRETRYDELAY : ConFreq(aclass);
244	<	if (nextconnect > aconf->hold)
245	<	nextconnect = aconf->hold;
220	>	conf->until = CurrentTime + conf->class->con_freq;
221		}
222		}
248	–	else if (IsClient(client_p))
249	–	{
250	–	++ServerStats.is_cl;
251	–	ServerStats.is_cbs += client_p->localClient->send.bytes;
252	–	ServerStats.is_cbr += client_p->localClient->recv.bytes;
253	–	ServerStats.is_cti += CurrentTime - client_p->firsttime;
254	–	}
223		else
224		++ServerStats.is_ni;
225
#	Line 267 | Line 235 | close_connection(struct Client *client_p
235		if (client_p->localClient->fd.flags.open)
236		fd_close(&client_p->localClient->fd);
237
270	–	if (HasServlink(client_p))
271	–	{
272	–	if (client_p->localClient->ctrlfd.flags.open)
273	–	fd_close(&client_p->localClient->ctrlfd);
274	–	}
275	–
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 289 | Line 251 | close_connection(struct Client *client_p
251		static void
252		ssl_handshake(int fd, struct Client *client_p)
253		{
254	+	X509 *cert = NULL;
255		int ret = SSL_accept(client_p->localClient->fd.ssl);
256	+	int err = SSL_get_error(client_p->localClient->fd.ssl, ret);
257	+
258	+	ilog(LOG_TYPE_IRCD, "SSL Error %d %s", err, ERR_error_string(err, NULL));
259	+
260	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
261	+	{
262	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
263	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
264	+	unsigned char md[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
265	+
266	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
267	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
268	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
269	+	{
270	+	unsigned int i = 0, n = 0;
271	+
272	+	if (X509_digest(cert, EVP_sha256(), md, &n))
273	+	{
274	+	for (; i < n; ++i)
275	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
276	+	client_p->certfp = xstrdup(buf);
277	+	}
278	+	}
279	+	else
280	+	ilog(LOG_TYPE_IRCD, "Client %s!%s@%s gave bad SSL client certificate: %d",
281	+	client_p->name, client_p->username, client_p->host, res);
282	+	X509_free(cert);
283	+	}
284
285		if (ret <= 0)
286	+	{
287		switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
288		{
289		case SSL_ERROR_WANT_WRITE:
#	Line 308 | Line 300 | ssl_handshake(int fd, struct Client *cli
300		exit_client(client_p, client_p, "Error during SSL handshake");
301		return;
302		}
303	+	}
304
305	<	execute_callback(auth_cb, client_p);
305	>	start_auth(client_p);
306		}
307		#endif
308
#	Line 323 | Line 316 | ssl_handshake(int fd, struct Client *cli
316		void
317		add_connection(struct Listener *listener, struct irc_ssaddr *irn, int fd)
318		{
319	<	struct Client *new_client;
327	<
328	<	assert(NULL != listener);
329	<
330	<	new_client = make_client(NULL);
319	>	struct Client *new_client = make_client(NULL);
320
321		fd_open(&new_client->localClient->fd, fd, 1,
322		(listener->flags & LISTENER_SSL) ?
323		"Incoming SSL connection" : "Incoming connection");
324
325	<	/*
325	>	/*
326		* copy address to 'sockhost' as a string, copy it to host too
327		* so we have something valid to put into error messages...
328		*/
329		memcpy(&new_client->localClient->ip, irn, sizeof(struct irc_ssaddr));
330
331	<	irc_getnameinfo((struct sockaddr*)&new_client->localClient->ip,
332	<	new_client->localClient->ip.ss_len,  new_client->sockhost,
333	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
331	>	getnameinfo((struct sockaddr *)&new_client->localClient->ip,
332	>	new_client->localClient->ip.ss_len, new_client->sockhost,
333	>	sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
334		new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
346	–	#ifdef IPV6
347	–	if (new_client->sockhost[0] == ':')
348	–	strlcat(new_client->host, "0", HOSTLEN+1);
335
336	<	if (new_client->localClient->aftype == AF_INET6 &&
337	<	ConfigFileEntry.dot_in_ip6_addr == 1)
336	>	#ifdef HAVE_LIBGEOIP
337	>	/* XXX IPV6 SUPPORT XXX */
338	>	if (irn->ss.ss_family == AF_INET && geoip_ctx)
339		{
340	<	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
341	<	strlcat(new_client->host, ".", HOSTLEN+1);
340	>	const struct sockaddr_in *v4 = (const struct sockaddr_in *)&new_client->localClient->ip;
341	>	new_client->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
342		}
356	–	else
343		#endif
358	–	strlcat(new_client->host, new_client->sockhost,HOSTLEN+1);
344
345	<	new_client->connect_id = ++connect_id;
345	>	if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
346	>	{
347	>	strlcpy(new_client->host, "0", sizeof(new_client->host));
348	>	strlcpy(new_client->host+1, new_client->sockhost, sizeof(new_client->host)-1);
349	>	memmove(new_client->sockhost+1, new_client->sockhost, sizeof(new_client->sockhost)-1);
350	>	new_client->sockhost[0] = '0';
351	>	}
352	>	else
353	>	strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
354	>
355		new_client->localClient->listener = listener;
356		++listener->ref_count;
357
358		#ifdef HAVE_LIBCRYPTO
359		if (listener->flags & LISTENER_SSL)
360		{
361	<	if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.ctx)) == NULL)
361	>	if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
362		{
363	<	ilog(L_CRIT, "SSL_new() ERROR! -- %s",
363	>	ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
364		ERR_error_string(ERR_get_error(), NULL));
365
366		SetDead(new_client);
#	Line 374 | Line 368 | add_connection(struct Listener *listener
368		return;
369		}
370
371	+	AddFlag(new_client, FLAGS_SSL);
372		SSL_set_fd(new_client->localClient->fd.ssl, fd);
373		ssl_handshake(0, new_client);
374		}
375		else
376		#endif
377	<	execute_callback(auth_cb, new_client);
377	>	start_auth(new_client);
378		}
379
380		/*
#	Line 509 | Line 504 | comm_connect_tcp(fde_t *fd, const char *
504		void *data, int aftype, int timeout)
505		{
506		struct addrinfo hints, *res;
507	<	char portname[PORTNAMELEN+1];
507	>	char portname[PORTNAMELEN + 1];
508
509		assert(callback);
510		fd->connect.callback = callback;
#	Line 541 | Line 536 | comm_connect_tcp(fde_t *fd, const char *
536		hints.ai_socktype = SOCK_STREAM;
537		hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
538
539	<	snprintf(portname, PORTNAMELEN, "%d", port);
539	>	snprintf(portname, sizeof(portname), "%d", port);
540
541	<	if (irc_getaddrinfo(host, portname, &hints, &res))
541	>	if (getaddrinfo(host, portname, &hints, &res))
542		{
543		/* Send the DNS request, for the next level */
549	–	fd->dns_query = MyMalloc(sizeof(struct DNSQuery));
550	–	fd->dns_query->ptr = fd;
551	–	fd->dns_query->callback = comm_connect_dns_callback;
544		if (aftype == AF_INET6)
545	<	gethost_byname_type(host, fd->dns_query, T_AAAA);
545	>	gethost_byname_type(comm_connect_dns_callback, fd, host, T_AAAA);
546		else
547	<	gethost_byname_type(host, fd->dns_query, T_A);
547	>	gethost_byname_type(comm_connect_dns_callback, fd, host, T_A);
548		}
549		else
550		{
#	Line 562 | Line 554 | comm_connect_tcp(fde_t *fd, const char *
554		memcpy(&fd->connect.hostaddr, res->ai_addr, res->ai_addrlen);
555		fd->connect.hostaddr.ss_len = res->ai_addrlen;
556		fd->connect.hostaddr.ss.ss_family = res->ai_family;
557	<	irc_freeaddrinfo(res);
557	>	freeaddrinfo(res);
558		comm_settimeout(fd, timeout*1000, comm_connect_timeout, NULL);
559		comm_connect_tryconnect(fd, NULL);
560		}
#	Line 610 | Line 602 | comm_connect_timeout(fde_t *fd, void *no
602		* otherwise we initiate the connect()
603		*/
604		static void
605	<	comm_connect_dns_callback(void *vptr, struct DNSReply *reply)
605	>	comm_connect_dns_callback(void *vptr, const struct irc_ssaddr *addr, const char *name)
606		{
607		fde_t *F = vptr;
608
609	<	if (reply == NULL)
609	>	if (name == NULL)
610		{
619	–	MyFree(F->dns_query);
620	–	F->dns_query = NULL;
611		comm_connect_callback(F, COMM_ERR_DNS);
612		return;
613		}
#	Line 631 | Line 621 | comm_connect_dns_callback(void *vptr, st
621		* the DNS record around, and the DNS cache is gone anyway..
622		*     -- adrian
623		*/
624	<	memcpy(&F->connect.hostaddr, &reply->addr, reply->addr.ss_len);
624	>	memcpy(&F->connect.hostaddr, addr, addr->ss_len);
625		/* The cast is hacky, but safe - port offset is same on v4 and v6 */
626		((struct sockaddr_in *) &F->connect.hostaddr)->sin_port =
627		F->connect.hostaddr.ss_port;
628	<	F->connect.hostaddr.ss_len = reply->addr.ss_len;
628	>	F->connect.hostaddr.ss_len = addr->ss_len;
629
630		/* Now, call the tryconnect() routine to try a connect() */
641	–	MyFree(F->dns_query);
642	–	F->dns_query = NULL;
631		comm_connect_tryconnect(F, NULL);
632		}
633
#	Line 667 | Line 655 | comm_connect_tryconnect(fde_t *fd, void
655		/* Error? */
656		if (retval < 0)
657		{
670	–	#ifdef _WIN32
671	–	errno = WSAGetLastError();
672	–	#endif
658		/*
659		* If we get EISCONN, then we've already connect()ed the socket,
660		* which is a good thing.
#	Line 728 | Line 713 | comm_open(fde_t *F, int family, int sock
713		*/
714		fd = socket(family, sock_type, proto);
715		if (fd < 0)
731	–	{
732	–	#ifdef _WIN32
733	–	errno = WSAGetLastError();
734	–	#endif
716		return -1; /* errno will be passed through, yay.. */
736	–	}
717
718		execute_callback(setup_socket_cb, fd);
719
#	Line 766 | Line 746 | comm_accept(struct Listener *lptr, struc
746		* reserved fd limit, but we can deal with that when comm_open()
747		* also does it. XXX -- adrian
748		*/
749	<	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, (socklen_t *)&addrlen);
749	>	newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, &addrlen);
750		if (newfd < 0)
771	–	{
772	–	#ifdef _WIN32
773	–	errno = WSAGetLastError();
774	–	#endif
751		return -1;
776	–	}
752
753		#ifdef IPV6
754		remove_ipv6_mapping(pn);
#	Line 789 | Line 764 | comm_accept(struct Listener *lptr, struc
764
765		/*
766		* remove_ipv6_mapping() - Removes IPv4-In-IPv6 mapping from an address
767	<	* This function should really inspect the struct itself rather than relying
793	<	* on inet_pton and inet_ntop.  OSes with IPv6 mapping listening on both
767	>	* OSes with IPv6 mapping listening on both
768		* AF_INET and AF_INET6 map AF_INET connections inside AF_INET6 structures
769		*
770		*/
#	Line 800 | Line 774 | remove_ipv6_mapping(struct irc_ssaddr *a
774		{
775		if (addr->ss.ss_family == AF_INET6)
776		{
777	<	struct sockaddr_in6 *v6;
804	<
805	<	v6 = (struct sockaddr_in6*)addr;
806	<	if (IN6_IS_ADDR_V4MAPPED(&v6->sin6_addr))
777	>	if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr))
778		{
779	<	char v4ip[HOSTIPLEN];
780	<	struct sockaddr_in *v4 = (struct sockaddr_in*)addr;
781	<	inetntop(AF_INET6, &v6->sin6_addr, v4ip, HOSTIPLEN);
782	<	inet_pton(AF_INET, v4ip, &v4->sin_addr);
779	>	struct sockaddr_in6 v6;
780	>	struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
781	>
782	>	memcpy(&v6, addr, sizeof(v6));
783	>	memset(v4, 0, sizeof(struct sockaddr_in));
784	>	memcpy(&v4->sin_addr, &v6.sin6_addr.s6_addr[12], sizeof(v4->sin_addr));
785	>
786		addr->ss.ss_family = AF_INET;
787		addr->ss_len = sizeof(struct sockaddr_in);
788		}

Diff Legend

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