anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Send 'initiator' in jingle node, send 'creator' in content node

Browse source
This commit is contained in:
fiaxh 2021-06-01 10:48:09 -06:00
parent 686035ca1e
commit 1ac16ecd84
3 changed files with 42 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xmpp-vala/src/module/xep/0166_jingle/content.vala
View file

@ -229,6 +229,12 @@ public class Xmpp.Xep.Jingle.Content : Object {
public void send_transport_info(StanzaNode transport) { public void send_transport_info(StanzaNode transport) {
session.send_transport_info(this, transport); session.send_transport_info(this, transport);
} }
internal StanzaNode build_outer_content_node() {
return new StanzaNode.build("content", NS_URI)
.put_attribute("creator", content_creator.to_string())
.put_attribute("name", content_name);
}
} }
public class Xmpp.Xep.Jingle.ContentEncryption : Object { public class Xmpp.Xep.Jingle.ContentEncryption : Object {

85
xmpp-vala/src/module/xep/0166_jingle/session.vala
View file

@ -444,93 +444,72 @@ public class Xmpp.Xep.Jingle.Session : Object {
internal void send_session_info(StanzaNode child_node) { internal void send_session_info(StanzaNode child_node) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode node = new StanzaNode.build("jingle", NS_URI).add_self_xmlns() StanzaNode jingle_node = build_outer_session_node("session-info").put_node(child_node);
.put_attribute("action", "session-info") Iq.Stanza iq = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
.put_attribute("sid", sid)
// TODO put `initiator`?
.put_node(child_node);
Iq.Stanza iq = new Iq.Stanza.set(node) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq);
} }
internal void send_content_modify(Content content, Senders senders) { internal void send_content_modify(Content content, Senders senders) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode node = new StanzaNode.build("jingle", NS_URI).add_self_xmlns() StanzaNode jingle_node = build_outer_session_node("content-modify")
.put_attribute("action", "content-modify") .put_node(content.build_outer_content_node()
.put_attribute("sid", sid)
.put_node(new StanzaNode.build("content", NS_URI)
.put_attribute("creator", content.content_creator.to_string())
.put_attribute("name", content.content_name)
.put_attribute("senders", senders.to_string())); .put_attribute("senders", senders.to_string()));
Iq.Stanza iq = new Iq.Stanza.set(node) { to=peer_full_jid };
Iq.Stanza iq = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq);
} }
internal void send_transport_accept(Content content, TransportParameters transport_params) { internal void send_transport_accept(Content content, TransportParameters transport_params) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode jingle_response = new StanzaNode.build("jingle", NS_URI) StanzaNode jingle_node = build_outer_session_node("transport-accept")
.add_self_xmlns() .put_node(content.build_outer_content_node()
.put_attribute("action", "transport-accept") .put_node(transport_params.to_transport_stanza_node("transport-accept")));
.put_attribute("sid", sid)
.put_node(new StanzaNode.build("content", NS_URI) Iq.Stanza iq_response = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
.put_attribute("creator", "initiator")
.put_attribute("name", content.content_name)
.put_node(transport_params.to_transport_stanza_node("transport-accept"))
);
Iq.Stanza iq_response = new Iq.Stanza.set(jingle_response) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq_response); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq_response);
} }
internal void send_transport_replace(Content content, TransportParameters transport_params) { internal void send_transport_replace(Content content, TransportParameters transport_params) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode jingle = new StanzaNode.build("jingle", NS_URI) StanzaNode jingle_node = build_outer_session_node("transport-replace")
.add_self_xmlns() .put_node(content.build_outer_content_node()
.put_attribute("action", "transport-replace") .put_node(transport_params.to_transport_stanza_node("transport-replace")));
.put_attribute("sid", sid)
.put_node(new StanzaNode.build("content", NS_URI) Iq.Stanza iq = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
.put_attribute("creator", "initiator")
.put_attribute("name", content.content_name)
.put_node(transport_params.to_transport_stanza_node("transport-replace"))
);
Iq.Stanza iq = new Iq.Stanza.set(jingle) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq);
} }
internal void send_transport_reject(Content content, StanzaNode transport_node) { internal void send_transport_reject(Content content, StanzaNode transport_node) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode jingle_response = new StanzaNode.build("jingle", NS_URI) StanzaNode jingle_node = build_outer_session_node("transport-reject")
.add_self_xmlns() .put_node(content.build_outer_content_node().put_node(transport_node));
.put_attribute("action", "transport-reject")
.put_attribute("sid", sid) Iq.Stanza iq_response = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
.put_node(new StanzaNode.build("content", NS_URI)
.put_attribute("creator", "initiator")
.put_attribute("name", content.content_name)
.put_node(transport_node)
);
Iq.Stanza iq_response = new Iq.Stanza.set(jingle_response) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq_response); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq_response);
} }
internal void send_transport_info(Content content, StanzaNode transport) { internal void send_transport_info(Content content, StanzaNode transport) {
if (state == State.ENDED) return; if (state == State.ENDED) return;
StanzaNode jingle = new StanzaNode.build("jingle", NS_URI) StanzaNode jingle_node = build_outer_session_node("transport-info")
.add_self_xmlns() .put_node(content.build_outer_content_node().put_node(transport));
.put_attribute("action", "transport-info")
.put_attribute("sid", sid) Iq.Stanza iq = new Iq.Stanza.set(jingle_node) { to=peer_full_jid };
.put_node(new StanzaNode.build("content", NS_URI)
.put_attribute("creator", "initiator")
.put_attribute("name", content.content_name)
.put_node(transport)
);
Iq.Stanza iq = new Iq.Stanza.set(jingle) { to=peer_full_jid };
stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq); stream.get_module(Iq.Module.IDENTITY).send_iq(stream, iq);
} }
private StanzaNode build_outer_session_node(string action) {
return new StanzaNode.build("jingle", NS_URI)
.add_self_xmlns()
.put_attribute("action", action)
.put_attribute("initiator", we_initiated ? local_full_jid.to_string() : peer_full_jid.to_string())
.put_attribute("sid", sid);
}
public bool senders_include_us(Senders senders) { public bool senders_include_us(Senders senders) {
switch (senders) { switch (senders) {
case Senders.BOTH: case Senders.BOTH:

5
xmpp-vala/src/module/xep/0167_jingle_rtp/session_info_type.vala
View file

@ -53,7 +53,10 @@ namespace Xmpp.Xep.JingleRtp {
foreach (Jingle.Content content in session.contents) { foreach (Jingle.Content content in session.contents) {
Parameters? parameters = content.content_params as Parameters; Parameters? parameters = content.content_params as Parameters;
if (parameters != null && parameters.media == media) { if (parameters != null && parameters.media == media) {
StanzaNode session_info_content = new StanzaNode.build(node_name, NS_URI).add_self_xmlns().put_attribute("name", content.content_name); StanzaNode session_info_content = new StanzaNode.build(node_name, NS_URI)
.add_self_xmlns()
.put_attribute("name", content.content_name)
.put_attribute("creator", content.content_creator.to_string());
session.send_session_info(session_info_content); session.send_session_info(session_info_content);
} }
} }