aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2022-02-12 14:07:19 +0100
committerfiaxh <git@lightrise.org>2022-02-12 14:22:29 +0100
commitbe751a5dda6e4b4612276d278f59f9f96ed0298c (patch)
tree3f0aeca430893c4ebf1fe51ab1102537a5681ca2 /libdino/src/service
parent6532c2b160c66540091d667c4af116ec4d71ff43 (diff)
downloaddino-be751a5dda6e4b4612276d278f59f9f96ed0298c.tar.gz
dino-be751a5dda6e4b4612276d278f59f9f96ed0298c.zip
Various call fixes
- If peer invited us claiming audio-only and then wants to have a video content, do a content-modify and accept audio-only - Check contents for video (and modify) and whether call is truly accepted in PeerState.accept() directly - If a message contains both JMI and CIM, only use JMI - Fix outgoing CIM (disabled) - Use opacity instead of visiblity for file_menu, small fixes - Add back owner/admin/member queries when joining MUC (regression from 33104a7)
Diffstat (limited to 'libdino/src/service')
-rw-r--r--libdino/src/service/call_peer_state.vala24
-rw-r--r--libdino/src/service/call_state.vala2
-rw-r--r--libdino/src/service/calls.vala35
3 files changed, 37 insertions, 24 deletions
diff --git a/libdino/src/service/call_peer_state.vala b/libdino/src/service/call_peer_state.vala
index cf39eec4..c97aa48d 100644
--- a/libdino/src/service/call_peer_state.vala
+++ b/libdino/src/service/call_peer_state.vala
@@ -90,7 +90,10 @@ public class Dino.PeerState : Object {
}
stream.get_module(Xmpp.Xep.JingleMessageInitiation.Module.IDENTITY).send_session_propose_to_peer(stream, jid, sid, descriptions);
-// call_state.cim_call_id = stream.get_module(Xmpp.Xep.CallInvites.Module.IDENTITY).send_jingle_propose(stream, jid, sid, we_should_send_video);
+
+// Uncomment this use CIM instead of JMI
+// call_state.cim_call_id = sid;
+// stream.get_module(Xmpp.Xep.CallInvites.Module.IDENTITY).send_jingle_propose(stream, call_state.cim_call_id, jid, sid, we_should_send_video);
} else if (jid_for_direct != null) {
yield call_resource(jid_for_direct);
}
@@ -111,8 +114,27 @@ public class Dino.PeerState : Object {
}
public void accept() {
+ if (!call_state.accepted) {
+ critical("Tried to accept peer in unaccepted call?! Something's fishy. Abort.");
+ return;
+ }
+
if (session != null) {
foreach (Xep.Jingle.Content content in session.contents) {
+ Xep.JingleRtp.Parameters? rtp_content_parameter = content.content_params as Xep.JingleRtp.Parameters;
+ if (rtp_content_parameter != null && rtp_content_parameter.media == "video") {
+ // We didn't accept video but our peer wants to negotiate that content
+ if (!we_should_send_video && session.senders_include_us(content.senders)) {
+ if (session.senders_include_counterpart(content.senders)) {
+ // If our peer wants to send, let them
+ content.modify(session.we_initiated ? Xep.Jingle.Senders.RESPONDER : Xep.Jingle.Senders.INITIATOR);
+ } else {
+ // If only we're supposed to send, reject
+ content.reject();
+ continue;
+ }
+ }
+ }
content.accept();
}
} else {
diff --git a/libdino/src/service/call_state.vala b/libdino/src/service/call_state.vala
index 73b26650..c403fc6a 100644
--- a/libdino/src/service/call_state.vala
+++ b/libdino/src/service/call_state.vala
@@ -373,7 +373,7 @@ public class Dino.CallState : Object {
handle_peer_left(peer_state, false, Xep.Jingle.ReasonElement.CANCEL, "Peer left the MUJI MUC");
});
- if (group_call.peers_to_connect_to.size > 3) {
+ if (group_call.peers_to_connect_to.size > 4) {
end("Call too full - P2p calls don't work well with many participants");
return;
}
diff --git a/libdino/src/service/calls.vala b/libdino/src/service/calls.vala
index 443c9ae4..ef853903 100644
--- a/libdino/src/service/calls.vala
+++ b/libdino/src/service/calls.vala
@@ -159,7 +159,7 @@ namespace Dino {
debug("[%s] Incoming call from %s from MUJI muc %s", account.bare_jid.to_string(), session.peer_full_jid.to_string(), muji_muc.to_string());
foreach (CallState call_state in call_states.values) {
- if (call_state.group_call != null && call_state.group_call.muc_jid.equals(muji_muc)) {
+ if (call_state.call.account.equals(account) && call_state.group_call != null && call_state.group_call.muc_jid.equals(muji_muc)) {
if (call_state.peers.keys.contains(session.peer_full_jid)) {
PeerState peer_state = call_state.peers[session.peer_full_jid];
debug("[%s] Incoming call, we know the peer. Expected %s", account.bare_jid.to_string(), peer_state.waiting_for_inbound_muji_connection.to_string());
@@ -182,28 +182,19 @@ namespace Dino {
debug(@"[%s] Incoming call from %s", account.bare_jid.to_string(), session.peer_full_jid.to_string());
- // Check if we already accepted this call via Jingle Message Initiation => accept
- Call? call = null;
- foreach (PeerState peer_state in jmi_request_peer.values) {
- CallState call_state = call_states[peer_state.call];
- if (peer_state.sid == session.sid &&
- call_state.call.account.equals(account) &&
- peer_state.jid.equals_bare(session.peer_full_jid) &&
- call_state.we_should_send_video == counterpart_wants_video &&
- call_state.accepted) {
- call = peer_state.call;
- break;
- }
- }
- if (call != null) {
- jmi_request_peer[call].set_session(session);
- jmi_request_peer[call].accept();
- jmi_request_peer.unset(call);
+ // Check if we already got this call via Jingle Message Initiation => accept
+ // PeerState.accept() checks if the call was accepted and ensures that we don't accidentally send video
+ PeerState? peer_state = get_peer_by_sid(account, session.sid, session.peer_full_jid);
+ if (peer_state != null) {
+ jmi_request_peer[peer_state.call].set_session(session);
+ jmi_request_peer[peer_state.call].accept();
+ jmi_request_peer.unset(peer_state.call);
return;
}
// This is a direct call without prior JMI. Ask user.
- PeerState peer_state = create_received_call(account, session.peer_full_jid, account.full_jid, counterpart_wants_video);
+ if (stream_interactor.get_module(MucManager.IDENTITY).might_be_groupchat(session.peer_full_jid.bare_jid, account)) return;
+ peer_state = create_received_call(account, session.peer_full_jid, account.full_jid, counterpart_wants_video);
peer_state.set_session(session);
Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(peer_state.call.counterpart.bare_jid, account, Conversation.Type.CHAT);
call_incoming(peer_state.call, peer_state.call_state, conversation, counterpart_wants_video, false);
@@ -260,8 +251,8 @@ namespace Dino {
return null;
}
- private PeerState? get_peer_by_sid(Account account, string sid, Jid jid1, Jid jid2) {
- Jid relevant_jid = jid1.equals_bare(account.bare_jid) ? jid2 : jid1;
+ private PeerState? get_peer_by_sid(Account account, string sid, Jid jid1, Jid? jid2 = null) {
+ Jid relevant_jid = jid1.equals_bare(account.bare_jid) && jid2 != null ? jid2 : jid1;
foreach (CallState call_state in call_states.values) {
if (!call_state.call.account.equals(account)) continue;
@@ -284,7 +275,7 @@ namespace Dino {
CallState call_state = call_states[call];
- if (call.counterparts.contains(inviter_jid) && call_state.accepted) {
+ if (call.counterparts.size == 1 && call.counterparts.contains(inviter_jid) && call_state.accepted) {
// A call is converted into a group call.
call_state.join_group_call.begin(muc_jid);
return null;