loudmouth/lm-socket.c
author Senko Rasic <senko.rasic@collabora.co.uk>
Sun, 09 Dec 2007 16:21:46 +0100
changeset 322 9d591fb31bc2
parent 308 7e2050a6df75
child 325 6e561a2cc542
permissions -rw-r--r--
Make blocking reads work
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     1
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     2
/*
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     3
 * Copyright (C) 2006 Imendio AB
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
     4
 * Copyright (C) 2006 Nokia Corporation. All rights reserved.
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
     5
 * Copyright (C) 2007 Collabora Ltd.
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     6
 *
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     7
 * This program is free software; you can redistribute it and/or
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     8
 * modify it under the terms of the GNU Lesser General Public License as
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
     9
 * published by the Free Software Foundation; either version 2 of the
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    10
 * License, or (at your option) any later version.
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    11
 *
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    12
 * This program is distributed in the hope that it will be useful,
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    15
 * Lesser General Public License for more details.
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    16
 *
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    17
 * You should have received a copy of the GNU Lesser General Public
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    18
 * License along with this program; if not, write to the
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    19
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    20
 * Boston, MA 02111-1307, USA.
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    21
 */
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    22
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    23
#include <config.h>
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    24
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    25
#include <string.h>
257
d2df6b962601 Compile fix for Solaris
Mikael Hallendal <micke@imendio.com>
parents: 256
diff changeset
    26
#include <sys/types.h>
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
    27
#include <arpa/nameser.h>
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
    28
#include <resolv.h>
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    29
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    30
#include "lm-debug.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    31
#include "lm-internals.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    32
#include "lm-misc.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    33
#include "lm-ssl.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    34
#include "lm-ssl-internals.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    35
#include "lm-proxy.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    36
#include "lm-socket.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    37
#include "lm-sock.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    38
#include "lm-error.h"
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    39
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    40
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    41
#include <asyncns.h>
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    42
#define freeaddrinfo(x) asyncns_freeaddrinfo(x)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    43
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    44
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    45
#define IN_BUFFER_SIZE 1024
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    46
#define MIN_PORT 1
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    47
#define MAX_PORT 65536
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
    48
#define SRV_LEN 8192
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    49
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    50
struct _LmSocket {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    51
	LmConnection *connection;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    52
	GMainContext *context;
151
hallski <hallski>
parents: 150
diff changeset
    53
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
    54
	gchar        *domain;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    55
	gchar        *server;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    56
	guint         port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    57
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    58
	gboolean      blocking;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    59
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    60
	LmSSL        *ssl;
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
    61
	gboolean      ssl_started;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    62
	LmProxy      *proxy;
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    63
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    64
	GIOChannel   *io_channel;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    65
	GSource      *watch_in;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    66
	GSource      *watch_err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    67
	GSource      *watch_hup;
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    68
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    69
	LmSocketT      fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    70
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    71
	GSource      *watch_connect;
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    72
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    73
	gboolean      cancel_open;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    74
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    75
	GSource      *watch_out;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    76
	GString      *out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    77
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    78
	LmConnectData *connect_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    79
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
    80
	IncomingDataFunc data_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
    81
	SocketClosedFunc closed_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
    82
	ConnectResultFunc connect_func;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    83
	gpointer         user_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    84
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    85
	guint          ref_count;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    86
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    87
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    88
	GSource		*watch_resolv;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    89
	asyncns_query_t *resolv_query;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    90
	asyncns_t	*asyncns_ctx;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    91
	GIOChannel	*resolv_channel;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
    92
#endif
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    93
}; 
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    94
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    95
static void         socket_free               (LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    96
static gboolean     socket_do_connect         (LmConnectData  *connect_data);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    97
static gboolean     socket_connect_cb         (GIOChannel     *source, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    98
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    99
					       LmConnectData  *connect_data);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   100
static gboolean     socket_in_event           (GIOChannel     *source,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   101
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   102
					       LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   103
static gboolean     socket_hup_event          (GIOChannel     *source,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   104
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   105
					       LmSocket       *socket);
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   106
static gboolean     socket_error_event        (GIOChannel     *source,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   107
					       GIOCondition    condition,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   108
					       LmSocket       *socket);
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   109
static gboolean     socket_buffered_write_cb  (GIOChannel     *source, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   110
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   111
					       LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   112
static gboolean     socket_parse_srv_response (unsigned char  *srv, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   113
					       int             srv_len, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   114
					       gchar         **out_server, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   115
					       guint          *out_port);
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   116
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   117
static void
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   118
socket_free (LmSocket *socket)
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   119
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   120
	g_free (socket->server);
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   121
	g_free (socket->domain);
151
hallski <hallski>
parents: 150
diff changeset
   122
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   123
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   124
		lm_ssl_unref (socket->ssl);
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   125
	}
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   126
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   127
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   128
		lm_proxy_unref (socket->proxy);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   129
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   130
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   131
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   132
		g_string_free (socket->out_buf, TRUE);
151
hallski <hallski>
parents: 150
diff changeset
   133
	}
hallski <hallski>
parents: 150
diff changeset
   134
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   135
	g_free (socket);
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   136
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   137
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   138
gint
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   139
lm_socket_do_write (LmSocket *socket, const gchar *buf, gint len)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   140
{
151
hallski <hallski>
parents: 150
diff changeset
   141
	gint b_written;
hallski <hallski>
parents: 150
diff changeset
   142
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   143
	if (socket->ssl_started) {
151
hallski <hallski>
parents: 150
diff changeset
   144
		b_written = _lm_ssl_send (socket->ssl, buf, len);
hallski <hallski>
parents: 150
diff changeset
   145
	} else {
hallski <hallski>
parents: 150
diff changeset
   146
		GIOStatus io_status = G_IO_STATUS_AGAIN;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   147
		gsize     bytes_written;
151
hallski <hallski>
parents: 150
diff changeset
   148
hallski <hallski>
parents: 150
diff changeset
   149
		while (io_status == G_IO_STATUS_AGAIN) {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   150
			io_status = g_io_channel_write_chars (socket->io_channel, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   151
							      buf, len, 
151
hallski <hallski>
parents: 150
diff changeset
   152
							      &bytes_written,
hallski <hallski>
parents: 150
diff changeset
   153
							      NULL);
hallski <hallski>
parents: 150
diff changeset
   154
		}
hallski <hallski>
parents: 150
diff changeset
   155
hallski <hallski>
parents: 150
diff changeset
   156
		b_written = bytes_written;
hallski <hallski>
parents: 150
diff changeset
   157
hallski <hallski>
parents: 150
diff changeset
   158
		if (io_status != G_IO_STATUS_NORMAL) {
hallski <hallski>
parents: 150
diff changeset
   159
			b_written = -1;
hallski <hallski>
parents: 150
diff changeset
   160
		}
hallski <hallski>
parents: 150
diff changeset
   161
	}
hallski <hallski>
parents: 150
diff changeset
   162
hallski <hallski>
parents: 150
diff changeset
   163
	return b_written;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   164
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   165
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   166
static gboolean
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   167
socket_read_incoming (LmSocket *socket,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   168
		      gchar    *buf,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   169
		      gsize     buf_size,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   170
		      gsize    *bytes_read,
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   171
		      gboolean *hangup,
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   172
		      gint     *reason)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   173
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   174
	GIOStatus status;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   175
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   176
	*hangup = FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   177
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   178
	if (socket->ssl_started) {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   179
		status = _lm_ssl_read (socket->ssl, 
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   180
				       buf, buf_size - 1, bytes_read);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   181
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   182
		status = g_io_channel_read_chars (socket->io_channel,
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   183
						  buf, buf_size - 1,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   184
						  bytes_read,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   185
						  NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   186
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   187
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   188
	if (status != G_IO_STATUS_NORMAL || *bytes_read < 0) {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   189
		switch (status) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   190
		case G_IO_STATUS_EOF:
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   191
			*reason = LM_DISCONNECT_REASON_HUP;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   192
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   193
		case G_IO_STATUS_AGAIN:
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   194
			/* No data readable but we didn't hangup */
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   195
			return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   196
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   197
		case G_IO_STATUS_ERROR:
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   198
			*reason = LM_DISCONNECT_REASON_ERROR;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   199
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   200
		default:
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   201
			*reason = LM_DISCONNECT_REASON_UNKNOWN;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   202
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   203
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   204
		/* Notify connection_in_event that we hangup the connection */
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   205
		*hangup = TRUE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   206
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   207
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   208
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   209
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   210
	buf[*bytes_read] = '\0';
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   211
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   212
	/* There is more data to be read */
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   213
	return TRUE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   214
}
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   215
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   216
static gboolean
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   217
socket_in_event (GIOChannel   *source,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   218
		     GIOCondition  condition,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   219
		     LmSocket     *socket)
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   220
{
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   221
	gchar     buf[IN_BUFFER_SIZE];
322
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   222
	gsize     bytes_read = 0;
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   223
	gboolean  read_anything = FALSE;
322
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   224
	gboolean  hangup = 0;
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   225
	gint      reason = 0;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   226
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   227
	if (!socket->io_channel) {
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   228
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   229
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   230
322
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   231
	while ((condition & G_IO_IN) && socket_read_incoming (socket, buf, IN_BUFFER_SIZE, 
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   232
				     &bytes_read, &hangup, &reason)) {
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   233
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   234
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "\nRECV [%d]:\n", 
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   235
		       (int)bytes_read);
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   236
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, 
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   237
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   238
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "'%s'\n", buf);
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   239
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, 
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   240
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   241
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   242
		lm_verbose ("Read: %d chars\n", (int)bytes_read);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   243
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   244
		(socket->data_func) (socket, buf, socket->user_data);
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   245
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   246
		read_anything = TRUE;
322
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   247
9d591fb31bc2 Make blocking reads work
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 308
diff changeset
   248
		condition = g_io_channel_get_buffer_condition (socket->io_channel);
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   249
	}
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   250
272
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   251
	/* If we have read something, delay the hangup so that the data can be
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   252
	 * processed. */
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   253
	if (hangup && !read_anything) {
00c0890d19c0 If data was read before hangup, delay signalling hangup so that the data can
Dafydd Harries <daf@rhydd.org>
parents: 271
diff changeset
   254
		(socket->closed_func) (socket, reason, socket->user_data);
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   255
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   256
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   257
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   258
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   259
}
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   260
	
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   261
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   262
socket_hup_event (GIOChannel   *source,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   263
		      GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   264
		      LmSocket     *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   265
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   266
	lm_verbose ("HUP event: %d->'%s'\n", 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   267
		    condition, lm_misc_io_condition_to_str (condition));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   268
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   269
	if (!socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   270
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   271
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   272
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   273
	(socket->closed_func) (socket, LM_DISCONNECT_REASON_HUP, 
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   274
			       socket->user_data);
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   275
	
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   276
	return TRUE;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   277
}
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   278
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   279
static gboolean
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   280
socket_error_event (GIOChannel   *source,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   281
		    GIOCondition  condition,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   282
		    LmSocket     *socket)
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   283
{
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   284
	lm_verbose ("ERROR event: %d->'%s'\n", 
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   285
		    condition, lm_misc_io_condition_to_str (condition));
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   286
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   287
	if (!socket->io_channel) {
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   288
		return FALSE;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   289
	}
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   290
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   291
	(socket->closed_func) (socket, LM_DISCONNECT_REASON_ERROR, 
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   292
			       socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   293
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   294
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   295
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   296
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   297
static gboolean
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   298
_lm_socket_ssl_init (LmSocket *socket, gboolean delayed)
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   299
{
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   300
	GError *error = NULL;
277
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   301
	const gchar *ssl_verify_domain = NULL;
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   302
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   303
	lm_verbose ("Setting up SSL...\n");
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   304
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   305
	_lm_ssl_initialize (socket->ssl);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   306
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   307
#ifdef HAVE_GNUTLS
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   308
	/* GNU TLS requires the socket to be blocking */
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   309
	_lm_sock_set_blocking (socket->fd, TRUE);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   310
#endif
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   311
277
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   312
	/* If we're using StartTLS, the correct thing is to verify against
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   313
	 * the domain. If we're using old SSL, we should verify against the
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   314
	 * hostname. */
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   315
	if (delayed)
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   316
		ssl_verify_domain = socket->domain;
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   317
	else
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   318
		ssl_verify_domain = socket->server;
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   319
	
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   320
	if (!_lm_ssl_begin (socket->ssl, socket->fd, ssl_verify_domain, &error)) {
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   321
		lm_verbose ("Could not begin SSL\n");
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   322
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   323
		if (error) {
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   324
			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   325
				"%s\n", error->message);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   326
				g_error_free (error);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   327
		}
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   328
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   329
		_lm_sock_shutdown (socket->fd);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   330
		_lm_sock_close (socket->fd);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   331
277
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   332
		if (!delayed)
f3ad3d16c8b5 Fixed SSL verification when old-style SSL connection is used.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 276
diff changeset
   333
			(socket->connect_func) (socket, FALSE, socket->user_data);
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   334
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   335
		return FALSE;
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   336
	}
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   337
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   338
#ifdef HAVE_GNUTLS
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   339
	_lm_sock_set_blocking (socket->fd, FALSE); 
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   340
#endif
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   341
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   342
	socket->ssl_started = TRUE;
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   343
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   344
  return TRUE;
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   345
}
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   346
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   347
gboolean
291
cebf76f7f0e9 Simplify and fix SSL/StartTLS handling in LmSocket
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 282
diff changeset
   348
lm_socket_starttls (LmSocket *socket)
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   349
{
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   350
	g_return_val_if_fail (lm_ssl_get_use_starttls (socket->ssl) == TRUE, FALSE);
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   351
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   352
	return _lm_socket_ssl_init (socket, TRUE);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   353
}
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   354
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   355
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   356
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   357
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   358
_lm_socket_succeeded (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   359
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   360
	LmSocket     *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   361
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   362
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   363
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   364
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   365
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   366
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   367
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   368
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   369
	/* Need some way to report error/success */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   370
	if (socket->cancel_open) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   371
		lm_verbose ("Cancelling connection...\n");
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   372
		(socket->connect_func) (socket, FALSE, socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   373
		return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   374
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   375
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   376
	socket->fd = connect_data->fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   377
	socket->io_channel = connect_data->io_channel;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   378
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   379
	freeaddrinfo (connect_data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   380
	socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   381
	g_free (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   382
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   383
	/* old-style ssl should be started immediately */
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
   384
	if (socket->ssl && (lm_ssl_get_use_starttls (socket->ssl) == FALSE)) {
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   385
		if (!_lm_socket_ssl_init (socket, FALSE))
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   386
			return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   387
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   388
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   389
	socket->watch_in = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   390
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   391
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   392
				      G_IO_IN,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   393
				      (GIOFunc) socket_in_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   394
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   395
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   396
	/* FIXME: if we add these, we don't get ANY
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   397
	 * response from the server, this is to do with the way that
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   398
	 * windows handles watches, see bug #331214.
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   399
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   400
#ifndef G_OS_WIN32
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   401
	socket->watch_err = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   402
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   403
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   404
				      G_IO_ERR,
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   405
				      (GIOFunc) socket_error_event,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   406
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   407
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   408
	socket->watch_hup =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   409
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   410
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   411
				      G_IO_HUP,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   412
				      (GIOFunc) socket_hup_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   413
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   414
#endif
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   415
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   416
	(socket->connect_func) (socket, TRUE, socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   417
}
151
hallski <hallski>
parents: 150
diff changeset
   418
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   419
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   420
_lm_socket_failed_with_error (LmConnectData *connect_data, int error) 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   421
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   422
	LmSocket *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   423
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   424
	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   425
	       "Connection failed: %s (error %d)\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   426
	       _lm_sock_get_error_str (error), error);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   427
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   428
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   429
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   430
	connect_data->current_addr = connect_data->current_addr->ai_next;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   431
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   432
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   433
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   434
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   435
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   436
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   437
	if (connect_data->io_channel != NULL) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   438
		g_io_channel_unref (connect_data->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   439
		/* FIXME: need to check for last unref and close the socket */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   440
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   441
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   442
	if (connect_data->current_addr == NULL) {
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   443
		(socket->connect_func) (socket, FALSE, socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   444
		
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   445
		 /* if the user callback called connection_close(), this is already freed */
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   446
		if (socket->connect_data != NULL) {
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   447
			freeaddrinfo (connect_data->resolved_addrs);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   448
			socket->connect_data = NULL;
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   449
			g_free (connect_data);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   450
		}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   451
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   452
		/* try to connect to the next host */
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   453
		return socket_do_connect (connect_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   454
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   455
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   456
	return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   457
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   458
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   459
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   460
_lm_socket_failed (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   461
{
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   462
	return _lm_socket_failed_with_error (connect_data,
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   463
                                       _lm_sock_get_last_error());
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   464
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   465
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   466
static gboolean 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   467
socket_connect_cb (GIOChannel   *source, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   468
		       GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   469
		       LmConnectData *connect_data) 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   470
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   471
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   472
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   473
	int              err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   474
	socklen_t        len;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   475
	LmSocketT         fd; 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   476
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   477
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   478
	addr = connect_data->current_addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   479
	fd = g_io_channel_unix_get_fd (source);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   480
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   481
	if (condition == G_IO_ERR) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   482
		len = sizeof (err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   483
		_lm_sock_get_error (fd, &err, &len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   484
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   485
			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   486
			       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   487
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   488
			_lm_socket_failed_with_error (connect_data, err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   489
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   490
			socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   491
			return FALSE;
151
hallski <hallski>
parents: 150
diff changeset
   492
		}
hallski <hallski>
parents: 150
diff changeset
   493
	}
hallski <hallski>
parents: 150
diff changeset
   494
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   495
	if (_lm_connection_async_connect_waiting (socket->connection)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   496
		gint res;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   497
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   498
		fd = g_io_channel_unix_get_fd (source);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   499
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   500
		res = _lm_sock_connect (fd, addr->ai_addr, (int)addr->ai_addrlen);  
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   501
		if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   502
			err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   503
			if (_lm_sock_is_blocking_success (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   504
				_lm_connection_set_async_connect_waiting (socket->connection, FALSE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   505
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   506
				g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   507
				       "Connection success (1).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   508
				
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   509
				_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   510
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   511
			
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   512
			if (_lm_connection_async_connect_waiting (socket->connection) &&
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   513
			    !_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   514
				g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   515
				       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   516
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   517
				_lm_sock_close (connect_data->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   518
				_lm_socket_failed_with_error (connect_data, err);
151
hallski <hallski>
parents: 150
diff changeset
   519
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   520
				socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   521
				return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   522
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   523
		} 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   524
	} else {		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   525
		/* for blocking sockets, G_IO_OUT means we are connected */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   526
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   527
		       "Connection success (2).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   528
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   529
		_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   530
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   531
 	return TRUE; 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   532
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   533
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   534
static gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   535
socket_do_connect (LmConnectData *connect_data) 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   536
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   537
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   538
	LmSocketT        fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   539
	int              res, err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   540
	int              port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   541
	char             name[NI_MAXHOST];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   542
	char             portname[NI_MAXSERV];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   543
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   544
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   545
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   546
	addr = connect_data->current_addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   547
 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   548
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   549
		port = htons (lm_proxy_get_port (socket->proxy));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   550
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   551
		port = htons (socket->port);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   552
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   553
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   554
	((struct sockaddr_in *) addr->ai_addr)->sin_port = port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   555
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   556
	res = getnameinfo (addr->ai_addr,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   557
			   (socklen_t)addr->ai_addrlen,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   558
			   name,     sizeof (name),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   559
			   portname, sizeof (portname),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   560
			   NI_NUMERICHOST | NI_NUMERICSERV);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   561
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   562
	if (res < 0) {
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   563
		return _lm_socket_failed (connect_data);
151
hallski <hallski>
parents: 150
diff changeset
   564
	}
hallski <hallski>
parents: 150
diff changeset
   565
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   566
	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   567
	       "Trying %s port %s...\n", name, portname);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   568
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   569
	fd = _lm_sock_makesocket (addr->ai_family,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   570
				  addr->ai_socktype, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   571
				  addr->ai_protocol);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   572
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   573
	if (!_LM_SOCK_VALID (fd)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   574
		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   575
		       "Failed making socket, error:%d...\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   576
		       _lm_sock_get_last_error ());
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   577
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   578
		return _lm_socket_failed (connect_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   579
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   580
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   581
	/* Even though it says _unix_new(), it is supported by glib on
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   582
	 * win32 because glib does some cool stuff to find out if it
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   583
	 * can treat it as a FD or a windows SOCKET.
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   584
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   585
	connect_data->fd = fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   586
	connect_data->io_channel = g_io_channel_unix_new (fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   587
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   588
	g_io_channel_set_encoding (connect_data->io_channel, NULL, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   589
	g_io_channel_set_buffered (connect_data->io_channel, FALSE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   590
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   591
	_lm_sock_set_blocking (connect_data->fd, socket->blocking);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   592
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   593
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   594
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   595
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   596
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   597
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   598
					      (GIOFunc) _lm_proxy_connect_cb, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   599
					      connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   600
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   601
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   602
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   603
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   604
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   605
					      (GIOFunc) socket_connect_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   606
					      connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   607
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   608
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   609
	_lm_connection_set_async_connect_waiting (socket->connection, !socket->blocking);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   610
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   611
  	res = _lm_sock_connect (connect_data->fd, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   612
				addr->ai_addr, (int)addr->ai_addrlen);  
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   613
	if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   614
		err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   615
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   616
			_lm_sock_close (connect_data->fd);
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   617
			return _lm_socket_failed_with_error (connect_data, err);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   618
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   619
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   620
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   621
	return TRUE;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   622
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   623
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   624
gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   625
lm_socket_output_is_buffered (LmSocket     *socket,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   626
			       const gchar  *buffer,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   627
			       gint          len)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   628
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   629
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   630
		lm_verbose ("Appending %d bytes to output buffer\n", len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   631
		g_string_append_len (socket->out_buf, buffer, len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   632
		return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   633
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   634
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   635
	return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   636
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   637
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   638
void
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   639
lm_socket_setup_output_buffer (LmSocket *socket, const gchar *buffer, gint len)
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   640
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   641
	lm_verbose ("OUTPUT BUFFER ENABLED\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   642
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   643
	socket->out_buf = g_string_new_len (buffer, len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   644
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   645
	socket->watch_out =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   646
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   647
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   648
				      G_IO_OUT,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   649
				      (GIOFunc) socket_buffered_write_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   650
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   651
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   652
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   653
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   654
socket_buffered_write_cb (GIOChannel   *source, 
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   655
			  GIOCondition  condition,
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   656
			  LmSocket     *socket)
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   657
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   658
	gint     b_written;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   659
	GString *out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   660
	/* FIXME: Do the writing */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   661
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   662
	out_buf = socket->out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   663
	if (!out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   664
		/* Should not be possible */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   665
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   666
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   667
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   668
	b_written = lm_socket_do_write (socket, out_buf->str, out_buf->len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   669
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   670
	if (b_written < 0) {
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   671
		(socket->closed_func) (socket, LM_DISCONNECT_REASON_ERROR, 
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   672
				       socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   673
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   674
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   675
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   676
	g_string_erase (out_buf, 0, (gsize) b_written);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   677
	if (out_buf->len == 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   678
		lm_verbose ("Output buffer is empty, going back to normal output\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   679
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   680
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   681
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   682
			socket->watch_out = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   683
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   684
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   685
		g_string_free (out_buf, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   686
		socket->out_buf = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   687
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   688
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   689
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   690
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   691
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   692
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   693
static gboolean
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   694
socket_parse_srv_response (unsigned char  *srv, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   695
			   int             srv_len, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   696
			   gchar         **out_server, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   697
			   guint          *out_port)
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   698
{
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   699
	int                  qdcount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   700
	int                  ancount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   701
	int                  len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   702
	const unsigned char *pos;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   703
	unsigned char       *end;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   704
	HEADER              *head;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   705
	char                 name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   706
	char                 pref_name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   707
	guint                pref_port = 0;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   708
	guint                pref_prio = 9999;
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   709
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   710
	pref_name[0] = 0;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   711
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   712
	pos = srv + sizeof (HEADER);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   713
	end = srv + srv_len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   714
	head = (HEADER *) srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   715
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   716
	qdcount = ntohs (head->qdcount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   717
	ancount = ntohs (head->ancount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   718
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   719
	/* Ignore the questions */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   720
	while (qdcount-- > 0 && (len = dn_expand (srv, end, pos, name, 255)) >= 0) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   721
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   722
		pos += len + QFIXEDSZ;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   723
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   724
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   725
	/* Parse the answers */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   726
	while (ancount-- > 0 && (len = dn_expand (srv, end, pos, name, 255)) >= 0) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   727
		/* Ignore the initial string */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   728
		uint16_t pref, weight, port;
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   729
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   730
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   731
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   732
		/* Ignore type, ttl, class and dlen */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   733
		pos += 10;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   734
		GETSHORT (pref, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   735
		GETSHORT (weight, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   736
		GETSHORT (port, pos);
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   737
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   738
		len = dn_expand (srv, end, pos, name, 255);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   739
		if (pref < pref_prio) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   740
			pref_prio = pref;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   741
			strcpy (pref_name, name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   742
			pref_port = port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   743
		}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   744
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   745
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   746
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   747
	if (pref_name[0]) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   748
		*out_server = g_strdup (pref_name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   749
		*out_port = pref_port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   750
		return TRUE;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   751
	} 
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   752
	return FALSE;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   753
}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   754
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   755
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   756
_lm_socket_create_phase1 (LmSocket *socket, unsigned char *srv_ans, int len);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   757
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   758
_lm_socket_create_phase2 (LmSocket *socket, struct addrinfo *ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   759
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   760
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   761
#define PHASE_1 0
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   762
#define PHASE_2 1
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   763
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   764
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   765
_lm_socket_resolver_done (GSource *source,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   766
    			  GIOCondition condition,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   767
			  gpointer data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   768
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   769
280
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   770
static void
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   771
_asyncns_done (LmSocket *socket)
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   772
{
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   773
	if (socket->resolv_channel != NULL) {
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   774
		g_io_channel_unref (socket->resolv_channel);
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   775
		socket->resolv_channel = NULL;
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   776
	}
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   777
 
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   778
	if (socket->watch_resolv) {
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   779
		g_source_destroy(socket->watch_resolv);
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   780
		socket->watch_resolv = NULL;
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   781
	}
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   782
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   783
	if (socket->asyncns_ctx) {
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   784
		asyncns_free (socket->asyncns_ctx);
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   785
		socket->asyncns_ctx = NULL;
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   786
	}
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   787
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   788
 	socket->resolv_query = NULL;
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   789
}
f1bfa3d3ad1c hoist _asyncns_done to above where it is first called
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 279
diff changeset
   790
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   791
void _asyncns_cancel (LmSocket *socket)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   792
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   793
	if (socket == NULL)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   794
		return;
276
3b05eae99e1a Fixed (double) asyncns cancellation bug, and made the code more robust.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 275
diff changeset
   795
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   796
	if (socket->asyncns_ctx) {
282
0bd1892a18d3 Fix another crash in asyncns cancel code
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 280
diff changeset
   797
		if (socket->resolv_query)
0bd1892a18d3 Fix another crash in asyncns cancel code
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 280
diff changeset
   798
			asyncns_cancel (socket->asyncns_ctx, socket->resolv_query);
0bd1892a18d3 Fix another crash in asyncns cancel code
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 280
diff changeset
   799
276
3b05eae99e1a Fixed (double) asyncns cancellation bug, and made the code more robust.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 275
diff changeset
   800
		_asyncns_done (socket);
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   801
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   802
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   803
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   804
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   805
_asyncns_prep (LmSocket *socket, GError **error)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   806
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   807
	if (socket->asyncns_ctx) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   808
		return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   809
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   810
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   811
	socket->asyncns_ctx = asyncns_new (1);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   812
	if (socket->asyncns_ctx == NULL) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   813
		g_set_error (error,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   814
				LM_ERROR,                 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   815
				LM_ERROR_CONNECTION_FAILED,   
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   816
				"can't initialise libasyncns");
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   817
		return FALSE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   818
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   819
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   820
	socket->resolv_channel =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   821
		g_io_channel_unix_new (asyncns_fd (socket->asyncns_ctx));
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   822
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   823
	socket->watch_resolv = 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   824
		lm_misc_add_io_watch (socket->context,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   825
				      socket->resolv_channel,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   826
				      G_IO_IN,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   827
				      (GIOFunc) _lm_socket_resolver_done,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   828
				      socket);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   829
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   830
	return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   831
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   832
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   833
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   834
_lm_socket_resolver_done (GSource *source,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   835
    			  GIOCondition condition,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   836
			  gpointer data)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   837
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   838
	LmSocket	*socket = (LmSocket *) data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   839
	struct addrinfo	*ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   840
	unsigned char   *srv_ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   841
	int 		 err;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   842
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   843
	/* process pending data */
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   844
	asyncns_wait (socket->asyncns_ctx, FALSE);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   845
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   846
	if (!asyncns_isdone (socket->asyncns_ctx, socket->resolv_query)) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   847
		return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   848
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   849
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   850
	switch ((guint) asyncns_getuserdata (socket->asyncns_ctx, socket->resolv_query)) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   851
	case PHASE_1:
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   852
		err = asyncns_res_done (socket->asyncns_ctx, socket->resolv_query, &srv_ans);
282
0bd1892a18d3 Fix another crash in asyncns cancel code
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 280
diff changeset
   853
		socket->resolv_query = NULL;
299
f38f614ce2ea Fix an error in handling asyncns SRV responses.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 298
diff changeset
   854
		_lm_socket_create_phase1 (socket, (err <= 0) ? NULL : srv_ans, err);
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   855
		return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   856
		break;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   857
	case PHASE_2:
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   858
		err = asyncns_getaddrinfo_done (socket->asyncns_ctx, socket->resolv_query, &ans);
282
0bd1892a18d3 Fix another crash in asyncns cancel code
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 280
diff changeset
   859
		socket->resolv_query = NULL;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   860
		_lm_socket_create_phase2 (socket, (err) ? NULL : ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   861
		_asyncns_done (socket);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   862
		return FALSE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   863
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   864
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   865
	g_assert_not_reached ();
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   866
	return FALSE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   867
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   868
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   869
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   870
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   871
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   872
_lm_socket_create_phase1 (LmSocket *socket,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   873
			  unsigned char *srv_ans,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   874
			  int len)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   875
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   876
	const char          *remote_addr;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   877
	LmConnectData       *data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   878
	struct addrinfo      req;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   879
#ifndef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   880
	struct addrinfo *ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   881
	int              err;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   882
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   883
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   884
	if (srv_ans != NULL) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   885
		gchar    *new_server;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   886
		guint     new_port;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   887
		gboolean  result;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   888
		result = socket_parse_srv_response (srv_ans, len, 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   889
						    &new_server, 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   890
						    &new_port);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   891
		if (result == TRUE) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   892
			g_free (socket->server);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   893
			socket->server = new_server;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   894
			if (!socket->port) socket->port = new_port;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   895
		}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   896
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   897
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   898
	/* If server wasn't specified and SRV failed, use domain */
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   899
	if (!socket->server) {
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   900
		lm_verbose ("SRV lookup failed, trying jid domain\n");
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   901
		socket->server = g_strdup (socket->domain);
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   902
	}
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   903
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   904
	if (socket->proxy) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   905
		remote_addr = lm_proxy_get_server (socket->proxy);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   906
	} else {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   907
		remote_addr = socket->server;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   908
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   909
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   910
	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   911
	       "Going to connect to %s%s:%u\n", (socket->proxy) ? "proxy " : "",
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   912
	       remote_addr, socket->port);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   913
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   914
	data = g_new0 (LmConnectData, 1);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   915
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   916
	data->socket        = socket;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   917
	data->connection    = socket->connection;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   918
	data->fd            = -1;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   919
	socket->connect_data = data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   920
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   921
	memset (&req, 0, sizeof(req));
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   922
	req.ai_family   = AF_UNSPEC;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   923
	req.ai_socktype = SOCK_STREAM;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   924
	req.ai_protocol = IPPROTO_TCP;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   925
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   926
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   927
	if (!_asyncns_prep (socket, NULL))
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   928
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   929
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   930
	socket->resolv_query =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   931
	  	asyncns_getaddrinfo (socket->asyncns_ctx,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   932
		    		     remote_addr,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   933
				     NULL,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   934
				     &req);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   935
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   936
	asyncns_setuserdata (socket->asyncns_ctx,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   937
			     socket->resolv_query,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   938
			     (gpointer) PHASE_2);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   939
#else
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   940
	err = getaddrinfo (remote_addr, NULL, &req, &ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   941
	_lm_socket_create_phase2 (socket, (err) ? NULL : ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   942
	if (err != 0)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   943
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   944
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   945
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   946
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   947
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   948
_lm_socket_create_phase2 (LmSocket *socket, struct addrinfo *ans)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   949
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   950
	if (ans == NULL) {
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   951
		lm_verbose ("error while resolving, bailing out\n");
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   952
		(socket->connect_func) (socket, FALSE, socket->user_data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   953
		g_free (socket->connect_data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   954
		socket->connect_data = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   955
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   956
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   957
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   958
	socket->connect_data->resolved_addrs = ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   959
	socket->connect_data->current_addr   = ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   960
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   961
	socket_do_connect (socket->connect_data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   962
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   963
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   964
LmSocket *
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   965
lm_socket_create (GMainContext      *context,
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   966
		  IncomingDataFunc   data_func,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   967
		  SocketClosedFunc   closed_func,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   968
		  ConnectResultFunc  connect_func,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   969
		  gpointer           user_data,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   970
		  LmConnection      *connection,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   971
		  gboolean           blocking,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   972
		  const gchar       *server,
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   973
		  const gchar       *domain,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   974
		  guint              port, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   975
		  LmSSL             *ssl,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   976
		  LmProxy           *proxy,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   977
		  GError           **error)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   978
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   979
	LmSocket        *socket;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   980
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   981
#ifndef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   982
	unsigned char    srv_ans[SRV_LEN];
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
   983
	int              len;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   984
#endif
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   985
	
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   986
	g_return_val_if_fail (domain != NULL, NULL);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   987
	g_return_val_if_fail ((port >= MIN_PORT && port <= MAX_PORT), NULL);
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   988
	g_return_val_if_fail (data_func != NULL, NULL);
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   989
	g_return_val_if_fail (closed_func != NULL, NULL);
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   990
	g_return_val_if_fail (connect_func != NULL, NULL);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   991
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   992
	socket = g_new0 (LmSocket, 1);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   993
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   994
	socket->ref_count = 1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   995
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   996
	socket->connection = connection;
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
   997
	socket->domain = g_strdup (domain);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   998
	socket->server = g_strdup (server);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   999
	socket->port = port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1000
	socket->cancel_open = FALSE;
291
cebf76f7f0e9 Simplify and fix SSL/StartTLS handling in LmSocket
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 282
diff changeset
  1001
	socket->ssl = ssl;
298
71aaed5a9c34 Properly detect if SSL has been started in case of StartTLS usage.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 292
diff changeset
  1002
	socket->ssl_started = FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1003
	socket->proxy = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1004
	socket->blocking = blocking;
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
  1005
	socket->data_func = data_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
  1006
	socket->closed_func = closed_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
  1007
	socket->connect_func = connect_func;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1008
	socket->user_data = user_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1009
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1010
	if (context) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1011
		socket->context = g_main_context_ref (context);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1012
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1013
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1014
	if (proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1015
		socket->proxy = lm_proxy_ref (proxy);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1016
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1017
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
  1018
	if (!server) {
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1019
		char          *srv;
275
37937c612f62 Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents: 274
diff changeset
  1020
		srv = g_strdup_printf ("_xmpp-client._tcp.%s", socket->domain);
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1021
		lm_verbose ("Performing a SRV lookup for %s\n", srv);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1022
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1023
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1024
		if (!_asyncns_prep (socket, error))
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1025
			return NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1026
		
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1027
		socket->resolv_query =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1028
			asyncns_res_query (socket->asyncns_ctx, srv, C_IN, T_SRV);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1029
		asyncns_setuserdata (socket->asyncns_ctx, socket->resolv_query, (gpointer) PHASE_1);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1030
#else
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1031
		res_init ();
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1032
274
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
  1033
		len = res_query (srv, C_IN, T_SRV, srv_ans, SRV_LEN);
c32a7011e435 Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents: 272
diff changeset
  1034
		_lm_socket_create_phase1 (socket, (len < 1) ? NULL : srv_ans, len);
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1035
		g_free (srv);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1036
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1037
	} else {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1038
		lm_verbose ("SRV lookup disabled for %s\n", socket->server);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
  1039
		_lm_socket_create_phase1 (socket, NULL, 0);
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
  1040
	}
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
  1041
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1042
	return socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1043
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1044
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1045
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1046
lm_socket_flush (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1047
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1048
	g_return_if_fail (socket != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1049
	g_return_if_fail (socket->io_channel != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1050
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1051
	g_io_channel_flush (socket->io_channel, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1052
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1053
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1054
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1055
lm_socket_close (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1056
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1057
	LmConnectData *data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1058
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
  1059
	g_return_if_fail (socket != NULL);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
  1060
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1061
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1062
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1063
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1064
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1065
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1066
	data = socket->connect_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1067
	if (data) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1068
		freeaddrinfo (data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1069
		socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1070
		g_free (data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1071
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1072
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1073
	if (socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1074
		if (socket->watch_in) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1075
			g_source_destroy (socket->watch_in);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1076
			socket->watch_in = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1077
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1078
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1079
		if (socket->watch_err) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1080
			g_source_destroy (socket->watch_err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1081
			socket->watch_err = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1082
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1083
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1084
		if (socket->watch_hup) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1085
			g_source_destroy (socket->watch_hup);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1086
			socket->watch_hup = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1087
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1088
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1089
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1090
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1091
			socket->watch_out = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1092
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1093
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1094
		g_io_channel_unref (socket->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1095
		socket->io_channel = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1096
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1097
		socket->fd = -1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1098
	}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1099
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1100
308
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1101
gchar *
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1102
lm_socket_get_local_host (LmSocket *socket)
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1103
{
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1104
	return _lm_sock_get_local_host (socket->fd);
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1105
}
7e2050a6df75 Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 299
diff changeset
  1106
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1107
LmSocket *
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1108
lm_socket_ref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1109
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1110
	g_return_val_if_fail (socket != NULL, NULL);
151
hallski <hallski>
parents: 150
diff changeset
  1111
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1112
	socket->ref_count++;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1113
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1114
	return socket;
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1115
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1116
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1117
void
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1118
lm_socket_unref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1119
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1120
	g_return_if_fail (socket != NULL);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1121
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1122
	socket->ref_count--;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1123
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1124
	if (socket->ref_count <= 0) {
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1125
		socket_free (socket);
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
  1126
	}
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
  1127
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1128
292
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1129
gboolean
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1130
lm_socket_set_keepalive (LmSocket *socket, int delay)
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1131
{
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1132
#ifdef USE_TCP_KEEPALIVES
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1133
	return _lm_sock_set_keepalive (socket->fd, delay);
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1134
#else
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1135
	return FALSE;
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1136
#endif /* USE_TCP_KEEPALIVES */
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1137
}
bb7269466be2 Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents: 291
diff changeset
  1138