From 52617a0a3ba3b265c360727981438249c680baa4 Mon Sep 17 00:00:00 2001
From: leecher1337 <leecher@dose.0wnz.at>
Date: Mon, 13 Jan 2025 12:26:06 +0100
Subject: [PATCH 1/2] [mod_sofia] On MIME multipart messages, pass on the
Content-ID, this is vital i.e. for routing RFC6442 Geolocation information
---
src/mod/endpoints/mod_sofia/sofia.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index a370b52442d..874e012a749 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -11171,7 +11171,9 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
for (mp = sip->sip_multipart; mp; mp = mp->mp_next) {
if (mp->mp_payload && mp->mp_payload->pl_data && mp->mp_content_type && mp->mp_content_type->c_type) {
- char *val = switch_core_session_sprintf(session, "%s:%s", mp->mp_content_type->c_type, mp->mp_payload->pl_data);
+ char *val;
+ if (mp->mp_content_id) val = switch_core_session_sprintf(session, "%s:~Content-ID: %s\r\n\r\n%s", mp->mp_content_type->c_type, mp->mp_content_id->g_string, mp->mp_payload->pl_data);
+ else val = switch_core_session_sprintf(session, "%s:%s", mp->mp_content_type->c_type, mp->mp_payload->pl_data);
switch_channel_add_variable_var_check(channel, "sip_multipart", val, SWITCH_FALSE, SWITCH_STACK_PUSH);
}
}
From 6d4776e178415e8d91691553c2028f2c6d8a9329 Mon Sep 17 00:00:00 2001
From: leecher1337 <leecher@dose.0wnz.at>
Date: Mon, 13 Jan 2025 12:33:52 +0100
Subject: [PATCH 2/2] [Core] Add handling of sendrcv flag for RFC4103 Real-Time
Text (RTT). Fix bug that always used RTP RED, even when not advertised by
peer leading to garbled text.
---
src/switch_core_media.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index de5d0eff74c..9bf83aab1fb 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -3234,7 +3234,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_read_frame(switch_core_session
if (type == SWITCH_MEDIA_TYPE_TEXT && !switch_test_flag((&engine->read_frame), SFF_CNG)) {
- if (engine->red_pt) {
+ if (engine->red_pt == engine->read_frame.payload) {
unsigned char *p = engine->read_frame.data;
*(p + engine->read_frame.datalen) = '\0';
@@ -5892,6 +5892,25 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
got_text++;
+ switch_core_media_set_rmode(smh->session, SWITCH_MEDIA_TYPE_TEXT, sdp_media_flow(m->m_mode), sdp_type);
+
+ if (sdp_type == SDP_TYPE_REQUEST) {
+ switch(t_engine->rmode) {
+ case SWITCH_MEDIA_FLOW_RECVONLY:
+ switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_TEXT, SWITCH_MEDIA_FLOW_SENDONLY, sdp_type);
+ break;
+ case SWITCH_MEDIA_FLOW_SENDONLY:
+ switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_TEXT, SWITCH_MEDIA_FLOW_RECVONLY, sdp_type);
+ break;
+ case SWITCH_MEDIA_FLOW_INACTIVE:
+ switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_TEXT, SWITCH_MEDIA_FLOW_INACTIVE, sdp_type);
+ break;
+ default:
+ switch_core_media_set_smode(smh->session, SWITCH_MEDIA_TYPE_TEXT, SWITCH_MEDIA_FLOW_SENDRECV, sdp_type);
+ break;
+ }
+ }
+
for (map = m->m_rtpmaps; map; map = map->rm_next) {
payload_map_t *pmap;