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