loudmouth/lm-socket.c
author Mikael Hallendal <micke@imendio.com>
Sat, 24 Feb 2007 23:30:02 +0100
changeset 249 2cca5ec7b573
parent 245 df2655dbe873
child 256 2266e56746ed
permissions -rw-r--r--
Style fixes
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>
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
    26
#include <arpa/nameser.h>
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
    27
#include <resolv.h>
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    28
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    29
#include "lm-debug.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    30
#include "lm-internals.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    31
#include "lm-misc.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    32
#include "lm-ssl.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    33
#include "lm-ssl-internals.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    34
#include "lm-proxy.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    35
#include "lm-socket.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    36
#include "lm-sock.h"
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    37
#include "lm-error.h"
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    38
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    39
#define IN_BUFFER_SIZE 1024
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    40
#define MIN_PORT 1
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    41
#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
    42
#define SRV_LEN 8192
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    43
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    44
struct _LmSocket {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    45
	LmConnection *connection;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    46
	GMainContext *context;
151
hallski <hallski>
parents: 150
diff changeset
    47
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    48
	gchar        *server;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    49
	guint         port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    50
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
    51
	gboolean      use_srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
    52
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    53
	gboolean      blocking;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
    54
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    55
	LmSSL        *ssl;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    56
	LmProxy      *proxy;
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    57
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    58
	GIOChannel   *io_channel;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    59
	GSource      *watch_in;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    60
	GSource      *watch_err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    61
	GSource      *watch_hup;
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    62
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    63
	LmSocketT      fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    64
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    65
	GSource      *watch_connect;
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    66
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    67
	gboolean      cancel_open;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    68
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    69
	GSource      *watch_out;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    70
	GString      *out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    71
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    72
	LmConnectData *connect_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    73
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    74
	IncomingDataFunc func;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    75
	gpointer         user_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    76
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    77
	guint          ref_count;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
    78
}; 
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
    79
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    80
static void         socket_free               (LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    81
static gboolean     socket_do_connect         (LmConnectData  *connect_data);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    82
static gboolean     socket_connect_cb         (GIOChannel     *source, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    83
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    84
					       LmConnectData  *connect_data);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    85
static gboolean     socket_in_event           (GIOChannel     *source,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    86
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    87
					       LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    88
static gboolean     socket_hup_event          (GIOChannel     *source,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    89
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    90
					       LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    91
static gboolean     socket_buffered_write_cb  (GIOChannel     *source, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    92
					       GIOCondition    condition,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    93
					       LmSocket       *socket);
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    94
static gboolean     socket_parse_srv_response (unsigned char  *srv, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    95
					       int             srv_len, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    96
					       gchar         **out_server, 
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
    97
					       guint          *out_port);
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    98
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
    99
static void
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   100
socket_free (LmSocket *socket)
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   101
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   102
	g_free (socket->server);
151
hallski <hallski>
parents: 150
diff changeset
   103
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   104
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   105
		lm_ssl_unref (socket->ssl);
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   106
	}
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   107
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   108
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   109
		lm_proxy_unref (socket->proxy);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   110
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   111
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   112
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   113
		g_string_free (socket->out_buf, TRUE);
151
hallski <hallski>
parents: 150
diff changeset
   114
	}
hallski <hallski>
parents: 150
diff changeset
   115
154
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   116
	g_free (socket);
207483c02cfc bus hacking
hallski <hallski>
parents: 151
diff changeset
   117
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   118
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   119
gint
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   120
lm_socket_do_write (LmSocket *socket, const gchar *buf, gint len)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   121
{
151
hallski <hallski>
parents: 150
diff changeset
   122
	gint b_written;
hallski <hallski>
parents: 150
diff changeset
   123
hallski <hallski>
parents: 150
diff changeset
   124
	if (socket->ssl) {
hallski <hallski>
parents: 150
diff changeset
   125
		b_written = _lm_ssl_send (socket->ssl, buf, len);
hallski <hallski>
parents: 150
diff changeset
   126
	} else {
hallski <hallski>
parents: 150
diff changeset
   127
		GIOStatus io_status = G_IO_STATUS_AGAIN;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   128
		gsize     bytes_written;
151
hallski <hallski>
parents: 150
diff changeset
   129
hallski <hallski>
parents: 150
diff changeset
   130
		while (io_status == G_IO_STATUS_AGAIN) {
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   131
			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
   132
							      buf, len, 
151
hallski <hallski>
parents: 150
diff changeset
   133
							      &bytes_written,
hallski <hallski>
parents: 150
diff changeset
   134
							      NULL);
hallski <hallski>
parents: 150
diff changeset
   135
		}
hallski <hallski>
parents: 150
diff changeset
   136
hallski <hallski>
parents: 150
diff changeset
   137
		b_written = bytes_written;
hallski <hallski>
parents: 150
diff changeset
   138
hallski <hallski>
parents: 150
diff changeset
   139
		if (io_status != G_IO_STATUS_NORMAL) {
hallski <hallski>
parents: 150
diff changeset
   140
			b_written = -1;
hallski <hallski>
parents: 150
diff changeset
   141
		}
hallski <hallski>
parents: 150
diff changeset
   142
	}
hallski <hallski>
parents: 150
diff changeset
   143
hallski <hallski>
parents: 150
diff changeset
   144
	return b_written;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   145
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   146
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   147
static gboolean
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   148
socket_read_incoming (LmSocket *socket,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   149
		      gchar    *buf,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   150
		      gsize     buf_size,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   151
		      gsize    *bytes_read,
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   152
		      gboolean *hangup)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   153
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   154
	GIOStatus status;
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   155
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   156
	*hangup = FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   157
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   158
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   159
		status = _lm_ssl_read (socket->ssl, 
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   160
				       buf, buf_size - 1, bytes_read);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   161
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   162
		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
   163
						  buf, buf_size - 1,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   164
						  bytes_read,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   165
						  NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   166
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   167
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   168
	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
   169
		gint reason;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   170
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   171
		switch (status) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   172
		case G_IO_STATUS_EOF:
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   173
			reason = LM_DISCONNECT_REASON_HUP;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   174
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   175
		case G_IO_STATUS_AGAIN:
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   176
			/* 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
   177
			return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   178
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   179
		case G_IO_STATUS_ERROR:
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   180
			reason = LM_DISCONNECT_REASON_ERROR;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   181
			break;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   182
		default:
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   183
			reason = LM_DISCONNECT_REASON_UNKNOWN;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   184
		}
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
		_lm_connection_do_close (socket->connection);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   187
		_lm_connection_signal_disconnect (socket->connection, reason);
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   188
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   189
		/* 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
   190
		*hangup = TRUE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   191
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   192
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   193
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   194
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   195
	buf[*bytes_read] = '\0';
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   196
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   197
	/* There is more data to be read */
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   198
	return TRUE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   199
}
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   200
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   201
static gboolean
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   202
socket_in_event (GIOChannel   *source,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   203
		     GIOCondition  condition,
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   204
		     LmSocket     *socket)
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   205
{
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   206
	gchar     buf[IN_BUFFER_SIZE];
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   207
	gsize     bytes_read;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   208
	gboolean  hangup;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   209
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   210
	if (!socket->io_channel) {
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   211
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   212
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   213
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   214
	while (socket_read_incoming (socket, buf, IN_BUFFER_SIZE, 
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   215
				     &bytes_read, &hangup)) {
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   216
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   217
		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
   218
		       (int)bytes_read);
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   219
		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
   220
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   221
		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
   222
		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
   223
		       "-----------------------------------\n");
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   224
		
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   225
		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
   226
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   227
		(socket->func) (socket, buf, socket->user_data);
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   228
	}
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   229
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   230
	if (hangup) {
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   231
		return FALSE;
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   232
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   233
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   234
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   235
}
202
42d0b1ed1b96 Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents: 196
diff changeset
   236
	
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   237
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   238
socket_hup_event (GIOChannel   *source,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   239
		      GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   240
		      LmSocket     *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   241
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   242
	lm_verbose ("HUP event: %d->'%s'\n", 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   243
		    condition, lm_misc_io_condition_to_str (condition));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   244
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   245
	if (!socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   246
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   247
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   248
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   249
	_lm_connection_do_close (socket->connection);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   250
	_lm_connection_signal_disconnect (socket->connection, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   251
					  LM_DISCONNECT_REASON_HUP);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   252
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   253
	return TRUE;
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   256
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   257
_lm_socket_succeeded (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   258
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   259
	LmSocket     *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   260
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   261
	socket = connect_data->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
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   264
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   265
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   266
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   267
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   268
	/* Need some way to report error/success */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   269
	if (socket->cancel_open) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   270
		lm_verbose ("Cancelling connection...\n");
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   271
		_lm_connection_socket_result (socket->connection, FALSE);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   272
		return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   273
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   274
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   275
	socket->fd = connect_data->fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   276
	socket->io_channel = connect_data->io_channel;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   277
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   278
	freeaddrinfo (connect_data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   279
	socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   280
	g_free (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   281
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   282
	if (socket->ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   283
		GError *error = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   284
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   285
		lm_verbose ("Setting up SSL...\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   286
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   287
#ifdef HAVE_GNUTLS
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   288
		/* GNU TLS requires the socket to be blocking */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   289
		_lm_sock_set_blocking (socket->fd, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   290
#endif
151
hallski <hallski>
parents: 150
diff changeset
   291
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   292
		if (!_lm_ssl_begin (socket->ssl, socket->fd,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   293
				    socket->server,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   294
				    &error)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   295
			lm_verbose ("Could not begin SSL\n");
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
			if (error) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   298
				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
   299
				       "%s\n", error->message);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   300
				g_error_free (error);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   301
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   302
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   303
 			_lm_sock_shutdown (socket->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   304
 			_lm_sock_close (socket->fd);
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
			_lm_connection_do_close (socket->connection);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   307
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   308
			_lm_connection_socket_result (socket->connection, FALSE);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   309
			return;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   310
		}
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
#ifdef HAVE_GNUTLS
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   313
		_lm_sock_set_blocking (socket->fd, FALSE); 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   314
#endif
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   317
	socket->watch_in = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   318
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   319
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   320
				      G_IO_IN,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   321
				      (GIOFunc) socket_in_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   322
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   323
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   324
	/* 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
   325
	 * 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
   326
	 * windows handles watches, see bug #331214.
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   327
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   328
#ifndef G_OS_WIN32
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   329
	socket->watch_err = 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   330
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   331
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   332
				      G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   333
				      (GIOFunc) _lm_connection_error_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   334
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   335
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   336
	socket->watch_hup =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   337
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   338
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   339
				      G_IO_HUP,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   340
				      (GIOFunc) socket_hup_event,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   341
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   342
#endif
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   343
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   344
	_lm_connection_socket_result (socket->connection, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   345
}
151
hallski <hallski>
parents: 150
diff changeset
   346
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   347
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   348
_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
   349
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   350
	LmSocket *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   351
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   352
	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
   353
	       "Connection failed: %s (error %d)\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   354
	       _lm_sock_get_error_str (error), error);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   355
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   356
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   357
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   358
	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
   359
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   360
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   361
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   362
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   363
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   364
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   365
	if (connect_data->io_channel != NULL) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   366
		g_io_channel_unref (connect_data->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   367
		/* 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
   368
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   369
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   370
	if (connect_data->current_addr == NULL) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   371
		_lm_connection_socket_result (socket->connection, FALSE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   372
		
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   373
		 /* 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
   374
		if (socket->connect_data != NULL) {
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   375
			freeaddrinfo (connect_data->resolved_addrs);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   376
			socket->connect_data = NULL;
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   377
			g_free (connect_data);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   378
		}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   379
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   380
		/* 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
   381
		return socket_do_connect (connect_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   382
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   383
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   384
	return FALSE;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   385
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   386
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   387
gboolean 
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   388
_lm_socket_failed (LmConnectData *connect_data)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   389
{
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   390
	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
   391
                                       _lm_sock_get_last_error());
196
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   394
static gboolean 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   395
socket_connect_cb (GIOChannel   *source, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   396
		       GIOCondition  condition,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   397
		       LmConnectData *connect_data) 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   398
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   399
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   400
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   401
	int              err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   402
	socklen_t        len;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   403
	LmSocketT         fd; 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   404
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   405
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   406
	addr = connect_data->current_addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   407
	fd = g_io_channel_unix_get_fd (source);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   408
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   409
	if (condition == G_IO_ERR) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   410
		len = sizeof (err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   411
		_lm_sock_get_error (fd, &err, &len);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   412
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   413
			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
   414
			       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   415
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   416
			_lm_socket_failed_with_error (connect_data, err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   417
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   418
			socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   419
			return FALSE;
151
hallski <hallski>
parents: 150
diff changeset
   420
		}
hallski <hallski>
parents: 150
diff changeset
   421
	}
hallski <hallski>
parents: 150
diff changeset
   422
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   423
	if (_lm_connection_async_connect_waiting (socket->connection)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   424
		gint res;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   425
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   426
		fd = g_io_channel_unix_get_fd (source);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   427
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   428
		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
   429
		if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   430
			err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   431
			if (_lm_sock_is_blocking_success (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   432
				_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
   433
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   434
				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
   435
				       "Connection success (1).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   436
				
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   437
				_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   438
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   439
			
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   440
			if (_lm_connection_async_connect_waiting (socket->connection) &&
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   441
			    !_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   442
				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
   443
				       "Connection failed.\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   444
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   445
				_lm_sock_close (connect_data->fd);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   446
				_lm_socket_failed_with_error (connect_data, err);
151
hallski <hallski>
parents: 150
diff changeset
   447
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   448
				socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   449
				return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   450
			}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   451
		} 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   452
	} else {		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   453
		/* 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
   454
		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
   455
		       "Connection success (2).\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   456
		
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   457
		_lm_socket_succeeded (connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   458
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   459
 	return TRUE; 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   460
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   461
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   462
static gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   463
socket_do_connect (LmConnectData *connect_data) 
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
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   466
	LmSocketT        fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   467
	int              res, err;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   468
	int              port;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   469
	char             name[NI_MAXHOST];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   470
	char             portname[NI_MAXSERV];
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   471
	struct addrinfo *addr;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   472
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   473
	socket = connect_data->socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   474
	addr = connect_data->current_addr;
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
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   477
		port = htons (lm_proxy_get_port (socket->proxy));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   478
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   479
		port = htons (socket->port);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   480
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   481
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   482
	((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
   483
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   484
	res = getnameinfo (addr->ai_addr,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   485
			   (socklen_t)addr->ai_addrlen,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   486
			   name,     sizeof (name),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   487
			   portname, sizeof (portname),
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   488
			   NI_NUMERICHOST | NI_NUMERICSERV);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   489
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   490
	if (res < 0) {
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   491
		return _lm_socket_failed (connect_data);
151
hallski <hallski>
parents: 150
diff changeset
   492
	}
hallski <hallski>
parents: 150
diff changeset
   493
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   494
	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
   495
	       "Trying %s port %s...\n", name, portname);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   496
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   497
	fd = _lm_sock_makesocket (addr->ai_family,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   498
				  addr->ai_socktype, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   499
				  addr->ai_protocol);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   500
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   501
	if (!_LM_SOCK_VALID (fd)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   502
		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
   503
		       "Failed making socket, error:%d...\n",
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   504
		       _lm_sock_get_last_error ());
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   505
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   506
		return _lm_socket_failed (connect_data);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   507
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   508
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   509
	/* 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
   510
	 * 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
   511
	 * 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
   512
	 */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   513
	connect_data->fd = fd;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   514
	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
   515
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   516
	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
   517
	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
   518
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   519
	_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
   520
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   521
	if (socket->proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   522
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   523
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   524
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   525
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   526
					      (GIOFunc) _lm_proxy_connect_cb, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   527
					      connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   528
	} else {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   529
		socket->watch_connect =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   530
			lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   531
					      connect_data->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   532
					      G_IO_OUT|G_IO_ERR,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   533
					      (GIOFunc) socket_connect_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   534
					      connect_data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   535
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   536
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   537
	_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
   538
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   539
  	res = _lm_sock_connect (connect_data->fd, 
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   540
				addr->ai_addr, (int)addr->ai_addrlen);  
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   541
	if (res < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   542
		err = _lm_sock_get_last_error ();
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   543
		if (!_lm_sock_is_blocking_error (err)) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   544
			_lm_sock_close (connect_data->fd);
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   545
			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
   546
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   547
	}
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   548
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   549
	return TRUE;
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   550
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   551
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   552
gboolean
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   553
lm_socket_output_is_buffered (LmSocket     *socket,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   554
			       const gchar  *buffer,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   555
			       gint          len)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   556
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   557
	if (socket->out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   558
		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
   559
		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
   560
		return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   561
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   562
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   563
	return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   564
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   565
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   566
void
249
2cca5ec7b573 Style fixes
Mikael Hallendal <micke@imendio.com>
parents: 245
diff changeset
   567
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
   568
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   569
	lm_verbose ("OUTPUT BUFFER ENABLED\n");
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   570
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   571
	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
   572
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   573
	socket->watch_out =
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   574
		lm_misc_add_io_watch (socket->context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   575
				      socket->io_channel,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   576
				      G_IO_OUT,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   577
				      (GIOFunc) socket_buffered_write_cb,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   578
				      socket);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   579
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   580
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   581
static gboolean
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   582
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
   583
			  GIOCondition  condition,
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   584
			  LmSocket     *socket)
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   585
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   586
	gint     b_written;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   587
	GString *out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   588
	/* FIXME: Do the writing */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   589
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   590
	out_buf = socket->out_buf;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   591
	if (!out_buf) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   592
		/* Should not be possible */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   593
		return FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   594
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   595
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   596
	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
   597
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   598
	if (b_written < 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   599
		_lm_connection_error_event (socket,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   600
					    G_IO_HUP, socket->connection);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   601
		return FALSE;
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
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   604
	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
   605
	if (out_buf->len == 0) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   606
		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
   607
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   608
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   609
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   610
			socket->watch_out = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   611
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   612
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   613
		g_string_free (out_buf, TRUE);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   614
		socket->out_buf = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   615
		return FALSE;
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
	return TRUE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   619
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   620
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   621
static gboolean
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   622
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
   623
			   int             srv_len, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   624
			   gchar         **out_server, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   625
			   guint          *out_port)
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   626
{
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   627
	int                  qdcount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   628
	int                  ancount;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   629
	int                  len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   630
	const unsigned char *pos;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   631
	unsigned char       *end;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   632
	HEADER              *head;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   633
	char                 name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   634
	char                 pref_name[256];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   635
	guint                pref_port = 0;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   636
	guint                pref_prio = 9999;
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   637
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   638
	pref_name[0] = 0;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   639
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   640
	pos = srv + sizeof (HEADER);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   641
	end = srv + srv_len;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   642
	head = (HEADER *) srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   643
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   644
	qdcount = ntohs (head->qdcount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   645
	ancount = ntohs (head->ancount);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   646
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   647
	/* Ignore the questions */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   648
	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
   649
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   650
		pos += len + QFIXEDSZ;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   651
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   652
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   653
	/* Parse the answers */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   654
	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
   655
		/* Ignore the initial string */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   656
		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
   657
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   658
		g_assert (len >= 0);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   659
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   660
		/* Ignore type, ttl, class and dlen */
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   661
		pos += 10;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   662
		GETSHORT (pref, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   663
		GETSHORT (weight, pos);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   664
		GETSHORT (port, pos);
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   665
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   666
		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
   667
		if (pref < pref_prio) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   668
			pref_prio = pref;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   669
			strcpy (pref_name, name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   670
			pref_port = port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   671
		}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   672
		pos += len;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   673
	}
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
	if (pref_name[0]) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   676
		*out_server = g_strdup (pref_name);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   677
		*out_port = pref_port;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   678
		return TRUE;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   679
	} 
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   680
	return FALSE;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   681
}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   682
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   683
LmSocket *
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   684
lm_socket_create (GMainContext      *context,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   685
		  IncomingDataFunc   func,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   686
		  gpointer           user_data,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   687
		  LmConnection      *connection,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   688
		  gboolean           blocking,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   689
		  const gchar       *server,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   690
		  guint              port, 
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   691
		  gboolean           use_srv,
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   692
		  LmSSL             *ssl,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   693
		  LmProxy           *proxy,
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   694
		  GError           **error)
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   695
{
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   696
	LmSocket        *socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   697
	struct addrinfo  req;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   698
	struct addrinfo *ans;
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   699
	const char      *remote_addr;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   700
	LmConnectData   *data;
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   701
	int              err;
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   702
	
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   703
	g_return_val_if_fail (server != NULL, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   704
	g_return_val_if_fail ((port >= MIN_PORT && port <= MAX_PORT), NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   705
	g_return_val_if_fail (func != NULL, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   706
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   707
	socket = g_new0 (LmSocket, 1);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   708
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   709
	memset (&req, 0, sizeof(req));
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   710
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   711
	req.ai_family   = AF_UNSPEC;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   712
	req.ai_socktype = SOCK_STREAM;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   713
	req.ai_protocol = IPPROTO_TCP;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   714
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   715
	socket->ref_count = 1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   716
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   717
	socket->connection = connection;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   718
	socket->server = g_strdup (server);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   719
	socket->port = port;
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   720
	socket->use_srv = use_srv;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   721
	socket->cancel_open = FALSE;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   722
	socket->ssl = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   723
	socket->proxy = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   724
	socket->blocking = blocking;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   725
	socket->func = func;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   726
	socket->user_data = user_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   727
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   728
	if (use_srv) {
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   729
		char          *srv;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   730
		unsigned char  srv_ans[SRV_LEN];
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   731
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   732
		res_init ();
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   733
245
df2655dbe873 Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents: 244
diff changeset
   734
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   735
		srv = g_strdup_printf ("_xmpp-client._tcp.%s", socket->server);
245
df2655dbe873 Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents: 244
diff changeset
   736
		lm_verbose ("Performing a SRV lookup for %s\n", srv);
df2655dbe873 Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents: 244
diff changeset
   737
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   738
		err = res_query (srv, C_IN, T_SRV, srv_ans, SRV_LEN);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   739
		if (err > 0) {
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   740
			gchar    *new_server;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   741
			guint     new_port;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   742
			gboolean  result;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   743
			
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   744
			result = socket_parse_srv_response (srv_ans, err, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   745
							    &new_server, 
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   746
							    &new_port);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   747
			if (result == TRUE) {
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   748
				g_free (socket->server);
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   749
				socket->server = new_server;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   750
				socket->port = new_port;
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   751
			}
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   752
		}
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   753
		g_free (srv);
245
df2655dbe873 Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents: 244
diff changeset
   754
	} else {
df2655dbe873 Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents: 244
diff changeset
   755
		lm_verbose ("SRV lookup disabled for %s\n", socket->server);
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   756
	}
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   757
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   758
	if (context) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   759
		socket->context = g_main_context_ref (context);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   760
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   761
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   762
	if (proxy) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   763
		socket->proxy = lm_proxy_ref (proxy);
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   764
		remote_addr = lm_proxy_get_server (socket->proxy);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   765
	} else {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   766
	    	remote_addr = socket->server;
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   767
	}
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   768
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   769
	g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET,
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   770
	       "Going to connect to %s%s:%u\n", (proxy) ? "proxy " : "",
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   771
	       remote_addr, socket->port);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   772
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   773
	err = getaddrinfo (remote_addr, NULL, &req, &ans);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   774
	if (err != 0) {
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   775
		const char *str;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   776
243
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   777
		str = _lm_sock_addrinfo_get_error_str (err);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   778
		g_set_error (error,
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   779
			     LM_ERROR,                 
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   780
			     LM_ERROR_CONNECTION_FAILED,   
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   781
			     str);
fa0794ef3570 Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents: 212
diff changeset
   782
		return NULL;
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   783
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   784
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   785
	if (ssl) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   786
		socket->ssl = lm_ssl_ref (ssl);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   787
		_lm_ssl_initialize (socket->ssl);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   788
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   789
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   790
	/* Prepare and do the nonblocking connection */
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   791
	data = g_new (LmConnectData, 1);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   792
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   793
	data->socket         = socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   794
	data->connection     = connection;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   795
	data->resolved_addrs = ans;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   796
	data->current_addr   = ans;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   797
	data->io_channel     = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   798
	data->fd             = -1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   799
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   800
	socket->connect_data = data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   801
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   802
	if (!socket_do_connect (data)) {
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   803
		g_set_error (error,
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   804
			LM_ERROR,
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   805
			LM_ERROR_CONNECTION_FAILED,
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   806
			"unable to connect");
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   807
		return NULL;
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   808
	}
244
8a05b79bad24 Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents: 243
diff changeset
   809
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   810
	return socket;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   811
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   812
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   813
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   814
lm_socket_flush (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   815
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   816
	g_return_if_fail (socket != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   817
	g_return_if_fail (socket->io_channel != NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   818
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   819
	g_io_channel_flush (socket->io_channel, NULL);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   820
}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   821
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   822
void
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   823
lm_socket_close (LmSocket *socket)
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   824
{
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   825
	LmConnectData *data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   826
212
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   827
	g_return_if_fail (socket != NULL);
87bc6b37a9e9 Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents: 202
diff changeset
   828
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   829
	if (socket->watch_connect) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   830
		g_source_destroy (socket->watch_connect);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   831
		socket->watch_connect = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   832
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   833
	
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   834
	data = socket->connect_data;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   835
	if (data) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   836
		freeaddrinfo (data->resolved_addrs);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   837
		socket->connect_data = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   838
		g_free (data);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   839
	}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   840
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   841
	if (socket->io_channel) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   842
		if (socket->watch_in) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   843
			g_source_destroy (socket->watch_in);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   844
			socket->watch_in = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   845
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   846
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   847
		if (socket->watch_err) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   848
			g_source_destroy (socket->watch_err);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   849
			socket->watch_err = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   850
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   851
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   852
		if (socket->watch_hup) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   853
			g_source_destroy (socket->watch_hup);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   854
			socket->watch_hup = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   855
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   856
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   857
		if (socket->watch_out) {
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   858
			g_source_destroy (socket->watch_out);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   859
			socket->watch_out = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   860
		}
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   861
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   862
		g_io_channel_unref (socket->io_channel);
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   863
		socket->io_channel = NULL;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   864
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   865
		socket->fd = -1;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   866
	}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   867
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   868
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   869
LmSocket *
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   870
lm_socket_ref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   871
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   872
	g_return_val_if_fail (socket != NULL, NULL);
151
hallski <hallski>
parents: 150
diff changeset
   873
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   874
	socket->ref_count++;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   875
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   876
	return socket;
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   877
}
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   878
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   879
void
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   880
lm_socket_unref (LmSocket *socket)
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   881
{
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   882
	g_return_if_fail (socket != NULL);
196
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   883
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   884
	socket->ref_count--;
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   885
209bfa124066 Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents: 161
diff changeset
   886
	if (socket->ref_count <= 0) {
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   887
		socket_free (socket);
147
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   888
	}
f4fe28b6c454 added upcoming files lm-socket.[ch]
hallski <hallski>
parents:
diff changeset
   889
}
149
54e67338c784 Commiting some work in progress
hallski <hallski>
parents: 148
diff changeset
   890