ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/s_bsd.c (file contents):
Revision 2230 by michael, Thu Jun 13 20:23:04 2013 UTC vs.
Revision 3312 by michael, Tue Apr 15 12:13:07 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_bsd.c: Network functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_bsd.c
23	>	* \brief Network functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 46 | Line 48
48		#include "send.h"
49		#include "memory.h"
50		#include "s_user.h"
51	<	#include "hook.h"
51	>
52
53		static const char *comm_err_str[] = { "Comm OK", "Error during bind()",
54		"Error during DNS lookup", "connect timeout", "Error during connect()",
55		"Comm Error" };
56
55	–	struct Callback *setup_socket_cb = NULL;
56	–
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 *);
#	Line 106 | Line 106 | get_sockerr(int fd)
106		}
107
108		/*
109	<	* report_error - report an error from an errno.
109	>	* report_error - report an error from an errno.
110		* Record error to log and also send a copy to all *LOCAL* opers online.
111		*
112		*        text        is a *format* string for outputing error. It must
#	Line 120 | Line 120 | get_sockerr(int fd)
120		* Cannot use perror() within daemon. stderr is closed in
121		* ircd and cannot be used. And, worse yet, it might have
122		* been reassigned to a normal connection...
123	<	*
123	>	*
124		* Actually stderr is still there IFF ircd was run with -s --Rodder
125		*/
126
127		void
128	<	report_error(int level, const char* text, const char* who, int error)
128	>	report_error(int level, const char* text, const char* who, int error)
129		{
130		who = (who) ? who : "";
131
#	Line 139 | Line 139 | report_error(int level, const char* text
139		*
140		* Set the socket non-blocking, and other wonderful bits.
141		*/
142	<	static void *
143	<	setup_socket(va_list args)
142	>	static void
143	>	setup_socket(int fd)
144		{
145	–	int fd = va_arg(args, int);
145		int opt = 1;
146
147		setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#	Line 153 | Line 152 | setup_socket(va_list args)
152		#endif
153
154		fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
156	–
157	–	return NULL;
158	–	}
159	–
160	–	/*
161	–	* init_comm()
162	–	*
163	–	* Initializes comm subsystem.
164	–	*/
165	–	void
166	–	init_comm(void)
167	–	{
168	–	setup_socket_cb = register_callback("setup_socket", setup_socket);
169	–	init_netio();
155		}
156
157		/*
#	Line 188 | Line 173 | close_connection(struct Client *client_p
173		* even if it is marked as blocked (COMM_SELECT_READ handler is called
174		* before COMM_SELECT_WRITE). Let's try, nothing to lose.. -adx
175		*/
176	<	ClearSendqBlocked(client_p);
176	>	DelFlag(client_p, FLAGS_BLOCKED);
177		send_queued_write(client_p);
178		}
179
#	Line 237 | Line 222 | close_connection(struct Client *client_p
222
223		dbuf_clear(&client_p->localClient->buf_sendq);
224		dbuf_clear(&client_p->localClient->buf_recvq);
225	<
225	>
226		MyFree(client_p->localClient->passwd);
227		detach_conf(client_p, CONF_CLIENT|CONF_OPER|CONF_SERVER);
243	–	client_p->from = NULL; /* ...this should catch them! >:) --msa */
244	–	}
245	–
246	–	/*  Base16 encoding is:
247	–	*  Copyright (c) 2001-2004, Roger Dingledine
248	–	*  Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson
249	–	*
250	–	*  Redistribution and use in source and binary forms, with or without
251	–	*  modification, are permitted provided that the following conditions are
252	–	*  met:
253	–	*
254	–	*  Redistributions of source code must retain the above copyright
255	–	*  notice, this list of conditions and the following disclaimer.
256	–
257	–	* Redistributions in binary form must reproduce the above copyright notice,
258	–	* this list of conditions and the following disclaimer
259	–	* in the documentation and/or other materials provided with the distribution.
260	–	*
261	–	* Neither the names of the copyright owners nor the names of its
262	–	* contributors may be used to endorse or promote products derived from
263	–	* this software without specific prior written permission.
264	–
265	–	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
266	–	* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
267	–	* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
268	–	* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
269	–	* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
270	–	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
271	–	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
272	–	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
273	–	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
274	–	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
275	–	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
276	–	*/
277	–	static void
278	–	base16_encode(char *dest, size_t destlen, const char *src, size_t srclen)
279	–	{
280	–	const char *end;
281	–	char *cp;
282	–
283	–	assert(destlen >= srclen * 2 + 1);
284	–
285	–	cp = dest;
286	–	end = src + srclen;
287	–
288	–	while (src < end)
289	–	{
290	–	*cp++ = "0123456789ABCDEF"[(*(const uint8_t *)src) >>  4];
291	–	*cp++ = "0123456789ABCDEF"[(*(const uint8_t *)src) & 0xf];
292	–	++src;
293	–	}
294	–
295	–	*cp = '\0';
228		}
229
230		#ifdef HAVE_LIBCRYPTO
#	Line 304 | Line 236 | static void
236		ssl_handshake(int fd, struct Client *client_p)
237		{
238		X509 *cert = NULL;
239	<	int ret = SSL_accept(client_p->localClient->fd.ssl);
308	<	int err = SSL_get_error(client_p->localClient->fd.ssl, ret);
239	>	int ret = 0;
240
241	<	ilog(LOG_TYPE_IRCD, "SSL Error %d %s", err, ERR_error_string(err, NULL));
311	<
312	<	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
241	>	if ((ret = SSL_accept(client_p->localClient->fd.ssl)) <= 0)
242		{
243	<	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
315	<	char buf[SHA_DIGEST_LENGTH * 2 + 1] = { '\0' };
316	<
317	<	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
318	<	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
319	<	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
243	>	if ((CurrentTime - client_p->localClient->firsttime) > 30)
244		{
245	<	base16_encode(buf, sizeof(buf),
246	<	(const char *)cert->sha1_hash, sizeof(cert->sha1_hash));
323	<	client_p->certfp = xstrdup(buf);
245	>	exit_client(client_p, "Timeout during SSL handshake");
246	>	return;
247		}
325	–	else
326	–	ilog(LOG_TYPE_IRCD, "Client %s!%s@%s gave bad SSL client certificate: %d",
327	–	client_p->name, client_p->username, client_p->host, res);
328	–	X509_free(cert);
329	–	}
248
331	–	if (ret <= 0)
332	–	{
249		switch (SSL_get_error(client_p->localClient->fd.ssl, ret))
250		{
251		case SSL_ERROR_WANT_WRITE:
252		comm_setselect(&client_p->localClient->fd, COMM_SELECT_WRITE,
253	<	(PF *) ssl_handshake, client_p, 0);
253	>	(PF *)ssl_handshake, client_p, 30);
254		return;
255
256		case SSL_ERROR_WANT_READ:
257		comm_setselect(&client_p->localClient->fd, COMM_SELECT_READ,
258	<	(PF *) ssl_handshake, client_p, 0);
258	>	(PF *)ssl_handshake, client_p, 30);
259		return;
260
261		default:
262	<	exit_client(client_p, client_p, "Error during SSL handshake");
263	<	return;
262	>	exit_client(client_p, "Error during SSL handshake");
263	>	return;
264		}
265		}
266
267	+	comm_settimeout(&client_p->localClient->fd, 0, NULL, NULL);
268	+
269	+	if ((cert = SSL_get_peer_certificate(client_p->localClient->fd.ssl)))
270	+	{
271	+	int res = SSL_get_verify_result(client_p->localClient->fd.ssl);
272	+	char buf[EVP_MAX_MD_SIZE * 2 + 1] = { '\0' };
273	+	unsigned char md[EVP_MAX_MD_SIZE] = { '\0' };
274	+
275	+	if (res == X509_V_OK || res == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
276	+	res == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE ||
277	+	res == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
278	+	{
279	+	unsigned int i = 0, n = 0;
280	+
281	+	if (X509_digest(cert, EVP_sha256(), md, &n))
282	+	{
283	+	for (; i < n; ++i)
284	+	snprintf(buf + 2 * i, 3, "%02X", md[i]);
285	+	client_p->certfp = xstrdup(buf);
286	+	}
287	+	}
288	+	else
289	+	ilog(LOG_TYPE_IRCD, "Client %s!%s@%s gave bad SSL client certificate: %d",
290	+	client_p->name, client_p->username, client_p->host, res);
291	+	X509_free(cert);
292	+	}
293	+
294		start_auth(client_p);
295		}
296		#endif
297
298		/*
299	<	* add_connection - creates a client which has just connected to us on
299	>	* add_connection - creates a client which has just connected to us on
300		* the given fd. The sockhost field is initialized with the ip# of the host.
301		* An unique id is calculated now, in case it is needed for auth.
302		* The client is sent to the auth module for verification, and not put in
#	Line 362 | Line 305 | ssl_handshake(int fd, struct Client *cli
305		void
306		add_connection(struct Listener *listener, struct irc_ssaddr *irn, int fd)
307		{
308	<	struct Client *new_client = make_client(NULL);
308	>	struct Client *client_p = make_client(NULL);
309
310	<	fd_open(&new_client->localClient->fd, fd, 1,
310	>	fd_open(&client_p->localClient->fd, fd, 1,
311		(listener->flags & LISTENER_SSL) ?
312	<	"Incoming SSL connection" : "Incoming connection");
312	>	"Incoming SSL connection" : "Incoming connection");
313
314		/*
315		* copy address to 'sockhost' as a string, copy it to host too
316		* so we have something valid to put into error messages...
317		*/
318	<	memcpy(&new_client->localClient->ip, irn, sizeof(struct irc_ssaddr));
318	>	memcpy(&client_p->localClient->ip, irn, sizeof(struct irc_ssaddr));
319
320	<	getnameinfo((struct sockaddr *)&new_client->localClient->ip,
321	<	new_client->localClient->ip.ss_len, new_client->sockhost,
322	<	sizeof(new_client->sockhost), NULL, 0, NI_NUMERICHOST);
323	<	new_client->localClient->aftype = new_client->localClient->ip.ss.ss_family;
320	>	getnameinfo((struct sockaddr *)&client_p->localClient->ip,
321	>	client_p->localClient->ip.ss_len, client_p->sockhost,
322	>	sizeof(client_p->sockhost), NULL, 0, NI_NUMERICHOST);
323	>	client_p->localClient->aftype = client_p->localClient->ip.ss.ss_family;
324
325		#ifdef HAVE_LIBGEOIP
326		/* XXX IPV6 SUPPORT XXX */
327		if (irn->ss.ss_family == AF_INET && geoip_ctx)
328		{
329	<	const struct sockaddr_in *v4 = (const struct sockaddr_in *)&new_client->localClient->ip;
330	<	new_client->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
329	>	const struct sockaddr_in *v4 = (const struct sockaddr_in *)&client_p->localClient->ip;
330	>	client_p->localClient->country_id = GeoIP_id_by_ipnum(geoip_ctx, (unsigned long)ntohl(v4->sin_addr.s_addr));
331		}
332		#endif
333
334	<	if (new_client->sockhost[0] == ':' && new_client->sockhost[1] == ':')
334	>	if (client_p->sockhost[0] == ':' && client_p->sockhost[1] == ':')
335		{
336	<	strlcpy(new_client->host, "0", sizeof(new_client->host));
337	<	strlcpy(new_client->host+1, new_client->sockhost, sizeof(new_client->host)-1);
338	<	memmove(new_client->sockhost+1, new_client->sockhost, sizeof(new_client->sockhost)-1);
339	<	new_client->sockhost[0] = '0';
336	>	strlcpy(client_p->host, "0", sizeof(client_p->host));
337	>	strlcpy(client_p->host+1, client_p->sockhost, sizeof(client_p->host)-1);
338	>	memmove(client_p->sockhost+1, client_p->sockhost, sizeof(client_p->sockhost)-1);
339	>	client_p->sockhost[0] = '0';
340		}
341		else
342	<	strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
342	>	strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host));
343
344	<	new_client->localClient->listener = listener;
344	>	client_p->localClient->listener = listener;
345		++listener->ref_count;
346
347		#ifdef HAVE_LIBCRYPTO
348		if (listener->flags & LISTENER_SSL)
349		{
350	<	if ((new_client->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
350	>	if ((client_p->localClient->fd.ssl = SSL_new(ServerInfo.server_ctx)) == NULL)
351		{
352		ilog(LOG_TYPE_IRCD, "SSL_new() ERROR! -- %s",
353		ERR_error_string(ERR_get_error(), NULL));
354
355	<	SetDead(new_client);
356	<	exit_client(new_client, new_client, "SSL_new failed");
355	>	SetDead(client_p);
356	>	exit_client(client_p, "SSL_new failed");
357		return;
358		}
359
360	<	SSL_set_fd(new_client->localClient->fd.ssl, fd);
361	<	ssl_handshake(0, new_client);
360	>	AddFlag(client_p, FLAGS_SSL);
361	>	SSL_set_fd(client_p->localClient->fd.ssl, fd);
362	>	ssl_handshake(0, client_p);
363		}
364		else
365		#endif
366	<	start_auth(new_client);
366	>	start_auth(client_p);
367		}
368
369		/*
#	Line 474 | Line 418 | comm_settimeout(fde_t *fd, time_t timeou
418		* flush functions, and when comm_close() is implemented correctly
419		* with close functions, we _actually_ don't call comm_close() here ..
420		* -- originally Adrian's notes
421	<	* comm_close() is replaced with fd_close() in fdlist.c
421	>	* comm_close() is replaced with fd_close() in fdlist.c
422		*/
423		void
424		comm_setflush(fde_t *fd, time_t timeout, PF *callback, void *cbdata)
#	Line 566 | Line 510 | comm_connect_tcp(fde_t *fd, const char *
510		*   -- adrian
511		*/
512		if ((clocal != NULL) && (bind(fd->fd, clocal, socklen) < 0))
513	<	{
513	>	{
514		/* Failure, call the callback with COMM_ERR_BIND */
515		comm_connect_callback(fd, COMM_ERR_BIND);
516		/* ... and quit */
#	Line 663 | Line 607 | comm_connect_dns_callback(void *vptr, co
607		/* Copy over the DNS reply info so we can use it in the connect() */
608		/*
609		* Note we don't fudge the refcount here, because we aren't keeping
610	<	* the DNS record around, and the DNS cache is gone anyway..
610	>	* the DNS record around, and the DNS cache is gone anyway..
611		*     -- adrian
612		*/
613		memcpy(&F->connect.hostaddr, addr, addr->ss_len);
#	Line 694 | Line 638 | comm_connect_tryconnect(fde_t *fd, void
638		return;
639
640		/* Try the connect() */
641	<	retval = connect(fd->fd, (struct sockaddr *) &fd->connect.hostaddr,
641	>	retval = connect(fd->fd, (struct sockaddr *) &fd->connect.hostaddr,
642		fd->connect.hostaddr.ss_len);
643
644		/* Error? */
#	Line 760 | Line 704 | comm_open(fde_t *F, int family, int sock
704		if (fd < 0)
705		return -1; /* errno will be passed through, yay.. */
706
707	<	execute_callback(setup_socket_cb, fd);
707	>	setup_socket(fd);
708
709		/* update things in our fd tracking */
710		fd_open(F, fd, 1, note);
#	Line 801 | Line 745 | comm_accept(struct Listener *lptr, struc
745		pn->ss_len = addrlen;
746		#endif
747
748	<	execute_callback(setup_socket_cb, newfd);
748	>	setup_socket(newfd);
749
750		/* .. and return */
751		return newfd;
752		}
753
754	<	/*
754	>	/*
755		* remove_ipv6_mapping() - Removes IPv4-In-IPv6 mapping from an address
756		* OSes with IPv6 mapping listening on both
757		* AF_INET and AF_INET6 map AF_INET connections inside AF_INET6 structures
758	<	*
758	>	*
759		*/
760		#ifdef IPV6
761		void
#	Line 821 | Line 765 | remove_ipv6_mapping(struct irc_ssaddr *a
765		{
766		if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr))
767		{
768	<	struct sockaddr_in6 v6;
768	>	struct sockaddr_in6 v6;
769		struct sockaddr_in *v4 = (struct sockaddr_in *)addr;
770
771		memcpy(&v6, addr, sizeof(v6));
#	Line 831 | Line 775 | remove_ipv6_mapping(struct irc_ssaddr *a
775		addr->ss.ss_family = AF_INET;
776		addr->ss_len = sizeof(struct sockaddr_in);
777		}
778	<	else
778	>	else
779		addr->ss_len = sizeof(struct sockaddr_in6);
780		}
781		else
782		addr->ss_len = sizeof(struct sockaddr_in);
783	<	}
783	>	}
784		#endif

Diff Legend

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