loudmouth/lm-socket.c
author Dafydd Harries <daf@rhydd.org>
Wed, 05 Sep 2007 16:00:09 +0100
changeset 272 00c0890d19c0
parent 271 52ea4e0b897a
child 274 c32a7011e435
permissions -rw-r--r--
If data was read before hangup, delay signalling hangup so that the data can be processed. Patch by Senko Rašić.
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
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    54
	gchar        *server;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    55
	guint         port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    56
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
    57
	gboolean      use_srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
    58
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    59
	gboolean      blocking;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    60
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    61
	LmSSL        *ssl;
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);
151
hallski <hallski>
parents: 150
diff changeset
   121
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   122
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   123
		lm_ssl_unref (socket->ssl);
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   124
	}
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   125
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   126
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   127
		lm_proxy_unref (socket->proxy);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   128
	}
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
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   131
		g_string_free (socket->out_buf, TRUE);
151
hallski <hallski>
parents: 150
diff changeset
   132
	}
hallski <hallski>
parents: 150
diff changeset
   133
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   134
	g_free (socket);
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   135
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   136
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   137
gint
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   138
lm_socket_do_write (LmSocket *socket, const gchar *buf, gint len)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   139
{
151
hallski <hallski>
parents: 150
diff changeset
   140
	gint b_written;
hallski <hallski>
parents: 150
diff changeset
   141
hallski <hallski>
parents: 150
diff changeset
   142
	if (socket->ssl) {
hallski <hallski>
parents: 150
diff changeset
   143
		b_written = _lm_ssl_send (socket->ssl, buf, len);
hallski <hallski>
parents: 150
diff changeset
   144
	} else {
hallski <hallski>
parents: 150
diff changeset
   145
		GIOStatus io_status = G_IO_STATUS_AGAIN;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   146
		gsize     bytes_written;
151
hallski <hallski>
parents: 150
diff changeset
   147
hallski <hallski>
parents: 150
diff changeset
   148
		while (io_status == G_IO_STATUS_AGAIN) {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   149
			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
   150
							      buf, len, 
151
hallski <hallski>
parents: 150
diff changeset
   151
							      &bytes_written,
hallski <hallski>
parents: 150
diff changeset
   152
							      NULL);
hallski <hallski>
parents: 150
diff changeset
   153
		}
hallski <hallski>
parents: 150
diff changeset
   154
hallski <hallski>
parents: 150
diff changeset
   155
		b_written = bytes_written;
hallski <hallski>
parents: 150
diff changeset
   156
hallski <hallski>
parents: 150
diff changeset
   157
		if (io_status != G_IO_STATUS_NORMAL) {
hallski <hallski>
parents: 150
diff changeset
   158
			b_written = -1;
hallski <hallski>
parents: 150
diff changeset
   159
		}
hallski <hallski>
parents: 150
diff changeset
   160
	}
hallski <hallski>
parents: 150
diff changeset
   161
hallski <hallski>
parents: 150
diff changeset
   162
	return b_written;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   163
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   164
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   165
static gboolean
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   166
socket_read_incoming (LmSocket *socket,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   167
		      gchar    *buf,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   168
		      gsize     buf_size,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   169
		      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
   170
		      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
   171
		      gint     *reason)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   172
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   173
	GIOStatus status;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   174
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   175
	*hangup = FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   176
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   177
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   178
		status = _lm_ssl_read (socket->ssl, 
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   179
				       buf, buf_size - 1, bytes_read);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   180
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   181
		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
   182
						  buf, buf_size - 1,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   183
						  bytes_read,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   184
						  NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   185
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   186
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   187
	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
   188
		switch (status) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   189
		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
   190
			*reason = LM_DISCONNECT_REASON_HUP;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   191
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   192
		case G_IO_STATUS_AGAIN:
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   193
			/* 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
   194
			return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   195
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   196
		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
   197
			*reason = LM_DISCONNECT_REASON_ERROR;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   198
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   199
		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
   200
			*reason = LM_DISCONNECT_REASON_UNKNOWN;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   201
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   202
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   203
		/* 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
   204
		*hangup = TRUE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   205
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   206
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   207
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   208
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   209
	buf[*bytes_read] = '\0';
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   210
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   211
	/* There is more data to be read */
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   212
	return TRUE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   213
}
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
static gboolean
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   216
socket_in_event (GIOChannel   *source,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   217
		     GIOCondition  condition,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   218
		     LmSocket     *socket)
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   219
{
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   220
	gchar     buf[IN_BUFFER_SIZE];
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   221
	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
   222
	gboolean  read_anything = FALSE;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   223
	gboolean  hangup;
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
   224
	gint      reason;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   225
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   226
	if (!socket->io_channel) {
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   227
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   228
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   229
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   230
	while (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
   231
				     &bytes_read, &hangup, &reason)) {
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   232
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   233
		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
   234
		       (int)bytes_read);
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   235
		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
   236
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   237
		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
   238
		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
   239
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   240
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   241
		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
   242
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   243
		(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
   244
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
		read_anything = TRUE;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   246
	}
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   247
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
   248
	/* 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
   249
	 * 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
   250
	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
   251
		(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
   252
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   253
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   254
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   255
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   256
}
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   257
	
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   258
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   259
socket_hup_event (GIOChannel   *source,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   260
		      GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   261
		      LmSocket     *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   262
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   263
	lm_verbose ("HUP event: %d->'%s'\n", 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   264
		    condition, lm_misc_io_condition_to_str (condition));
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
	if (!socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   267
		return FALSE;
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
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   270
	(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
   271
			       socket->user_data);
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   272
	
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   273
	return TRUE;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   274
}
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
static gboolean
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   277
socket_error_event (GIOChannel   *source,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   278
		    GIOCondition  condition,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   279
		    LmSocket     *socket)
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   280
{
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   281
	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
   282
		    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
   283
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   284
	if (!socket->io_channel) {
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   285
		return FALSE;
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
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   288
	(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
   289
			       socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   290
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   291
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   292
}
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
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   295
_lm_socket_succeeded (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   296
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   297
	LmSocket     *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   298
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   299
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   300
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   301
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   302
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   303
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   304
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   305
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   306
	/* Need some way to report error/success */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   307
	if (socket->cancel_open) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   308
		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
   309
		(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
   310
		return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   311
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   312
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   313
	socket->fd = connect_data->fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   314
	socket->io_channel = connect_data->io_channel;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   315
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   316
	freeaddrinfo (connect_data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   317
	socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   318
	g_free (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   319
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   320
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   321
		GError *error = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   322
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   323
		lm_verbose ("Setting up SSL...\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   324
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   325
#ifdef HAVE_GNUTLS
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   326
		/* GNU TLS requires the socket to be blocking */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   327
		_lm_sock_set_blocking (socket->fd, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   328
#endif
151
hallski <hallski>
parents: 150
diff changeset
   329
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   330
		if (!_lm_ssl_begin (socket->ssl, socket->fd,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   331
				    socket->server,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   332
				    &error)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   333
			lm_verbose ("Could not begin SSL\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   334
				    
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   335
			if (error) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   336
				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
   337
				       "%s\n", error->message);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   338
				g_error_free (error);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   339
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   340
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   341
 			_lm_sock_shutdown (socket->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   342
 			_lm_sock_close (socket->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   343
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   344
			(socket->connect_func) (socket, FALSE, 
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   345
						socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   346
			return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   347
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   348
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   349
#ifdef HAVE_GNUTLS
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   350
		_lm_sock_set_blocking (socket->fd, FALSE); 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   351
#endif
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   352
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   353
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   354
	socket->watch_in = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   355
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   356
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   357
				      G_IO_IN,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   358
				      (GIOFunc) socket_in_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   359
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   360
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   361
	/* 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
   362
	 * 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
   363
	 * windows handles watches, see bug #331214.
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   364
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   365
#ifndef G_OS_WIN32
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   366
	socket->watch_err = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   367
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   368
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   369
				      G_IO_ERR,
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   370
				      (GIOFunc) socket_error_event,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   371
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   372
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   373
	socket->watch_hup =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   374
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   375
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   376
				      G_IO_HUP,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   377
				      (GIOFunc) socket_hup_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   378
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   379
#endif
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   380
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   381
	(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
   382
}
151
hallski <hallski>
parents: 150
diff changeset
   383
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   384
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   385
_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
   386
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   387
	LmSocket *socket;
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
	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
   390
	       "Connection failed: %s (error %d)\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   391
	       _lm_sock_get_error_str (error), error);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   392
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   393
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   394
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   395
	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
   396
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   397
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   398
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   399
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   400
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   401
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   402
	if (connect_data->io_channel != NULL) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   403
		g_io_channel_unref (connect_data->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   404
		/* 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
   405
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   406
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   407
	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
   408
		(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
   409
		
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   410
		 /* 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
   411
		if (socket->connect_data != NULL) {
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   412
			freeaddrinfo (connect_data->resolved_addrs);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   413
			socket->connect_data = NULL;
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   414
			g_free (connect_data);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   415
		}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   416
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   417
		/* 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
   418
		return socket_do_connect (connect_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   419
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   420
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   421
	return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   422
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   423
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   424
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   425
_lm_socket_failed (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   426
{
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   427
	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
   428
                                       _lm_sock_get_last_error());
196
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   431
static gboolean 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   432
socket_connect_cb (GIOChannel   *source, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   433
		       GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   434
		       LmConnectData *connect_data) 
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
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   437
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   438
	int              err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   439
	socklen_t        len;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   440
	LmSocketT         fd; 
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
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   443
	addr = connect_data->current_addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   444
	fd = g_io_channel_unix_get_fd (source);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   445
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   446
	if (condition == G_IO_ERR) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   447
		len = sizeof (err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   448
		_lm_sock_get_error (fd, &err, &len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   449
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   450
			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
   451
			       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   452
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   453
			_lm_socket_failed_with_error (connect_data, err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   454
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   455
			socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   456
			return FALSE;
151
hallski <hallski>
parents: 150
diff changeset
   457
		}
hallski <hallski>
parents: 150
diff changeset
   458
	}
hallski <hallski>
parents: 150
diff changeset
   459
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   460
	if (_lm_connection_async_connect_waiting (socket->connection)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   461
		gint res;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   462
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   463
		fd = g_io_channel_unix_get_fd (source);
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
		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
   466
		if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   467
			err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   468
			if (_lm_sock_is_blocking_success (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   469
				_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
   470
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   471
				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
   472
				       "Connection success (1).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   473
				
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   474
				_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   475
			}
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
			if (_lm_connection_async_connect_waiting (socket->connection) &&
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   478
			    !_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   479
				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
   480
				       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   481
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   482
				_lm_sock_close (connect_data->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   483
				_lm_socket_failed_with_error (connect_data, err);
151
hallski <hallski>
parents: 150
diff changeset
   484
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   485
				socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   486
				return FALSE;
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
		} 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   489
	} else {		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   490
		/* 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
   491
		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
   492
		       "Connection success (2).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   493
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   494
		_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   495
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   496
 	return TRUE; 
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
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   499
static gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   500
socket_do_connect (LmConnectData *connect_data) 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   501
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   502
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   503
	LmSocketT        fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   504
	int              res, err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   505
	int              port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   506
	char             name[NI_MAXHOST];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   507
	char             portname[NI_MAXSERV];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   508
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   509
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   510
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   511
	addr = connect_data->current_addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   512
 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   513
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   514
		port = htons (lm_proxy_get_port (socket->proxy));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   515
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   516
		port = htons (socket->port);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   517
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   518
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   519
	((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
   520
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   521
	res = getnameinfo (addr->ai_addr,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   522
			   (socklen_t)addr->ai_addrlen,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   523
			   name,     sizeof (name),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   524
			   portname, sizeof (portname),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   525
			   NI_NUMERICHOST | NI_NUMERICSERV);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   526
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   527
	if (res < 0) {
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   528
		return _lm_socket_failed (connect_data);
151
hallski <hallski>
parents: 150
diff changeset
   529
	}
hallski <hallski>
parents: 150
diff changeset
   530
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   531
	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
   532
	       "Trying %s port %s...\n", name, portname);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   533
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   534
	fd = _lm_sock_makesocket (addr->ai_family,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   535
				  addr->ai_socktype, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   536
				  addr->ai_protocol);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   537
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   538
	if (!_LM_SOCK_VALID (fd)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   539
		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
   540
		       "Failed making socket, error:%d...\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   541
		       _lm_sock_get_last_error ());
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   542
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   543
		return _lm_socket_failed (connect_data);
196
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   546
	/* 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
   547
	 * 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
   548
	 * 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
   549
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   550
	connect_data->fd = fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   551
	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
   552
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   553
	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
   554
	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
   555
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   556
	_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
   557
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   558
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   559
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   560
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   561
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   562
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   563
					      (GIOFunc) _lm_proxy_connect_cb, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   564
					      connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   565
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   566
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   567
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   568
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   569
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   570
					      (GIOFunc) socket_connect_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   571
					      connect_data);
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   574
	_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
   575
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   576
  	res = _lm_sock_connect (connect_data->fd, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   577
				addr->ai_addr, (int)addr->ai_addrlen);  
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   578
	if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   579
		err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   580
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   581
			_lm_sock_close (connect_data->fd);
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   582
			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
   583
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   584
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   585
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   586
	return TRUE;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   587
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   588
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   589
gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   590
lm_socket_output_is_buffered (LmSocket     *socket,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   591
			       const gchar  *buffer,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   592
			       gint          len)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   593
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   594
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   595
		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
   596
		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
   597
		return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   598
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   599
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   600
	return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   601
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   602
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   603
void
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   604
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
   605
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   606
	lm_verbose ("OUTPUT BUFFER ENABLED\n");
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
	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
   609
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   610
	socket->watch_out =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   611
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   612
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   613
				      G_IO_OUT,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   614
				      (GIOFunc) socket_buffered_write_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   615
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   616
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   617
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   618
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   619
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
   620
			  GIOCondition  condition,
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   621
			  LmSocket     *socket)
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   622
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   623
	gint     b_written;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   624
	GString *out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   625
	/* FIXME: Do the writing */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   626
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   627
	out_buf = socket->out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   628
	if (!out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   629
		/* Should not be possible */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   630
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   631
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   632
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   633
	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
   634
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   635
	if (b_written < 0) {
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   636
		(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
   637
				       socket->user_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   638
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   639
	}
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
	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
   642
	if (out_buf->len == 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   643
		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
   644
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   645
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   646
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   647
			socket->watch_out = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   648
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   649
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   650
		g_string_free (out_buf, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   651
		socket->out_buf = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   652
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   653
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   654
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   655
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   656
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   657
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   658
static gboolean
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   659
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
   660
			   int             srv_len, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   661
			   gchar         **out_server, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   662
			   guint          *out_port)
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   663
{
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   664
	int                  qdcount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   665
	int                  ancount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   666
	int                  len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   667
	const unsigned char *pos;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   668
	unsigned char       *end;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   669
	HEADER              *head;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   670
	char                 name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   671
	char                 pref_name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   672
	guint                pref_port = 0;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   673
	guint                pref_prio = 9999;
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   674
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   675
	pref_name[0] = 0;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   676
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   677
	pos = srv + sizeof (HEADER);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   678
	end = srv + srv_len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   679
	head = (HEADER *) srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   680
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   681
	qdcount = ntohs (head->qdcount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   682
	ancount = ntohs (head->ancount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   683
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   684
	/* Ignore the questions */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   685
	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
   686
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   687
		pos += len + QFIXEDSZ;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   688
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   689
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   690
	/* Parse the answers */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   691
	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
   692
		/* Ignore the initial string */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   693
		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
   694
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   695
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   696
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   697
		/* Ignore type, ttl, class and dlen */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   698
		pos += 10;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   699
		GETSHORT (pref, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   700
		GETSHORT (weight, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   701
		GETSHORT (port, pos);
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   702
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   703
		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
   704
		if (pref < pref_prio) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   705
			pref_prio = pref;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   706
			strcpy (pref_name, name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   707
			pref_port = port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   708
		}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   709
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   710
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   711
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   712
	if (pref_name[0]) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   713
		*out_server = g_strdup (pref_name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   714
		*out_port = pref_port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   715
		return TRUE;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   716
	} 
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   717
	return FALSE;
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
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   720
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   721
_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
   722
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   723
_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
   724
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   725
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   726
#define PHASE_1 0
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   727
#define PHASE_2 1
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   728
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   729
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   730
_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
   731
    			  GIOCondition condition,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   732
			  gpointer data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   733
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   734
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   735
void _asyncns_cancel (LmSocket *socket)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   736
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   737
	if (socket == NULL)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   738
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   739
	if (socket->asyncns_ctx) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   740
		if (socket->watch_resolv) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   741
			g_source_destroy (socket->watch_resolv);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   742
			socket->watch_resolv = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   743
		}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   744
		if (socket->resolv_channel) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   745
			g_io_channel_close (socket->resolv_channel);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   746
			socket->resolv_channel = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   747
		}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   748
		asyncns_cancel (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
   749
		asyncns_free (socket->asyncns_ctx);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   750
		socket->asyncns_ctx = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   751
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   752
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   753
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   754
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   755
_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
   756
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   757
	if (socket->asyncns_ctx) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   758
		return TRUE;
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
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   761
	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
   762
	if (socket->asyncns_ctx == NULL) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   763
		g_set_error (error,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   764
				LM_ERROR,                 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   765
				LM_ERROR_CONNECTION_FAILED,   
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   766
				"can't initialise libasyncns");
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   767
		return FALSE;
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
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   770
	socket->resolv_channel =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   771
		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
   772
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   773
	socket->watch_resolv = 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   774
		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
   775
				      socket->resolv_channel,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   776
				      G_IO_IN,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   777
				      (GIOFunc) _lm_socket_resolver_done,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   778
				      socket);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   779
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   780
	return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   781
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   782
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   783
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   784
_asyncns_done (LmSocket *socket)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   785
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   786
	if (socket->resolv_channel == NULL)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   787
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   788
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   789
	g_io_channel_unref (socket->resolv_channel);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   790
	socket->resolv_channel = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   791
	asyncns_free (socket->asyncns_ctx);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   792
	socket->asyncns_ctx = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   793
	socket->watch_resolv = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   794
	socket->resolv_query = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   795
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   796
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   797
static gboolean
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   798
_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
   799
    			  GIOCondition condition,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   800
			  gpointer data)
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
	LmSocket	*socket = (LmSocket *) data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   803
	struct addrinfo	*ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   804
	unsigned char   *srv_ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   805
	int 		 err;
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
	/* process pending data */
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   808
	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
   809
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   810
	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
   811
		return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   812
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   813
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   814
	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
   815
	case PHASE_1:
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   816
		err = asyncns_res_done (socket->asyncns_ctx, socket->resolv_query, &srv_ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   817
		_lm_socket_create_phase1 (socket, (err) ? NULL : srv_ans, err);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   818
		return TRUE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   819
		break;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   820
	case PHASE_2:
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   821
		err = asyncns_getaddrinfo_done (socket->asyncns_ctx, socket->resolv_query, &ans);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   822
		_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
   823
		_asyncns_done (socket);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   824
		return FALSE;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   825
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   826
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   827
	g_assert_not_reached ();
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   828
	return FALSE;
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
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   831
#endif
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 void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   834
_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
   835
			  unsigned char *srv_ans,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   836
			  int len)
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
	const char          *remote_addr;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   839
	LmConnectData       *data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   840
	struct addrinfo      req;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   841
#ifndef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   842
	struct addrinfo *ans;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   843
	int              err;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   844
#endif
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 (srv_ans != NULL) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   847
		gchar    *new_server;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   848
		guint     new_port;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   849
		gboolean  result;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   850
		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
   851
						    &new_server, 
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   852
						    &new_port);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   853
		if (result == TRUE) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   854
			g_free (socket->server);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   855
			socket->server = new_server;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   856
			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
   857
		}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   858
	}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   859
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   860
	if (socket->proxy) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   861
		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
   862
	} else {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   863
		remote_addr = socket->server;
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
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   866
	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
   867
	       "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
   868
	       remote_addr, socket->port);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   869
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   870
	data = g_new0 (LmConnectData, 1);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   871
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   872
	data->socket        = socket;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   873
	data->connection    = socket->connection;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   874
	data->fd            = -1;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   875
	socket->connect_data = data;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   876
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   877
	memset (&req, 0, sizeof(req));
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   878
	req.ai_family   = AF_UNSPEC;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   879
	req.ai_socktype = SOCK_STREAM;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   880
	req.ai_protocol = IPPROTO_TCP;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   881
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   882
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   883
	if (!_asyncns_prep (socket, NULL))
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   884
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   885
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   886
	socket->resolv_query =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   887
	  	asyncns_getaddrinfo (socket->asyncns_ctx,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   888
		    		     remote_addr,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   889
				     NULL,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   890
				     &req);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   891
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   892
	asyncns_setuserdata (socket->asyncns_ctx,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   893
			     socket->resolv_query,
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   894
			     (gpointer) PHASE_2);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   895
#else
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   896
	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
   897
	_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
   898
	if (err != 0)
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   899
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   900
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   901
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   902
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   903
static void
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   904
_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
   905
{
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   906
	if (ans == NULL) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   907
		lm_verbose ("error while resolving, bailing out");
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   908
		(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
   909
		g_free (socket->connect_data);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   910
		socket->connect_data = NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   911
		return;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   912
	}
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
	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
   915
	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
   916
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   917
	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
   918
}
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   919
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   920
LmSocket *
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   921
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
   922
		  IncomingDataFunc   data_func,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   923
		  SocketClosedFunc   closed_func,
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   924
		  ConnectResultFunc  connect_func,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   925
		  gpointer           user_data,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   926
		  LmConnection      *connection,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   927
		  gboolean           blocking,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   928
		  const gchar       *server,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   929
		  guint              port, 
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   930
		  gboolean           use_srv,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   931
		  LmSSL             *ssl,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   932
		  LmProxy           *proxy,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   933
		  GError           **error)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   934
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   935
	LmSocket        *socket;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   936
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   937
#ifndef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   938
	unsigned char    srv_ans[SRV_LEN];
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   939
	int              err;
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   940
#endif
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   941
	
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   942
	g_return_val_if_fail (server != NULL, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   943
	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
   944
	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
   945
	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
   946
	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
   947
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   948
	socket = g_new0 (LmSocket, 1);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   949
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   950
	socket->ref_count = 1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   951
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   952
	socket->connection = connection;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   953
	socket->server = g_strdup (server);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   954
	socket->port = port;
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   955
	socket->use_srv = use_srv;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   956
	socket->cancel_open = FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   957
	socket->ssl = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   958
	socket->proxy = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   959
	socket->blocking = blocking;
256
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   960
	socket->data_func = data_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   961
	socket->closed_func = closed_func;
2266e56746ed Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents: 249
diff changeset
   962
	socket->connect_func = connect_func;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   963
	socket->user_data = user_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   964
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   965
	if (context) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   966
		socket->context = g_main_context_ref (context);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   967
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   968
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   969
	if (proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   970
		socket->proxy = lm_proxy_ref (proxy);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   971
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   972
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   973
	if (ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   974
		socket->ssl = lm_ssl_ref (ssl);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   975
		_lm_ssl_initialize (socket->ssl);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   976
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   977
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   978
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   979
	if (use_srv) {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   980
		char          *srv;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   981
		srv = g_strdup_printf ("_xmpp-client._tcp.%s", socket->server);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   982
		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
   983
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   984
#ifdef HAVE_ASYNCNS
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   985
		if (!_asyncns_prep (socket, error))
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   986
			return NULL;
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   987
		
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   988
		socket->resolv_query =
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   989
			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
   990
		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
   991
#else
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   992
		res_init ();
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   993
271
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   994
		err = res_query (srv, C_IN, T_SRV, srv_ans, SRV_LEN);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   995
		_lm_socket_create_phase1 (socket, (err) ? NULL : srv_ans, err);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   996
		g_free (srv);
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   997
#endif
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   998
	} else {
52ea4e0b897a Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents: 257
diff changeset
   999
		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
  1000
		_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
  1001
	}
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
  1002
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1003
	return socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1004
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1005
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1006
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1007
lm_socket_flush (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1008
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1009
	g_return_if_fail (socket != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1010
	g_return_if_fail (socket->io_channel != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1011
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1012
	g_io_channel_flush (socket->io_channel, NULL);
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1015
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1016
lm_socket_close (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1017
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1018
	LmConnectData *data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1019
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
  1020
	g_return_if_fail (socket != NULL);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
  1021
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1022
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1023
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1024
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1025
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1026
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1027
	data = socket->connect_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1028
	if (data) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1029
		freeaddrinfo (data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1030
		socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1031
		g_free (data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1032
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1033
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1034
	if (socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1035
		if (socket->watch_in) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1036
			g_source_destroy (socket->watch_in);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1037
			socket->watch_in = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1038
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1039
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1040
		if (socket->watch_err) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1041
			g_source_destroy (socket->watch_err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1042
			socket->watch_err = NULL;
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
		if (socket->watch_hup) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1046
			g_source_destroy (socket->watch_hup);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1047
			socket->watch_hup = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1048
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1049
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1050
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1051
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1052
			socket->watch_out = NULL;
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1055
		g_io_channel_unref (socket->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1056
		socket->io_channel = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1057
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1058
		socket->fd = -1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1059
	}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1060
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1061
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1062
LmSocket *
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1063
lm_socket_ref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1064
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1065
	g_return_val_if_fail (socket != NULL, NULL);
151
hallski <hallski>
parents: 150
diff changeset
  1066
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1067
	socket->ref_count++;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1068
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1069
	return socket;
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1070
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1071
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1072
void
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1073
lm_socket_unref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1074
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1075
	g_return_if_fail (socket != NULL);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1076
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
  1077
	socket->ref_count--;
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->ref_count <= 0) {
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1080
		socket_free (socket);
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
  1081
	}
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
  1082
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
  1083