~singpolyma/asterisk

0001a21bffd41e746c81bb7e447d3c6ad53a73bf — Stephen Paul Weber 3 years ago 622abee
Commit Debian 3.0 (quilt) metadata

[dgit (8.5) quilt-fixup]
A debian/patches/default-to-active-on-session-accept.patch => debian/patches/default-to-active-on-session-accept.patch +28 -0
@@ 0,0 1,28 @@
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 21 Aug 2020 20:52:39 -0500
X-Dgit-Generated: 1:16.2.1~dfsg-1+deb10u1 622abeeaf1287724a30b01b0fe615059b903097c
Subject: Default to active on session-accept

Sometimes we send session-accept before the other side has expressed a clear
preference (or before we have processed it, anyway...) -- so just assume the
other side sent actpass, which will set us to active.  This is find so long as
the other side would actually say actpass or passive, but probably very bad if
the other side would say active.

---

--- asterisk-16.2.1~dfsg.orig/channels/chan_motif.c
+++ asterisk-16.2.1~dfsg/channels/chan_motif.c
@@ -1598,6 +1598,12 @@ static void jingle_send_session_initiate
 /*! \brief Internal function which sends a session-accept message */
 static void jingle_send_session_accept(struct jingle_session *session)
 {
+	struct ast_rtp_engine_dtls *dtls;
+	if ((dtls = ast_rtp_instance_get_dtls(session->rtp)) && dtls->get_setup(session->rtp) == AST_RTP_DTLS_SETUP_ACTPASS) {
+		// We don't know what the remote wants yet, so just assume both?
+		// This will cause us to reply with active
+		dtls->set_setup(session->rtp, AST_RTP_DTLS_SETUP_ACTPASS);
+	}
 	jingle_send_session_action(session, session->transport == JINGLE_TRANSPORT_GOOGLE_V1 ? "accept" : "session-accept");
 }
 

A debian/patches/remove-duplicate-fingerprint.patch => debian/patches/remove-duplicate-fingerprint.patch +18 -0
@@ 0,0 1,18 @@
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 21 Aug 2020 20:52:22 -0500
X-Dgit-Generated: 1:16.2.1~dfsg-1+deb10u1 d424a9060208cf833769b57ec39c493c1fc66102
Subject: Remove duplicate fingerprint


---

--- asterisk-16.2.1~dfsg.orig/channels/chan_motif.c
+++ asterisk-16.2.1~dfsg/channels/chan_motif.c
@@ -1497,7 +1497,6 @@ static int jingle_add_content(struct jin
 		if (session->transport == JINGLE_TRANSPORT_ICE_UDP) {
 			iks_insert_attrib(transport, "xmlns", JINGLE_ICE_UDP_NS);
 			jingle_add_ice_udp_candidates_to_transport(rtp, transport, NULL, session->maxicecandidates);
-			jingle_add_fingerprint(rtp, transport);
 			iks_insert_node(content, transport);
 		} else if (session->transport == JINGLE_TRANSPORT_GOOGLE_V2) {
 			iks_insert_attrib(transport, "xmlns", GOOGLE_TRANSPORT_NS);

M debian/patches/series => debian/patches/series +2 -0
@@ 39,3 39,5 @@ AST-2019-002.patch
AST-2019-003.patch
apply-patch-from-eta.patch
there-can-be-children-other-than-content.patch
remove-duplicate-fingerprint.patch
default-to-active-on-session-accept.patch