Merge 'upstream/master'

6 files changed, 0 insertions, 930 deletions

diff --git a/plugins/ice/src/dtls_srtp.vala b/plugins/ice/src/dtls_srtp.vala
deleted file mode 100644
index c9813b7e..00000000
--- a/plugins/ice/src/dtls_srtp.vala
+++ /dev/null
@@ -1,361 +0,0 @@
-using GnuTLS;
-
-namespace Dino.Plugins.Ice.DtlsSrtp {
-
-public class CredentialsCapsule {
-    public uint8[] own_fingerprint;
-    public X509.Certificate[] own_cert;
-    public X509.PrivateKey private_key;
-}
-
-public class Handler {
-
-    public signal void send_data(uint8[] data);
-
-    public bool ready { get {
-        return srtp_session.has_encrypt && srtp_session.has_decrypt;
-    }}
-
-    public Mode mode { get; set; default = Mode.CLIENT; }
-    public uint8[] own_fingerprint { get; private set; }
-    public uint8[] peer_fingerprint { get; set; }
-    public string peer_fp_algo { get; set; }
-
-    private CredentialsCapsule credentials;
-    private Cond buffer_cond = Cond();
-    private Mutex buffer_mutex = Mutex();
-    private Gee.LinkedList<Bytes> buffer_queue = new Gee.LinkedList<Bytes>();
-
-    private bool running = false;
-    private bool stop = false;
-    private bool restart = false;
-
-    private Crypto.Srtp.Session srtp_session = new Crypto.Srtp.Session();
-
-    public Handler.with_cert(CredentialsCapsule creds) {
-        this.credentials = creds;
-        this.own_fingerprint = creds.own_fingerprint;
-    }
-
-    public uint8[]? process_incoming_data(uint component_id, uint8[] data) throws Crypto.Error {
-        if (data[0] >= 128) {
-            if (!srtp_session.has_decrypt) {
-                debug("Received data before SRTP session is ready, dropping.");
-                return null;
-            }
-            if (component_id == 1) {
-                if (data.length >= 2 && data[1] >= 192 && data[1] < 224) {
-                    return srtp_session.decrypt_rtcp(data);
-                }
-                return srtp_session.decrypt_rtp(data);
-            }
-            if (component_id == 2) return srtp_session.decrypt_rtcp(data);
-        }
-        if (component_id == 1 && data.length >= 1 && (data[0] >= 20 && data[0] < 64)) {
-            on_data_rec(data);
-            return null;
-        }
-        debug("Dropping unknown data from component %u", component_id);
-        return null;
-    }
-
-    public uint8[]? process_outgoing_data(uint component_id, uint8[] data) throws Crypto.Error {
-        if (srtp_session.has_encrypt) {
-            if (component_id == 1) {
-                if (data.length >= 2 && data[1] >= 192 && data[1] < 224) {
-                    return srtp_session.encrypt_rtcp(data);
-                }
-                return srtp_session.encrypt_rtp(data);
-            }
-            if (component_id == 2) return srtp_session.encrypt_rtcp(data);
-        }
-        return null;
-    }
-
-    public void on_data_rec(owned uint8[] data) {
-        buffer_mutex.lock();
-        buffer_queue.add(new Bytes.take(data));
-        buffer_cond.signal();
-        buffer_mutex.unlock();
-    }
-
-    internal static CredentialsCapsule generate_credentials() throws GLib.Error {
-        int err = 0;
-
-        X509.PrivateKey private_key = X509.PrivateKey.create();
-        err = private_key.generate(PKAlgorithm.ECDSA, 256);
-        throw_if_error(err);
-
-        var start_time = new DateTime.now_local().add_days(-1);
-        var end_time = start_time.add_days(2);
-
-        X509.Certificate cert = X509.Certificate.create();
-        cert.set_key(private_key);
-        cert.set_version(1);
-        cert.set_activation_time ((time_t) start_time.to_unix ());
-        cert.set_expiration_time ((time_t) end_time.to_unix ());
-
-        uint32 serial = 1;
-        cert.set_serial(&serial, sizeof(uint32));
-
-        cert.sign(cert, private_key);
-
-        uint8[] own_fingerprint = get_fingerprint(cert, DigestAlgorithm.SHA256);
-        X509.Certificate[] own_cert = new X509.Certificate[] { (owned)cert };
-
-        var creds = new CredentialsCapsule();
-        creds.own_fingerprint = own_fingerprint;
-        creds.own_cert = (owned) own_cert;
-        creds.private_key = (owned) private_key;
-
-        return creds;
-    }
-
-    public void stop_dtls_connection() {
-        buffer_mutex.lock();
-        stop = true;
-        buffer_cond.signal();
-        buffer_mutex.unlock();
-    }
-
-    public async Xmpp.Xep.Jingle.ContentEncryption? setup_dtls_connection() {
-        MainContext context = MainContext.current_source().get_context();
-        var thread = new Thread<Xmpp.Xep.Jingle.ContentEncryption>("dtls-connection", () => {
-            var res = setup_dtls_connection_thread();
-            Source source = new IdleSource();
-            source.set_callback(setup_dtls_connection.callback);
-            source.attach(context);
-            return res;
-        });
-        yield;
-        return thread.join();
-    }
-
-    private Xmpp.Xep.Jingle.ContentEncryption? setup_dtls_connection_thread() {
-        buffer_mutex.lock();
-        if (stop) {
-            restart = true;
-            buffer_mutex.unlock();
-            return null;
-        }
-        if (running || ready) {
-            buffer_mutex.unlock();
-            return null;
-        }
-        running = true;
-        restart = false;
-        buffer_mutex.unlock();
-
-        InitFlags server_or_client = mode == Mode.SERVER ? InitFlags.SERVER : InitFlags.CLIENT;
-        debug("Setting up DTLS connection. We're %s", mode.to_string());
-
-        CertificateCredentials cert_cred = CertificateCredentials.create();
-        int err = cert_cred.set_x509_key(credentials.own_cert, credentials.private_key);
-        throw_if_error(err);
-
-        Session? session = Session.create(server_or_client | InitFlags.DATAGRAM);
-        session.enable_heartbeat(1);
-        session.set_srtp_profile_direct("SRTP_AES128_CM_HMAC_SHA1_80");
-        session.set_credentials(GnuTLS.CredentialsType.CERTIFICATE, cert_cred);
-        session.server_set_request(CertificateRequest.REQUEST);
-        session.set_priority_from_string("NORMAL:!VERS-TLS-ALL:+VERS-DTLS-ALL:+CTYPE-CLI-X509");
-
-        session.set_transport_pointer(this);
-        session.set_pull_function(pull_function);
-        session.set_pull_timeout_function(pull_timeout_function);
-        session.set_push_function(push_function);
-        session.set_verify_function(verify_function);
-
-        DateTime maximum_time = new DateTime.now_utc().add_seconds(20);
-        do {
-            err = session.handshake();
-
-            DateTime current_time = new DateTime.now_utc();
-            if (maximum_time.compare(current_time) < 0) {
-                warning("DTLS handshake timeouted");
-                err = ErrorCode.APPLICATION_ERROR_MIN + 1;
-                break;
-            }
-            if (stop) {
-                debug("DTLS handshake stopped");
-                err = ErrorCode.APPLICATION_ERROR_MIN + 2;
-                break;
-            }
-        } while (err < 0 && !((ErrorCode)err).is_fatal());
-
-        buffer_mutex.lock();
-        if (stop) {
-            stop = false;
-            running = false;
-            bool restart = restart;
-            buffer_mutex.unlock();
-            if (restart) {
-                debug("Restarting DTLS handshake");
-                return setup_dtls_connection_thread();
-            }
-            return null;
-        }
-        buffer_mutex.unlock();
-        if (err != ErrorCode.SUCCESS) {
-            warning("DTLS handshake failed: %s", ((ErrorCode)err).to_string());
-            return null;
-        }
-
-        uint8[] km = new uint8[150];
-        Datum? client_key, client_salt, server_key, server_salt;
-        session.get_srtp_keys(km, km.length, out client_key, out client_salt, out server_key, out server_salt);
-        if (client_key == null || client_salt == null || server_key == null || server_salt == null) {
-            warning("SRTP client/server key/salt null");
-        }
-
-        debug("Finished DTLS connection. We're %s", mode.to_string());
-        if (mode == Mode.SERVER) {
-            srtp_session.set_encryption_key(Crypto.Srtp.AES_CM_128_HMAC_SHA1_80, server_key.extract(), server_salt.extract());
-            srtp_session.set_decryption_key(Crypto.Srtp.AES_CM_128_HMAC_SHA1_80, client_key.extract(), client_salt.extract());
-        } else {
-            srtp_session.set_encryption_key(Crypto.Srtp.AES_CM_128_HMAC_SHA1_80, client_key.extract(), client_salt.extract());
-            srtp_session.set_decryption_key(Crypto.Srtp.AES_CM_128_HMAC_SHA1_80, server_key.extract(), server_salt.extract());
-        }
-        return new Xmpp.Xep.Jingle.ContentEncryption(Xmpp.Xep.JingleIceUdp.DTLS_NS_URI, "DTLS-SRTP", credentials.own_fingerprint, peer_fingerprint);
-    }
-
-    private static ssize_t pull_function(void* transport_ptr, uint8[] buffer) {
-        Handler self = transport_ptr as Handler;
-
-        self.buffer_mutex.lock();
-        while (self.buffer_queue.size == 0) {
-            self.buffer_cond.wait(self.buffer_mutex);
-            if (self.stop) {
-                self.buffer_mutex.unlock();
-                debug("DTLS handshake pull_function stopped");
-                return -1;
-            }
-        }
-        Bytes data = self.buffer_queue.remove_at(0);
-        self.buffer_mutex.unlock();
-
-        uint8[] data_uint8 = Bytes.unref_to_data((owned) data);
-        Memory.copy(buffer, data_uint8, data_uint8.length);
-
-        // The callback should return 0 on connection termination, a positive number indicating the number of bytes received, and -1 on error.
-        return (ssize_t)data_uint8.length;
-    }
-
-    private static int pull_timeout_function(void* transport_ptr, uint ms) {
-        Handler self = transport_ptr as Handler;
-
-        int64 end_time = get_monotonic_time() + ms * 1000;
-
-        self.buffer_mutex.lock();
-        while (self.buffer_queue.size == 0) {
-            self.buffer_cond.wait_until(self.buffer_mutex, end_time);
-            if (self.stop) {
-                self.buffer_mutex.unlock();
-                debug("DTLS handshake pull_timeout_function stopped");
-                return -1;
-            }
-
-            if (get_monotonic_time() > end_time) {
-                self.buffer_mutex.unlock();
-                return 0;
-            }
-        }
-        self.buffer_mutex.unlock();
-
-        // The callback should return 0 on timeout, a positive number if data can be received, and -1 on error.
-        return 1;
-    }
-
-    private static ssize_t push_function(void* transport_ptr, uint8[] buffer) {
-        Handler self = transport_ptr as Handler;
-        self.send_data(buffer);
-
-        // The callback should return a positive number indicating the bytes sent, and -1 on error.
-        return (ssize_t)buffer.length;
-    }
-
-    private static int verify_function(Session session) {
-        Handler self = session.get_transport_pointer() as Handler;
-        try {
-            bool valid = self.verify_peer_cert(session);
-            if (!valid) {
-                warning("DTLS certificate invalid. Aborting handshake.");
-                return 1;
-            }
-        } catch (Error e) {
-            warning("Error during DTLS certificate validation: %s. Aborting handshake.", e.message);
-            return 1;
-        }
-
-        // The callback function should return 0 for the handshake to continue or non-zero to terminate.
-        return 0;
-    }
-
-    private bool verify_peer_cert(Session session) throws GLib.Error {
-        unowned Datum[] cert_datums = session.get_peer_certificates();
-        if (cert_datums.length == 0) {
-            warning("No peer certs");
-            return false;
-        }
-        if (cert_datums.length > 1) warning("More than one peer cert");
-
-        X509.Certificate peer_cert = X509.Certificate.create();
-        peer_cert.import(ref cert_datums[0], CertificateFormat.DER);
-
-        DigestAlgorithm algo;
-        switch (peer_fp_algo) {
-            case "sha-256":
-                algo = DigestAlgorithm.SHA256;
-                break;
-            default:
-                warning("Unkown peer fingerprint algorithm: %s", peer_fp_algo);
-                return false;
-        }
-
-        uint8[] real_peer_fp = get_fingerprint(peer_cert, algo);
-
-        if (real_peer_fp.length != this.peer_fingerprint.length) {
-            warning("Fingerprint lengths not equal %i vs %i", real_peer_fp.length, peer_fingerprint.length);
-            return false;
-        }
-
-        for (int i = 0; i < real_peer_fp.length; i++) {
-            if (real_peer_fp[i] != this.peer_fingerprint[i]) {
-                warning("First cert in peer cert list doesn't equal advertised one: %s vs %s", format_fingerprint(real_peer_fp), format_fingerprint(peer_fingerprint));
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
-
-private uint8[] get_fingerprint(X509.Certificate certificate, DigestAlgorithm digest_algo) {
-    uint8[] buf = new uint8[512];
-    size_t buf_out_size = 512;
-    certificate.get_fingerprint(digest_algo, buf, ref buf_out_size);
-
-    uint8[] ret = new uint8[buf_out_size];
-    for (int i = 0; i < buf_out_size; i++) {
-        ret[i] = buf[i];
-    }
-    return ret;
-}
-
-private string format_fingerprint(uint8[] fingerprint) {
-    var sb = new StringBuilder();
-    for (int i = 0; i < fingerprint.length; i++) {
-        sb.append("%02X".printf(fingerprint[i]));
-        if (i < fingerprint.length - 1) {
-            sb.append(":");
-        }
-    }
-    return sb.str;
-}
-
-
-public enum Mode {
-    CLIENT, SERVER
-}
-
-}
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
diff --git a/plugins/ice/src/plugin.vala b/plugins/ice/src/plugin.vala
deleted file mode 100644
index d1655a74..00000000
--- a/plugins/ice/src/plugin.vala
+++ /dev/null
@@ -1,104 +0,0 @@
-using Gee;
-using Dino.Entities;
-using Xmpp;
-using Xmpp.Xep;
-
-private extern const size_t NICE_ADDRESS_STRING_LEN;
-
-public class Dino.Plugins.Ice.Plugin : RootInterface, Object {
-    private HashMap<Account, uint> timeouts = new HashMap<Account, uint>(Account.hash_func, Account.equals_func);
-
-    public Dino.Application app;
-
-    public void registered(Dino.Application app) {
-        Nice.debug_enable(true);
-        this.app = app;
-        app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
-            list.add(new Module());
-        });
-        app.stream_interactor.stream_attached_modules.connect((account, stream) => {
-            if (stream.get_module(Socks5Bytestreams.Module.IDENTITY) != null) {
-                stream.get_module(Socks5Bytestreams.Module.IDENTITY).set_local_ip_address_handler(get_local_ip_addresses);
-            }
-            if (stream.get_module(JingleRawUdp.Module.IDENTITY) != null) {
-                stream.get_module(JingleRawUdp.Module.IDENTITY).set_local_ip_address_handler(get_local_ip_addresses);
-            }
-        });
-        app.stream_interactor.stream_negotiated.connect(external_discovery_refresh_services);
-    }
-
-    private async void external_discovery_refresh_services(Account account, XmppStream stream) {
-        Module? ice_udp_module = stream.get_module(JingleIceUdp.Module.IDENTITY) as Module;
-        if (ice_udp_module == null) return;
-
-        Gee.List<Xep.ExternalServiceDiscovery.Service> services = yield ExternalServiceDiscovery.request_services(stream);
-        foreach (Xep.ExternalServiceDiscovery.Service service in services) {
-            if (service.transport == "udp" && (service.ty == "stun" || service.ty == "turn")) {
-                InetAddress? ip = yield lookup_ipv4_addess(service.host);
-                if (ip == null) continue;
-
-                if (ip.is_any || ip.is_link_local || ip.is_loopback || ip.is_multicast || ip.is_site_local) {
-                    warning("Ignoring STUN/TURN server at %s", service.host);
-                    continue;
-                }
-
-                if (service.ty == "stun") {
-                    debug("Server offers STUN server: %s:%u, resolved to %s", service.host, service.port, ip.to_string());
-                    ice_udp_module.stun_ip = ip.to_string();
-                    ice_udp_module.stun_port = service.port;
-                } else if (service.ty == "turn") {
-                    debug("Server offers TURN server: %s:%u, resolved to %s", service.host, service.port, ip.to_string());
-                    ice_udp_module.turn_ip = ip.to_string();
-                    ice_udp_module.turn_service = service;
-                }
-            }
-        }
-        if (ice_udp_module.stun_ip == null) {
-            InetAddress ip = yield lookup_ipv4_addess("stun.dino.im");
-            if (ip == null) return;
-
-            debug("Using fallback STUN server: stun.dino.im:7886, resolved to %s", ip.to_string());
-
-            ice_udp_module.stun_ip = ip.to_string();
-            ice_udp_module.stun_port = 7886;
-        }
-
-        // Refresh TURN credentials before they expire
-        if (ice_udp_module.turn_service != null) {
-            DateTime? expires = ice_udp_module.turn_service.expires;
-            if (expires != null) {
-                uint refresh_delay = (uint) (expires.to_unix() - new DateTime.now_utc().to_unix()) / 2;
-
-                if (refresh_delay >= 300 && refresh_delay <= (int64) uint.MAX) { // 5 min < refetch < max
-                    debug("Re-fetching TURN credentials in %u sec", refresh_delay);
-
-                    timeouts.unset(account);
-                    timeouts[account] = Timeout.add_seconds((uint) refresh_delay, () => {
-                        external_discovery_refresh_services.begin(account, stream);
-                        return false;
-                    });
-                } else {
-                    warning("TURN credentials' expiry time = %u, *not* re-fetching", refresh_delay);
-                }
-            }
-        }
-    }
-
-    public void shutdown() {
-        // Nothing to do
-    }
-
-    private async InetAddress? lookup_ipv4_addess(string host) {
-        try {
-            Resolver resolver = Resolver.get_default();
-            GLib.List<GLib.InetAddress>? ips = yield resolver.lookup_by_name_async(host);
-            foreach (GLib.InetAddress ina in ips) {
-                if (ina.get_family() != SocketFamily.IPV4) continue;
-                return ina;
-            }
-        } catch (Error e) {
-            warning("Failed looking up IP address of %s", host);
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/plugins/ice/src/register_plugin.vala b/plugins/ice/src/register_plugin.vala
deleted file mode 100644
index b2ed56c1..00000000
--- a/plugins/ice/src/register_plugin.vala
+++ /dev/null
@@ -1,3 +0,0 @@
-public Type register_plugin(Module module) {
-    return typeof (Dino.Plugins.Ice.Plugin);
-}
diff --git a/plugins/ice/src/transport_parameters.vala b/plugins/ice/src/transport_parameters.vala
deleted file mode 100644
index 66dde8b1..00000000
--- a/plugins/ice/src/transport_parameters.vala
+++ /dev/null
@@ -1,389 +0,0 @@
-using Gee;
-using Xmpp;
-using Xmpp.Xep;
-
-
-public class Dino.Plugins.Ice.TransportParameters : JingleIceUdp.IceUdpTransportParameters {
-    private Nice.Agent agent;
-    private uint stream_id;
-    private bool we_want_connection;
-    private bool remote_credentials_set;
-    private Map<uint8, DatagramConnection> connections = new HashMap<uint8, DatagramConnection>();
-    private DtlsSrtp.Handler? dtls_srtp_handler;
-    private MainContext thread_context;
-    private MainLoop thread_loop;
-
-    private class DatagramConnection : Jingle.DatagramConnection {
-        private Nice.Agent agent;
-        private DtlsSrtp.Handler? dtls_srtp_handler;
-        private uint stream_id;
-        private string? error;
-        private ulong datagram_received_id;
-
-        public DatagramConnection(Nice.Agent agent, DtlsSrtp.Handler? dtls_srtp_handler, uint stream_id, uint8 component_id) {
-            this.agent = agent;
-            this.dtls_srtp_handler = dtls_srtp_handler;
-            this.stream_id = stream_id;
-            this.component_id = component_id;
-            this.datagram_received_id = this.datagram_received.connect((datagram) => {
-                bytes_received += datagram.length;
-            });
-        }
-
-        public override async void terminate(bool we_terminated, string? reason_string = null, string? reason_text = null) {
-            yield base.terminate(we_terminated, reason_string, reason_text);
-            this.disconnect(datagram_received_id);
-            agent = null;
-            dtls_srtp_handler = null;
-        }
-
-        public override void send_datagram(Bytes datagram) {
-            if (this.agent != null && is_component_ready(agent, stream_id, component_id)) {
-                try {
-                    if (dtls_srtp_handler != null) {
-                        uint8[] encrypted_data = dtls_srtp_handler.process_outgoing_data(component_id, datagram.get_data());
-                        if (encrypted_data == null) return;
-                        GLib.OutputVector vector = { encrypted_data, encrypted_data.length };
-                        GLib.OutputVector[] vectors = { vector };
-                        Nice.OutputMessage message = { vectors };
-                        Nice.OutputMessage[] messages = { message };
-                        agent.send_messages_nonblocking(stream_id, component_id, messages);
-                    } else {
-                        GLib.OutputVector vector = { datagram.get_data(), datagram.get_size() };
-                        GLib.OutputVector[] vectors = { vector };
-                        Nice.OutputMessage message = { vectors };
-                        Nice.OutputMessage[] messages = { message };
-                        agent.send_messages_nonblocking(stream_id, component_id, messages);
-                    }
-                    bytes_sent += datagram.length;
-                } catch (GLib.Error e) {
-                    warning("%s while send_datagram stream %u component %u", e.message, stream_id, component_id);
-                }
-            }
-        }
-    }
-
-    public TransportParameters(Nice.Agent agent, DtlsSrtp.CredentialsCapsule? credentials, Xep.ExternalServiceDiscovery.Service? turn_service, string? turn_ip, uint8 components, Jid local_full_jid, Jid peer_full_jid, StanzaNode? node = null) {
-        base(components, local_full_jid, peer_full_jid, node);
-        this.we_want_connection = (node == null);
-        this.agent = agent;
-
-        if (this.peer_fingerprint != null || !incoming) {
-            dtls_srtp_handler = setup_dtls(this, credentials);
-            own_fingerprint = dtls_srtp_handler.own_fingerprint;
-            if (incoming) {
-                own_setup = "active";
-                dtls_srtp_handler.mode = DtlsSrtp.Mode.CLIENT;
-                dtls_srtp_handler.peer_fingerprint = peer_fingerprint;
-                dtls_srtp_handler.peer_fp_algo = peer_fp_algo;
-            } else {
-                own_setup = "actpass";
-                dtls_srtp_handler.mode = DtlsSrtp.Mode.SERVER;
-                dtls_srtp_handler.setup_dtls_connection.begin((_, res) => {
-                    var content_encryption = dtls_srtp_handler.setup_dtls_connection.end(res);
-                    if (content_encryption != null) {
-                        this.content.encryptions[content_encryption.encryption_ns] = content_encryption;
-                    }
-                });
-            }
-        }
-
-        agent.candidate_gathering_done.connect(on_candidate_gathering_done);
-        agent.initial_binding_request_received.connect(on_initial_binding_request_received);
-        agent.component_state_changed.connect(on_component_state_changed);
-        agent.new_selected_pair_full.connect(on_new_selected_pair_full);
-        agent.new_candidate_full.connect(on_new_candidate);
-
-        agent.controlling_mode = !incoming;
-        stream_id = agent.add_stream(components);
-        thread_context = new MainContext();
-        new Thread<void*>(@"ice-thread-$stream_id", () => {
-            thread_context.push_thread_default();
-            thread_loop = new MainLoop(thread_context, false);
-            thread_loop.run();
-            thread_context.pop_thread_default();
-            return null;
-        });
-
-        if (turn_ip != null) {
-            for (uint8 component_id = 1; component_id <= components; component_id++) {
-                agent.set_relay_info(stream_id, component_id, turn_ip, turn_service.port, turn_service.username, turn_service.password, Nice.RelayType.UDP);
-                debug("TURN info (component %i) %s:%u", component_id, turn_ip, turn_service.port);
-            }
-        }
-        string ufrag;
-        string pwd;
-        agent.get_local_credentials(stream_id, out ufrag, out pwd);
-        init(ufrag, pwd);
-
-        for (uint8 component_id = 1; component_id <= components; component_id++) {
-            // We don't properly get local candidates before this call
-            agent.attach_recv(stream_id, component_id, thread_context, on_recv);
-        }
-
-        agent.gather_candidates(stream_id);
-    }
-
-    private static DtlsSrtp.Handler setup_dtls(TransportParameters tp, DtlsSrtp.CredentialsCapsule credentials) {
-        var weak_self = WeakRef(tp);
-        DtlsSrtp.Handler dtls_srtp = new DtlsSrtp.Handler.with_cert(credentials);
-        dtls_srtp.send_data.connect((data) => {
-            TransportParameters self = (TransportParameters) weak_self.get();
-            if (self != null) self.agent.send(self.stream_id, 1, data);
-        });
-        return dtls_srtp;
-    }
-
-    private void on_candidate_gathering_done(uint stream_id) {
-        if (stream_id != this.stream_id) return;
-        debug("on_candidate_gathering_done in %u", stream_id);
-
-        for (uint8 i = 1; i <= components; i++) {
-            foreach (unowned Nice.Candidate nc in agent.get_local_candidates(stream_id, i)) {
-                if (nc.transport == Nice.CandidateTransport.UDP) {
-                    JingleIceUdp.Candidate? candidate = candidate_to_jingle(nc);
-                    if (candidate == null) continue;
-                    debug("Local candidate summary: %s", agent.generate_local_candidate_sdp(nc));
-                }
-            }
-        }
-    }
-
-    private void on_new_candidate(Nice.Candidate nc) {
-        if (nc.stream_id != stream_id) return;
-        JingleIceUdp.Candidate? candidate = candidate_to_jingle(nc);
-        if (candidate == null) return;
-
-        if (nc.transport == Nice.CandidateTransport.UDP) {
-            // Execution was in the agent thread before
-            add_local_candidate_threadsafe(candidate);
-        }
-    }
-
-    private bool bytes_equal(uint8[] a1, uint8[] a2) {
-        return a1.length == a2.length && Memory.cmp(a1, a2, a1.length) == 0;
-    }
-
-    public override void handle_transport_accept(StanzaNode transport) throws Jingle.IqError {
-        debug("on_transport_accept from %s", peer_full_jid.to_string());
-        base.handle_transport_accept(transport);
-
-        if (dtls_srtp_handler != null && peer_fingerprint != null) {
-            if (dtls_srtp_handler.peer_fingerprint != null) {
-                if (!bytes_equal(dtls_srtp_handler.peer_fingerprint, peer_fingerprint)) {
-                    warning("Tried to replace certificate fingerprint mid use. We don't allow that.");
-                    peer_fingerprint = dtls_srtp_handler.peer_fingerprint;
-                    peer_fp_algo = dtls_srtp_handler.peer_fp_algo;
-                }
-            } else {
-                dtls_srtp_handler.peer_fingerprint = peer_fingerprint;
-                dtls_srtp_handler.peer_fp_algo = peer_fp_algo;
-            }
-            if (peer_setup == "passive") {
-                dtls_srtp_handler.mode = DtlsSrtp.Mode.CLIENT;
-                dtls_srtp_handler.stop_dtls_connection();
-                dtls_srtp_handler.setup_dtls_connection.begin((_, res) => {
-                    var content_encryption = dtls_srtp_handler.setup_dtls_connection.end(res);
-                    if (content_encryption != null) {
-                        this.content.encryptions[content_encryption.encryption_ns] = content_encryption;
-                    }
-                });
-            }
-        } else {
-            dtls_srtp_handler = null;
-        }
-    }
-
-    public override void handle_transport_info(StanzaNode transport) throws Jingle.IqError {
-        debug("on_transport_info from %s", peer_full_jid.to_string());
-        base.handle_transport_info(transport);
-
-        if (dtls_srtp_handler != null && peer_fingerprint != null) {
-            if (dtls_srtp_handler.peer_fingerprint != null) {
-                if (!bytes_equal(dtls_srtp_handler.peer_fingerprint, peer_fingerprint)) {
-                    warning("Tried to replace certificate fingerprint mid use. We don't allow that.");
-                    peer_fingerprint = dtls_srtp_handler.peer_fingerprint;
-                    peer_fp_algo = dtls_srtp_handler.peer_fp_algo;
-                }
-            } else {
-                dtls_srtp_handler.peer_fingerprint = peer_fingerprint;
-                dtls_srtp_handler.peer_fp_algo = peer_fp_algo;
-            }
-        }
-
-        if (!we_want_connection) return;
-
-        if (remote_ufrag != null && remote_pwd != null && !remote_credentials_set) {
-            agent.set_remote_credentials(stream_id, remote_ufrag, remote_pwd);
-            remote_credentials_set = true;
-        }
-        for (uint8 i = 1; i <= components; i++) {
-            SList<Nice.Candidate> candidates = new SList<Nice.Candidate>();
-            foreach (JingleIceUdp.Candidate candidate in remote_candidates) {
-                if (candidate.component == i) {
-                    candidates.append(candidate_to_nice(candidate));
-                }
-            }
-            int new_candidates = agent.set_remote_candidates(stream_id, i, candidates);
-            debug("Updated to %i remote candidates for candidate %u via transport info", new_candidates, i);
-        }
-    }
-
-    public override void create_transport_connection(XmppStream stream, Jingle.Content content) {
-        debug("create_transport_connection: %s", content.session.sid);
-        debug("local_credentials: %s %s", local_ufrag, local_pwd);
-        debug("remote_credentials: %s %s", remote_ufrag, remote_pwd);
-        debug("expected incoming credentials: %s %s", local_ufrag + ":" + remote_ufrag, local_pwd);
-        debug("expected outgoing credentials: %s %s", remote_ufrag + ":" + local_ufrag, remote_pwd);
-
-        we_want_connection = true;
-
-        if (remote_ufrag != null && remote_pwd != null && !remote_credentials_set) {
-            agent.set_remote_credentials(stream_id, remote_ufrag, remote_pwd);
-            remote_credentials_set = true;
-        }
-        for (uint8 i = 1; i <= components; i++) {
-            SList<Nice.Candidate> candidates = new SList<Nice.Candidate>();
-            foreach (JingleIceUdp.Candidate candidate in remote_candidates) {
-                if (candidate.ip.has_prefix("fe80::")) continue;
-                if (candidate.component == i) {
-                    candidates.append(candidate_to_nice(candidate));
-                    debug("remote candidate: %s", agent.generate_local_candidate_sdp(candidate_to_nice(candidate)));
-                }
-            }
-            int new_candidates = agent.set_remote_candidates(stream_id, i, candidates);
-            debug("Initiated component %u with %i remote candidates", i, new_candidates);
-
-            connections[i] = new DatagramConnection(agent, dtls_srtp_handler, stream_id, i);
-            content.set_transport_connection(connections[i], i);
-        }
-
-        base.create_transport_connection(stream, content);
-    }
-
-    private void on_component_state_changed(uint stream_id, uint component_id, uint state) {
-        if (stream_id != this.stream_id) return;
-        debug("stream %u component %u state changed to %s", stream_id, component_id, agent.get_component_state(stream_id, component_id).to_string());
-        may_consider_ready(stream_id, component_id);
-        if (incoming && dtls_srtp_handler != null && !dtls_srtp_handler.ready && is_component_ready(agent, stream_id, component_id) && dtls_srtp_handler.mode == DtlsSrtp.Mode.CLIENT) {
-            dtls_srtp_handler.setup_dtls_connection.begin((_, res) => {
-                Jingle.ContentEncryption? encryption = dtls_srtp_handler.setup_dtls_connection.end(res);
-                if (encryption != null) {
-                    this.content.encryptions[encryption.encryption_ns] = encryption;
-                }
-            });
-        }
-    }
-
-    private void may_consider_ready(uint stream_id, uint component_id) {
-        if (stream_id != this.stream_id) return;
-        if (connections.has_key((uint8) component_id) && !connections[(uint8)component_id].ready && is_component_ready(agent, stream_id, component_id) && (dtls_srtp_handler == null || dtls_srtp_handler.ready)) {
-            connections[(uint8)component_id].ready = true;
-        }
-    }
-
-    private void on_initial_binding_request_received(uint stream_id) {
-        if (stream_id != this.stream_id) return;
-        debug("initial_binding_request_received");
-    }
-
-    private void on_new_selected_pair_full(uint stream_id, uint component_id, Nice.Candidate p1, Nice.Candidate p2) {
-        if (stream_id != this.stream_id) return;
-        debug("new_selected_pair_full %u [%s, %s]", component_id, agent.generate_local_candidate_sdp(p1), agent.generate_local_candidate_sdp(p2));
-    }
-
-    private void on_recv(Nice.Agent agent, uint stream_id, uint component_id, uint8[] data) {
-        if (stream_id != this.stream_id) return;
-        uint8[] decrypt_data = null;
-        if (dtls_srtp_handler != null) {
-            try {
-                decrypt_data = dtls_srtp_handler.process_incoming_data(component_id, data);
-                if (decrypt_data == null) return;
-            } catch (Crypto.Error e) {
-                warning("%s while on_recv stream %u component %u", e.message, stream_id, component_id);
-                return;
-            }
-        }
-        may_consider_ready(stream_id, component_id);
-        if (connections.has_key((uint8) component_id)) {
-            if (!connections[(uint8) component_id].ready) {
-                debug("on_recv stream %u component %u when state %s", stream_id, component_id, agent.get_component_state(stream_id, component_id).to_string());
-            }
-            connections[(uint8) component_id].datagram_received(new Bytes(decrypt_data ?? data));
-        } else {
-            debug("on_recv stream %u component %u length %u", stream_id, component_id, data.length);
-        }
-    }
-
-    private static Nice.Candidate candidate_to_nice(JingleIceUdp.Candidate c) {
-        Nice.CandidateType type;
-        switch (c.type_) {
-            case JingleIceUdp.Candidate.Type.HOST: type = Nice.CandidateType.HOST; break;
-            case JingleIceUdp.Candidate.Type.PRFLX: type = Nice.CandidateType.PEER_REFLEXIVE; break;
-            case JingleIceUdp.Candidate.Type.RELAY: type = Nice.CandidateType.RELAYED; break;
-            case JingleIceUdp.Candidate.Type.SRFLX: type = Nice.CandidateType.SERVER_REFLEXIVE; break;
-            default: assert_not_reached();
-        }
-
-        Nice.Candidate candidate = new Nice.Candidate(type);
-        candidate.component_id = c.component;
-        char[] foundation = new char[Nice.CANDIDATE_MAX_FOUNDATION];
-        Memory.copy(foundation, c.foundation.data, size_t.min(c.foundation.length, Nice.CANDIDATE_MAX_FOUNDATION - 1));
-        candidate.foundation = foundation;
-        candidate.addr = Nice.Address();
-        candidate.addr.init();
-        candidate.addr.set_from_string(c.ip);
-        candidate.addr.set_port(c.port);
-        candidate.priority = c.priority;
-        if (c.rel_addr != null) {
-            candidate.base_addr = Nice.Address();
-            candidate.base_addr.init();
-            candidate.base_addr.set_from_string(c.rel_addr);
-            candidate.base_addr.set_port(c.rel_port);
-        }
-        candidate.transport = Nice.CandidateTransport.UDP;
-        return candidate;
-    }
-
-    private static JingleIceUdp.Candidate? candidate_to_jingle(Nice.Candidate nc) {
-        JingleIceUdp.Candidate candidate = new JingleIceUdp.Candidate();
-        switch (nc.type) {
-            case Nice.CandidateType.HOST: candidate.type_ = JingleIceUdp.Candidate.Type.HOST; break;
-            case Nice.CandidateType.PEER_REFLEXIVE: candidate.type_ = JingleIceUdp.Candidate.Type.PRFLX; break;
-            case Nice.CandidateType.RELAYED: candidate.type_ = JingleIceUdp.Candidate.Type.RELAY; break;
-            case Nice.CandidateType.SERVER_REFLEXIVE: candidate.type_ = JingleIceUdp.Candidate.Type.SRFLX; break;
-            default: assert_not_reached();
-        }
-        candidate.component = (uint8) nc.component_id;
-        candidate.foundation = ((string)nc.foundation).dup();
-        candidate.generation = 0;
-        candidate.id = Random.next_int().to_string("%08x"); // TODO
-
-        char[] res = new char[NICE_ADDRESS_STRING_LEN];
-        nc.addr.to_string(res);
-        candidate.ip = (string) res;
-        candidate.network = 0; // TODO
-        candidate.port = (uint16) nc.addr.get_port();
-        candidate.priority = nc.priority;
-        candidate.protocol = "udp";
-        if (nc.base_addr.is_valid() && !nc.base_addr.equal(nc.addr)) {
-            res = new char[NICE_ADDRESS_STRING_LEN];
-            nc.base_addr.to_string(res);
-            candidate.rel_addr = (string) res;
-            candidate.rel_port = (uint16) nc.base_addr.get_port();
-        }
-        if (candidate.ip.has_prefix("fe80::")) return null;
-
-        return candidate;
-    }
-
-    public override void dispose() {
-        base.dispose();
-        agent = null;
-        dtls_srtp_handler = null;
-        connections.clear();
-        if (thread_loop != null) {
-            thread_loop.quit();
-        }
-    }
-}
diff --git a/plugins/ice/src/util.vala b/plugins/ice/src/util.vala
deleted file mode 100644
index dd89d2f4..00000000
--- a/plugins/ice/src/util.vala
+++ /dev/null
@@ -1,18 +0,0 @@
-using Gee;
-
-namespace Dino.Plugins.Ice {
-
-internal static bool is_component_ready(Nice.Agent agent, uint stream_id, uint component_id) {
-    var state = agent.get_component_state(stream_id, component_id);
-    return state == Nice.ComponentState.CONNECTED || state == Nice.ComponentState.READY;
-}
-
-internal Gee.List<string> get_local_ip_addresses() {
-    Gee.List<string> result = new ArrayList<string>();
-    foreach (string ip_address in Nice.interfaces_get_local_ips(false)) {
-        result.add(ip_address);
-    }
-    return result;
-}
-
-}
\ No newline at end of file