author | Mikael Hallendal <micke@imendio.com> |
Sun, 30 Nov 2008 09:49:06 +0100 | |
changeset 574 | f84be3f7c7e0 |
parent 572 | 0a4fa0952ef6 |
permissions | -rw-r--r-- |
1 | 1 |
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ |
2 |
/* |
|
247
a519eff901e6
Slight code refactoring in _lm_connection_socket_result
Mikael Hallendal <micke@imendio.com>
parents:
245
diff
changeset
|
3 |
* Copyright (C) 2003-2007 Imendio AB |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
4 |
* Copyright (C) 2006 Nokia Corporation. All rights reserved. |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
5 |
* Copyright (C) 2007 Collabora Ltd. |
1 | 6 |
* |
7 |
* This program is free software; you can redistribute it and/or |
|
8 |
* modify it under the terms of the GNU Lesser General Public License as |
|
9 |
* published by the Free Software Foundation; either version 2 of the |
|
10 |
* License, or (at your option) any later version. |
|
11 |
* |
|
12 |
* This program is distributed in the hope that it will be useful, |
|
13 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
14 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
15 |
* Lesser General Public License for more details. |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU Lesser General Public |
|
18 |
* License along with this program; if not, write to the |
|
19 |
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|
20 |
* Boston, MA 02111-1307, USA. |
|
21 |
*/ |
|
22 |
||
23 |
#include <config.h> |
|
24 |
||
12
fc5e71b1369c
2003-07-07 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
9
diff
changeset
|
25 |
#include <string.h> |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
26 |
#include <sys/stat.h> |
12
fc5e71b1369c
2003-07-07 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
9
diff
changeset
|
27 |
#include <sys/types.h> |
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
28 |
#include <fcntl.h> |
337
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
29 |
|
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
30 |
/* Needed on Mac OS X */ |
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
31 |
#if HAVE_NETINET_IN_H |
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
32 |
#include <netinet/in.h> |
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
33 |
#endif |
7bc0c6ad11ff
Fixes LM-118 so that building on Mac OS X works again.
Richard Hult <richard@imendio.com>
parents:
324
diff
changeset
|
34 |
|
271
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
35 |
#include <arpa/nameser.h> |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
36 |
#include <resolv.h> |
9
2e14e3ab411b
2003-06-24 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
7
diff
changeset
|
37 |
|
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
38 |
#include <glib.h> |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
39 |
|
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
40 |
#include "lm-sock.h" |
1 | 41 |
#include "lm-debug.h" |
42 |
#include "lm-error.h" |
|
43 |
#include "lm-internals.h" |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
44 |
#include "lm-message-queue.h" |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
45 |
#include "lm-misc.h" |
137
18785575aa7a
2006-04-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
133
diff
changeset
|
46 |
#include "lm-ssl-internals.h" |
1 | 47 |
#include "lm-parser.h" |
48 |
#include "lm-sha.h" |
|
49 |
#include "lm-connection.h" |
|
155
d24c4392d4e3
2006-06-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
153
diff
changeset
|
50 |
#include "lm-utils.h" |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
51 |
#include "lm-socket.h" |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
52 |
#include "lm-sasl.h" |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
53 |
|
271
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
54 |
#define IN_BUFFER_SIZE 1024 |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
55 |
#define SRV_LEN 8192 |
1 | 56 |
|
57 |
typedef struct { |
|
58 |
LmHandlerPriority priority; |
|
59 |
LmMessageHandler *handler; |
|
60 |
} HandlerData; |
|
61 |
||
62 |
struct _LmConnection { |
|
63 |
/* Parameters */ |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
64 |
GMainContext *context; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
65 |
gchar *server; |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
66 |
gchar *jid; |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
67 |
gchar *effective_jid; |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
68 |
guint port; |
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
69 |
gboolean use_srv; |
1 | 70 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
71 |
LmSocket *socket; |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
72 |
LmSSL *ssl; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
73 |
LmProxy *proxy; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
74 |
LmParser *parser; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
75 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
76 |
gchar *stream_id; |
1 | 77 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
78 |
GHashTable *id_handlers; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
79 |
GSList *handlers[LM_MESSAGE_TYPE_UNKNOWN]; |
1 | 80 |
|
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
81 |
/* XMPP1.0 stuff (SASL, resource binding, StartTLS) */ |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
82 |
gboolean use_sasl; |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
83 |
LmSASL *sasl; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
84 |
gchar *resource; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
85 |
LmMessageHandler *features_cb; |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
86 |
LmMessageHandler *starttls_cb; |
317
e7ceb196a573
Don't require StartTLS after it's already been started.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
316
diff
changeset
|
87 |
gboolean tls_started; |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
88 |
|
1 | 89 |
/* Communication */ |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
90 |
guint open_id; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
91 |
LmCallback *open_cb; |
1 | 92 |
|
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
93 |
gboolean async_connect_waiting; |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
94 |
gboolean blocking; |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
95 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
96 |
gboolean cancel_open; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
97 |
LmCallback *auth_cb; |
1 | 98 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
99 |
LmCallback *disconnect_cb; |
1 | 100 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
101 |
LmMessageQueue *queue; |
1 | 102 |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
103 |
LmConnectionState state; |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
104 |
|
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
105 |
guint keep_alive_rate; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
106 |
GSource *keep_alive_source; |
184
4e16d32b2410
2006-10-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
181
diff
changeset
|
107 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
108 |
gint ref_count; |
1 | 109 |
}; |
110 |
||
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
111 |
typedef enum { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
112 |
AUTH_TYPE_PLAIN = 1, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
113 |
AUTH_TYPE_DIGEST = 2, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
114 |
AUTH_TYPE_0K = 4 |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
115 |
} AuthType; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
116 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
117 |
#define XMPP_NS_BIND "urn:ietf:params:xml:ns:xmpp-bind" |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
118 |
#define XMPP_NS_SESSION "urn:ietf:params:xml:ns:xmpp-session" |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
119 |
#define XMPP_NS_STARTTLS "urn:ietf:params:xml:ns:xmpp-tls" |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
120 |
|
1 | 121 |
static void connection_free (LmConnection *connection); |
122 |
||
123 |
||
124 |
static void connection_handle_message (LmConnection *connection, |
|
125 |
LmMessage *message); |
|
126 |
||
127 |
static void connection_new_message_cb (LmParser *parser, |
|
128 |
LmMessage *message, |
|
129 |
LmConnection *connection); |
|
57
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
130 |
static gboolean connection_do_open (LmConnection *connection, |
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
131 |
GError **error); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
132 |
void connection_do_close (LmConnection *connection); |
1 | 133 |
|
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
134 |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
135 |
static LmMessage * connection_create_auth_req_msg (const gchar *username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
136 |
static LmMessage * connection_create_auth_msg (LmConnection *connection, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
137 |
const gchar *username, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
138 |
const gchar *password, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
139 |
const gchar *resource, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
140 |
gint auth_type); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
141 |
static LmHandlerResult connection_auth_req_reply (LmMessageHandler *handler, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
142 |
LmConnection *connection, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
143 |
LmMessage *m, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
144 |
gpointer user_data); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
145 |
static int connection_check_auth_type (LmMessage *auth_req_rpl); |
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
146 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
147 |
static LmHandlerResult |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
148 |
connection_auth_reply (LmMessageHandler *handler, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
149 |
LmConnection *connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
150 |
LmMessage *m, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
151 |
gpointer user_data); |
1 | 152 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
153 |
static void connection_stream_received (LmConnection *connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
154 |
LmMessage *m); |
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
155 |
static void connection_stream_error (LmConnection *connection, |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
156 |
LmMessage *m); |
1 | 157 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
158 |
static gint connection_handler_compare_func (HandlerData *a, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
159 |
HandlerData *b); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
160 |
static gboolean connection_send_keep_alive (LmConnection *connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
161 |
static void connection_start_keep_alive (LmConnection *connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
162 |
static void connection_stop_keep_alive (LmConnection *connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
163 |
static gboolean connection_send (LmConnection *connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
164 |
const gchar *str, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
165 |
gint len, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
166 |
GError **error); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
167 |
static void connection_message_queue_cb (LmMessageQueue *queue, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
168 |
LmConnection *connection); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
169 |
static void connection_signal_disconnect (LmConnection *connection, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
170 |
LmDisconnectReason reason); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
171 |
static void connection_incoming_data (LmSocket *socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
172 |
const gchar *buf, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
173 |
LmConnection *connection); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
174 |
static void connection_socket_closed_cb (LmSocket *socket, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
175 |
LmDisconnectReason reason, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
176 |
LmConnection *connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
177 |
static void connection_socket_connect_cb (LmSocket *socket, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
178 |
gboolean result, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
179 |
LmConnection *connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
180 |
|
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
181 |
static gboolean connection_get_server_from_jid (const gchar *jid, |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
182 |
gchar **server); |
248
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
183 |
static void connection_send_stream_header (LmConnection *connection); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
184 |
static LmHandlerResult connection_features_cb (LmMessageHandler *handler, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
185 |
LmConnection *connection, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
186 |
LmMessage *message, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
187 |
gpointer user_data); |
1 | 188 |
|
189 |
static void |
|
190 |
connection_free (LmConnection *connection) |
|
191 |
{ |
|
115
f2a921e232e5
2005-04-24 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
114
diff
changeset
|
192 |
int i; |
43
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
193 |
|
574
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
194 |
/* This needs to be run before starting to free internal states. |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
195 |
* It used to be run after the handlers where freed which lead to a |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
196 |
* crash when the connection was freed prior to running |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
197 |
* lm_connection_close. |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
198 |
*/ |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
199 |
if (connection->state >= LM_CONNECTION_STATE_OPENING) { |
f84be3f7c7e0
fixed the coding style
Mikael Hallendal <micke@imendio.com>
parents:
572
diff
changeset
|
200 |
connection_do_close (connection); |
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
201 |
} |
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
202 |
|
1 | 203 |
g_free (connection->server); |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
204 |
g_free (connection->jid); |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
205 |
g_free (connection->effective_jid); |
230
8acc59cf04ea
Free stream_id when freeing the connection.
Mikael Hallendal <micke@imendio.com>
parents:
226
diff
changeset
|
206 |
g_free (connection->stream_id); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
207 |
g_free (connection->resource); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
208 |
|
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
209 |
if (connection->sasl) { |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
210 |
lm_sasl_free (connection->sasl); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
211 |
} |
1 | 212 |
|
153
b2324df84971
2006-06-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
143
diff
changeset
|
213 |
if (connection->parser) { |
b2324df84971
2006-06-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
143
diff
changeset
|
214 |
lm_parser_free (connection->parser); |
b2324df84971
2006-06-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
143
diff
changeset
|
215 |
} |
b2324df84971
2006-06-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
143
diff
changeset
|
216 |
|
43
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
217 |
/* Unref handlers */ |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
218 |
for (i = 0; i < LM_MESSAGE_TYPE_UNKNOWN; ++i) { |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
219 |
GSList *l; |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
220 |
|
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
221 |
for (l = connection->handlers[i]; l; l = l->next) { |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
222 |
HandlerData *hd = (HandlerData *) l->data; |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
223 |
|
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
224 |
lm_message_handler_unref (hd->handler); |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
225 |
g_free (hd); |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
226 |
} |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
227 |
|
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
228 |
g_slist_free (connection->handlers[i]); |
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
229 |
} |
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
230 |
g_hash_table_destroy (connection->id_handlers); |
43
66ff4339e06e
2003-10-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
40
diff
changeset
|
231 |
|
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
232 |
if (connection->open_cb) { |
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
233 |
_lm_utils_free_callback (connection->open_cb); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
234 |
} |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
235 |
|
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
236 |
if (connection->auth_cb) { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
237 |
_lm_utils_free_callback (connection->auth_cb); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
238 |
} |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
239 |
|
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
240 |
lm_connection_set_disconnect_function (connection, NULL, NULL, NULL); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
241 |
|
211
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
242 |
if (connection->proxy) { |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
243 |
lm_proxy_unref (connection->proxy); |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
244 |
} |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
245 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
246 |
lm_message_queue_unref (connection->queue); |
115
f2a921e232e5
2005-04-24 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
114
diff
changeset
|
247 |
|
128
a1f41ebde5c4
2005-08-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
126
diff
changeset
|
248 |
if (connection->context) { |
a1f41ebde5c4
2005-08-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
126
diff
changeset
|
249 |
g_main_context_unref (connection->context); |
a1f41ebde5c4
2005-08-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
126
diff
changeset
|
250 |
} |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
251 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
252 |
if (connection->socket) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
253 |
lm_socket_unref (connection->socket); |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
254 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
255 |
|
128
a1f41ebde5c4
2005-08-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
126
diff
changeset
|
256 |
g_free (connection); |
1 | 257 |
} |
258 |
||
259 |
static void |
|
260 |
connection_handle_message (LmConnection *connection, LmMessage *m) |
|
261 |
{ |
|
262 |
LmMessageHandler *handler; |
|
263 |
GSList *l; |
|
264 |
const gchar *id; |
|
265 |
LmHandlerResult result = LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
|
266 |
||
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
267 |
lm_connection_ref (connection); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
268 |
|
1 | 269 |
if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM) { |
270 |
connection_stream_received (connection, m); |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
271 |
goto out; |
1 | 272 |
} |
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
273 |
|
514
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
274 |
id = lm_message_node_get_attribute (m->node, "id"); |
294
bd0b7673bc4a
Properly check if the message is error/reply before calling the reply handler.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
292
diff
changeset
|
275 |
|
514
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
276 |
if (id) { |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
277 |
handler = g_hash_table_lookup (connection->id_handlers, id); |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
278 |
if (handler) { |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
279 |
result = _lm_message_handler_handle_message (handler, |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
280 |
connection, |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
281 |
m); |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
282 |
g_hash_table_remove (connection->id_handlers, |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
283 |
id); |
1 | 284 |
} |
514
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
285 |
} |
294
bd0b7673bc4a
Properly check if the message is error/reply before calling the reply handler.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
292
diff
changeset
|
286 |
|
514
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
287 |
if (result == LM_HANDLER_RESULT_REMOVE_MESSAGE) { |
31d914756fde
Allow replies to non-iq stanzas. [#22]
Frank Zschockelt <lm@freakysoft.de>
parents:
511
diff
changeset
|
288 |
goto out; |
1 | 289 |
} |
290 |
||
291 |
for (l = connection->handlers[lm_message_get_type (m)]; |
|
292 |
l && result == LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
|
293 |
l = l->next) { |
|
294 |
HandlerData *hd = (HandlerData *) l->data; |
|
295 |
||
296 |
result = _lm_message_handler_handle_message (hd->handler, |
|
297 |
connection, |
|
298 |
m); |
|
299 |
} |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
300 |
|
311
153357413e1b
Allow application handlers on stream errors, before closing down the connection.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
308
diff
changeset
|
301 |
if (lm_message_get_type (m) == LM_MESSAGE_TYPE_STREAM_ERROR) { |
153357413e1b
Allow application handlers on stream errors, before closing down the connection.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
308
diff
changeset
|
302 |
connection_stream_error (connection, m); |
153357413e1b
Allow application handlers on stream errors, before closing down the connection.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
308
diff
changeset
|
303 |
goto out; |
153357413e1b
Allow application handlers on stream errors, before closing down the connection.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
308
diff
changeset
|
304 |
} |
153357413e1b
Allow application handlers on stream errors, before closing down the connection.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
308
diff
changeset
|
305 |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
306 |
out: |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
307 |
lm_connection_unref (connection); |
1 | 308 |
|
309 |
return; |
|
310 |
} |
|
311 |
||
312 |
static void |
|
313 |
connection_new_message_cb (LmParser *parser, |
|
314 |
LmMessage *m, |
|
315 |
LmConnection *connection) |
|
316 |
{ |
|
100
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
317 |
const gchar *from; |
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
318 |
|
1 | 319 |
lm_message_ref (m); |
320 |
||
100
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
321 |
from = lm_message_node_get_attribute (m->node, "from"); |
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
322 |
if (!from) { |
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
323 |
from = "unknown"; |
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
324 |
} |
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
325 |
|
1 | 326 |
lm_verbose ("New message with type=\"%s\" from: %s\n", |
327 |
_lm_message_type_to_string (lm_message_get_type (m)), |
|
100
2b2a0caf1b3a
2004-10-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
99
diff
changeset
|
328 |
from); |
1 | 329 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
330 |
lm_message_queue_push_tail (connection->queue, m); |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
331 |
} |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
332 |
|
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
333 |
static gboolean |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
334 |
connection_send_keep_alive (LmConnection *connection) |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
335 |
{ |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
336 |
if (!connection_send (connection, " ", -1, NULL)) { |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
337 |
lm_verbose ("Error while sending keep alive package!\n"); |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
338 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
339 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
340 |
return TRUE; |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
341 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
342 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
343 |
static void |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
344 |
connection_start_keep_alive (LmConnection *connection) |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
345 |
{ |
468
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
346 |
/* try using TCP keepalives if possible */ |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
347 |
if ((connection->keep_alive_rate > 0) && |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
348 |
lm_socket_set_keepalive (connection->socket, |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
349 |
connection->keep_alive_rate)) { |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
350 |
#ifdef ONLY_TCP_KEEP_ALIVE |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
351 |
/* Many NAT firewalls seems to not handle this correctly and |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
352 |
* will disconnect the clients */ |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
353 |
return; |
ca6cce100797
Changed so that normal XMPP "pings" are always sent when keep alive is enabled.
Mikael Hallendal <micke@imendio.com>
parents:
394
diff
changeset
|
354 |
#endif /* ONLY_TCP_KEEP_ALIVE */ |
345 | 355 |
} |
292
bb7269466be2
Use TCP keepalives on Linux if available; if not, fallback to manual keepalives.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
291
diff
changeset
|
356 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
357 |
if (connection->keep_alive_source) { |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
358 |
connection_stop_keep_alive (connection); |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
359 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
360 |
|
93
903382d1c95d
2004-08-30 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
91
diff
changeset
|
361 |
if (connection->keep_alive_rate > 0) { |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
362 |
connection->keep_alive_source = |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
363 |
lm_misc_add_timeout (connection->context, |
341
f44b206faf54
Fixed the keep alive rate when using TCP for handling keep alive. Fixes LM-121.
Mikael Hallendal <micke@imendio.com>
parents:
340
diff
changeset
|
364 |
connection->keep_alive_rate * 1000, |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
365 |
(GSourceFunc) connection_send_keep_alive, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
366 |
connection); |
93
903382d1c95d
2004-08-30 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
91
diff
changeset
|
367 |
} |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
368 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
369 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
370 |
static void |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
371 |
connection_stop_keep_alive (LmConnection *connection) |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
372 |
{ |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
373 |
if (connection->keep_alive_source) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
374 |
g_source_destroy (connection->keep_alive_source); |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
375 |
} |
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
376 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
377 |
connection->keep_alive_source = NULL; |
1 | 378 |
} |
379 |
||
380 |
static gboolean |
|
381 |
connection_send (LmConnection *connection, |
|
382 |
const gchar *str, |
|
383 |
gint len, |
|
384 |
GError **error) |
|
385 |
{ |
|
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
386 |
gint b_written; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
387 |
|
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
388 |
if (connection->state < LM_CONNECTION_STATE_OPENING) { |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
389 |
g_log (LM_LOG_DOMAIN,LM_LOG_LEVEL_NET, |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
390 |
"Connection is not open.\n"); |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
391 |
|
1 | 392 |
g_set_error (error, |
393 |
LM_ERROR, |
|
394 |
LM_ERROR_CONNECTION_NOT_OPEN, |
|
395 |
"Connection is not open, call lm_connection_open() first"); |
|
396 |
return FALSE; |
|
397 |
} |
|
398 |
||
399 |
if (len == -1) { |
|
400 |
len = strlen (str); |
|
401 |
} |
|
402 |
||
403 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "\nSEND:\n"); |
|
404 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, |
|
405 |
"-----------------------------------\n"); |
|
406 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, "%s\n", str); |
|
407 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_NET, |
|
408 |
"-----------------------------------\n"); |
|
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
409 |
|
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
410 |
/* Check to see if there already is an output buffer, if so, add to the |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
411 |
buffer and return */ |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
412 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
413 |
if (lm_socket_output_is_buffered (connection->socket, str, len)) { |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
414 |
return TRUE; |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
415 |
} |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
416 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
417 |
b_written = lm_socket_do_write (connection->socket, str, len); |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
418 |
|
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
419 |
if (b_written < 0) { |
283
b77f6cfe229e
lm-connection.c: connection_send(): in case of error, properly set the error variable
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
281
diff
changeset
|
420 |
g_set_error (error, |
b77f6cfe229e
lm-connection.c: connection_send(): in case of error, properly set the error variable
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
281
diff
changeset
|
421 |
LM_ERROR, |
b77f6cfe229e
lm-connection.c: connection_send(): in case of error, properly set the error variable
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
281
diff
changeset
|
422 |
LM_ERROR_CONNECTION_FAILED, |
b77f6cfe229e
lm-connection.c: connection_send(): in case of error, properly set the error variable
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
281
diff
changeset
|
423 |
"Server closed the connection"); |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
424 |
return FALSE; |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
425 |
} |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
426 |
|
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
427 |
if (b_written < len) { |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
428 |
lm_socket_setup_output_buffer (connection->socket, |
133
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
429 |
str + b_written, |
f7522d7ed6dc
2006-04-03 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
132
diff
changeset
|
430 |
len - b_written); |
15
1ff2f81867e1
2003-07-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
12
diff
changeset
|
431 |
} |
1 | 432 |
|
433 |
return TRUE; |
|
434 |
} |
|
435 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
436 |
static void |
249 | 437 |
connection_message_queue_cb (LmMessageQueue *queue, LmConnection *connection) |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
438 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
439 |
LmMessage *m; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
440 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
441 |
m = lm_message_queue_pop_nth (connection->queue, 0); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
442 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
443 |
if (m) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
444 |
connection_handle_message (connection, m); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
445 |
lm_message_unref (m); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
446 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
447 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
448 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
449 |
/* Returns directly */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
450 |
/* Setups all data needed to start the connection attempts */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
451 |
static gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
452 |
connection_do_open (LmConnection *connection, GError **error) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
453 |
{ |
281
4e0421c44a73
Fixed a leak in extracting the domain name from the jid.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
275
diff
changeset
|
454 |
gchar *domain = NULL; |
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
455 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
456 |
if (lm_connection_is_open (connection)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
457 |
g_set_error (error, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
458 |
LM_ERROR, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
459 |
LM_ERROR_CONNECTION_NOT_OPEN, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
460 |
"Connection is already open, call lm_connection_close() first"); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
461 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
462 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
463 |
|
275
37937c612f62
Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents:
274
diff
changeset
|
464 |
if (!connection_get_server_from_jid (connection->jid, &domain)) { |
327
2372eec7b179
connection_do_open: behave nicely if jid isn't set (1.2.x also behaves this way)
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
324
diff
changeset
|
465 |
domain = g_strdup (connection->server); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
466 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
467 |
|
345 | 468 |
lm_verbose ("Connecting to: %s:%d\n", connection->server, connection->port); |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
469 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
470 |
connection->socket = lm_socket_create (connection->context, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
471 |
(IncomingDataFunc) connection_incoming_data, |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
472 |
(SocketClosedFunc) connection_socket_closed_cb, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
473 |
(ConnectResultFunc) connection_socket_connect_cb, |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
474 |
connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
475 |
connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
476 |
connection->blocking, |
275
37937c612f62
Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents:
274
diff
changeset
|
477 |
connection->server, |
37937c612f62
Made SRV handling more sane, and implemented fallback using jid domain name.
Senko Rasic <senko@phyrexia.(none)>
parents:
274
diff
changeset
|
478 |
domain, |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
479 |
connection->port, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
480 |
connection->ssl, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
481 |
connection->proxy, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
482 |
error); |
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
483 |
|
281
4e0421c44a73
Fixed a leak in extracting the domain name from the jid.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
275
diff
changeset
|
484 |
g_free (domain); |
4e0421c44a73
Fixed a leak in extracting the domain name from the jid.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
275
diff
changeset
|
485 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
486 |
if (!connection->socket) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
487 |
return FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
488 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
489 |
|
344
11473296fea5
Return FALSE from lm_connection_open in the synchronous case instead of open callback
Owen Taylor <otaylor@redhat.com>
parents:
341
diff
changeset
|
490 |
lm_message_queue_attach (connection->queue, connection->context); |
11473296fea5
Return FALSE from lm_connection_open in the synchronous case instead of open callback
Owen Taylor <otaylor@redhat.com>
parents:
341
diff
changeset
|
491 |
|
11473296fea5
Return FALSE from lm_connection_open in the synchronous case instead of open callback
Owen Taylor <otaylor@redhat.com>
parents:
341
diff
changeset
|
492 |
connection->state = LM_CONNECTION_STATE_OPENING; |
11473296fea5
Return FALSE from lm_connection_open in the synchronous case instead of open callback
Owen Taylor <otaylor@redhat.com>
parents:
341
diff
changeset
|
493 |
connection->async_connect_waiting = FALSE; |
11473296fea5
Return FALSE from lm_connection_open in the synchronous case instead of open callback
Owen Taylor <otaylor@redhat.com>
parents:
341
diff
changeset
|
494 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
495 |
return TRUE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
496 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
497 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
498 |
void |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
499 |
connection_do_close (LmConnection *connection) |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
500 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
501 |
connection_stop_keep_alive (connection); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
502 |
|
211
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
503 |
if (connection->socket) { |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
504 |
lm_socket_close (connection->socket); |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
505 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
506 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
507 |
lm_message_queue_detach (connection->queue); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
508 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
509 |
if (!lm_connection_is_open (connection)) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
510 |
/* lm_connection_is_open is FALSE for state OPENING as well */ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
511 |
connection->state = LM_CONNECTION_STATE_CLOSED; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
512 |
connection->async_connect_waiting = FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
513 |
return; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
514 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
515 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
516 |
connection->state = LM_CONNECTION_STATE_CLOSED; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
517 |
connection->async_connect_waiting = FALSE; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
518 |
if (connection->ssl) { |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
519 |
_lm_ssl_close (connection->ssl); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
520 |
} |
324
4b06b1173262
Properly clean up SASL context on disconnect, allowing connection object reuse.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
323
diff
changeset
|
521 |
|
4b06b1173262
Properly clean up SASL context on disconnect, allowing connection object reuse.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
323
diff
changeset
|
522 |
if (connection->sasl) { |
4b06b1173262
Properly clean up SASL context on disconnect, allowing connection object reuse.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
323
diff
changeset
|
523 |
lm_sasl_free (connection->sasl); |
4b06b1173262
Properly clean up SASL context on disconnect, allowing connection object reuse.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
323
diff
changeset
|
524 |
connection->sasl = NULL; |
4b06b1173262
Properly clean up SASL context on disconnect, allowing connection object reuse.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
323
diff
changeset
|
525 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
526 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
527 |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
528 |
typedef struct { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
529 |
gchar *username; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
530 |
gchar *password; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
531 |
gchar *resource; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
532 |
} AuthReqData; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
533 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
534 |
static void |
345 | 535 |
auth_req_data_free (AuthReqData *data) |
536 |
{ |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
537 |
g_free (data->username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
538 |
g_free (data->password); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
539 |
g_free (data->resource); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
540 |
g_free (data); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
541 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
542 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
543 |
static LmMessage * |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
544 |
connection_create_auth_req_msg (const gchar *username) |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
545 |
{ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
546 |
LmMessage *m; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
547 |
LmMessageNode *q_node; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
548 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
549 |
m = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
550 |
LM_MESSAGE_SUB_TYPE_GET); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
551 |
q_node = lm_message_node_add_child (m->node, "query", NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
552 |
lm_message_node_set_attributes (q_node, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
553 |
"xmlns", "jabber:iq:auth", |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
554 |
NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
555 |
lm_message_node_add_child (q_node, "username", username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
556 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
557 |
return m; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
558 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
559 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
560 |
static LmMessage * |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
561 |
connection_create_auth_msg (LmConnection *connection, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
562 |
const gchar *username, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
563 |
const gchar *password, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
564 |
const gchar *resource, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
565 |
gint auth_type) |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
566 |
{ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
567 |
LmMessage *auth_msg; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
568 |
LmMessageNode *q_node; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
569 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
570 |
auth_msg = lm_message_new_with_sub_type (NULL, LM_MESSAGE_TYPE_IQ, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
571 |
LM_MESSAGE_SUB_TYPE_SET); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
572 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
573 |
q_node = lm_message_node_add_child (auth_msg->node, "query", NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
574 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
575 |
lm_message_node_set_attributes (q_node, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
576 |
"xmlns", "jabber:iq:auth", |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
577 |
NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
578 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
579 |
lm_message_node_add_child (q_node, "username", username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
580 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
581 |
if (auth_type & AUTH_TYPE_0K) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
582 |
lm_verbose ("Using 0k auth (not implemented yet)\n"); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
583 |
/* TODO: Should probably use this? */ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
584 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
585 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
586 |
if (auth_type & AUTH_TYPE_DIGEST) { |
496
76a465d81893
Make lm_sha_hash thread safe. Fixes LM-64
Andreas Köhler <andi5.py@gmx.net>
parents:
468
diff
changeset
|
587 |
gchar *str; |
76a465d81893
Make lm_sha_hash thread safe. Fixes LM-64
Andreas Köhler <andi5.py@gmx.net>
parents:
468
diff
changeset
|
588 |
gchar *digest; |
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
589 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
590 |
lm_verbose ("Using digest\n"); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
591 |
str = g_strconcat (connection->stream_id, password, NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
592 |
digest = lm_sha_hash (str); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
593 |
g_free (str); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
594 |
lm_message_node_add_child (q_node, "digest", digest); |
496
76a465d81893
Make lm_sha_hash thread safe. Fixes LM-64
Andreas Köhler <andi5.py@gmx.net>
parents:
468
diff
changeset
|
595 |
g_free (digest); |
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
596 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
597 |
else if (auth_type & AUTH_TYPE_PLAIN) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
598 |
lm_verbose ("Using plaintext auth\n"); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
599 |
lm_message_node_add_child (q_node, "password", password); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
600 |
} else { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
601 |
/* TODO: Report error somehow */ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
602 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
603 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
604 |
lm_message_node_add_child (q_node, "resource", resource); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
605 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
606 |
return auth_msg; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
607 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
608 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
609 |
static LmHandlerResult |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
610 |
connection_auth_req_reply (LmMessageHandler *handler, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
611 |
LmConnection *connection, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
612 |
LmMessage *m, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
613 |
gpointer user_data) |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
614 |
{ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
615 |
int auth_type; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
616 |
LmMessage *auth_msg; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
617 |
LmMessageHandler *auth_handler; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
618 |
AuthReqData *data = (AuthReqData *) user_data; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
619 |
gboolean result; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
620 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
621 |
auth_type = connection_check_auth_type (m); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
622 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
623 |
auth_msg = connection_create_auth_msg (connection, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
624 |
data->username, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
625 |
data->password, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
626 |
data->resource, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
627 |
auth_type); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
628 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
629 |
auth_handler = lm_message_handler_new (connection_auth_reply, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
630 |
NULL, NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
631 |
result = lm_connection_send_with_reply (connection, auth_msg, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
632 |
auth_handler, NULL); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
633 |
lm_message_handler_unref (auth_handler); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
634 |
lm_message_unref (auth_msg); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
635 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
636 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
637 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
638 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
639 |
static int |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
640 |
connection_check_auth_type (LmMessage *auth_req_rpl) |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
641 |
{ |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
642 |
LmMessageNode *q_node; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
643 |
gint ret_val = 0; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
644 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
645 |
q_node = lm_message_node_get_child (auth_req_rpl->node, "query"); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
646 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
647 |
if (!q_node) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
648 |
return AUTH_TYPE_PLAIN; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
649 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
650 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
651 |
if (lm_message_node_get_child (q_node, "password")) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
652 |
ret_val |= AUTH_TYPE_PLAIN; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
653 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
654 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
655 |
if (lm_message_node_get_child (q_node, "digest")) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
656 |
ret_val |= AUTH_TYPE_DIGEST; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
657 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
658 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
659 |
if (lm_message_node_get_child (q_node, "sequence") && |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
660 |
lm_message_node_get_child (q_node, "token")) { |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
661 |
ret_val |= AUTH_TYPE_0K; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
662 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
663 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
664 |
return ret_val; |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
665 |
} |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
666 |
|
1 | 667 |
static LmHandlerResult |
668 |
connection_auth_reply (LmMessageHandler *handler, |
|
669 |
LmConnection *connection, |
|
670 |
LmMessage *m, |
|
671 |
gpointer user_data) |
|
672 |
{ |
|
673 |
const gchar *type; |
|
674 |
gboolean result = TRUE; |
|
675 |
||
676 |
g_return_val_if_fail (connection != NULL, |
|
677 |
LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS); |
|
678 |
||
679 |
||
680 |
type = lm_message_node_get_attribute (m->node, "type"); |
|
681 |
if (strcmp (type, "result") == 0) { |
|
682 |
result = TRUE; |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
683 |
connection->state = LM_CONNECTION_STATE_AUTHENTICATED; |
1 | 684 |
} |
685 |
else if (strcmp (type, "error") == 0) { |
|
686 |
result = FALSE; |
|
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
687 |
connection->state = LM_CONNECTION_STATE_OPEN; |
1 | 688 |
} |
689 |
||
690 |
lm_verbose ("AUTH reply: %d\n", result); |
|
691 |
||
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
692 |
if (connection->auth_cb) { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
693 |
LmCallback *cb = connection->auth_cb; |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
694 |
|
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
695 |
connection->auth_cb = NULL; |
1 | 696 |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
697 |
if (cb->func) { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
698 |
(* ((LmResultFunction) cb->func)) (connection, |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
699 |
result, cb->user_data); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
700 |
} |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
701 |
|
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
702 |
_lm_utils_free_callback (cb); |
1 | 703 |
} |
704 |
||
705 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
706 |
} |
|
707 |
||
708 |
||
320
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
709 |
static LmHandlerResult |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
710 |
_lm_connection_starttls_cb (LmMessageHandler *handler, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
711 |
LmConnection *connection, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
712 |
LmMessage *message, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
713 |
gpointer user_data) |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
714 |
{ |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
715 |
if (lm_socket_starttls (connection->socket)) { |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
716 |
connection->tls_started = TRUE; |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
717 |
connection_send_stream_header (connection); |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
718 |
} else { |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
719 |
connection_do_close (connection); |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
720 |
connection_signal_disconnect (connection, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
721 |
LM_DISCONNECT_REASON_ERROR); |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
722 |
} |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
723 |
|
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
724 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
725 |
} |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
726 |
|
1 | 727 |
static void |
728 |
connection_stream_received (LmConnection *connection, LmMessage *m) |
|
729 |
{ |
|
730 |
gboolean result; |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
731 |
const char *xmpp_version; |
1 | 732 |
|
733 |
g_return_if_fail (connection != NULL); |
|
734 |
g_return_if_fail (m != NULL); |
|
735 |
||
736 |
connection->stream_id = g_strdup (lm_message_node_get_attribute (m->node, |
|
737 |
"id"));; |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
738 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
739 |
xmpp_version = lm_message_node_get_attribute (m->node, "version"); |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
740 |
if (xmpp_version && strcmp (xmpp_version, "1.0") == 0) { |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
741 |
lm_verbose ("XMPP 1.0 stream received: %s\n", |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
742 |
connection->stream_id); |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
743 |
|
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
744 |
connection->use_sasl = TRUE; |
255
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
745 |
|
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
746 |
/* stream is started multiple times, but we only want |
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
747 |
* one sasl mechanism */ |
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
748 |
if (!connection->sasl) |
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
749 |
connection->sasl = lm_sasl_new(connection); |
320
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
750 |
|
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
751 |
/* if we'd like to use tls and we didn't already start |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
752 |
* it, prepare for it now */ |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
753 |
if (connection->ssl && |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
754 |
lm_ssl_get_use_starttls (connection->ssl) && |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
755 |
!connection->starttls_cb) { |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
756 |
connection->starttls_cb = |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
757 |
lm_message_handler_new (_lm_connection_starttls_cb, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
758 |
NULL, NULL); |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
759 |
lm_connection_register_message_handler (connection, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
760 |
connection->starttls_cb, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
761 |
LM_MESSAGE_TYPE_PROCEED, |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
762 |
LM_HANDLER_PRIORITY_FIRST); |
02b814ccc535
Register starttls handler at the proper moment, when the stream is received.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
317
diff
changeset
|
763 |
} |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
764 |
} else { |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
765 |
lm_verbose ("Old Jabber stream received: %s\n", |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
766 |
connection->stream_id); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
767 |
} |
1 | 768 |
|
345 | 769 |
if (connection->state < LM_CONNECTION_STATE_OPEN) { |
323
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
770 |
connection->state = LM_CONNECTION_STATE_OPEN; |
345 | 771 |
} |
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
772 |
|
1 | 773 |
/* Check to see if the stream is correctly set up */ |
774 |
result = TRUE; |
|
775 |
||
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
776 |
connection_start_keep_alive (connection); |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
777 |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
778 |
if (connection->open_cb) { |
1 | 779 |
LmCallback *cb = connection->open_cb; |
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
780 |
|
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
781 |
connection->open_cb = NULL; |
1 | 782 |
|
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
783 |
if (cb->func) { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
784 |
(* ((LmResultFunction) cb->func)) (connection, result, |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
785 |
cb->user_data); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
786 |
} |
210
96b01140c00c
Free open_cb correctly in connection_stream_received.
Mikael Hallendal <micke@imendio.com>
parents:
207
diff
changeset
|
787 |
_lm_utils_free_callback (cb); |
1 | 788 |
} |
789 |
} |
|
790 |
||
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
791 |
static void |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
792 |
connection_stream_error (LmConnection *connection, LmMessage *m) |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
793 |
{ |
329
27b7a4649b6e
Properly check for reason node in stream errors.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
327
diff
changeset
|
794 |
LmMessageNode *node, *reason_node; |
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
795 |
LmDisconnectReason reason; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
796 |
|
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
797 |
g_return_if_fail (connection != NULL); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
798 |
g_return_if_fail (m != NULL); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
799 |
|
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
800 |
node = m->node; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
801 |
|
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
802 |
/* Resource conflict */ |
329
27b7a4649b6e
Properly check for reason node in stream errors.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
327
diff
changeset
|
803 |
reason_node = lm_message_node_get_child (node, "conflict"); |
27b7a4649b6e
Properly check for reason node in stream errors.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
327
diff
changeset
|
804 |
if (reason_node) { |
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
805 |
lm_verbose ("Stream error: Conflict (resource connected elsewhere)\n"); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
806 |
reason = LM_DISCONNECT_REASON_RESOURCE_CONFLICT; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
807 |
return; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
808 |
} |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
809 |
|
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
810 |
/* XML is crack */ |
329
27b7a4649b6e
Properly check for reason node in stream errors.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
327
diff
changeset
|
811 |
reason_node = lm_message_node_get_child (node, "xml-not-well-formed"); |
27b7a4649b6e
Properly check for reason node in stream errors.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
327
diff
changeset
|
812 |
if (reason_node) { |
306
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
813 |
lm_verbose ("Stream error: XML not well formed\n"); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
814 |
reason = LM_DISCONNECT_REASON_INVALID_XML; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
815 |
return; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
816 |
} |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
817 |
|
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
818 |
lm_verbose ("Stream error: Unrecognised error\n"); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
819 |
reason = LM_DISCONNECT_REASON_ERROR; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
820 |
connection->stream_id = g_strdup (lm_message_node_get_attribute (m->node, |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
821 |
"id"));; |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
822 |
connection_do_close (connection); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
823 |
connection_signal_disconnect (connection, reason); |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
824 |
} |
d466fc30829f
Added disconnect error for resource conflict. Fixes LM-55.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
297
diff
changeset
|
825 |
|
1 | 826 |
static gint |
827 |
connection_handler_compare_func (HandlerData *a, HandlerData *b) |
|
828 |
{ |
|
829 |
return b->priority - a->priority; |
|
830 |
} |
|
831 |
||
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
832 |
static void |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
833 |
connection_signal_disconnect (LmConnection *connection, |
1 | 834 |
LmDisconnectReason reason) |
835 |
{ |
|
836 |
if (connection->disconnect_cb && connection->disconnect_cb->func) { |
|
837 |
LmCallback *cb = connection->disconnect_cb; |
|
838 |
||
284
5f82151c42ea
temporarily reference connection while calling disconnect callback, so that it's safe for the callback to unref the connection
Dafydd Harries <daf@rhydd.org>
parents:
281
diff
changeset
|
839 |
lm_connection_ref (connection); |
1 | 840 |
(* ((LmDisconnectFunction) cb->func)) (connection, |
841 |
reason, |
|
842 |
cb->user_data); |
|
284
5f82151c42ea
temporarily reference connection while calling disconnect callback, so that it's safe for the callback to unref the connection
Dafydd Harries <daf@rhydd.org>
parents:
281
diff
changeset
|
843 |
lm_connection_unref (connection); |
1 | 844 |
} |
845 |
} |
|
846 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
847 |
static void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
848 |
connection_incoming_data (LmSocket *socket, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
849 |
const gchar *buf, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
850 |
LmConnection *connection) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
851 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
852 |
lm_parser_parse (connection->parser, buf); |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
853 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
854 |
|
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
855 |
static void |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
856 |
connection_socket_closed_cb (LmSocket *socket, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
857 |
LmDisconnectReason reason, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
858 |
LmConnection *connection) |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
859 |
{ |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
860 |
connection_do_close (connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
861 |
connection_signal_disconnect (connection, reason); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
862 |
} |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
863 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
864 |
static void |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
865 |
connection_socket_connect_cb (LmSocket *socket, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
866 |
gboolean result, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
867 |
LmConnection *connection) |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
868 |
{ |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
869 |
if (!result) { |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
870 |
connection_do_close (connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
871 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
872 |
if (connection->open_cb) { |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
873 |
LmCallback *cb = connection->open_cb; |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
874 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
875 |
connection->open_cb = NULL; |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
876 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
877 |
(* ((LmResultFunction) cb->func)) (connection, FALSE, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
878 |
cb->user_data); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
879 |
_lm_utils_free_callback (cb); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
880 |
} |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
881 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
882 |
return; |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
883 |
} |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
884 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
885 |
/* FIXME: Set up according to XMPP 1.0 specification */ |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
886 |
/* StartTLS and the like */ |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
887 |
if (!connection_send (connection, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
888 |
"<?xml version='1.0' encoding='UTF-8'?>", -1, |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
889 |
NULL)) { |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
890 |
lm_verbose ("Failed to send xml version and encoding\n"); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
891 |
connection_do_close (connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
892 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
893 |
return; |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
894 |
} |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
895 |
|
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
896 |
connection_send_stream_header (connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
897 |
} |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
898 |
|
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
899 |
static gboolean |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
900 |
connection_get_server_from_jid (const gchar *jid, |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
901 |
gchar **server) |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
902 |
{ |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
903 |
gchar *ch; |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
904 |
gchar *ch_end; |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
905 |
|
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
906 |
if (jid != NULL && (ch = strchr (jid, '@')) != NULL) { |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
907 |
ch_end = strchr(ch + 1, '/'); |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
908 |
if (ch_end != NULL) { |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
909 |
*server = g_strndup (ch + 1, ch_end - ch - 1); |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
910 |
} else { |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
911 |
*server = g_strdup (ch + 1); |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
912 |
} |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
913 |
|
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
914 |
return TRUE; |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
915 |
} |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
916 |
|
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
917 |
return FALSE; |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
918 |
} |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
919 |
|
248
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
920 |
static void |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
921 |
connection_send_stream_header (LmConnection *connection) |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
922 |
{ |
247
a519eff901e6
Slight code refactoring in _lm_connection_socket_result
Mikael Hallendal <micke@imendio.com>
parents:
245
diff
changeset
|
923 |
LmMessage *m; |
a519eff901e6
Slight code refactoring in _lm_connection_socket_result
Mikael Hallendal <micke@imendio.com>
parents:
245
diff
changeset
|
924 |
gchar *server_from_jid; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
925 |
|
248
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
926 |
lm_verbose ("Sending stream header\n"); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
927 |
|
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
928 |
if (!connection_get_server_from_jid (connection->jid, &server_from_jid)) { |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
929 |
server_from_jid = g_strdup (connection->server); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
930 |
} |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
931 |
|
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
932 |
m = lm_message_new (server_from_jid, LM_MESSAGE_TYPE_STREAM); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
933 |
lm_message_node_set_attributes (m->node, |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
934 |
"xmlns:stream", |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
935 |
"http://etherx.jabber.org/streams", |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
936 |
"xmlns", "jabber:client", |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
937 |
"version", "1.0", |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
938 |
NULL); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
939 |
|
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
940 |
g_free (server_from_jid); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
941 |
|
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
942 |
if (!lm_connection_send (connection, m, NULL)) { |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
943 |
lm_verbose ("Failed to send stream information\n"); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
944 |
connection_do_close (connection); |
248
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
945 |
} |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
946 |
|
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
947 |
lm_message_unref (m); |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
948 |
} |
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
949 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
950 |
gboolean |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
951 |
_lm_connection_async_connect_waiting (LmConnection *connection) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
952 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
953 |
return connection->async_connect_waiting; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
954 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
955 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
956 |
void |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
957 |
_lm_connection_set_async_connect_waiting (LmConnection *connection, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
958 |
gboolean waiting) |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
959 |
{ |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
960 |
connection->async_connect_waiting = waiting; |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
961 |
} |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
962 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
963 |
static void |
222
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
964 |
connection_call_auth_cb (LmConnection *connection, gboolean success) |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
965 |
{ |
226
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
966 |
if (success) { |
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
967 |
connection->state = LM_CONNECTION_STATE_AUTHENTICATED; |
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
968 |
} else { |
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
969 |
connection->state = LM_CONNECTION_STATE_OPEN; |
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
970 |
} |
5a31f474b9fd
Update the connection state after SASL authentication result.
Mikael Hallendal <micke@imendio.com>
parents:
223
diff
changeset
|
971 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
972 |
if (connection->auth_cb) { |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
973 |
LmCallback *cb = connection->auth_cb; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
974 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
975 |
connection->auth_cb = NULL; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
976 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
977 |
if (cb->func) { |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
978 |
(* ((LmResultFunction) cb->func)) (connection, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
979 |
success, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
980 |
cb->user_data); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
981 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
982 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
983 |
_lm_utils_free_callback (cb); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
984 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
985 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
986 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
987 |
static LmHandlerResult |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
988 |
connection_bind_reply (LmMessageHandler *handler, |
255
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
989 |
LmConnection *connection, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
990 |
LmMessage *message, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
991 |
gpointer user_data) |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
992 |
{ |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
993 |
LmMessage *m; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
994 |
LmMessageNode *session_node; |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
995 |
LmMessageNode *jid_node; |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
996 |
int result; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
997 |
LmMessageSubType type; |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
998 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
999 |
type = lm_message_get_sub_type (message); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1000 |
if (type == LM_MESSAGE_SUB_TYPE_ERROR) { |
340
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1001 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1002 |
"%s: error while binding to resource\n", G_STRFUNC); |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1003 |
|
222
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1004 |
connection_call_auth_cb (connection, FALSE); |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1005 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1006 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1007 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1008 |
|
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1009 |
/* use whatever server returns as our effective jid */ |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1010 |
jid_node = lm_message_node_find_child (message->node, "jid"); |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1011 |
if (jid_node) { |
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1012 |
g_free (connection->effective_jid); |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1013 |
connection->effective_jid = g_strdup |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1014 |
(lm_message_node_get_value (jid_node)); |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1015 |
} |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1016 |
|
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1017 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1018 |
m = lm_message_new_with_sub_type (NULL, |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1019 |
LM_MESSAGE_TYPE_IQ, |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1020 |
LM_MESSAGE_SUB_TYPE_SET); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1021 |
|
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1022 |
session_node = lm_message_node_add_child (m->node, "session", NULL); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1023 |
lm_message_node_set_attributes (session_node, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1024 |
"xmlns", XMPP_NS_SESSION, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1025 |
NULL); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1026 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1027 |
result = lm_connection_send (connection, m, NULL); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1028 |
lm_message_unref (m); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1029 |
if (result < 0) { |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1030 |
connection_do_close (connection); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1031 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1032 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1033 |
/* We may finally tell the client they're authorized */ |
222
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1034 |
connection_call_auth_cb (connection, TRUE); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1035 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1036 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1037 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1038 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1039 |
static LmHandlerResult |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1040 |
connection_features_cb (LmMessageHandler *handler, |
255
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1041 |
LmConnection *connection, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1042 |
LmMessage *message, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1043 |
gpointer user_data) |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1044 |
{ |
255
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1045 |
LmMessageNode *bind_node; |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1046 |
LmMessageNode *starttls_node; |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1047 |
LmMessageNode *old_auth; |
511
2eee98b870e7
Use SASL before old style auth if both are supported. [#19]
Jelmer Vernooij <jelmer@samba.org>
parents:
496
diff
changeset
|
1048 |
LmMessageNode *sasl_mechanisms; |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1049 |
|
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1050 |
starttls_node = lm_message_node_find_child (message->node, "starttls"); |
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1051 |
if (connection->ssl && lm_ssl_get_use_starttls (connection->ssl)) { |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1052 |
if (starttls_node) { |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1053 |
LmMessage *msg; |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1054 |
|
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1055 |
msg = lm_message_new (NULL, LM_MESSAGE_TYPE_STARTTLS); |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1056 |
|
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1057 |
lm_message_node_set_attributes ( |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1058 |
msg->node, |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1059 |
"xmlns", XMPP_NS_STARTTLS, |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1060 |
NULL); |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1061 |
|
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1062 |
lm_connection_send (connection, msg, NULL); |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1063 |
lm_message_unref (msg); |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1064 |
|
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1065 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
317
e7ceb196a573
Don't require StartTLS after it's already been started.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
316
diff
changeset
|
1066 |
} else if (!connection->tls_started && |
e7ceb196a573
Don't require StartTLS after it's already been started.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
316
diff
changeset
|
1067 |
lm_ssl_get_require_starttls (connection->ssl)) { |
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1068 |
/* If there were no starttls features present and we require it, this is |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1069 |
* the place to scream. */ |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1070 |
|
340
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1071 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1072 |
"%s: required StartTLS feature not supported by server\n", G_STRFUNC); |
289
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1073 |
connection_do_close (connection); |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1074 |
connection_signal_disconnect (connection, |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1075 |
LM_DISCONNECT_REASON_ERROR); |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1076 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
839adca0d863
LmConnection: take starttls settings from LmSSL object
Dafydd Harries <daf@rhydd.org>
parents:
288
diff
changeset
|
1077 |
} |
274
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1078 |
} |
c32a7011e435
Adding StartTLS support.
Senko Rasic <senko@phyrexia.(none)>
parents:
271
diff
changeset
|
1079 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1080 |
bind_node = lm_message_node_find_child (message->node, "bind"); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1081 |
if (bind_node) { |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1082 |
LmMessageHandler *bind_handler; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1083 |
LmMessage *bind_msg; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1084 |
const gchar *ns; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1085 |
int result; |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1086 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1087 |
ns = lm_message_node_get_attribute (bind_node, "xmlns"); |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1088 |
if (!ns || strcmp (ns, XMPP_NS_BIND) != 0) { |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1089 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1090 |
} |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1091 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1092 |
bind_msg = lm_message_new_with_sub_type (NULL, |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1093 |
LM_MESSAGE_TYPE_IQ, |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1094 |
LM_MESSAGE_SUB_TYPE_SET); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1095 |
|
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1096 |
bind_node = lm_message_node_add_child (bind_msg->node, |
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1097 |
"bind", NULL); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1098 |
lm_message_node_set_attributes (bind_node, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1099 |
"xmlns", XMPP_NS_BIND, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1100 |
NULL); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1101 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1102 |
lm_message_node_add_child (bind_node, "resource", |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1103 |
connection->resource); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1104 |
|
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1105 |
bind_handler = lm_message_handler_new (connection_bind_reply, |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1106 |
NULL, NULL); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1107 |
result = lm_connection_send_with_reply (connection, bind_msg, |
223
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1108 |
bind_handler, NULL); |
b343ed8b3fea
More style fixes to the SASL patch
Mikael Hallendal <micke@imendio.com>
parents:
222
diff
changeset
|
1109 |
lm_message_handler_unref (bind_handler); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1110 |
lm_message_unref (bind_msg); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1111 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1112 |
if (result < 0) { |
339
b1e0d0551a8c
Use g_log instead of g_debug for debug output.
Mikael Hallendal <micke@imendio.com>
parents:
338
diff
changeset
|
1113 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
340
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1114 |
"%s: can't send resource binding request\n", G_STRFUNC); |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1115 |
connection_do_close (connection); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1116 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1117 |
} |
220
f6b9482ae89e
Some style fixes to the SASL patch.
Mikael Hallendal <micke@imendio.com>
parents:
219
diff
changeset
|
1118 |
|
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1119 |
old_auth = lm_message_node_find_child (message->node, "auth"); |
511
2eee98b870e7
Use SASL before old style auth if both are supported. [#19]
Jelmer Vernooij <jelmer@samba.org>
parents:
496
diff
changeset
|
1120 |
|
2eee98b870e7
Use SASL before old style auth if both are supported. [#19]
Jelmer Vernooij <jelmer@samba.org>
parents:
496
diff
changeset
|
1121 |
sasl_mechanisms = lm_message_node_find_child (message->node, "mechanisms"); |
2eee98b870e7
Use SASL before old style auth if both are supported. [#19]
Jelmer Vernooij <jelmer@samba.org>
parents:
496
diff
changeset
|
1122 |
if (connection->use_sasl && old_auth != NULL && sasl_mechanisms == NULL) { |
340
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1123 |
g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL, |
ce4dcda8797c
Added new line for g_log printouts
Mikael Hallendal <micke@imendio.com>
parents:
339
diff
changeset
|
1124 |
"Server uses XEP-0078 (jabber iq auth) instead of SASL\n"); |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1125 |
/* So the server is XMPP1.0, but doesn't support SASL and uses |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1126 |
* obsolete XEP-0078 instead. Let's cope. */ |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1127 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1128 |
connection->use_sasl = FALSE; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1129 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1130 |
if (connection->sasl) { |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1131 |
const gchar *user, *pass; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1132 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1133 |
lm_sasl_get_auth_params (connection->sasl, &user, &pass); |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1134 |
if (user && pass) { |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1135 |
GError *error = NULL; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1136 |
_lm_connection_old_auth (connection, user, pass, |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1137 |
connection->resource, &error); |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1138 |
|
345 | 1139 |
if (error) { |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1140 |
g_error_free (error); |
345 | 1141 |
} |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1142 |
} |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1143 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1144 |
lm_sasl_free (connection->sasl); |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1145 |
connection->sasl = NULL; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1146 |
} |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1147 |
} |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1148 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1149 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1150 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1151 |
|
1 | 1152 |
/** |
1153 |
* lm_connection_new: |
|
1154 |
* @server: The hostname to the server for the connection. |
|
1155 |
* |
|
1156 |
* Creates a new closed connection. To open the connection call |
|
1157 |
* lm_connection_open(). @server can be #NULL but must be set before calling lm_connection_open(). |
|
1158 |
* |
|
1159 |
* Return value: A newly created LmConnection, should be unreffed with lm_connection_unref(). |
|
1160 |
**/ |
|
1161 |
LmConnection * |
|
1162 |
lm_connection_new (const gchar *server) |
|
1163 |
{ |
|
1164 |
LmConnection *connection; |
|
1165 |
gint i; |
|
1166 |
||
1167 |
lm_debug_init (); |
|
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1168 |
_lm_sock_library_init (); |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1169 |
|
1 | 1170 |
connection = g_new0 (LmConnection, 1); |
1171 |
||
1172 |
if (server) { |
|
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
1173 |
connection->server = _lm_utils_hostname_to_punycode (server); |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
1174 |
connection->use_srv = FALSE; |
1 | 1175 |
} else { |
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
1176 |
connection->server = NULL; |
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
1177 |
connection->use_srv = TRUE; |
1 | 1178 |
} |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1179 |
|
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1180 |
connection->context = NULL; |
1 | 1181 |
connection->port = LM_CONNECTION_DEFAULT_PORT; |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1182 |
connection->jid = NULL; |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1183 |
connection->effective_jid = NULL; |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1184 |
connection->ssl = NULL; |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1185 |
connection->proxy = NULL; |
1 | 1186 |
connection->disconnect_cb = NULL; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1187 |
connection->queue = lm_message_queue_new ((LmMessageQueueCallback) connection_message_queue_cb, |
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1188 |
connection); |
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1189 |
connection->cancel_open = FALSE; |
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
1190 |
connection->state = LM_CONNECTION_STATE_CLOSED; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1191 |
connection->keep_alive_source = NULL; |
93
903382d1c95d
2004-08-30 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
91
diff
changeset
|
1192 |
connection->keep_alive_rate = 0; |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1193 |
connection->socket = NULL; |
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1194 |
connection->use_sasl = FALSE; |
317
e7ceb196a573
Don't require StartTLS after it's already been started.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
316
diff
changeset
|
1195 |
connection->tls_started = FALSE; |
1 | 1196 |
|
1197 |
connection->id_handlers = g_hash_table_new_full (g_str_hash, |
|
1198 |
g_str_equal, |
|
1199 |
g_free, |
|
1200 |
(GDestroyNotify) lm_message_handler_unref); |
|
1201 |
connection->ref_count = 1; |
|
1202 |
||
1203 |
for (i = 0; i < LM_MESSAGE_TYPE_UNKNOWN; ++i) { |
|
1204 |
connection->handlers[i] = NULL; |
|
1205 |
} |
|
1206 |
||
1207 |
connection->parser = lm_parser_new |
|
1208 |
((LmParserMessageFunction) connection_new_message_cb, |
|
1209 |
connection, NULL); |
|
1210 |
||
1211 |
return connection; |
|
1212 |
} |
|
1213 |
||
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1214 |
/** |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1215 |
* lm_connection_new_with_context: |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1216 |
* @server: The hostname to the server for the connection. |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1217 |
* @context: The context this connection should be running in. |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1218 |
* |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1219 |
* Creates a new closed connection running in a certain context. To open the |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1220 |
* connection call #lm_connection_open. @server can be #NULL but must be set |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1221 |
* before calling #lm_connection_open. |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1222 |
* |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1223 |
* Return value: A newly created LmConnection, should be unreffed with lm_connection_unref(). |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1224 |
**/ |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1225 |
LmConnection * |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1226 |
lm_connection_new_with_context (const gchar *server, GMainContext *context) |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1227 |
{ |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1228 |
LmConnection *connection; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1229 |
|
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1230 |
connection = lm_connection_new (server); |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1231 |
connection->context = context; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1232 |
|
168
ac1affcd5d22
2006-09-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
156
diff
changeset
|
1233 |
if (context) { |
ac1affcd5d22
2006-09-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
156
diff
changeset
|
1234 |
g_main_context_ref (connection->context); |
ac1affcd5d22
2006-09-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
156
diff
changeset
|
1235 |
} |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1236 |
|
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1237 |
return connection; |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1238 |
} |
63
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1239 |
|
1 | 1240 |
/** |
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1241 |
* lm_connection_open: |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1242 |
* @connection: #LmConnection to open |
1 | 1243 |
* @function: Callback function that will be called when the connection is open. |
1244 |
* @user_data: User data that will be passed to @function. |
|
1245 |
* @notify: Function for freeing that user_data, can be NULL. |
|
1246 |
* @error: location to store error, or %NULL |
|
1247 |
* |
|
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1248 |
* An async call to open @connection. When the connection is open @function will be called. |
1 | 1249 |
* |
1250 |
* Return value: #TRUE if everything went fine, otherwise #FALSE. |
|
1251 |
**/ |
|
1252 |
gboolean |
|
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1253 |
lm_connection_open (LmConnection *connection, |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1254 |
LmResultFunction function, |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1255 |
gpointer user_data, |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1256 |
GDestroyNotify notify, |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1257 |
GError **error) |
1 | 1258 |
{ |
63
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1259 |
g_return_val_if_fail (connection != NULL, FALSE); |
1 | 1260 |
|
63
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1261 |
connection->open_cb = _lm_utils_new_callback (function, |
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1262 |
user_data, notify); |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1263 |
connection->blocking = FALSE; |
1 | 1264 |
|
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1265 |
return connection_do_open (connection, error); |
1 | 1266 |
} |
1267 |
||
1268 |
/** |
|
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1269 |
* lm_connection_open_and_block: |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1270 |
* @connection: an #LmConnection to open |
1 | 1271 |
* @error: location to store error, or %NULL |
1272 |
* |
|
1273 |
* Opens @connection and waits until the stream is setup. |
|
1274 |
* |
|
1275 |
* Return value: #TRUE if no errors where encountered during opening and stream setup successfully, #FALSE otherwise. |
|
1276 |
**/ |
|
1277 |
gboolean |
|
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1278 |
lm_connection_open_and_block (LmConnection *connection, GError **error) |
1 | 1279 |
{ |
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1280 |
gboolean result; |
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1281 |
LmConnectionState state; |
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1282 |
|
1 | 1283 |
g_return_val_if_fail (connection != NULL, FALSE); |
57
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
1284 |
|
63
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1285 |
connection->open_cb = NULL; |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1286 |
connection->blocking = TRUE; |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1287 |
|
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1288 |
result = connection_do_open (connection, error); |
63
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1289 |
|
7b8d0db459ff
2004-01-05 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
62
diff
changeset
|
1290 |
if (result == FALSE) { |
1 | 1291 |
return FALSE; |
1292 |
} |
|
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1293 |
|
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
1294 |
while ((state = lm_connection_get_state (connection)) == LM_CONNECTION_STATE_OPENING) { |
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1295 |
if (g_main_context_pending (connection->context)) { |
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1296 |
g_main_context_iteration (connection->context, TRUE); |
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1297 |
} else { |
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1298 |
/* Sleep for 1 millisecond */ |
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1299 |
g_usleep (1000); |
1 | 1300 |
} |
1301 |
} |
|
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1302 |
|
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1303 |
if (lm_connection_is_open (connection)) { |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1304 |
connection_start_keep_alive (connection); |
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1305 |
return TRUE; |
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1306 |
} |
1 | 1307 |
|
132
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1308 |
/* Need to set the error here: LM-15 */ |
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1309 |
g_set_error (error, |
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1310 |
LM_ERROR, |
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1311 |
LM_ERROR_CONNECTION_FAILED, |
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1312 |
"Opening the connection failed"); |
8c9c1629f691
2006-03-20 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
130
diff
changeset
|
1313 |
|
64
dd835d5cee71
2004-01-06 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
63
diff
changeset
|
1314 |
return FALSE; |
1 | 1315 |
} |
1316 |
||
1317 |
/** |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1318 |
* lm_connection_cancel_open: |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1319 |
* @connection: an #LmConnection to cancel opening on |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1320 |
* |
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
1321 |
* Cancels the open operation of a connection. The connection should be in the state #LM_CONNECTION_STATE_OPENING. |
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1322 |
**/ |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1323 |
void |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1324 |
lm_connection_cancel_open (LmConnection *connection) |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1325 |
{ |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1326 |
g_return_if_fail (connection != NULL); |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1327 |
|
211
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
1328 |
if (connection->open_cb) { |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
1329 |
_lm_utils_free_callback (connection->open_cb); |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
1330 |
connection->open_cb = NULL; |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
1331 |
} |
efbf2da5e443
Added checks when freeing proxy and closing socket. Also free open_cb in cancel_open.
Mikael Hallendal <micke@imendio.com>
parents:
210
diff
changeset
|
1332 |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1333 |
connection->cancel_open = TRUE; |
271
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1334 |
|
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1335 |
#ifdef HAVE_ASYNCNS |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1336 |
_asyncns_cancel(connection->socket); |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1337 |
#endif |
57
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
1338 |
} |
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
1339 |
|
6b168a8917f7
2003-12-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
56
diff
changeset
|
1340 |
/** |
1 | 1341 |
* lm_connection_close: |
1342 |
* @connection: #LmConnection to close |
|
1343 |
* @error: location to store error, or %NULL |
|
1344 |
* |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1345 |
* A synchronous call to close the connection. When returning the connection is considered to be closed and can be opened again with lm_connection_open(). |
1 | 1346 |
* |
1347 |
* Return value: Returns #TRUE if no errors where detected, otherwise #FALSE. |
|
1348 |
**/ |
|
1349 |
gboolean |
|
1350 |
lm_connection_close (LmConnection *connection, |
|
1351 |
GError **error) |
|
1352 |
{ |
|
156
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1353 |
gboolean no_errors = TRUE; |
1 | 1354 |
|
156
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1355 |
g_return_val_if_fail (connection != NULL, FALSE); |
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1356 |
|
271
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1357 |
#ifdef HAVE_ASYNCNS |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1358 |
_asyncns_cancel (connection->socket); |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1359 |
#endif |
52ea4e0b897a
Perform name resolution asynchronously. Patch by Senko Rašić.
Dafydd Harries <daf@rhydd.org>
parents:
256
diff
changeset
|
1360 |
|
156
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1361 |
if (connection->state == LM_CONNECTION_STATE_CLOSED) { |
1 | 1362 |
g_set_error (error, |
1363 |
LM_ERROR, |
|
1364 |
LM_ERROR_CONNECTION_NOT_OPEN, |
|
1365 |
"Connection is not open, call lm_connection_open() first"); |
|
1366 |
return FALSE; |
|
1367 |
} |
|
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1368 |
|
1 | 1369 |
lm_verbose ("Disconnecting from: %s:%d\n", |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1370 |
connection->server, connection->port); |
1 | 1371 |
|
156
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1372 |
if (lm_connection_is_open (connection)) { |
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1373 |
if (!connection_send (connection, "</stream:stream>", -1, error)) { |
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1374 |
no_errors = FALSE; |
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1375 |
} |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1376 |
|
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1377 |
lm_socket_flush (connection->socket); |
1 | 1378 |
} |
1379 |
||
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1380 |
connection_do_close (connection); |
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1381 |
connection_signal_disconnect (connection, LM_DISCONNECT_REASON_OK); |
1 | 1382 |
|
156
8c054d9e98b8
2006-06-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
155
diff
changeset
|
1383 |
return no_errors; |
1 | 1384 |
} |
1385 |
||
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1386 |
static void |
222
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1387 |
connection_sasl_auth_finished (LmSASL *sasl, |
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1388 |
LmConnection *connection, |
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1389 |
gboolean success, |
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1390 |
const gchar *reason) |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1391 |
{ |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1392 |
if (!success) { |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1393 |
lm_verbose ("SASL authentication failed, closing connection\n"); |
222
ca97251ddee8
Renamed internal functions to conform to code style.
Mikael Hallendal <micke@imendio.com>
parents:
221
diff
changeset
|
1394 |
connection_call_auth_cb (connection, FALSE); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1395 |
return; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1396 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1397 |
|
248
09a3e0e55ab8
Refactored sending of the stream header.
Mikael Hallendal <micke@imendio.com>
parents:
247
diff
changeset
|
1398 |
connection_send_stream_header (connection); |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1399 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1400 |
|
1 | 1401 |
/** |
1402 |
* lm_connection_authenticate: |
|
1403 |
* @connection: #LmConnection to authenticate. |
|
1404 |
* @username: Username used to authenticate. |
|
1405 |
* @password: Password corresponding to @username. |
|
1406 |
* @resource: Resource used for this connection. |
|
1407 |
* @function: Callback called when authentication is finished. |
|
1408 |
* @user_data: Userdata passed to @function when called. |
|
1409 |
* @notify: Destroy function to free the memory used by @user_data, can be NULL. |
|
1410 |
* @error: location to store error, or %NULL |
|
1411 |
* |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1412 |
* Tries to authenticate a user against the server. The #LmResult in the result callback @function will say whether it succeeded or not. |
1 | 1413 |
* |
1414 |
* Return value: #TRUE if no errors where detected while sending the authentication message, #FALSE otherwise. |
|
1415 |
**/ |
|
1416 |
gboolean |
|
1417 |
lm_connection_authenticate (LmConnection *connection, |
|
1418 |
const gchar *username, |
|
1419 |
const gchar *password, |
|
1420 |
const gchar *resource, |
|
1421 |
LmResultFunction function, |
|
1422 |
gpointer user_data, |
|
1423 |
GDestroyNotify notify, |
|
1424 |
GError **error) |
|
1425 |
{ |
|
1426 |
g_return_val_if_fail (connection != NULL, FALSE); |
|
1427 |
g_return_val_if_fail (username != NULL, FALSE); |
|
1428 |
g_return_val_if_fail (password != NULL, FALSE); |
|
1429 |
g_return_val_if_fail (resource != NULL, FALSE); |
|
1430 |
||
1431 |
if (!lm_connection_is_open (connection)) { |
|
1432 |
g_set_error (error, |
|
1433 |
LM_ERROR, |
|
1434 |
LM_ERROR_CONNECTION_NOT_OPEN, |
|
1435 |
"Connection is not open, call lm_connection_open() first"); |
|
1436 |
return FALSE; |
|
1437 |
} |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1438 |
|
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1439 |
connection->state = LM_CONNECTION_STATE_AUTHENTICATING; |
1 | 1440 |
|
1441 |
connection->auth_cb = _lm_utils_new_callback (function, |
|
1442 |
user_data, |
|
1443 |
notify); |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1444 |
|
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1445 |
connection->resource = g_strdup (resource); |
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1446 |
connection->effective_jid = g_strdup_printf ("%s/%s", |
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1447 |
connection->jid, connection->resource); |
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1448 |
|
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1449 |
if (connection->use_sasl) { |
255
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1450 |
lm_sasl_authenticate (connection->sasl, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1451 |
username, password, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1452 |
connection->server, |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1453 |
connection_sasl_auth_finished); |
704881ac7788
Fixed potential problem if auth was not called from the open callback.
Mikael Hallendal <micke@imendio.com>
parents:
249
diff
changeset
|
1454 |
|
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1455 |
connection->features_cb = |
256
2266e56746ed
Refactoring to clear up interface between LmSocket and LmConnection.
Mikael Hallendal <micke@imendio.com>
parents:
255
diff
changeset
|
1456 |
lm_message_handler_new (connection_features_cb, |
219
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1457 |
NULL, NULL); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1458 |
lm_connection_register_message_handler (connection, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1459 |
connection->features_cb, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1460 |
LM_MESSAGE_TYPE_STREAM_FEATURES, |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1461 |
LM_HANDLER_PRIORITY_FIRST); |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1462 |
|
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1463 |
return TRUE; |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1464 |
} |
6daf884bc7bd
Added SASL-support to LmConnection, patch from Senko Rasic
Mikael Hallendal <micke@imendio.com>
parents:
211
diff
changeset
|
1465 |
|
332
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1466 |
return _lm_connection_old_auth (connection, username, password, |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1467 |
resource, error); |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1468 |
} |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1469 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1470 |
gboolean |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1471 |
_lm_connection_old_auth (LmConnection *connection, const gchar *username, |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1472 |
const gchar *password, const gchar *resource, GError **error) |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1473 |
{ |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1474 |
LmMessage *m; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1475 |
AuthReqData *data; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1476 |
LmMessageHandler *handler; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1477 |
gboolean result; |
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1478 |
|
6b6ad42cd508
Support obsolete XEP-0078 (old-style jabber auth for XMPP1.0).
Senko Rasic <senko@phyrexia.lan>
parents:
329
diff
changeset
|
1479 |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1480 |
m = connection_create_auth_req_msg (username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1481 |
|
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1482 |
data = g_new0 (AuthReqData, 1); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1483 |
data->username = g_strdup (username); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1484 |
data->password = g_strdup (password); |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1485 |
data->resource = g_strdup (resource); |
1 | 1486 |
|
21
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1487 |
handler = lm_message_handler_new (connection_auth_req_reply, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1488 |
data, |
091f3e5ec468
2003-07-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
15
diff
changeset
|
1489 |
(GDestroyNotify) auth_req_data_free); |
1 | 1490 |
result = lm_connection_send_with_reply (connection, m, handler, error); |
1491 |
||
1492 |
lm_message_handler_unref (handler); |
|
1493 |
lm_message_unref (m); |
|
1494 |
||
1495 |
return result; |
|
1496 |
} |
|
1497 |
||
1498 |
/** |
|
1499 |
* lm_connection_authenticate_and_block: |
|
1500 |
* @connection: an #LmConnection |
|
1501 |
* @username: Username used to authenticate. |
|
1502 |
* @password: Password corresponding to @username. |
|
1503 |
* @resource: Resource used for this connection. |
|
1504 |
* @error: location to store error, or %NULL |
|
1505 |
* |
|
1506 |
* Tries to authenticate a user against the server. This function blocks until a reply to the authentication attempt is returned and returns whether it was successful or not. |
|
1507 |
* |
|
1508 |
* Return value: #TRUE if no errors where detected and authentication was successful. #FALSE otherwise. |
|
1509 |
**/ |
|
1510 |
gboolean |
|
1511 |
lm_connection_authenticate_and_block (LmConnection *connection, |
|
1512 |
const gchar *username, |
|
1513 |
const gchar *password, |
|
1514 |
const gchar *resource, |
|
1515 |
GError **error) |
|
1516 |
{ |
|
323
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1517 |
gboolean result; |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1518 |
|
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1519 |
result = lm_connection_authenticate (connection, username, password, |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1520 |
resource, NULL, NULL, NULL, error); |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1521 |
|
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1522 |
if (!result) |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1523 |
return result; |
1 | 1524 |
|
323
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1525 |
while (lm_connection_get_state (connection) == LM_CONNECTION_STATE_AUTHENTICATING) { |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1526 |
if (g_main_context_pending (connection->context)) { |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1527 |
g_main_context_iteration (connection->context, TRUE); |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1528 |
} else { |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1529 |
/* Sleep for 1 millisecond */ |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1530 |
g_usleep (1000); |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1531 |
} |
1 | 1532 |
} |
1533 |
||
323
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1534 |
switch (lm_connection_get_state (connection)) { |
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1535 |
case LM_CONNECTION_STATE_AUTHENTICATED: |
1 | 1536 |
return TRUE; |
1537 |
break; |
|
323
64ea88f05696
Make lm_connection_authenticate_and_block reuse lm_connection_authenticate
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
320
diff
changeset
|
1538 |
case LM_CONNECTION_STATE_OPEN: |
54
eee846c76348
2003-11-11 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
47
diff
changeset
|
1539 |
g_set_error (error, |
eee846c76348
2003-11-11 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
47
diff
changeset
|
1540 |
LM_ERROR, |
eee846c76348
2003-11-11 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
47
diff
changeset
|
1541 |
LM_ERROR_AUTH_FAILED, |
eee846c76348
2003-11-11 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
47
diff
changeset
|
1542 |
"Authentication failed"); |
1 | 1543 |
return FALSE; |
1544 |
break; |
|
1545 |
default: |
|
1546 |
g_assert_not_reached (); |
|
1547 |
break; |
|
1548 |
} |
|
1549 |
||
1550 |
return FALSE; |
|
1551 |
} |
|
1552 |
||
1553 |
/** |
|
394
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1554 |
* lm_connection_get_keep_alive_rate: |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1555 |
* @connection: an #LmConnection |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1556 |
* |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1557 |
* Get the keep alive rate, in seconds. Zero is returned if no keep alive rate has been set. |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1558 |
* |
555
695c909d0c45
Fixed up the documentation for 1.4.3 [#27]
Mikael Hallendal <micke@imendio.com>
parents:
514
diff
changeset
|
1559 |
* Since 1.4.0 |
695c909d0c45
Fixed up the documentation for 1.4.3 [#27]
Mikael Hallendal <micke@imendio.com>
parents:
514
diff
changeset
|
1560 |
* |
695c909d0c45
Fixed up the documentation for 1.4.3 [#27]
Mikael Hallendal <micke@imendio.com>
parents:
514
diff
changeset
|
1561 |
* Return value: The keep alive rate in seconds. |
394
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1562 |
**/ |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1563 |
guint |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1564 |
lm_connection_get_keep_alive_rate (LmConnection *connection) |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1565 |
{ |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1566 |
g_return_val_if_fail (connection != NULL, 0); |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1567 |
|
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1568 |
return connection->keep_alive_rate; |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1569 |
} |
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1570 |
|
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1571 |
/** |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1572 |
* lm_connection_set_keep_alive_rate: |
394
03933ba2fb40
Added lm_connection_get_keep_alive.
Mikael Hallendal <micke@imendio.com>
parents:
345
diff
changeset
|
1573 |
* @connection: an #LmConnection |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1574 |
* @rate: Number of seconds between keep alive packages are sent. |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1575 |
* |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1576 |
* Set the keep alive rate, in seconds. Set to 0 to prevent keep alive messages to be sent. |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1577 |
* A keep alive message is a single space character. |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1578 |
**/ |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1579 |
void |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1580 |
lm_connection_set_keep_alive_rate (LmConnection *connection, guint rate) |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1581 |
{ |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1582 |
g_return_if_fail (connection != NULL); |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1583 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1584 |
connection_stop_keep_alive (connection); |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1585 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1586 |
if (rate == 0) { |
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1587 |
connection->keep_alive_source = NULL; |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1588 |
return; |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1589 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1590 |
|
341
f44b206faf54
Fixed the keep alive rate when using TCP for handling keep alive. Fixes LM-121.
Mikael Hallendal <micke@imendio.com>
parents:
340
diff
changeset
|
1591 |
connection->keep_alive_rate = rate; |
90
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1592 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1593 |
if (lm_connection_is_open (connection)) { |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1594 |
connection_start_keep_alive (connection); |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1595 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1596 |
} |
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1597 |
|
3f4b38614416
2004-08-25 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
89
diff
changeset
|
1598 |
/** |
1 | 1599 |
* lm_connection_is_open: |
1600 |
* @connection: #LmConnection to check if it is open. |
|
1601 |
* |
|
1602 |
* Check if the @connection is currently open. |
|
1603 |
* |
|
1604 |
* Return value: #TRUE if connection is open and #FALSE if it is closed. |
|
1605 |
**/ |
|
1606 |
gboolean |
|
1607 |
lm_connection_is_open (LmConnection *connection) |
|
1608 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1609 |
g_return_val_if_fail (connection != NULL, FALSE); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1610 |
|
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
1611 |
return connection->state >= LM_CONNECTION_STATE_OPEN; |
1 | 1612 |
} |
1613 |
||
1614 |
/** |
|
1615 |
* lm_connection_is_authenticated: |
|
1616 |
* @connection: #LmConnection to check if it is authenticated |
|
1617 |
* |
|
1618 |
* Check if @connection is authenticated. |
|
1619 |
* |
|
1620 |
* Return value: #TRUE if connection is authenticated, #FALSE otherwise. |
|
1621 |
**/ |
|
1622 |
gboolean |
|
1623 |
lm_connection_is_authenticated (LmConnection *connection) |
|
1624 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1625 |
g_return_val_if_fail (connection != NULL, FALSE); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1626 |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
1627 |
return connection->state >= LM_CONNECTION_STATE_AUTHENTICATED; |
1 | 1628 |
} |
1629 |
||
1630 |
/** |
|
1631 |
* lm_connection_get_server: |
|
1632 |
* @connection: an #LmConnection |
|
1633 |
* |
|
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1634 |
* Fetches the server address that @connection is using. |
1 | 1635 |
* |
1636 |
* Return value: the server address |
|
1637 |
**/ |
|
1638 |
const gchar * |
|
1639 |
lm_connection_get_server (LmConnection *connection) |
|
1640 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1641 |
g_return_val_if_fail (connection != NULL, NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1642 |
|
1 | 1643 |
return connection->server; |
1644 |
} |
|
1645 |
||
1646 |
/** |
|
1647 |
* lm_connection_set_server: |
|
1648 |
* @connection: an #LmConnection |
|
1649 |
* @server: Address of the server |
|
1650 |
* |
|
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1651 |
* Sets the server address for @connection to @server. Notice that @connection |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1652 |
* can't be open while doing this. |
1 | 1653 |
**/ |
1654 |
void |
|
1655 |
lm_connection_set_server (LmConnection *connection, const gchar *server) |
|
1656 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1657 |
g_return_if_fail (connection != NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1658 |
g_return_if_fail (server != NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1659 |
|
1 | 1660 |
if (lm_connection_is_open (connection)) { |
1661 |
g_warning ("Can't change server address while connected"); |
|
1662 |
return; |
|
1663 |
} |
|
1664 |
||
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1665 |
g_free (connection->server); |
155
d24c4392d4e3
2006-06-16 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
153
diff
changeset
|
1666 |
connection->server = _lm_utils_hostname_to_punycode (server); |
245
df2655dbe873
Make LmConnection accept not having a server set as long as JID is set.
Mikael Hallendal <micke@imendio.com>
parents:
244
diff
changeset
|
1667 |
connection->use_srv = FALSE; |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1668 |
} |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1669 |
|
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1670 |
/** |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1671 |
* lm_connection_get_jid: |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1672 |
* @connection: an #LmConnection |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1673 |
* |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1674 |
* Fetches the jid set for @connection is using. |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1675 |
* |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1676 |
* Return value: the jid |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1677 |
**/ |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1678 |
const gchar * |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1679 |
lm_connection_get_jid (LmConnection *connection) |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1680 |
{ |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1681 |
g_return_val_if_fail (connection != NULL, NULL); |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1682 |
|
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1683 |
return connection->jid; |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1684 |
} |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1685 |
|
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1686 |
/** |
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1687 |
* lm_connection_get_full_jid: |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1688 |
* @connection: an #LmConnection |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1689 |
* |
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1690 |
* Returns the full jid that server set for us after |
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1691 |
* resource binding, complete with the resource. |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1692 |
* |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1693 |
* Return value: the jid |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1694 |
**/ |
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1695 |
gchar * |
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1696 |
lm_connection_get_full_jid (LmConnection *connection) |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1697 |
{ |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1698 |
g_return_val_if_fail (connection != NULL, NULL); |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1699 |
|
307
f169e9281745
Rename lm_conn_get_effective_jid() to lm_conn_get_full_jid() to
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
306
diff
changeset
|
1700 |
return connection->effective_jid; |
297
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1701 |
} |
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1702 |
|
f65eee8ec802
Support for returning effective JID, possibly changed by the server.
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
294
diff
changeset
|
1703 |
/** |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1704 |
* lm_connection_set_jid: |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1705 |
* @connection: an #LmConnection |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1706 |
* @jid: JID to be used for @connection |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1707 |
* |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1708 |
* Sets the JID to be used for @connection. |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1709 |
**/ |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1710 |
void |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1711 |
lm_connection_set_jid (LmConnection *connection, const gchar *jid) |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1712 |
{ |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1713 |
g_return_if_fail (connection != NULL); |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1714 |
|
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1715 |
if (lm_connection_is_open (connection)) { |
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1716 |
g_warning ("Can't change JID while connected"); |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1717 |
return; |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1718 |
} |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1719 |
|
89
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1720 |
g_free (connection->jid); |
e756a937e540
2004-08-09 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
87
diff
changeset
|
1721 |
connection->jid = g_strdup (jid); |
1 | 1722 |
} |
1723 |
||
1724 |
/** |
|
1725 |
* lm_connection_get_port: |
|
1726 |
* @connection: an #LmConnection |
|
1727 |
* |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1728 |
* Fetches the port that @connection is using. |
1 | 1729 |
* |
555
695c909d0c45
Fixed up the documentation for 1.4.3 [#27]
Mikael Hallendal <micke@imendio.com>
parents:
514
diff
changeset
|
1730 |
* Return value: The port used. |
1 | 1731 |
**/ |
1732 |
guint |
|
1733 |
lm_connection_get_port (LmConnection *connection) |
|
1734 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1735 |
g_return_val_if_fail (connection != NULL, 0); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1736 |
|
1 | 1737 |
return connection->port; |
1738 |
} |
|
1739 |
||
1740 |
/** |
|
1741 |
* lm_connection_set_port: |
|
1742 |
* @connection: an #LmConnection |
|
1743 |
* @port: server port |
|
1744 |
* |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1745 |
* Sets the server port that @connection will be using. |
1 | 1746 |
**/ |
1747 |
void |
|
1748 |
lm_connection_set_port (LmConnection *connection, guint port) |
|
1749 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1750 |
g_return_if_fail (connection != NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1751 |
|
1 | 1752 |
if (lm_connection_is_open (connection)) { |
1753 |
g_warning ("Can't change server port while connected"); |
|
1754 |
return; |
|
1755 |
} |
|
1756 |
||
1757 |
connection->port = port; |
|
1758 |
} |
|
1759 |
||
1760 |
/** |
|
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1761 |
* lm_connection_get_ssl: |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1762 |
* @connection: an #LmConnection |
15
1ff2f81867e1
2003-07-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
12
diff
changeset
|
1763 |
* |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1764 |
* Returns the SSL struct if the connection is using one. |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1765 |
* |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1766 |
* Return value: The ssl struct or %NULL if no proxy is used. |
15
1ff2f81867e1
2003-07-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
12
diff
changeset
|
1767 |
**/ |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1768 |
LmSSL * |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1769 |
lm_connection_get_ssl (LmConnection *connection) |
15
1ff2f81867e1
2003-07-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
12
diff
changeset
|
1770 |
{ |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1771 |
g_return_val_if_fail (connection != NULL, NULL); |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1772 |
|
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1773 |
return connection->ssl; |
15
1ff2f81867e1
2003-07-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
12
diff
changeset
|
1774 |
} |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1775 |
|
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1776 |
/** |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1777 |
* lm_connection_set_ssl: |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1778 |
* @connection: An #LmConnection |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1779 |
* @ssl: An #LmSSL |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1780 |
* |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1781 |
* Sets SSL struct or unset if @ssl is %NULL. If set @connection will use SSL to for the connection. |
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1782 |
*/ |
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1783 |
void |
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1784 |
lm_connection_set_ssl (LmConnection *connection, LmSSL *ssl) |
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1785 |
{ |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1786 |
g_return_if_fail (connection != NULL); |
123
c1c7eb267b52
* loudmouth/lm-connection.c (lm_connection_set_ssl):
mr <mr>
parents:
121
diff
changeset
|
1787 |
g_return_if_fail (lm_ssl_is_supported () == TRUE); |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1788 |
|
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1789 |
if (connection->ssl) { |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1790 |
lm_ssl_unref (connection->ssl); |
62
39b83ccd70ff
2003-12-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
61
diff
changeset
|
1791 |
} |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1792 |
|
68
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1793 |
if (ssl) { |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1794 |
connection->ssl = lm_ssl_ref (ssl); |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1795 |
} else { |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1796 |
connection->ssl = NULL; |
28203e15de0e
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
67
diff
changeset
|
1797 |
} |
1 | 1798 |
} |
1799 |
||
1800 |
/** |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1801 |
* lm_connection_get_proxy: |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1802 |
* @connection: an #LmConnection |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1803 |
* |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1804 |
* Returns the proxy if the connection is using one. |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1805 |
* |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1806 |
* Return value: The proxy or %NULL if no proxy is used. |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1807 |
**/ |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1808 |
LmProxy * |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1809 |
lm_connection_get_proxy (LmConnection *connection) |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1810 |
{ |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1811 |
g_return_val_if_fail (connection != NULL, NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1812 |
|
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1813 |
return connection->proxy; |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1814 |
} |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1815 |
|
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1816 |
/** |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1817 |
* lm_connection_set_proxy: |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1818 |
* @connection: an #LmConnection |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1819 |
* @proxy: an #LmProxy |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1820 |
* |
94
85b606ac2c0c
2004-09-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
93
diff
changeset
|
1821 |
* Sets the proxy to use for this connection. To unset pass #NULL. |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1822 |
* |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1823 |
**/ |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1824 |
void |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1825 |
lm_connection_set_proxy (LmConnection *connection, LmProxy *proxy) |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1826 |
{ |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1827 |
g_return_if_fail (connection != NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1828 |
|
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1829 |
if (lm_connection_is_open (connection)) { |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1830 |
g_warning ("Can't change server proxy while connected"); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1831 |
return; |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1832 |
} |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1833 |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1834 |
if (connection->proxy) { |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1835 |
lm_proxy_unref (connection->proxy); |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1836 |
connection->proxy = NULL; |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1837 |
} |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1838 |
|
94
85b606ac2c0c
2004-09-02 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
93
diff
changeset
|
1839 |
if (proxy && lm_proxy_get_type (proxy) != LM_PROXY_TYPE_NONE) { |
87
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1840 |
connection->proxy = lm_proxy_ref (proxy); |
2d68f59e3fd4
2004-08-08 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
84
diff
changeset
|
1841 |
} |
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1842 |
} |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1843 |
|
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1844 |
/** |
1 | 1845 |
* lm_connection_send: |
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1846 |
* @connection: #LmConnection to send message over. |
1 | 1847 |
* @message: #LmMessage to send. |
1848 |
* @error: location to store error, or %NULL |
|
1849 |
* |
|
1850 |
* Asynchronous call to send a message. |
|
1851 |
* |
|
1852 |
* Return value: Returns #TRUE if no errors where detected while sending, #FALSE otherwise. |
|
1853 |
**/ |
|
1854 |
gboolean |
|
1855 |
lm_connection_send (LmConnection *connection, |
|
1856 |
LmMessage *message, |
|
1857 |
GError **error) |
|
1858 |
{ |
|
1859 |
gchar *xml_str; |
|
1860 |
gchar *ch; |
|
1861 |
gboolean result; |
|
1862 |
||
1863 |
g_return_val_if_fail (connection != NULL, FALSE); |
|
1864 |
g_return_val_if_fail (message != NULL, FALSE); |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1865 |
|
1 | 1866 |
xml_str = lm_message_node_to_string (message->node); |
1867 |
if ((ch = strstr (xml_str, "</stream:stream>"))) { |
|
1868 |
*ch = '\0'; |
|
1869 |
} |
|
1870 |
||
1871 |
result = connection_send (connection, xml_str, -1, error); |
|
1872 |
g_free (xml_str); |
|
1873 |
||
1874 |
return result; |
|
1875 |
} |
|
1876 |
||
1877 |
/** |
|
1878 |
* lm_connection_send_with_reply: |
|
1879 |
* @connection: #LmConnection used to send message. |
|
1880 |
* @message: #LmMessage to send. |
|
1881 |
* @handler: #LmMessageHandler that will be used when a reply to @message arrives |
|
1882 |
* @error: location to store error, or %NULL |
|
1883 |
* |
|
1884 |
* Send a #LmMessage which will result in a reply. |
|
1885 |
* |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
1886 |
* Return value: Returns #TRUE if no errors where detected while sending, #FALSE otherwise. |
1 | 1887 |
**/ |
1888 |
gboolean |
|
1889 |
lm_connection_send_with_reply (LmConnection *connection, |
|
1890 |
LmMessage *message, |
|
1891 |
LmMessageHandler *handler, |
|
1892 |
GError **error) |
|
1893 |
{ |
|
1894 |
gchar *id; |
|
1895 |
||
1896 |
g_return_val_if_fail (connection != NULL, FALSE); |
|
1897 |
g_return_val_if_fail (message != NULL, FALSE); |
|
1898 |
g_return_val_if_fail (handler != NULL, FALSE); |
|
1899 |
||
1900 |
if (lm_message_node_get_attribute (message->node, "id")) { |
|
1901 |
id = g_strdup (lm_message_node_get_attribute (message->node, |
|
1902 |
"id")); |
|
1903 |
} else { |
|
1904 |
id = _lm_utils_generate_id (); |
|
1905 |
lm_message_node_set_attributes (message->node, "id", id, NULL); |
|
1906 |
} |
|
1907 |
||
1908 |
g_hash_table_insert (connection->id_handlers, |
|
1909 |
id, lm_message_handler_ref (handler)); |
|
1910 |
||
1911 |
return lm_connection_send (connection, message, error); |
|
1912 |
} |
|
1913 |
||
1914 |
/** |
|
1915 |
* lm_connection_send_with_reply_and_block: |
|
1916 |
* @connection: an #LmConnection |
|
1917 |
* @message: an #LmMessage |
|
1918 |
* @error: Set if error was detected during sending. |
|
1919 |
* |
|
1920 |
* Send @message and wait for return. |
|
1921 |
* |
|
1922 |
* Return value: The reply |
|
1923 |
**/ |
|
1924 |
LmMessage * |
|
1925 |
lm_connection_send_with_reply_and_block (LmConnection *connection, |
|
1926 |
LmMessage *message, |
|
1927 |
GError **error) |
|
1928 |
{ |
|
1929 |
gchar *id; |
|
1930 |
LmMessage *reply = NULL; |
|
1931 |
||
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1932 |
g_return_val_if_fail (connection != NULL, NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1933 |
g_return_val_if_fail (message != NULL, NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
1934 |
|
125
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1935 |
if (connection->state < LM_CONNECTION_STATE_OPENING) { |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1936 |
g_set_error (error, |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1937 |
LM_ERROR, |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1938 |
LM_ERROR_CONNECTION_NOT_OPEN, |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1939 |
"Connection is not open, call lm_connection_open() first"); |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1940 |
return FALSE; |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1941 |
} |
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1942 |
|
6163119136b5
2005-08-12 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
124
diff
changeset
|
1943 |
|
1 | 1944 |
if (lm_message_node_get_attribute (message->node, "id")) { |
1945 |
id = g_strdup (lm_message_node_get_attribute (message->node, |
|
1946 |
"id")); |
|
1947 |
} else { |
|
1948 |
id = _lm_utils_generate_id (); |
|
1949 |
lm_message_node_set_attributes (message->node, "id", id, NULL); |
|
1950 |
} |
|
1951 |
||
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1952 |
lm_message_queue_detach (connection->queue); |
1 | 1953 |
|
1954 |
lm_connection_send (connection, message, error); |
|
1955 |
||
1956 |
while (!reply) { |
|
1957 |
const gchar *m_id; |
|
140
103227122f45
2006-04-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
137
diff
changeset
|
1958 |
guint n; |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1959 |
|
82
a32b54e654e2
2004-03-17 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
80
diff
changeset
|
1960 |
g_main_context_iteration (connection->context, TRUE); |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1961 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1962 |
if (lm_message_queue_is_empty (connection->queue)) { |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1963 |
continue; |
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1964 |
} |
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1965 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1966 |
for (n = 0; n < lm_message_queue_get_length (connection->queue); n++) { |
1 | 1967 |
LmMessage *m; |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1968 |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1969 |
m = (LmMessage *) lm_message_queue_peek_nth (connection->queue, n); |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1970 |
|
1 | 1971 |
m_id = lm_message_node_get_attribute (m->node, "id"); |
1972 |
||
1973 |
if (m_id && strcmp (m_id, id) == 0) { |
|
1974 |
reply = m; |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1975 |
lm_message_queue_pop_nth (connection->queue, n); |
39
b909b5af5a97
2003-10-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
37
diff
changeset
|
1976 |
break; |
1 | 1977 |
} |
1978 |
} |
|
1979 |
} |
|
1980 |
||
1981 |
g_free (id); |
|
196
209bfa124066
Imported LmConnection refactor from old repository.
Mikael Hallendal <micke@imendio.com>
parents:
187
diff
changeset
|
1982 |
lm_message_queue_attach (connection->queue, connection->context); |
1 | 1983 |
|
1984 |
return reply; |
|
1985 |
} |
|
1986 |
||
1987 |
/** |
|
1988 |
* lm_connection_register_message_handler: |
|
1989 |
* @connection: Connection to register a handler for. |
|
1990 |
* @handler: Message handler to register. |
|
1991 |
* @type: Message type that @handler will handle. |
|
1992 |
* @priority: The priority in which to call @handler. |
|
1993 |
* |
|
1994 |
* Registers a #LmMessageHandler to handle incoming messages of a certain type. |
|
1995 |
* To unregister the handler call lm_connection_unregister_message_handler(). |
|
1996 |
**/ |
|
1997 |
void |
|
1998 |
lm_connection_register_message_handler (LmConnection *connection, |
|
1999 |
LmMessageHandler *handler, |
|
2000 |
LmMessageType type, |
|
2001 |
LmHandlerPriority priority) |
|
2002 |
{ |
|
2003 |
HandlerData *hd; |
|
2004 |
||
2005 |
g_return_if_fail (connection != NULL); |
|
2006 |
g_return_if_fail (handler != NULL); |
|
2007 |
g_return_if_fail (type != LM_MESSAGE_TYPE_UNKNOWN); |
|
2008 |
||
2009 |
hd = g_new0 (HandlerData, 1); |
|
2010 |
hd->priority = priority; |
|
2011 |
hd->handler = lm_message_handler_ref (handler); |
|
2012 |
||
2013 |
connection->handlers[type] = g_slist_insert_sorted (connection->handlers[type], |
|
2014 |
hd, |
|
2015 |
(GCompareFunc) connection_handler_compare_func); |
|
2016 |
} |
|
2017 |
||
2018 |
/** |
|
2019 |
* lm_connection_unregister_message_handler: |
|
2020 |
* @connection: Connection to unregister a handler for. |
|
2021 |
* @handler: The handler to unregister. |
|
2022 |
* @type: What type of messages to unregister this handler for. |
|
2023 |
* |
|
2024 |
* Unregisters a handler for @connection. @handler will no longer be called |
|
2025 |
* when incoming messages of @type arrive. |
|
2026 |
**/ |
|
2027 |
void |
|
2028 |
lm_connection_unregister_message_handler (LmConnection *connection, |
|
2029 |
LmMessageHandler *handler, |
|
2030 |
LmMessageType type) |
|
2031 |
{ |
|
207
6dd9dc2f6b69
Cleaned up lm_connection_unref_message_handler.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
2032 |
GSList *l; |
1 | 2033 |
|
2034 |
g_return_if_fail (connection != NULL); |
|
2035 |
g_return_if_fail (handler != NULL); |
|
2036 |
g_return_if_fail (type != LM_MESSAGE_TYPE_UNKNOWN); |
|
2037 |
||
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2038 |
for (l = connection->handlers[type]; l; l = l->next) { |
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2039 |
HandlerData *hd = (HandlerData *) l->data; |
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2040 |
|
207
6dd9dc2f6b69
Cleaned up lm_connection_unref_message_handler.
Mikael Hallendal <micke@imendio.com>
parents:
196
diff
changeset
|
2041 |
if (handler == hd->handler) { |
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2042 |
connection->handlers[type] = g_slist_remove_link (connection->handlers[type], l); |
1 | 2043 |
g_slist_free (l); |
2044 |
lm_message_handler_unref (hd->handler); |
|
2045 |
g_free (hd); |
|
2046 |
break; |
|
2047 |
} |
|
2048 |
} |
|
2049 |
} |
|
2050 |
||
2051 |
/** |
|
2052 |
* lm_connection_set_disconnect_function: |
|
2053 |
* @connection: Connection to register disconnect callback for. |
|
2054 |
* @function: Function to be called when @connection is closed. |
|
2055 |
* @user_data: User data passed to @function. |
|
2056 |
* @notify: Function that will be called with @user_data when @user_data needs to be freed. Pass #NULL if it shouldn't be freed. |
|
2057 |
* |
|
2058 |
* Set the callback that will be called when a connection is closed. |
|
2059 |
**/ |
|
2060 |
void |
|
2061 |
lm_connection_set_disconnect_function (LmConnection *connection, |
|
2062 |
LmDisconnectFunction function, |
|
2063 |
gpointer user_data, |
|
2064 |
GDestroyNotify notify) |
|
2065 |
{ |
|
66
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
2066 |
g_return_if_fail (connection != NULL); |
577d5059b718
2004-01-15 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
65
diff
changeset
|
2067 |
|
1 | 2068 |
if (connection->disconnect_cb) { |
2069 |
_lm_utils_free_callback (connection->disconnect_cb); |
|
2070 |
} |
|
2071 |
||
143
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2072 |
if (function) { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2073 |
connection->disconnect_cb = _lm_utils_new_callback (function, |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2074 |
user_data, |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2075 |
notify); |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2076 |
} else { |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2077 |
connection->disconnect_cb = NULL; |
92193c23b0c7
2006-05-26 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
140
diff
changeset
|
2078 |
} |
1 | 2079 |
} |
2080 |
||
2081 |
/** |
|
2082 |
* lm_connection_send_raw: |
|
2083 |
* @connection: Connection used to send |
|
2084 |
* @str: The string to send, the entire string will be sent. |
|
2085 |
* @error: Set if error was detected during sending. |
|
2086 |
* |
|
2087 |
* Asynchronous call to send a raw string. Useful for debugging and testing. |
|
2088 |
* |
|
2089 |
* Return value: Returns #TRUE if no errors was detected during sending, |
|
2090 |
* #FALSE otherwise. |
|
2091 |
**/ |
|
2092 |
gboolean |
|
2093 |
lm_connection_send_raw (LmConnection *connection, |
|
2094 |
const gchar *str, |
|
2095 |
GError **error) |
|
2096 |
{ |
|
2097 |
g_return_val_if_fail (connection != NULL, FALSE); |
|
168
ac1affcd5d22
2006-09-01 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
156
diff
changeset
|
2098 |
g_return_val_if_fail (str != NULL, FALSE); |
1 | 2099 |
|
2100 |
return connection_send (connection, str, -1, error); |
|
2101 |
} |
|
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2102 |
/** |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2103 |
* lm_connection_get_state: |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2104 |
* @connection: Connection to get state on |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2105 |
* |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2106 |
* Returns the state of the connection. |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2107 |
* |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2108 |
* Return value: The state of the connection. |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2109 |
**/ |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2110 |
LmConnectionState |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2111 |
lm_connection_get_state (LmConnection *connection) |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2112 |
{ |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2113 |
g_return_val_if_fail (connection != NULL, |
91
d51b8e4f43d9
2004-08-27 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
90
diff
changeset
|
2114 |
LM_CONNECTION_STATE_CLOSED); |
59
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2115 |
|
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2116 |
return connection->state; |
ef952e8c114d
2003-12-19 Mikael Hallendal <micke@imendio.com>
hallski <hallski>
parents:
57
diff
changeset
|
2117 |
} |
1 | 2118 |
|
2119 |
/** |
|
308
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2120 |
* lm_connection_get_client_host: |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2121 |
* @connection: An #LmConnection |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2122 |
* |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2123 |
* Returns the local host name of the connection. |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2124 |
* |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2125 |
* Return value: A newly allocated string representing the local host name. |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2126 |
**/ |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2127 |
gchar * |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2128 |
lm_connection_get_local_host (LmConnection *connection) |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2129 |
{ |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2130 |
return lm_socket_get_local_host (connection->socket); |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2131 |
} |
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2132 |
|
7e2050a6df75
Added lm_connection_get_client_host (forward-port from LM1.2).
Senko Rasic <senko.rasic@collabora.co.uk>
parents:
307
diff
changeset
|
2133 |
/** |
1 | 2134 |
* lm_connection_ref: |
2135 |
* @connection: Connection to add a reference to. |
|
2136 |
* |
|
2137 |
* Add a reference on @connection. To remove a reference call |
|
2138 |
* lm_connection_unref(). |
|
2139 |
* |
|
2140 |
* Return value: Returns the same connection. |
|
2141 |
**/ |
|
2142 |
LmConnection* |
|
2143 |
lm_connection_ref (LmConnection *connection) |
|
2144 |
{ |
|
2145 |
g_return_val_if_fail (connection != NULL, NULL); |
|
2146 |
||
2147 |
connection->ref_count++; |
|
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2148 |
|
1 | 2149 |
return connection; |
2150 |
} |
|
2151 |
||
2152 |
/** |
|
2153 |
* lm_connection_unref: |
|
2154 |
* @connection: Connection to remove reference from. |
|
2155 |
* |
|
2156 |
* Removes a reference on @connection. If there are no references to |
|
56
3bf928955fc5
2003-11-20 Ross Burton <ross@burtonini.com>
hallski <hallski>
parents:
55
diff
changeset
|
2157 |
* @connection it will be freed and shouldn't be used again. |
1 | 2158 |
**/ |
2159 |
void |
|
2160 |
lm_connection_unref (LmConnection *connection) |
|
2161 |
{ |
|
2162 |
g_return_if_fail (connection != NULL); |
|
2163 |
||
2164 |
connection->ref_count--; |
|
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2165 |
|
1 | 2166 |
if (connection->ref_count == 0) { |
572
0a4fa0952ef6
Don't free connection internals before it's closed. [#34]
Mikael Hallendal <micke@imendio.com>
parents:
555
diff
changeset
|
2167 |
connection_free (connection); |
1 | 2168 |
} |
2169 |
} |