author | Mikael Hallendal <micke@imendio.com> |
Sat, 24 Feb 2007 16:51:06 +0100 | |
changeset 245 | df2655dbe873 |
parent 244 | 8a05b79bad24 |
child 249 | 2cca5ec7b573 |
permissions | -rw-r--r-- |
147 | 1 |
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
2 |
/* |
|
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 | 6 |
* |
7 |
* This program is free software; you can redistribute it and/or |
|
8 |
* modify it under the terms of the GNU Lesser General Public License as |
|
9 |
* published by the Free Software Foundation; either version 2 of the |
|
10 |
* License, or (at your option) any later version. |
|
11 |
* |
|
12 |
* This program is distributed in the hope that it will be useful, |
|
13 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
14 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
15 |
* Lesser General Public License for more details. |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU Lesser General Public |
|
18 |
* License along with this program; if not, write to the |
|
19 |
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
20 |
* Boston, MA 02111-1307, USA. |
|
21 |
*/ |
|
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 | 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 | 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 | 43 |
|
149 | 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 | 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 | 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 | 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 | 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 | 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 | 79 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
80 |
static void socket_free (LmSocket *socket); |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
81 |
static gboolean socket_do_connect (LmConnectData *connect_data); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
82 |
static gboolean socket_connect_cb (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
83 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
84 |
LmConnectData *connect_data); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
85 |
static gboolean socket_in_event (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
86 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
87 |
LmSocket *socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
88 |
static gboolean socket_hup_event (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
89 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
90 |
LmSocket *socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
91 |
static gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
92 |
socket_buffered_write_cb (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
93 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
94 |
LmSocket *socket); |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
95 |
static gboolean 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
|
96 |
int srv_len, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
97 |
gchar **out_server, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
98 |
guint *out_port); |
147 | 99 |
|
100 |
static void |
|
149 | 101 |
socket_free (LmSocket *socket) |
147 | 102 |
{ |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
103 |
g_free (socket->server); |
151 | 104 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
105 |
if (socket->ssl) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
106 |
lm_ssl_unref (socket->ssl); |
154 | 107 |
} |
108 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
109 |
if (socket->proxy) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
110 |
lm_proxy_unref (socket->proxy); |
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 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
113 |
if (socket->out_buf) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
114 |
g_string_free (socket->out_buf, TRUE); |
151 | 115 |
} |
116 |
||
154 | 117 |
g_free (socket); |
118 |
} |
|
149 | 119 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
120 |
gint |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
121 |
lm_socket_do_write (LmSocket *socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
122 |
const gchar *buf, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
123 |
gint len) |
149 | 124 |
{ |
151 | 125 |
gint b_written; |
126 |
||
127 |
if (socket->ssl) { |
|
128 |
b_written = _lm_ssl_send (socket->ssl, buf, len); |
|
129 |
} else { |
|
130 |
GIOStatus io_status = G_IO_STATUS_AGAIN; |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
131 |
gsize bytes_written; |
151 | 132 |
|
133 |
while (io_status == G_IO_STATUS_AGAIN) { |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
134 |
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
|
135 |
buf, len, |
151 | 136 |
&bytes_written, |
137 |
NULL); |
|
138 |
} |
|
139 |
||
140 |
b_written = bytes_written; |
|
141 |
||
142 |
if (io_status != G_IO_STATUS_NORMAL) { |
|
143 |
b_written = -1; |
|
144 |
} |
|
145 |
} |
|
146 |
||
147 |
return b_written; |
|
149 | 148 |
} |
149 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
150 |
static gboolean |
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
151 |
socket_read_incoming (LmSocket *socket, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
152 |
gchar *buf, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
153 |
gsize buf_size, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
154 |
gsize *bytes_read, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
155 |
gboolean *hangup) |
149 | 156 |
{ |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
157 |
GIOStatus status; |
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
158 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
159 |
*hangup = FALSE; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
160 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
161 |
if (socket->ssl) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
162 |
status = _lm_ssl_read (socket->ssl, |
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
163 |
buf, buf_size - 1, bytes_read); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
164 |
} else { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
165 |
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
|
166 |
buf, buf_size - 1, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
167 |
bytes_read, |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
168 |
NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
169 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
170 |
|
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
171 |
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
|
172 |
gint reason; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
173 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
174 |
switch (status) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
175 |
case G_IO_STATUS_EOF: |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
176 |
reason = LM_DISCONNECT_REASON_HUP; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
177 |
break; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
178 |
case G_IO_STATUS_AGAIN: |
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
179 |
/* 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
|
180 |
return FALSE; |
196
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 |
case G_IO_STATUS_ERROR: |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
183 |
reason = LM_DISCONNECT_REASON_ERROR; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
184 |
break; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
185 |
default: |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
186 |
reason = LM_DISCONNECT_REASON_UNKNOWN; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
187 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
188 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
189 |
_lm_connection_do_close (socket->connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
190 |
_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
|
191 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
192 |
/* 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
|
193 |
*hangup = TRUE; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
194 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
195 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
196 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
197 |
|
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
198 |
buf[*bytes_read] = '\0'; |
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 |
/* There is more data to be read */ |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
201 |
return TRUE; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
202 |
} |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
203 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
204 |
static gboolean |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
205 |
socket_in_event (GIOChannel *source, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
206 |
GIOCondition condition, |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
207 |
LmSocket *socket) |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
208 |
{ |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
209 |
gchar buf[IN_BUFFER_SIZE]; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
210 |
gsize bytes_read; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
211 |
gboolean hangup; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
212 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
213 |
if (!socket->io_channel) { |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
214 |
return FALSE; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
215 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
216 |
|
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
217 |
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
|
218 |
&bytes_read, &hangup)) { |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
219 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
220 |
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
|
221 |
(int)bytes_read); |
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 |
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
|
225 |
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
|
226 |
"-----------------------------------\n"); |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
227 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
228 |
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
|
229 |
|
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
230 |
(socket->func) (socket, buf, socket->user_data); |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
231 |
} |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
232 |
|
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
233 |
if (hangup) { |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
234 |
return FALSE; |
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
235 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
236 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
237 |
return TRUE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
238 |
} |
202
42d0b1ed1b96
Forward port of fix to LM-71.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
239 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
240 |
static gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
241 |
socket_hup_event (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
242 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
243 |
LmSocket *socket) |
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 |
lm_verbose ("HUP event: %d->'%s'\n", |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
246 |
condition, lm_misc_io_condition_to_str (condition)); |
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 |
if (!socket->io_channel) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
249 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
250 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
251 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
252 |
_lm_connection_do_close (socket->connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
253 |
_lm_connection_signal_disconnect (socket->connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
254 |
LM_DISCONNECT_REASON_HUP); |
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 |
return TRUE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
257 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
258 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
259 |
void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
260 |
_lm_socket_succeeded (LmConnectData *connect_data) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
261 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
262 |
LmSocket *socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
263 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
264 |
socket = connect_data->socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
265 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
266 |
if (socket->watch_connect) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
267 |
g_source_destroy (socket->watch_connect); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
268 |
socket->watch_connect = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
269 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
270 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
271 |
/* Need some way to report error/success */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
272 |
if (socket->cancel_open) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
273 |
lm_verbose ("Cancelling connection...\n"); |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
274 |
_lm_connection_socket_result (socket->connection, FALSE); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
275 |
return; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
276 |
} |
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 |
socket->fd = connect_data->fd; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
279 |
socket->io_channel = connect_data->io_channel; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
280 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
281 |
freeaddrinfo (connect_data->resolved_addrs); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
282 |
socket->connect_data = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
283 |
g_free (connect_data); |
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 |
if (socket->ssl) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
286 |
GError *error = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
287 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
288 |
lm_verbose ("Setting up SSL...\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
289 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
290 |
#ifdef HAVE_GNUTLS |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
291 |
/* GNU TLS requires the socket to be blocking */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
292 |
_lm_sock_set_blocking (socket->fd, TRUE); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
293 |
#endif |
151 | 294 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
295 |
if (!_lm_ssl_begin (socket->ssl, socket->fd, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
296 |
socket->server, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
297 |
&error)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
298 |
lm_verbose ("Could not begin SSL\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
299 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
300 |
if (error) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
301 |
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
|
302 |
"%s\n", error->message); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
303 |
g_error_free (error); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
304 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
305 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
306 |
_lm_sock_shutdown (socket->fd); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
307 |
_lm_sock_close (socket->fd); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
308 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
309 |
_lm_connection_do_close (socket->connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
310 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
311 |
_lm_connection_socket_result (socket->connection, FALSE); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
312 |
return; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
313 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
314 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
315 |
#ifdef HAVE_GNUTLS |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
316 |
_lm_sock_set_blocking (socket->fd, FALSE); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
317 |
#endif |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
318 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
319 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
320 |
socket->watch_in = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
321 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
322 |
socket->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
323 |
G_IO_IN, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
324 |
(GIOFunc) socket_in_event, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
325 |
socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
326 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
327 |
/* 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
|
328 |
* 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
|
329 |
* windows handles watches, see bug #331214. |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
330 |
*/ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
331 |
#ifndef G_OS_WIN32 |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
332 |
socket->watch_err = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
333 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
334 |
socket->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
335 |
G_IO_ERR, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
336 |
(GIOFunc) _lm_connection_error_event, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
337 |
socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
338 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
339 |
socket->watch_hup = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
340 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
341 |
socket->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
342 |
G_IO_HUP, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
343 |
(GIOFunc) socket_hup_event, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
344 |
socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
345 |
#endif |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
346 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
347 |
_lm_connection_socket_result (socket->connection, TRUE); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
348 |
} |
151 | 349 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
350 |
gboolean |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
351 |
_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
|
352 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
353 |
LmSocket *socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
354 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
355 |
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
|
356 |
"Connection failed: %s (error %d)\n", |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
357 |
_lm_sock_get_error_str (error), error); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
358 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
359 |
socket = connect_data->socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
360 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
361 |
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
|
362 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
363 |
if (socket->watch_connect) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
364 |
g_source_destroy (socket->watch_connect); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
365 |
socket->watch_connect = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
366 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
367 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
368 |
if (connect_data->io_channel != NULL) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
369 |
g_io_channel_unref (connect_data->io_channel); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
370 |
/* 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
|
371 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
372 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
373 |
if (connect_data->current_addr == NULL) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
374 |
_lm_connection_socket_result (socket->connection, FALSE); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
375 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
376 |
/* 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
|
377 |
if (socket->connect_data != NULL) { |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
378 |
freeaddrinfo (connect_data->resolved_addrs); |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
379 |
socket->connect_data = NULL; |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
380 |
g_free (connect_data); |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
381 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
382 |
} else { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
383 |
/* 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
|
384 |
return socket_do_connect (connect_data); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
385 |
} |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
386 |
|
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
387 |
return FALSE; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
388 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
389 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
390 |
gboolean |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
391 |
_lm_socket_failed (LmConnectData *connect_data) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
392 |
{ |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
393 |
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
|
394 |
_lm_sock_get_last_error()); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
395 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
396 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
397 |
static gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
398 |
socket_connect_cb (GIOChannel *source, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
399 |
GIOCondition condition, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
400 |
LmConnectData *connect_data) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
401 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
402 |
LmSocket *socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
403 |
struct addrinfo *addr; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
404 |
int err; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
405 |
socklen_t len; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
406 |
LmSocketT fd; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
407 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
408 |
socket = connect_data->socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
409 |
addr = connect_data->current_addr; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
410 |
fd = g_io_channel_unix_get_fd (source); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
411 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
412 |
if (condition == G_IO_ERR) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
413 |
len = sizeof (err); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
414 |
_lm_sock_get_error (fd, &err, &len); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
415 |
if (!_lm_sock_is_blocking_error (err)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
416 |
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
|
417 |
"Connection failed.\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
418 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
419 |
_lm_socket_failed_with_error (connect_data, err); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
420 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
421 |
socket->watch_connect = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
422 |
return FALSE; |
151 | 423 |
} |
424 |
} |
|
425 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
426 |
if (_lm_connection_async_connect_waiting (socket->connection)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
427 |
gint res; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
428 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
429 |
fd = g_io_channel_unix_get_fd (source); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
430 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
431 |
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
|
432 |
if (res < 0) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
433 |
err = _lm_sock_get_last_error (); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
434 |
if (_lm_sock_is_blocking_success (err)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
435 |
_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
|
436 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
437 |
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
|
438 |
"Connection success (1).\n"); |
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 |
_lm_socket_succeeded (connect_data); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
441 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
442 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
443 |
if (_lm_connection_async_connect_waiting (socket->connection) && |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
444 |
!_lm_sock_is_blocking_error (err)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
445 |
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
|
446 |
"Connection failed.\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
447 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
448 |
_lm_sock_close (connect_data->fd); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
449 |
_lm_socket_failed_with_error (connect_data, err); |
151 | 450 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
451 |
socket->watch_connect = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
452 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
453 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
454 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
455 |
} else { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
456 |
/* 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
|
457 |
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
|
458 |
"Connection success (2).\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
459 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
460 |
_lm_socket_succeeded (connect_data); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
461 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
462 |
return TRUE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
463 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
464 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
465 |
static gboolean |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
466 |
socket_do_connect (LmConnectData *connect_data) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
467 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
468 |
LmSocket *socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
469 |
LmSocketT fd; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
470 |
int res, err; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
471 |
int port; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
472 |
char name[NI_MAXHOST]; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
473 |
char portname[NI_MAXSERV]; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
474 |
struct addrinfo *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 |
socket = connect_data->socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
477 |
addr = connect_data->current_addr; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
478 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
479 |
if (socket->proxy) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
480 |
port = htons (lm_proxy_get_port (socket->proxy)); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
481 |
} else { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
482 |
port = htons (socket->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 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
485 |
((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
|
486 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
487 |
res = getnameinfo (addr->ai_addr, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
488 |
(socklen_t)addr->ai_addrlen, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
489 |
name, sizeof (name), |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
490 |
portname, sizeof (portname), |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
491 |
NI_NUMERICHOST | NI_NUMERICSERV); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
492 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
493 |
if (res < 0) { |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
494 |
return _lm_socket_failed (connect_data); |
151 | 495 |
} |
496 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
497 |
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
|
498 |
"Trying %s port %s...\n", name, portname); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
499 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
500 |
fd = _lm_sock_makesocket (addr->ai_family, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
501 |
addr->ai_socktype, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
502 |
addr->ai_protocol); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
503 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
504 |
if (!_LM_SOCK_VALID (fd)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
505 |
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
|
506 |
"Failed making socket, error:%d...\n", |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
507 |
_lm_sock_get_last_error ()); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
508 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
509 |
return _lm_socket_failed (connect_data); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
510 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
511 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
512 |
/* 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
|
513 |
* 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
|
514 |
* 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
|
515 |
*/ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
516 |
connect_data->fd = fd; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
517 |
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
|
518 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
519 |
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
|
520 |
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
|
521 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
522 |
_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
|
523 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
524 |
if (socket->proxy) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
525 |
socket->watch_connect = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
526 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
527 |
connect_data->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
528 |
G_IO_OUT|G_IO_ERR, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
529 |
(GIOFunc) _lm_proxy_connect_cb, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
530 |
connect_data); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
531 |
} else { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
532 |
socket->watch_connect = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
533 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
534 |
connect_data->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
535 |
G_IO_OUT|G_IO_ERR, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
536 |
(GIOFunc) socket_connect_cb, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
537 |
connect_data); |
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 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
540 |
_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
|
541 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
542 |
res = _lm_sock_connect (connect_data->fd, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
543 |
addr->ai_addr, (int)addr->ai_addrlen); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
544 |
if (res < 0) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
545 |
err = _lm_sock_get_last_error (); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
546 |
if (!_lm_sock_is_blocking_error (err)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
547 |
_lm_sock_close (connect_data->fd); |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
548 |
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
|
549 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
550 |
} |
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
551 |
|
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
552 |
return TRUE; |
149 | 553 |
} |
554 |
||
555 |
gboolean |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
556 |
lm_socket_output_is_buffered (LmSocket *socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
557 |
const gchar *buffer, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
558 |
gint len) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
559 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
560 |
if (socket->out_buf) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
561 |
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
|
562 |
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
|
563 |
return TRUE; |
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 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
567 |
} |
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 |
void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
570 |
lm_socket_setup_output_buffer (LmSocket *socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
571 |
const gchar *buffer, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
572 |
gint len) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
573 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
574 |
lm_verbose ("OUTPUT BUFFER ENABLED\n"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
575 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
576 |
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
|
577 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
578 |
socket->watch_out = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
579 |
lm_misc_add_io_watch (socket->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
580 |
socket->io_channel, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
581 |
G_IO_OUT, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
582 |
(GIOFunc) socket_buffered_write_cb, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
583 |
socket); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
584 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
585 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
586 |
static gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
587 |
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
|
588 |
GIOCondition condition, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
589 |
LmSocket *socket) |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
590 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
591 |
gint b_written; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
592 |
GString *out_buf; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
593 |
/* FIXME: Do the writing */ |
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 |
out_buf = socket->out_buf; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
596 |
if (!out_buf) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
597 |
/* Should not be possible */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
598 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
599 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
600 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
601 |
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
|
602 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
603 |
if (b_written < 0) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
604 |
_lm_connection_error_event (socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
605 |
G_IO_HUP, socket->connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
606 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
607 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
608 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
609 |
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
|
610 |
if (out_buf->len == 0) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
611 |
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
|
612 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
613 |
if (socket->watch_out) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
614 |
g_source_destroy (socket->watch_out); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
615 |
socket->watch_out = NULL; |
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 |
g_string_free (out_buf, TRUE); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
619 |
socket->out_buf = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
620 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
621 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
622 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
623 |
return TRUE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
624 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
625 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
626 |
static gboolean |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
627 |
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
|
628 |
int srv_len, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
629 |
gchar **out_server, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
630 |
guint *out_port) |
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
631 |
{ |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
632 |
int qdcount; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
633 |
int ancount; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
634 |
int len; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
635 |
const unsigned char *pos; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
636 |
unsigned char *end; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
637 |
HEADER *head; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
638 |
char name[256]; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
639 |
char pref_name[256]; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
640 |
guint pref_port = 0; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
641 |
guint pref_prio = 9999; |
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
642 |
|
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
643 |
pref_name[0] = 0; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
644 |
|
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
645 |
pos = srv + sizeof (HEADER); |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
646 |
end = srv + srv_len; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
647 |
head = (HEADER *) srv; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
648 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
649 |
qdcount = ntohs (head->qdcount); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
650 |
ancount = ntohs (head->ancount); |
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 |
/* Ignore the questions */ |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
653 |
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
|
654 |
g_assert (len >= 0); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
655 |
pos += len + QFIXEDSZ; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
656 |
} |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
657 |
|
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
658 |
/* Parse the answers */ |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
659 |
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
|
660 |
/* Ignore the initial string */ |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
661 |
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
|
662 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
663 |
g_assert (len >= 0); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
664 |
pos += len; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
665 |
/* Ignore type, ttl, class and dlen */ |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
666 |
pos += 10; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
667 |
GETSHORT (pref, pos); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
668 |
GETSHORT (weight, pos); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
669 |
GETSHORT (port, pos); |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
670 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
671 |
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
|
672 |
if (pref < pref_prio) { |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
673 |
pref_prio = pref; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
674 |
strcpy (pref_name, name); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
675 |
pref_port = port; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
676 |
} |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
677 |
pos += len; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
678 |
} |
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 |
if (pref_name[0]) { |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
681 |
*out_server = g_strdup (pref_name); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
682 |
*out_port = pref_port; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
683 |
return TRUE; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
684 |
} |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
685 |
return FALSE; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
686 |
} |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
687 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
688 |
LmSocket * |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
689 |
lm_socket_create (GMainContext *context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
690 |
IncomingDataFunc func, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
691 |
gpointer user_data, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
692 |
LmConnection *connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
693 |
gboolean blocking, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
694 |
const gchar *server, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
695 |
guint port, |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
696 |
gboolean use_srv, |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
697 |
LmSSL *ssl, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
698 |
LmProxy *proxy, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
699 |
GError **error) |
149 | 700 |
{ |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
701 |
LmSocket *socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
702 |
struct addrinfo req; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
703 |
struct addrinfo *ans; |
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
704 |
const char *remote_addr; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
705 |
LmConnectData *data; |
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
706 |
int err; |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
707 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
708 |
g_return_val_if_fail (server != NULL, NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
709 |
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
|
710 |
g_return_val_if_fail (func != NULL, NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
711 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
712 |
socket = g_new0 (LmSocket, 1); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
713 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
714 |
memset (&req, 0, sizeof(req)); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
715 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
716 |
req.ai_family = AF_UNSPEC; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
717 |
req.ai_socktype = SOCK_STREAM; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
718 |
req.ai_protocol = IPPROTO_TCP; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
719 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
720 |
socket->ref_count = 1; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
721 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
722 |
socket->connection = connection; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
723 |
socket->server = g_strdup (server); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
724 |
socket->port = port; |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
725 |
socket->use_srv = use_srv; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
726 |
socket->cancel_open = FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
727 |
socket->ssl = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
728 |
socket->proxy = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
729 |
socket->blocking = blocking; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
730 |
socket->func = func; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
731 |
socket->user_data = user_data; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
732 |
|
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
733 |
if (use_srv) { |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
734 |
char *srv; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
735 |
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
|
736 |
|
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
737 |
res_init (); |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
738 |
|
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
|
739 |
|
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
740 |
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
|
741 |
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
|
742 |
|
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
743 |
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
|
744 |
if (err > 0) { |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
745 |
gchar *new_server; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
746 |
guint new_port; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
747 |
gboolean result; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
748 |
|
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
749 |
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
|
750 |
&new_server, |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
751 |
&new_port); |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
752 |
if (result == TRUE) { |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
753 |
g_free (socket->server); |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
754 |
socket->server = new_server; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
755 |
socket->port = new_port; |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
756 |
} |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
757 |
} |
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
758 |
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
|
759 |
} 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
|
760 |
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
|
761 |
} |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
762 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
763 |
if (context) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
764 |
socket->context = g_main_context_ref (context); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
765 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
766 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
767 |
if (proxy) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
768 |
socket->proxy = lm_proxy_ref (proxy); |
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
769 |
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
|
770 |
} else { |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
771 |
remote_addr = socket->server; |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
772 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
773 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
774 |
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
|
775 |
"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
|
776 |
remote_addr, socket->port); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
777 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
778 |
err = getaddrinfo (remote_addr, NULL, &req, &ans); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
779 |
if (err != 0) { |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
780 |
const char *str; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
781 |
|
243
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
782 |
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
|
783 |
g_set_error (error, |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
784 |
LM_ERROR, |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
785 |
LM_ERROR_CONNECTION_FAILED, |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
786 |
str); |
fa0794ef3570
Implement SRV lookups, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
212
diff
changeset
|
787 |
return NULL; |
196
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 |
if (ssl) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
791 |
socket->ssl = lm_ssl_ref (ssl); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
792 |
_lm_ssl_initialize (socket->ssl); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
793 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
794 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
795 |
/* Prepare and do the nonblocking connection */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
796 |
data = g_new (LmConnectData, 1); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
797 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
798 |
data->socket = socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
799 |
data->connection = connection; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
800 |
data->resolved_addrs = ans; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
801 |
data->current_addr = ans; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
802 |
data->io_channel = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
803 |
data->fd = -1; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
804 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
805 |
socket->connect_data = data; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
806 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
807 |
if (!socket_do_connect (data)) { |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
808 |
g_set_error (error, |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
809 |
LM_ERROR, |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
810 |
LM_ERROR_CONNECTION_FAILED, |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
811 |
"unable to connect"); |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
812 |
return NULL; |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
813 |
} |
244
8a05b79bad24
Make use_srv optional in LmSocket and plugged a leak.
Mikael Hallendal <micke@imendio.com>
parents:
243
diff
changeset
|
814 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
815 |
return socket; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
816 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
817 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
818 |
void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
819 |
lm_socket_flush (LmSocket *socket) |
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 |
g_return_if_fail (socket != NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
822 |
g_return_if_fail (socket->io_channel != NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
823 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
824 |
g_io_channel_flush (socket->io_channel, NULL); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
825 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
826 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
827 |
void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
828 |
lm_socket_close (LmSocket *socket) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
829 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
830 |
LmConnectData *data; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
831 |
|
212
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
832 |
g_return_if_fail (socket != NULL); |
87bc6b37a9e9
Improved error checking in LmSocket when connecting.
Mikael Hallendal <micke@imendio.com>
parents:
202
diff
changeset
|
833 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
834 |
if (socket->watch_connect) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
835 |
g_source_destroy (socket->watch_connect); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
836 |
socket->watch_connect = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
837 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
838 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
839 |
data = socket->connect_data; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
840 |
if (data) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
841 |
freeaddrinfo (data->resolved_addrs); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
842 |
socket->connect_data = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
843 |
g_free (data); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
844 |
} |
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 |
if (socket->io_channel) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
847 |
if (socket->watch_in) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
848 |
g_source_destroy (socket->watch_in); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
849 |
socket->watch_in = 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_err) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
853 |
g_source_destroy (socket->watch_err); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
854 |
socket->watch_err = 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_hup) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
858 |
g_source_destroy (socket->watch_hup); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
859 |
socket->watch_hup = 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 |
if (socket->watch_out) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
863 |
g_source_destroy (socket->watch_out); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
864 |
socket->watch_out = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
865 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
866 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
867 |
g_io_channel_unref (socket->io_channel); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
868 |
socket->io_channel = NULL; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
869 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
870 |
socket->fd = -1; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
871 |
} |
149 | 872 |
} |
873 |
||
874 |
LmSocket * |
|
875 |
lm_socket_ref (LmSocket *socket) |
|
876 |
{ |
|
877 |
g_return_val_if_fail (socket != NULL, NULL); |
|
151 | 878 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
879 |
socket->ref_count++; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
880 |
|
149 | 881 |
return socket; |
882 |
} |
|
883 |
||
884 |
void |
|
885 |
lm_socket_unref (LmSocket *socket) |
|
886 |
{ |
|
887 |
g_return_if_fail (socket != NULL); |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
888 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
889 |
socket->ref_count--; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
890 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
161
diff
changeset
|
891 |
if (socket->ref_count <= 0) { |
149 | 892 |
socket_free (socket); |
147 | 893 |
} |
894 |
} |
|
149 | 895 |