author | Nicolas Cornu <nicolas.cornu@ensi-bourges.fr> |
Wed, 01 Sep 2010 01:19:40 +0200 | |
changeset 165 | 763c26abd99d |
parent 159 | 1df5f5e3f1e7 |
permissions | -rw-r--r-- |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
1 |
/* |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
2 |
* send.c |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
3 |
* |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
4 |
* Copyrigth (C) 2010 Nicolas Cornu <nicolas.cornu@ensi-bourges.fr> |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
5 |
* |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License as published by |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
8 |
* the Free Software Foundation; either version 2 of the License, or (at |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
9 |
* your option) any later version. |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
10 |
* |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
11 |
* This program is distributed in the hope that it will be useful, but |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
12 |
* WITHOUT ANY WARRANTY; without even the implied warranty of |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
13 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
14 |
* General Public License for more details. |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
15 |
* |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
16 |
* You should have received a copy of the GNU General Public License |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
17 |
* along with this program; if not, write to the Free Software |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
18 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
19 |
* USA |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
20 |
*/ |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
21 |
|
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
22 |
#include <glib.h> |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
23 |
#include <loudmouth/loudmouth.h> |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
24 |
|
28
ed7520776c41
Add .h to make dependencies
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
27
diff
changeset
|
25 |
#include <mcabber/xmpp_helper.h> |
ed7520776c41
Add .h to make dependencies
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
27
diff
changeset
|
26 |
#include <mcabber/xmpp_defines.h> |
58 | 27 |
#include <mcabber/settings.h> |
28 |
#include <mcabber/logprint.h> |
|
27 | 29 |
|
35
a0fd92a93af7
Fix the function converting a JingleNode to a LmMessage.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
28
diff
changeset
|
30 |
#include <jingle/jingle.h> |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
31 |
#include <jingle/sessions.h> |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
32 |
#include <jingle/send.h> |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
33 |
|
35
a0fd92a93af7
Fix the function converting a JingleNode to a LmMessage.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
28
diff
changeset
|
34 |
|
107 | 35 |
void jingle_send_session_terminate(JingleSession *js, const gchar *reason) |
35
a0fd92a93af7
Fix the function converting a JingleNode to a LmMessage.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
28
diff
changeset
|
36 |
{ |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
37 |
JingleAckHandle *ackhandle; |
118
f3408f4fe61a
JS5B: to message
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
110
diff
changeset
|
38 |
LmMessageNode *node2; |
107 | 39 |
LmMessage *r = lm_message_new_with_sub_type(js->to, LM_MESSAGE_TYPE_IQ, |
40 |
LM_MESSAGE_SUB_TYPE_SET); |
|
41 |
LmMessageNode *node = lm_message_get_node(r); |
|
118
f3408f4fe61a
JS5B: to message
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
110
diff
changeset
|
42 |
node2 = lm_message_node_add_child(node, "jingle", NULL); |
f3408f4fe61a
JS5B: to message
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
110
diff
changeset
|
43 |
lm_message_node_set_attributes(node2, "xmlns", NS_JINGLE, |
107 | 44 |
"action", "session-terminate", |
45 |
"sid", js->sid, |
|
46 |
NULL); |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
47 |
if (r == NULL) return; |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
48 |
|
36
c300f2af08d0
Fix the send_session_terminate function.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
35
diff
changeset
|
49 |
if (reason != NULL) { |
118
f3408f4fe61a
JS5B: to message
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
110
diff
changeset
|
50 |
node = lm_message_node_add_child(node2, "reason", NULL); |
107 | 51 |
lm_message_node_add_child(node, reason, NULL); |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
52 |
} |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
53 |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
54 |
ackhandle = g_new0(JingleAckHandle, 1); |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
55 |
ackhandle->callback = NULL; |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
56 |
ackhandle->user_data = NULL; |
48
3c08b78be871
add ack iq to the list
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
47
diff
changeset
|
57 |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
58 |
lm_connection_send_with_reply(lconnection, r, |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
59 |
jingle_new_ack_handler(ackhandle), NULL); |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
60 |
lm_message_unref(r); |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
61 |
} |
38 | 62 |
|
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
63 |
static void jingle_handle_ack_iq_sa(JingleAckType acktype, LmMessage *mess, |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
64 |
gpointer data) |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
65 |
{ |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
66 |
LmMessageNode *node; |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
67 |
const gchar *type, *cause; |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
68 |
JingleSession *sess = (JingleSession*)data; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
69 |
|
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
70 |
if (acktype == JINGLE_ACK_TIMEOUT) { |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
71 |
// TODO: handle ack timeout... |
148
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
72 |
scr_LogPrint(LPRINT_LOGNORM, "Jingle: did not receive the accept ack in time, aborting"); |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
73 |
session_delete(sess); |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
74 |
return; |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
75 |
} |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
76 |
|
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
77 |
if(lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_RESULT) { |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
78 |
return; |
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
79 |
} |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
80 |
|
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
81 |
if(lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_ERROR) { |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
82 |
node = lm_message_get_node(mess); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
83 |
node = lm_message_node_get_child(node,"error"); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
84 |
type = lm_message_node_get_attribute(node, "type"); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
85 |
if(node->children != NULL) |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
86 |
cause = node->children->name; |
148
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
87 |
else |
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
88 |
cause = "?"; |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
89 |
scr_LogPrint(LPRINT_LOGNORM, "Jingle: session-accept %s: %s", type, cause); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
90 |
} |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
91 |
// We delete the session, there was an error |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
92 |
session_delete(sess); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
93 |
} |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
94 |
|
119
0b9a7b505079
create the session when receiving a session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
118
diff
changeset
|
95 |
void jingle_send_session_accept(JingleSession *js) |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
96 |
{ |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
97 |
LmMessage *mess; |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
98 |
JingleAckHandle *ackhandle; |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
99 |
|
119
0b9a7b505079
create the session when receiving a session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
118
diff
changeset
|
100 |
mess = lm_message_from_jinglesession(js, JINGLE_SESSION_ACCEPT); |
107 | 101 |
|
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
102 |
if (mess) { |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
103 |
ackhandle = g_new0(JingleAckHandle, 1); |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
104 |
ackhandle->callback = jingle_handle_ack_iq_sa; |
119
0b9a7b505079
create the session when receiving a session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
118
diff
changeset
|
105 |
ackhandle->user_data = (gpointer)js; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
106 |
ackhandle->timeout = 60; |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
107 |
lm_connection_send_with_reply(lconnection, mess, |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
108 |
jingle_new_ack_handler(ackhandle), NULL); |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
109 |
lm_message_unref(mess); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
110 |
} |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
111 |
} |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
112 |
|
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
113 |
static void jingle_handle_ack_iq_si(JingleAckType acktype, LmMessage *mess, |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
114 |
gpointer data) |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
115 |
{ |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
116 |
LmMessageNode *node; |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
117 |
const gchar *type, *cause; |
92
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
118 |
JingleSession *sess = (JingleSession*)data; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
119 |
|
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
120 |
if (acktype == JINGLE_ACK_TIMEOUT) { |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
121 |
// TODO: handle ack timeout... |
148
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
122 |
scr_LogPrint(LPRINT_LOGNORM, "Jingle: did not receive the initiate ack in time, aborting"); |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
123 |
session_delete(sess); |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
124 |
return; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
125 |
} |
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
126 |
|
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
127 |
if (lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_RESULT) |
159
1df5f5e3f1e7
Fix the segfault when quitting in IBB and various other bugs.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
156
diff
changeset
|
128 |
return; // TODO: put a timeout on the session-accept |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
129 |
if (lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_ERROR) { |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
130 |
node = lm_message_get_node(mess); |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
131 |
node = lm_message_node_get_child(node,"error"); |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
132 |
type = lm_message_node_get_attribute(node, "type"); |
92
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
133 |
if(node->children != NULL) |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
134 |
cause = node->children->name; |
148
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
135 |
else |
cb40539b88b7
Fix compilation warnings. Add documentation in the code.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
129
diff
changeset
|
136 |
cause = "?"; |
92
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
137 |
scr_LogPrint(LPRINT_LOGNORM, "Jingle: session-initiate %s: %s", type, cause); |
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
138 |
} |
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
139 |
// We delete the session, there was an error |
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
140 |
session_delete(sess); |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
141 |
} |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
142 |
|
80
1c2ef2c5debe
Modifications to the JingleSession struct.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
68
diff
changeset
|
143 |
void jingle_send_session_initiate(JingleSession *js) |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
144 |
{ |
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
145 |
JingleAckHandle *ackhandle; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
146 |
GError *err = NULL; |
128
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
147 |
gboolean status; |
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
148 |
|
94
a49f78cada29
Fix bugs. Use directly the JingleSession to determine the recipient.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
92
diff
changeset
|
149 |
LmMessage *mess = lm_message_from_jinglesession(js, JINGLE_SESSION_INITIATE); |
90
b250d32fea87
It's not an error if the jingle element has no initiator attribute.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
89
diff
changeset
|
150 |
lm_message_node_set_attribute(lm_message_node_get_child(mess->node, "jingle"), |
b250d32fea87
It's not an error if the jingle element has no initiator attribute.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
89
diff
changeset
|
151 |
"initiator", js->from); |
105
c31988e107b3
ibb handle new data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
103
diff
changeset
|
152 |
|
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
153 |
if (mess) { |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
154 |
ackhandle = g_new0(JingleAckHandle, 1); |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
155 |
ackhandle->callback = jingle_handle_ack_iq_si; |
118
f3408f4fe61a
JS5B: to message
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
110
diff
changeset
|
156 |
ackhandle->user_data = (gpointer)js; |
129
2d5c3efda92a
Add a timeout to the AckHandlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
128
diff
changeset
|
157 |
ackhandle->timeout = 60; |
128
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
158 |
status = lm_connection_send_with_reply(lconnection, mess, |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
159 |
jingle_new_ack_handler(ackhandle), &err); |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
160 |
// TODO: delete the ack_handler |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
161 |
if (status == FALSE || err != NULL) { |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
162 |
scr_LogPrint(LPRINT_LOGNORM, "Jingle: %s: try again", err->message); |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
163 |
session_delete(js); |
cded9f40039e
Give info when asking for events
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
126
diff
changeset
|
164 |
} |
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
165 |
lm_message_unref(mess); |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
166 |
} |
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
167 |
} |