kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow gtalk and jingle to use TLS connections again.

Browse Source 
Closes issue #9972


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-11-06 18:44:19 +00:00
parent 4c6c69bdcc
commit 2c582c7cfb
4 changed files with 53 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_gtalk.c
View File

@@ -436,7 +436,7 @@ static int gtalk_invite(struct gtalk_pvt *p, char *to, char *from, char *sid, in
iks_insert_node(gtalk, transport);
iks_insert_node(dcodecs, payload_telephone);
iks_send(client->connection->p, iq);
ast_aji_send(client->connection, iq);
iks_delete(payload_telephone);
iks_delete(transport);
iks_delete(dcodecs);
@@ -473,7 +473,7 @@ static int gtalk_invite_response(struct gtalk_pvt *p, char *to , char *from, cha
iks_insert_attrib(transport, "xmlns", "http://www.google.com/transport/p2p");
iks_insert_node(iq,session);
iks_insert_node(session,transport);
iks_send(p->parent->connection->p, iq);
ast_aji_send(p->parent->connection, iq);
iks_delete(transport);
iks_delete(session);
iks_delete(iq);
@@ -570,7 +570,7 @@ static int gtalk_response(struct gtalk *client, char *from, ikspak *pak, const c
iks_insert_node(response, error);
}
}
iks_send(client->connection->p, response);
ast_aji_send(client->connection, response);
if (reason)
iks_delete(reason);
if (error)
@@ -830,7 +830,7 @@ static int gtalk_create_candidates(struct gtalk *client, struct gtalk_pvt *p, ch
iks_insert_attrib(candidate, "type", "relay");
iks_insert_attrib(candidate, "network", "0");
iks_insert_attrib(candidate, "generation", "0");
iks_send(c->p, iq);
ast_aji_send(c, iq);
}
p->laststun = 0;
@@ -1036,7 +1036,7 @@ static int gtalk_action(struct gtalk *client, struct gtalk_pvt *p, const char *a
iks_insert_attrib(session, "initiator", p->initiator ? p->us : p->them);
iks_insert_attrib(session, "xmlns", "http://www.google.com/session");
iks_insert_node(request, session);
iks_send(client->connection->p, request);
ast_aji_send(client->connection, request);
iks_delete(session);
res = 0;
}
@@ -1274,7 +1274,7 @@ static int gtalk_add_candidate(struct gtalk *client, ikspak *pak)
iks_insert_attrib(receipt, "from", from);
iks_insert_attrib(receipt, "to", iks_find_attrib(pak->x, "from"));
iks_insert_attrib(receipt, "id", iks_find_attrib(pak->x, "id"));
iks_send(c->p, receipt);
ast_aji_send(c, receipt);
iks_delete(receipt);
return 1;
@@ -1447,7 +1447,7 @@ static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duratio
} else if (ast->dtmff.frametype == AST_FRAME_DTMF_END || duration != 0) {
iks_insert_attrib(dtmf, "action", "button-up");
}
iks_send(client->connection->p, iq);
ast_aji_send(client->connection, iq);
iks_delete(iq);
iks_delete(gtalk);
iks_delete(dtmf);

14
channels/chan_jingle.c
View File

@@ -372,7 +372,7 @@ static int jingle_accept_call(struct jingle *client, struct jingle_pvt *p)
iks_insert_node(dcodecs, payload_audio);
iks_insert_node(dcodecs, payload_cn);
iks_send(c->p, iq);
ast_aji_send(c, iq);
iks_delete(payload_red);
iks_delete(payload_audio);
iks_delete(payload_cn);
@@ -473,7 +473,7 @@ static int jingle_response(struct jingle *client, ikspak *pak, const char *reaso
iks_insert_node(response, error);
}
}
iks_send(client->connection->p, response);
ast_aji_send(client->connection, response);
if (reason)
iks_delete(reason);
if (error)
@@ -729,7 +729,7 @@ static int jingle_create_candidates(struct jingle *client, struct jingle_pvt *p,
}
iks_insert_attrib(candidate, "ufrag", tmp->ufrag);
iks_send(c->p, iq);
ast_aji_send(c, iq);
}
p->laststun = 0;
@@ -915,7 +915,7 @@ static int jingle_action(struct jingle *client, struct jingle_pvt *p, const char
iks_insert_node(iq, jingle);
iks_send(client->connection->p, iq);
ast_aji_send(client->connection, iq);
iks_delete(jingle);
res = 0;
}
@@ -1124,7 +1124,7 @@ static int jingle_add_candidate(struct jingle *client, ikspak *pak)
iks_insert_attrib(receipt, "from", c->jid->full);
iks_insert_attrib(receipt, "to", iks_find_attrib(pak->x, "from"));
iks_insert_attrib(receipt, "id", iks_find_attrib(pak->x, "id"));
iks_send(c->p, receipt);
ast_aji_send(c, receipt);
iks_delete(receipt);
return 1;
@@ -1287,7 +1287,7 @@ static int jingle_digit(struct ast_channel *ast, char digit, unsigned int durati
} else if (ast->dtmff.frametype == AST_FRAME_DTMF_END || duration != 0) {
iks_insert_attrib(dtmf, "action", "button-up");
}
iks_send(client->connection->p, iq);
ast_aji_send(client->connection, iq);
iks_delete(iq);
iks_delete(jingle);
iks_delete(dtmf);
@@ -1354,7 +1354,7 @@ static int jingle_transmit_invite(struct jingle_pvt *p)
iks_insert_node(jingle, content);
iks_insert_node(iq, jingle);
iks_send(client->p, iq);
ast_aji_send(client, iq);
iks_delete(iq);
iks_delete(jingle);