author | Nicolas Cornu <nicolas.cornu@ensi-bourges.fr> |
Sat, 14 Aug 2010 01:39:05 +0200 | |
changeset 113 | cb5adb25ad87 |
parent 110 | c0341c164405 |
child 118 | f3408f4fe61a |
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; |
36
c300f2af08d0
Fix the send_session_terminate function.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
35
diff
changeset
|
38 |
|
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); |
|
42 |
lm_message_node_add_child(node, "jingle", NULL); |
|
43 |
node = lm_message_node_get_child(node, "jingle"); |
|
44 |
lm_message_node_set_attributes(node, "xmlns", NS_JINGLE, |
|
45 |
"action", "session-terminate", |
|
46 |
"sid", js->sid, |
|
47 |
NULL); |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
48 |
if (r == NULL) return; |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
49 |
|
36
c300f2af08d0
Fix the send_session_terminate function.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
35
diff
changeset
|
50 |
if (reason != NULL) { |
110
c0341c164405
JFT: compute the md5 when receiving
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
107
diff
changeset
|
51 |
lm_message_node_add_child(node, "reason", NULL); |
107 | 52 |
node = lm_message_node_get_child(node, "reason"); |
53 |
lm_message_node_add_child(node, reason, NULL); |
|
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
54 |
} |
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
55 |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
56 |
ackhandle = g_new0(JingleAckHandle, 1); |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
57 |
ackhandle->callback = NULL; |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
58 |
ackhandle->user_data = NULL; |
48
3c08b78be871
add ack iq to the list
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
47
diff
changeset
|
59 |
|
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
60 |
lm_connection_send_with_reply(lconnection, r, |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
61 |
jingle_new_ack_handler(ackhandle), NULL); |
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
62 |
lm_message_unref(r); |
26
af14f8f5a2b6
send session terminated
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
diff
changeset
|
63 |
} |
38 | 64 |
|
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
65 |
static void jingle_handle_ack_iq_sa(LmMessage *mess, gpointer *data) |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
66 |
{ |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
67 |
LmMessageNode *node; |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
68 |
const gchar *type, *cause; |
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
69 |
GSList *child = NULL; |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
70 |
JingleSession *sess = (JingleSession*)data; |
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
71 |
SessionContent *sc; |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
72 |
|
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
73 |
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
|
74 |
return; |
101
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
75 |
} |
4235aa1a7664
JFT: add a func to send data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
99
diff
changeset
|
76 |
|
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
77 |
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
|
78 |
node = lm_message_get_node(mess); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
79 |
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
|
80 |
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
|
81 |
if(node->children != NULL) |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
82 |
cause = node->children->name; |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
83 |
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
|
84 |
} |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
85 |
// 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
|
86 |
session_delete(sess); |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
87 |
} |
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
88 |
|
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
89 |
void jingle_send_session_accept(JingleNode *jn) |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
90 |
{ |
94
a49f78cada29
Fix bugs. Use directly the JingleSession to determine the recipient.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
92
diff
changeset
|
91 |
JingleSession *sess; |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
92 |
JingleContent *cn; |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
93 |
LmMessage *mess; |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
94 |
GSList *child = NULL; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
95 |
JingleAppFuncs *appfuncs; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
96 |
JingleTransportFuncs *transfuncs; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
97 |
gconstpointer description, transport; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
98 |
const gchar *xmlns; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
99 |
GError *err = NULL; |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
100 |
JingleAckHandle *ackhandle; |
48
3c08b78be871
add ack iq to the list
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
47
diff
changeset
|
101 |
|
67
c12618793df0
New functions in sessions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
64
diff
changeset
|
102 |
sess = session_new_from_jinglenode(jn); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
103 |
|
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
104 |
for (child = jn->content; child; child = child->next) { |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
105 |
cn = (JingleContent *)(child->data); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
106 |
|
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
107 |
xmlns = lm_message_node_get_attribute(cn->description, "xmlns"); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
108 |
appfuncs = jingle_get_appfuncs(xmlns); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
109 |
if (appfuncs == NULL) continue; |
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 |
xmlns = lm_message_node_get_attribute(cn->transport, "xmlns"); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
112 |
transfuncs = jingle_get_transportfuncs(xmlns); |
59
69985ccda25a
We send a session-accept \o/... Endly
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
58
diff
changeset
|
113 |
if (transfuncs == NULL) continue; |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
114 |
|
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
115 |
description = appfuncs->check(cn, &err); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
116 |
if (description == NULL || err != NULL) continue; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
117 |
transport = transfuncs->check(cn, &err); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
118 |
if (transport == NULL || err != NULL) continue; |
64
63d4f434abbc
Add a command to JFT to send or request a file
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
59
diff
changeset
|
119 |
|
59
69985ccda25a
We send a session-accept \o/... Endly
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
58
diff
changeset
|
120 |
scr_log_print(LPRINT_DEBUG, "jingle: New content accepted: %s", cn->name); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
121 |
|
67
c12618793df0
New functions in sessions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
64
diff
changeset
|
122 |
session_add_content_from_jinglecontent(sess, cn, JINGLE_SESSION_STATE_ACTIVE); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
123 |
} |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
124 |
|
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
125 |
if(g_slist_length(sess->content) == 0) { |
107 | 126 |
jingle_send_session_terminate(sess, "unsupported-applications"); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
127 |
session_delete(sess); |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
128 |
return; |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
129 |
} |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
130 |
|
99 | 131 |
mess = lm_message_from_jinglesession(sess, JINGLE_SESSION_ACCEPT); |
107 | 132 |
|
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
133 |
if (mess) { |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
134 |
ackhandle = g_new0(JingleAckHandle, 1); |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
135 |
ackhandle->callback = jingle_handle_ack_iq_sa; |
98 | 136 |
ackhandle->user_data = (gpointer*)sess; |
97
3968001b0396
use jinglesession in send_session_accept
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
94
diff
changeset
|
137 |
lm_connection_send_with_reply(lconnection, mess, |
52
d803c882a182
Fix the ack handlers.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
49
diff
changeset
|
138 |
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
|
139 |
lm_message_unref(mess); |
43
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
140 |
} |
357e69106171
Split handle_session_initiate into two functions
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
38
diff
changeset
|
141 |
} |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
142 |
|
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
143 |
static void jingle_handle_ack_iq_si(LmMessage *mess, gpointer *data) |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
144 |
{ |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
145 |
LmMessageNode *node; |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
146 |
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
|
147 |
JingleSession *sess = (JingleSession*)data; |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
148 |
|
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
149 |
if(lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_RESULT) |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
150 |
return; |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
151 |
if(lm_message_get_sub_type(mess) == LM_MESSAGE_SUB_TYPE_ERROR) { |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
152 |
node = lm_message_get_node(mess); |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
153 |
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
|
154 |
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
|
155 |
if(node->children != NULL) |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
156 |
cause = node->children->name; |
92
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
157 |
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
|
158 |
} |
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
159 |
// 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
|
160 |
session_delete(sess); |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
161 |
} |
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
162 |
|
80
1c2ef2c5debe
Modifications to the JingleSession struct.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
68
diff
changeset
|
163 |
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
|
164 |
{ |
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
165 |
JingleAckHandle *ackhandle; |
81
8b6320ad470b
Add comments, change some function names...
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
80
diff
changeset
|
166 |
GSList *listentry; |
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
167 |
|
94
a49f78cada29
Fix bugs. Use directly the JingleSession to determine the recipient.
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
92
diff
changeset
|
168 |
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
|
169 |
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
|
170 |
"initiator", js->from); |
105
c31988e107b3
ibb handle new data
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
103
diff
changeset
|
171 |
|
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
172 |
if (mess) { |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
173 |
ackhandle = g_new0(JingleAckHandle, 1); |
91
7d3e75eec29e
handle error for session-initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
90
diff
changeset
|
174 |
ackhandle->callback = jingle_handle_ack_iq_si; |
92
e6c23d765038
delete the sess if ack is an error
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
91
diff
changeset
|
175 |
ackhandle->user_data = (gpointer*)js; |
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
176 |
lm_connection_send_with_reply(lconnection, mess, |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
177 |
jingle_new_ack_handler(ackhandle), NULL); |
83
d5c5e9be53cb
modify send_session_initiate
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
81
diff
changeset
|
178 |
lm_message_unref(mess); |
68
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
179 |
} |
ae8b0d03887e
Start the send_session_initiate function
Nicolas Cornu <nicolas.cornu@ensi-bourges.fr>
parents:
67
diff
changeset
|
180 |
} |