Merge 'upstream/master'

1 files changed, 0 insertions, 55 deletions

diff --git a/plugins/ice/src/module.vala b/plugins/ice/src/module.vala
deleted file mode 100644
index 2645d7dc..00000000
--- a/plugins/ice/src/module.vala
+++ /dev/null
@@ -1,55 +0,0 @@
-using Gee;
-using Xmpp;
-using Xmpp.Xep;
-
-public class Dino.Plugins.Ice.Module : JingleIceUdp.Module {
-
-    public string? stun_ip = null;
-    public uint stun_port = 0;
-    public string? turn_ip = null;
-    public Xep.ExternalServiceDiscovery.Service? turn_service = null;
-
-    private weak Nice.Agent? agent;
-    private HashMap<string, DtlsSrtp.CredentialsCapsule> cerds = new HashMap<string, DtlsSrtp.CredentialsCapsule>();
-
-    private Nice.Agent get_agent() {
-        Nice.Agent? agent = this.agent;
-        if (agent == null) {
-            agent = new Nice.Agent(MainContext.@default(), Nice.Compatibility.RFC5245);
-            if (stun_ip != null) {
-                agent.stun_server = stun_ip;
-                agent.stun_server_port = stun_port;
-            }
-            agent.ice_tcp = false;
-            agent.set_software("Dino");
-            agent.weak_ref(agent_unweak);
-            this.agent = agent;
-            debug("STUN server for libnice %s %u", agent.stun_server, agent.stun_server_port);
-        }
-        return agent;
-    }
-
-    public override Jingle.TransportParameters create_transport_parameters(XmppStream stream, uint8 components, Jid local_full_jid, Jid peer_full_jid) {
-        DtlsSrtp.CredentialsCapsule? cred = get_create_credentials(local_full_jid, peer_full_jid);
-        return new TransportParameters(get_agent(), cred, turn_service, turn_ip, components, local_full_jid, peer_full_jid);
-    }
-
-    public override Jingle.TransportParameters parse_transport_parameters(XmppStream stream, uint8 components, Jid local_full_jid, Jid peer_full_jid, StanzaNode transport) throws Jingle.IqError {
-        DtlsSrtp.CredentialsCapsule? cred = get_create_credentials(local_full_jid, peer_full_jid);
-        return new TransportParameters(get_agent(), cred, turn_service, turn_ip, components, local_full_jid, peer_full_jid, transport);
-    }
-
-    private DtlsSrtp.CredentialsCapsule? get_create_credentials(Jid local_full_jid, Jid peer_full_jid) {
-        string from_to_id = local_full_jid.to_string() + peer_full_jid.to_string();
-        try {
-            if (!cerds.has_key(from_to_id)) cerds[from_to_id] = DtlsSrtp.Handler.generate_credentials();
-        } catch (Error e) {
-            warning("Error creating dtls credentials: %s", e.message);
-        }
-        return cerds[from_to_id];
-    }
-
-    private void agent_unweak() {
-        this.agent = null;
-    }
-}
\ No newline at end of file