loudmouth: loudmouth/lm-old-socket.c@cdd6a0c5b439 (annotated)

516 4dd3aa6b83e5 Change the tab width to 4 steps in the emacs headers Mikael Hallendal <micke@imendio.com> parents: 515 diff changeset	1	/* -- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -- */
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	2	/*
512 9f050099129d Updated copyright years Mikael Hallendal <micke@imendio.com> parents: 502 diff changeset	3	* Copyright (C) 2006-2008 Imendio AB
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	4	* Copyright (C) 2006 Nokia Corporation. All rights reserved.
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	5	* Copyright (C) 2007 Collabora Ltd.
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	6	*
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	7	* This program is free software; you can redistribute it and/or
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	8	* modify it under the terms of the GNU Lesser General Public License as
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	9	* published by the Free Software Foundation; either version 2 of the
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	10	* License, or (at your option) any later version.
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	11	*
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	12	* This program is distributed in the hope that it will be useful,
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	15	* Lesser General Public License for more details.
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	16	*
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	17	* You should have received a copy of the GNU Lesser General Public
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	18	* License along with this program; if not, write to the
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	19	* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	20	* Boston, MA 02111-1307, USA.
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	21	*/
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	22
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	23	#include <config.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	24
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	25	#include <string.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	26	#include <sys/types.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	27
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	28	/* Needed on Mac OS X */
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	29	#if HAVE_NETINET_IN_H
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	30	#include <netinet/in.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	31	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	32
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	33	/* Needed on Mac OS X */
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	34	#if HAVE_ARPA_NAMESER_COMPAT_H
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	35	#include <arpa/nameser_compat.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	36	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	37
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	38	#include <arpa/nameser.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	39	#include <resolv.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	40
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	41	#include "lm-debug.h"
475 001da49d7fd1 Added cancel operation for asyncns resolver Mikael Hallendal <micke@imendio.com> parents: 470 diff changeset	42	#include "lm-error.h"
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	43	#include "lm-internals.h"
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	44	#include "lm-misc.h"
475 001da49d7fd1 Added cancel operation for asyncns resolver Mikael Hallendal <micke@imendio.com> parents: 470 diff changeset	45	#include "lm-proxy.h"
001da49d7fd1 Added cancel operation for asyncns resolver Mikael Hallendal <micke@imendio.com> parents: 470 diff changeset	46	#include "lm-resolver.h"
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	47	#include "lm-ssl.h"
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	48	#include "lm-ssl-internals.h"
475 001da49d7fd1 Added cancel operation for asyncns resolver Mikael Hallendal <micke@imendio.com> parents: 470 diff changeset	49	#include "lm-sock.h"
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	50	#include "lm-old-socket.h"
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	51
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	52	#ifdef HAVE_ASYNCNS
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	53	#include <asyncns.h>
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	54	#define freeaddrinfo(x) asyncns_freeaddrinfo(x)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	55	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	56
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	57	#define IN_BUFFER_SIZE 1024
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	58	#define SRV_LEN 8192
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	59
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	60	struct _LmOldSocket {
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	61	LmConnection *connection;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	62	GMainContext *context;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	63
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	64	gchar *domain;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	65	gchar *server;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	66	guint port;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	67
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	68	gboolean blocking;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	69
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	70	LmSSL *ssl;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	71	gboolean ssl_started;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	72	LmProxy *proxy;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	73
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	74	GIOChannel *io_channel;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	75	GSource *watch_in;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	76	GSource *watch_err;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	77	GSource *watch_hup;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	78
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	79	LmOldSocketT fd;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	80
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	81	GSource *watch_connect;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	82
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	83	gboolean cancel_open;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	84
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	85	GSource *watch_out;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	86	GString *out_buf;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	87
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	88	LmConnectData *connect_data;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	89
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	90	IncomingDataFunc data_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	91	SocketClosedFunc closed_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	92	ConnectResultFunc connect_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	93	gpointer user_data;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	94
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	95	guint ref_count;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	96
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	97	LmResolver *resolver;
475 001da49d7fd1 Added cancel operation for asyncns resolver Mikael Hallendal <micke@imendio.com> parents: 470 diff changeset	98
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	99	#ifdef HAVE_ASYNCNS
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	100	GSource *watch_resolv;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	101	asyncns_query_t *resolv_query;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	102	asyncns_t *asyncns_ctx;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	103	GIOChannel *resolv_channel;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	104	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	105	};
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	106
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	107	static void socket_free (LmOldSocket *socket);
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	108	static gboolean socket_do_connect (LmConnectData *connect_data);
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	109	static gboolean socket_connect_cb (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	110	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	111	LmConnectData *connect_data);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	112	static gboolean socket_in_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	113	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	114	LmOldSocket *socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	115	static gboolean socket_hup_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	116	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	117	LmOldSocket *socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	118	static gboolean socket_error_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	119	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	120	LmOldSocket *socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	121	static gboolean socket_buffered_write_cb (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	122	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	123	LmOldSocket *socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	124	static void socket_close_io_channel (GIOChannel *io_channel);
444 57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	125	static gboolean old_socket_output_is_buffered (LmOldSocket *socket,
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	126	const gchar *buffer,
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	127	gint len);
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	128	static void old_socket_setup_output_buffer (LmOldSocket *socket,
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	129	const gchar *buffer,
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	130	gint len);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	131
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	132	static void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	133	socket_free (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	134	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	135	g_free (socket->server);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	136	g_free (socket->domain);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	137
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	138	if (socket->ssl) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	139	lm_ssl_unref (socket->ssl);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	140	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	141
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	142	if (socket->proxy) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	143	lm_proxy_unref (socket->proxy);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	144	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	145
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	146	if (socket->out_buf) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	147	g_string_free (socket->out_buf, TRUE);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	148	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	149
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	150	if (socket->resolver) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	151	g_object_unref (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	152	}
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	153
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	154	g_free (socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	155	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	156
448 4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	157	static gint
4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	158	old_socket_do_write (LmOldSocket socket, const gchar buf, guint len)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	159	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	160	gint b_written;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	161
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	162	if (socket->ssl_started) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	163	b_written = _lm_ssl_send (socket->ssl, buf, len);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	164	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	165	GIOStatus io_status = G_IO_STATUS_AGAIN;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	166	gsize bytes_written;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	167
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	168	while (io_status == G_IO_STATUS_AGAIN) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	169	io_status = g_io_channel_write_chars (socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	170	buf, len,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	171	&bytes_written,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	172	NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	173	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	174
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	175	b_written = bytes_written;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	176
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	177	if (io_status != G_IO_STATUS_NORMAL) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	178	b_written = -1;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	179	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	180	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	181
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	182	return b_written;
448 4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	183	}
4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	184
4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	185	gint
4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	186	lm_old_socket_write (LmOldSocket socket, const gchar buf, gint len)
4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	187	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	188	gint b_written;
448 4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	189
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	190	if (old_socket_output_is_buffered (socket, buf, len)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	191	return len;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	192	}
448 4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	193
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	194	b_written = old_socket_do_write (socket, buf, len);
448 4aec5fbe96f1 Split out old_socket_do_write from lm_old_socket_do_write. Mikael Hallendal <micke@imendio.com> parents: 447 diff changeset	195
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	196	if (b_written < len && b_written != -1) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	197	old_socket_setup_output_buffer (socket,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	198	buf + b_written,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	199	len - b_written);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	200	return len;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	201	}
443 5dd3b432c53e Moved output buffer creation/addition to LmOldSocket where it belongs. Mikael Hallendal <micke@imendio.com> parents: 431 diff changeset	202
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	203	return b_written;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	204	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	205
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	206	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	207	socket_read_incoming (LmOldSocket *socket,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	208	gchar *buf,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	209	gsize buf_size,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	210	gsize *bytes_read,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	211	gboolean *hangup,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	212	gint *reason)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	213	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	214	GIOStatus status;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	215
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	216	*hangup = FALSE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	217
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	218	if (socket->ssl_started) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	219	status = _lm_ssl_read (socket->ssl,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	220	buf, buf_size - 1, bytes_read);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	221	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	222	status = g_io_channel_read_chars (socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	223	buf, buf_size - 1,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	224	bytes_read,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	225	NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	226	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	227
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	228	if (status != G_IO_STATUS_NORMAL \|\| *bytes_read < 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	229	switch (status) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	230	case G_IO_STATUS_EOF:
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	231	*reason = LM_DISCONNECT_REASON_HUP;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	232	break;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	233	case G_IO_STATUS_AGAIN:
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	234	/* No data readable but we didn't hangup */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	235	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	236	break;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	237	case G_IO_STATUS_ERROR:
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	238	*reason = LM_DISCONNECT_REASON_ERROR;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	239	break;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	240	default:
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	241	*reason = LM_DISCONNECT_REASON_UNKNOWN;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	242	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	243
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	244	/* Notify connection_in_event that we hangup the connection */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	245	*hangup = TRUE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	246
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	247	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	248	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	249
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	250	buf[*bytes_read] = '\0';
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	251
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	252	/* There is more data to be read */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	253	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	254	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	255
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	256	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	257	socket_in_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	258	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	259	LmOldSocket *socket)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	260	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	261	gchar buf[IN_BUFFER_SIZE];
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	262	gsize bytes_read = 0;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	263	gboolean read_anything = FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	264	gboolean hangup = 0;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	265	gint reason = 0;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	266
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	267	if (!socket->io_channel) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	268	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	269	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	270
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	271	while ((condition & G_IO_IN) && socket_read_incoming (socket, buf, IN_BUFFER_SIZE,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	272	&bytes_read, &hangup, &reason)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	273
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	274	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "\nRECV [%d]:\n",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	275	(int)bytes_read);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	276	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	277	"-----------------------------------\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	278	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "'%s'\n", buf);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	279	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	280	"-----------------------------------\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	281
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	282	lm_verbose ("Read: %d chars\n", (int)bytes_read);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	283
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	284	(socket->data_func) (socket, buf, socket->user_data);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	285
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	286	read_anything = TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	287
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	288	condition = g_io_channel_get_buffer_condition (socket->io_channel);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	289	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	290
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	291	/* If we have read something, delay the hangup so that the data can be
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	292	* processed. */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	293	if (hangup && !read_anything) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	294	(socket->closed_func) (socket, reason, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	295	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	296	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	297
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	298	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	299	}
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	300
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	301	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	302	socket_hup_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	303	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	304	LmOldSocket *socket)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	305	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	306	lm_verbose ("HUP event: %d->'%s'\n",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	307	condition, lm_misc_io_condition_to_str (condition));
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	308
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	309	if (!socket->io_channel) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	310	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	311	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	312
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	313	(socket->closed_func) (socket, LM_DISCONNECT_REASON_HUP,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	314	socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	315
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	316	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	317	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	318
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	319	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	320	socket_error_event (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	321	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	322	LmOldSocket *socket)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	323	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	324	lm_verbose ("ERROR event: %d->'%s'\n",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	325	condition, lm_misc_io_condition_to_str (condition));
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	326
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	327	if (!socket->io_channel) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	328	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	329	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	330
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	331	(socket->closed_func) (socket, LM_DISCONNECT_REASON_ERROR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	332	socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	333
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	334	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	335	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	336
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	337	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	338	_lm_old_socket_ssl_init (LmOldSocket *socket, gboolean delayed)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	339	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	340	GError *error = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	341	const gchar *ssl_verify_domain = NULL;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	342
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	343	lm_verbose ("Setting up SSL...\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	344
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	345	_lm_ssl_initialize (socket->ssl);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	346
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	347	#ifdef HAVE_GNUTLS
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	348	/* GNU TLS requires the socket to be blocking */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	349	_lm_sock_set_blocking (socket->fd, TRUE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	350	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	351
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	352	/* If we're using StartTLS, the correct thing is to verify against
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	353	* the domain. If we're using old SSL, we should verify against the
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	354	* hostname. */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	355	if (delayed)
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	356	ssl_verify_domain = socket->domain;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	357	else
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	358	ssl_verify_domain = socket->server;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	359
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	360	if (!_lm_ssl_begin (socket->ssl, socket->fd, ssl_verify_domain, &error)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	361	lm_verbose ("Could not begin SSL\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	362
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	363	if (error) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	364	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	365	"%s\n", error->message);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	366	g_error_free (error);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	367	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	368
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	369	_lm_sock_shutdown (socket->fd);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	370	_lm_sock_close (socket->fd);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	371
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	372	if (!delayed && socket->connect_func) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	373	(socket->connect_func) (socket, FALSE, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	374	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	375
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	376	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	377	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	378
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	379	#ifdef HAVE_GNUTLS
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	380	_lm_sock_set_blocking (socket->fd, FALSE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	381	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	382
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	383	socket->ssl_started = TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	384
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	385	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	386	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	387
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	388	gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	389	lm_old_socket_starttls (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	390	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	391	g_return_val_if_fail (lm_ssl_get_use_starttls (socket->ssl) == TRUE, FALSE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	392
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	393	return _lm_old_socket_ssl_init (socket, TRUE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	394	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	395
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	396
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	397
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	398	void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	399	_lm_old_socket_succeeded (LmConnectData *connect_data)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	400	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	401	LmOldSocket *socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	402
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	403	socket = connect_data->socket;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	404
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	405	if (socket->watch_connect) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	406	g_source_destroy (socket->watch_connect);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	407	socket->watch_connect = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	408	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	409
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	410	/* Need some way to report error/success */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	411	if (socket->cancel_open) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	412	lm_verbose ("Cancelling connection...\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	413	if (socket->connect_func) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	414	(socket->connect_func) (socket, FALSE, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	415	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	416	return;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	417	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	418
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	419	socket->fd = connect_data->fd;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	420	socket->io_channel = connect_data->io_channel;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	421
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	422	g_object_unref (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	423	socket->resolver = NULL;
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	424
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	425	socket->connect_data = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	426	g_free (connect_data);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	427
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	428	/* old-style ssl should be started immediately */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	429	if (socket->ssl && (lm_ssl_get_use_starttls (socket->ssl) == FALSE)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	430	if (!_lm_old_socket_ssl_init (socket, FALSE)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	431	return;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	432	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	433	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	434
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	435	socket->watch_in =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	436	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	437	socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	438	G_IO_IN,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	439	(GIOFunc) socket_in_event,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	440	socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	441
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	442	/* FIXME: if we add these, we don't get ANY
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	443	* response from the server, this is to do with the way that
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	444	* windows handles watches, see bug #331214.
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	445	*/
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	446	#ifndef G_OS_WIN32
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	447	socket->watch_err =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	448	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	449	socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	450	G_IO_ERR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	451	(GIOFunc) socket_error_event,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	452	socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	453
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	454	socket->watch_hup =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	455	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	456	socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	457	G_IO_HUP,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	458	(GIOFunc) socket_hup_event,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	459	socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	460	#endif
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	461
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	462	if (socket->connect_func) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	463	(socket->connect_func) (socket, TRUE, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	464	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	465	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	466
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	467	gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	468	_lm_old_socket_failed_with_error (LmConnectData *connect_data, int error)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	469	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	470	LmOldSocket *socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	471
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	472	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	473	"Connection failed: %s (error %d)\n",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	474	_lm_sock_get_error_str (error), error);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	475
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	476	socket = lm_old_socket_ref (connect_data->socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	477
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	478	connect_data->current_addr = lm_resolver_results_get_next (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	479
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	480	if (socket->watch_connect) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	481	g_source_destroy (socket->watch_connect);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	482	socket->watch_connect = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	483	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	484
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	485	if (connect_data->io_channel != NULL) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	486	socket_close_io_channel (connect_data->io_channel);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	487	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	488
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	489	if (connect_data->current_addr == NULL) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	490	if (socket->connect_func) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	491	(socket->connect_func) (socket, FALSE, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	492	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	493
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	494	/* if the user callback called connection_close(), this is already freed */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	495	if (socket->connect_data != NULL) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	496	if (socket->resolver) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	497	g_object_unref (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	498	}
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	499
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	500	socket->connect_data = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	501	g_free (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	502	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	503	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	504	/* try to connect to the next host */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	505	return socket_do_connect (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	506	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	507
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	508	lm_old_socket_unref(socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	509
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	510	return FALSE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	511	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	512
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	513	gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	514	_lm_old_socket_failed (LmConnectData *connect_data)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	515	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	516	return _lm_old_socket_failed_with_error (connect_data,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	517	_lm_sock_get_last_error());
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	518	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	519
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	520	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	521	socket_connect_cb (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	522	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	523	LmConnectData *connect_data)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	524	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	525	LmOldSocket *socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	526	struct addrinfo *addr;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	527	int err;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	528	socklen_t len;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	529	LmOldSocketT fd;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	530	gboolean result = FALSE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	531
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	532	socket = lm_old_socket_ref (connect_data->socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	533	addr = connect_data->current_addr;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	534	fd = g_io_channel_unix_get_fd (source);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	535
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	536	if (condition == G_IO_ERR) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	537	len = sizeof (err);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	538	_lm_sock_get_error (fd, &err, &len);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	539	if (!_lm_sock_is_blocking_error (err)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	540	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	541	"Connection failed.\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	542
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	543	/* error condition, but might be possible to recover
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	544	* from it (by connecting to the next host) */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	545	if (!_lm_old_socket_failed_with_error (connect_data, err)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	546	socket->watch_connect = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	547	goto out;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	548	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	549	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	550	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	551
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	552	if (_lm_connection_async_connect_waiting (socket->connection)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	553	gint res;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	554
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	555	fd = g_io_channel_unix_get_fd (source);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	556
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	557	res = _lm_sock_connect (fd, addr->ai_addr, (int)addr->ai_addrlen);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	558	if (res < 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	559	err = _lm_sock_get_last_error ();
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	560	if (_lm_sock_is_blocking_success (err)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	561	_lm_connection_set_async_connect_waiting (socket->connection, FALSE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	562
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	563	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	564	"Connection success (1).\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	565
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	566	_lm_old_socket_succeeded (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	567	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	568
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	569	if (_lm_connection_async_connect_waiting (socket->connection) &&
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	570	!_lm_sock_is_blocking_error (err)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	571	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	572	"Connection failed.\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	573
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	574	_lm_sock_close (connect_data->fd);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	575	_lm_old_socket_failed_with_error (connect_data, err);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	576
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	577	socket->watch_connect = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	578	goto out;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	579	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	580	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	581	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	582	/* for blocking sockets, G_IO_OUT means we are connected */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	583	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	584	"Connection success (2).\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	585
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	586	_lm_old_socket_succeeded (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	587	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	588
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	589	result = TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	590
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	591	out:
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	592	lm_old_socket_unref(socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	593
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	594	return result;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	595	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	596
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	597	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	598	socket_do_connect (LmConnectData *connect_data)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	599	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	600	LmOldSocket *socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	601	LmOldSocketT fd;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	602	int res, err;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	603	int port;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	604	char name[NI_MAXHOST];
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	605	char portname[NI_MAXSERV];
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	606	struct addrinfo *addr;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	607
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	608	socket = connect_data->socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	609	addr = connect_data->current_addr;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	610
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	611	if (socket->proxy) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	612	port = htons (lm_proxy_get_port (socket->proxy));
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	613	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	614	port = htons (socket->port);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	615	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	616
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	617	((struct sockaddr_in *) addr->ai_addr)->sin_port = port;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	618
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	619	res = getnameinfo (addr->ai_addr,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	620	(socklen_t)addr->ai_addrlen,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	621	name, sizeof (name),
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	622	portname, sizeof (portname),
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	623	NI_NUMERICHOST \| NI_NUMERICSERV);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	624
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	625	if (res < 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	626	return _lm_old_socket_failed (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	627	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	628
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	629	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	630	"Trying %s port %s...\n", name, portname);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	631
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	632	fd = _lm_sock_makesocket (addr->ai_family,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	633	addr->ai_socktype,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	634	addr->ai_protocol);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	635
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	636	if (!_LM_SOCK_VALID (fd)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	637	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	638	"Failed making socket, error:%d...\n",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	639	_lm_sock_get_last_error ());
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	640
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	641	return _lm_old_socket_failed (connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	642	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	643
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	644	/* Even though it says _unix_new(), it is supported by glib on
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	645	* win32 because glib does some cool stuff to find out if it
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	646	* can treat it as a FD or a windows SOCKET.
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	647	*/
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	648	connect_data->fd = fd;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	649	connect_data->io_channel = g_io_channel_unix_new (fd);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	650
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	651	g_io_channel_set_encoding (connect_data->io_channel, NULL, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	652	g_io_channel_set_buffered (connect_data->io_channel, FALSE);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	653
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	654	_lm_sock_set_blocking (connect_data->fd, socket->blocking);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	655
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	656	if (socket->proxy) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	657	socket->watch_connect =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	658	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	659	connect_data->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	660	G_IO_OUT\|G_IO_ERR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	661	(GIOFunc) _lm_proxy_connect_cb,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	662	connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	663	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	664	socket->watch_connect =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	665	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	666	connect_data->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	667	G_IO_OUT\|G_IO_ERR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	668	(GIOFunc) socket_connect_cb,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	669	connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	670	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	671
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	672	_lm_connection_set_async_connect_waiting (socket->connection, !socket->blocking);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	673
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	674	res = _lm_sock_connect (connect_data->fd,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	675	addr->ai_addr, (int)addr->ai_addrlen);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	676	if (res < 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	677	err = _lm_sock_get_last_error ();
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	678	if (!_lm_sock_is_blocking_error (err)) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	679	_lm_sock_close (connect_data->fd);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	680	return _lm_old_socket_failed_with_error (connect_data, err);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	681	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	682	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	683
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	684	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	685	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	686
444 57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	687	static gboolean
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	688	old_socket_output_is_buffered (LmOldSocket *socket,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	689	const gchar *buffer,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	690	gint len)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	691	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	692	if (socket->out_buf) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	693	lm_verbose ("Appending %d bytes to output buffer\n", len);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	694	g_string_append_len (socket->out_buf, buffer, len);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	695	return TRUE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	696	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	697
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	698	return FALSE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	699	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	700
444 57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	701	static void
57c59cfdd77c Made the output buffer functions private to LmOldSocket. Mikael Hallendal <micke@imendio.com> parents: 443 diff changeset	702	old_socket_setup_output_buffer (LmOldSocket socket, const gchar buffer, gint len)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	703	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	704	lm_verbose ("OUTPUT BUFFER ENABLED\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	705
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	706	socket->out_buf = g_string_new_len (buffer, len);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	707
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	708	socket->watch_out =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	709	lm_misc_add_io_watch (socket->context,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	710	socket->io_channel,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	711	G_IO_OUT,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	712	(GIOFunc) socket_buffered_write_cb,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	713	socket);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	714	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	715
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	716	static gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	717	socket_buffered_write_cb (GIOChannel *source,
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	718	GIOCondition condition,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	719	LmOldSocket *socket)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	720	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	721	gint b_written;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	722	GString *out_buf;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	723	/* FIXME: Do the writing */
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	724
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	725	out_buf = socket->out_buf;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	726	if (!out_buf) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	727	/* Should not be possible */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	728	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	729	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	730
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	731	b_written = old_socket_do_write (socket, out_buf->str, out_buf->len);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	732
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	733	if (b_written < 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	734	(socket->closed_func) (socket, LM_DISCONNECT_REASON_ERROR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	735	socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	736	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	737	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	738
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	739	g_string_erase (out_buf, 0, (gsize) b_written);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	740	if (out_buf->len == 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	741	lm_verbose ("Output buffer is empty, going back to normal output\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	742
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	743	if (socket->watch_out) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	744	g_source_destroy (socket->watch_out);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	745	socket->watch_out = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	746	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	747
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	748	g_string_free (out_buf, TRUE);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	749	socket->out_buf = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	750	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	751	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	752
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	753	return TRUE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	754	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	755
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	756	static void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	757	socket_close_io_channel (GIOChannel *io_channel)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	758	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	759	gint fd;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	760
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	761	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	762	"Freeing up IOChannel and file descriptor\n");
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	763
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	764	fd = g_io_channel_unix_get_fd (io_channel);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	765
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	766	g_io_channel_unref (io_channel);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	767
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	768	_lm_sock_close (fd);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	769	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	770
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	771	/* FIXME: Need to have a way to only get srv reply and then decide if the
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	772	* resolver should continue to look the host up.
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	773	*
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	774	* This is needed for the case when we do a SRV lookup to lookup the
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	775	* real host of the service and then connect to it through a proxy.
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	776	*/
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	777	static void
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	778	old_socket_resolver_srv_cb (LmResolver *resolver,
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	779	LmResolverResult result,
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	780	gpointer user_data)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	781	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	782	LmOldSocket socket = (LmOldSocket ) user_data;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	783	const gchar *remote_addr;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	784
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	785	if (result != LM_RESOLVER_RESULT_OK) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	786	lm_verbose ("SRV lookup failed, trying jid domain\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	787	socket->server = g_strdup (socket->domain);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	788	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	789	g_object_get (resolver, "host", &socket->server, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	790	g_object_get (resolver, "port", &socket->port, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	791	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	792
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	793	if (socket->proxy) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	794	remote_addr = lm_proxy_get_server (socket->proxy);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	795	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	796	remote_addr = socket->server;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	797	}
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	798
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	799	g_object_set (resolver,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	800	"host", remote_addr,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	801	"type", LM_RESOLVER_HOST,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	802	NULL);
502 4b69fbfa8797 Create connect_data in LmOldSocket, revert a segfault when working on LmResolver. Mikael Hallendal <micke@imendio.com> parents: 476 diff changeset	803
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	804	lm_resolver_lookup (resolver);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	805	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	806
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	807	static void
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	808	old_socket_resolver_host_cb (LmResolver *resolver,
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	809	LmResolverResult result,
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	810	gpointer user_data)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	811	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	812	LmOldSocket socket = (LmOldSocket ) user_data;
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	813
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	814	if (result != LM_RESOLVER_RESULT_OK) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	815	lm_verbose ("error while resolving, bailing out\n");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	816	if (socket->connect_func) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	817	(socket->connect_func) (socket, FALSE, socket->user_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	818	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	819	g_object_unref (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	820	socket->resolver = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	821	g_free (socket->connect_data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	822	socket->connect_data = NULL;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	823
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	824	return;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	825	}
502 4b69fbfa8797 Create connect_data in LmOldSocket, revert a segfault when working on LmResolver. Mikael Hallendal <micke@imendio.com> parents: 476 diff changeset	826
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	827	socket->connect_data->current_addr =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	828	lm_resolver_results_get_next (resolver);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	829
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	830	socket_do_connect (socket->connect_data);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	831	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	832
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	833	LmOldSocket *
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	834	lm_old_socket_create (GMainContext *context,
451 0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	835	IncomingDataFunc data_func,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	836	SocketClosedFunc closed_func,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	837	ConnectResultFunc connect_func,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	838	gpointer user_data,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	839	LmConnection *connection,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	840	gboolean blocking,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	841	const gchar *server,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	842	const gchar *domain,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	843	guint port,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	844	LmSSL *ssl,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	845	LmProxy *proxy,
0c8ea9d1bec2 Some style fixes Mikael Hallendal <micke@imendio.com> parents: 450 diff changeset	846	GError **error)
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	847	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	848	LmOldSocket *socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	849	LmConnectData *data;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	850
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	851	g_return_val_if_fail (domain != NULL, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	852	g_return_val_if_fail ((port >= LM_MIN_PORT && port <= LM_MAX_PORT), NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	853	g_return_val_if_fail (data_func != NULL, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	854	g_return_val_if_fail (closed_func != NULL, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	855	g_return_val_if_fail (connect_func != NULL, NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	856
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	857	socket = g_new0 (LmOldSocket, 1);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	858
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	859	socket->ref_count = 1;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	860
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	861	socket->connection = connection;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	862	socket->domain = g_strdup (domain);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	863	socket->server = g_strdup (server);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	864	socket->port = port;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	865	socket->cancel_open = FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	866	socket->ssl = ssl;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	867	socket->ssl_started = FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	868	socket->proxy = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	869	socket->blocking = blocking;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	870
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	871	if (context) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	872	socket->context = g_main_context_ref (context);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	873	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	874
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	875	if (proxy) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	876	socket->proxy = lm_proxy_ref (proxy);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	877	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	878
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	879	data = g_new0 (LmConnectData, 1);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	880	data->socket = socket;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	881	data->connection = socket->connection;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	882	data->fd = -1;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	883	socket->connect_data = data;
502 4b69fbfa8797 Create connect_data in LmOldSocket, revert a segfault when working on LmResolver. Mikael Hallendal <micke@imendio.com> parents: 476 diff changeset	884
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	885	if (!server) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	886	socket->resolver = lm_resolver_new_for_service (socket->domain,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	887	"xmpp-client",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	888	"tcp",
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	889	old_socket_resolver_srv_cb,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	890	socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	891	} else {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	892	socket->resolver =
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	893	lm_resolver_new_for_host (socket->server ? socket->server : socket->domain,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	894	old_socket_resolver_host_cb,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	895	socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	896	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	897
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	898	if (socket->context) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	899	g_object_set (socket->resolver, "context", context, NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	900	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	901
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	902	socket->data_func = data_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	903	socket->closed_func = closed_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	904	socket->connect_func = connect_func;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	905	socket->user_data = user_data;
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	906
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	907	lm_resolver_lookup (socket->resolver);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	908
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	909	#if 0
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	910	if (socket->connect_data == NULL) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	911	/* Open failed synchronously, probably a DNS lookup problem */
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	912	lm_old_socket_unref(socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	913
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	914	g_set_error (error,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	915	LM_ERROR,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	916	LM_ERROR_CONNECTION_FAILED,
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	917	"Failed to resolve server");
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	918
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	919	return NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	920	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	921
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	922	#endif
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	923
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	924	return socket;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	925	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	926
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	927	void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	928	lm_old_socket_flush (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	929	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	930	g_return_if_fail (socket != NULL);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	931	g_return_if_fail (socket->io_channel != NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	932
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	933	g_io_channel_flush (socket->io_channel, NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	934	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	935
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	936	void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	937	lm_old_socket_close (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	938	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	939	LmConnectData *data;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	940
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	941	g_return_if_fail (socket != NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	942
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	943	if (socket->watch_connect) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	944	g_source_destroy (socket->watch_connect);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	945	socket->watch_connect = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	946	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	947
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	948	data = socket->connect_data;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	949	if (data) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	950	socket->connect_data = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	951	g_free (data);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	952	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	953
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	954	if (socket->resolver) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	955	g_object_unref (socket->resolver);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	956	socket->resolver = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	957	}
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	958
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	959	if (socket->io_channel) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	960	if (socket->watch_in) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	961	g_source_destroy (socket->watch_in);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	962	socket->watch_in = NULL;
476 08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	963	}
08d36982e998 First cut of integrating the new resolver in LmOldSocket Mikael Hallendal <micke@imendio.com> parents: 475 diff changeset	964
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	965	if (socket->watch_err) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	966	g_source_destroy (socket->watch_err);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	967	socket->watch_err = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	968	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	969
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	970	if (socket->watch_hup) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	971	g_source_destroy (socket->watch_hup);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	972	socket->watch_hup = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	973	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	974
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	975	if (socket->watch_out) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	976	g_source_destroy (socket->watch_out);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	977	socket->watch_out = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	978	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	979
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	980	socket_close_io_channel (socket->io_channel);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	981
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	982	socket->io_channel = NULL;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	983	socket->fd = -1;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	984	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	985
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	986	if (socket->ssl) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	987	_lm_ssl_close (socket->ssl);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	988	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	989	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	990
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	991	gchar *
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	992	lm_old_socket_get_local_host (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	993	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	994	return _lm_sock_get_local_host (socket->fd);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	995	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	996
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	997	LmOldSocket *
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	998	lm_old_socket_ref (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	999	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1000	g_return_val_if_fail (socket != NULL, NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1001
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1002	socket->ref_count++;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1003
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1004	return socket;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1005	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1006
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1007	void
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1008	lm_old_socket_unref (LmOldSocket *socket)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1009	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1010	g_return_if_fail (socket != NULL);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1011
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1012	socket->ref_count--;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1013
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1014	if (socket->ref_count <= 0) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1015	socket_free (socket);
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1016	}
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1017	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1018
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1019	gboolean
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1020	lm_old_socket_set_keepalive (LmOldSocket *socket, int delay)
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1021	{
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1022	#ifdef USE_TCP_KEEPALIVES
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1023	return _lm_sock_set_keepalive (socket->fd, delay);
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1024	#else
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1025	return FALSE;
431 04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1026	#endif /* USE_TCP_KEEPALIVES */
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1027	}
04577a6b7ff7 Renamed LmSocket to LmOldSocket to make room for a new socket abstraction layer. Mikael Hallendal <micke@imendio.com> parents: diff changeset	1028
446 e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1029	void
e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1030	lm_old_socket_asyncns_cancel (LmOldSocket *socket)
e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1031	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1032	if (!socket->resolver) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1033	return;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1034	}
446 e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1035
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1036	lm_resolver_cancel (socket->resolver);
446 e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1037	}
e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1038
450 548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1039	gboolean
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1040	lm_old_socket_get_use_starttls (LmOldSocket *socket)
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1041	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1042	if (!socket->ssl) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1043	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1044	}
446 e97c43e6f05f Moved the ifdefs for HAVE_ASYNCNS to the LmOldSocket code. Mikael Hallendal <micke@imendio.com> parents: 445 diff changeset	1045
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1046	return lm_ssl_get_use_starttls (socket->ssl);
450 548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1047	}
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1048
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1049	gboolean
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1050	lm_old_socket_get_require_starttls (LmOldSocket *socket)
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1051	{
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1052	if (!socket->ssl) {
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1053	return FALSE;
cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1054	}
450 548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1055
518 cdd6a0c5b439 Went over all of the files and made sure they all were indented the same way. Mikael Hallendal <micke@imendio.com> parents: 516 diff changeset	1056	return lm_ssl_get_require_starttls (socket->ssl);
450 548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1057	}
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1058
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1059
548b5e3d9bea Refactored some of the SSL code in LmConnection. Mikael Hallendal <micke@imendio.com> parents: 449 diff changeset	1060

author	Mikael Hallendal <micke@imendio.com>
	Wed, 08 Oct 2008 13:11:02 +0200
changeset 518	cdd6a0c5b439
parent 516	4dd3aa6b83e5
child 530	4b34a9381345
permissions	-rw-r--r--