From 62d4d47b1a09075acc19cd792a90468d50e6cb14 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Wed, 26 Aug 2015 13:43:13 +0300 Subject: [PATCH] FS-8198: Fixed default CRLF sequence in t38 SDP --- src/switch_core_media.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/switch_core_media.c b/src/switch_core_media.c index 0ffe6a6878..c31e334776 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -8306,13 +8306,13 @@ SWITCH_DECLARE(void) switch_core_media_set_udptl_image_sdp(switch_core_session_t uint32_t port; const char *family = "IP4"; const char *username; - const char *bit_removal_on = "a=T38FaxFillBitRemoval\n"; + const char *bit_removal_on = "a=T38FaxFillBitRemoval\r\n"; const char *bit_removal_off = ""; - const char *mmr_on = "a=T38FaxTranscodingMMR\n"; + const char *mmr_on = "a=T38FaxTranscodingMMR\r\n"; const char *mmr_off = ""; - const char *jbig_on = "a=T38FaxTranscodingJBIG\n"; + const char *jbig_on = "a=T38FaxTranscodingJBIG\r\n"; const char *jbig_off = ""; const char *var; int broken_boolean; @@ -8375,46 +8375,46 @@ SWITCH_DECLARE(void) switch_core_media_set_udptl_image_sdp(switch_core_session_t switch_snprintf(buf, sizeof(buf), - "v=0\n" - "o=%s %010u %010u IN %s %s\n" - "s=%s\n" "c=IN %s %s\n" "t=0 0\n", username, smh->owner_id, smh->session_id, family, ip, username, family, ip); + "v=0\r\n" + "o=%s %010u %010u IN %s %s\r\n" + "s=%s\r\n" "c=IN %s %s\r\n" "t=0 0\r\n", username, smh->owner_id, smh->session_id, family, ip, username, family, ip); if (t38_options->T38FaxMaxBuffer) { - switch_snprintf(max_buf, sizeof(max_buf), "a=T38FaxMaxBuffer:%d\n", t38_options->T38FaxMaxBuffer); + switch_snprintf(max_buf, sizeof(max_buf), "a=T38FaxMaxBuffer:%d\r\n", t38_options->T38FaxMaxBuffer); }; if (t38_options->T38FaxMaxDatagram) { - switch_snprintf(max_data, sizeof(max_data), "a=T38FaxMaxDatagram:%d\n", t38_options->T38FaxMaxDatagram); + switch_snprintf(max_data, sizeof(max_data), "a=T38FaxMaxDatagram:%d\r\n", t38_options->T38FaxMaxDatagram); }; if (broken_boolean) { - bit_removal_on = "a=T38FaxFillBitRemoval:1\n"; - bit_removal_off = "a=T38FaxFillBitRemoval:0\n"; + bit_removal_on = "a=T38FaxFillBitRemoval:1\r\n"; + bit_removal_off = "a=T38FaxFillBitRemoval:0\r\n"; - mmr_on = "a=T38FaxTranscodingMMR:1\n"; - mmr_off = "a=T38FaxTranscodingMMR:0\n"; + mmr_on = "a=T38FaxTranscodingMMR:1\r\n"; + mmr_off = "a=T38FaxTranscodingMMR:0\r\n"; - jbig_on = "a=T38FaxTranscodingJBIG:1\n"; - jbig_off = "a=T38FaxTranscodingJBIG:0\n"; + jbig_on = "a=T38FaxTranscodingJBIG:1\r\n"; + jbig_off = "a=T38FaxTranscodingJBIG:0\r\n"; } switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), - "m=image %d udptl t38\n" - "a=T38FaxVersion:%d\n" - "a=T38MaxBitRate:%d\n" + "m=image %d udptl t38\r\n" + "a=T38FaxVersion:%d\r\n" + "a=T38MaxBitRate:%d\r\n" "%s" "%s" "%s" - "a=T38FaxRateManagement:%s\n" + "a=T38FaxRateManagement:%s\r\n" "%s" "%s" - "a=T38FaxUdpEC:%s\n", - //"a=T38VendorInfo:%s\n", + "a=T38FaxUdpEC:%s\r\n", + //"a=T38VendorInfo:%s\r\n", port, t38_options->T38FaxVersion, t38_options->T38MaxBitRate, @@ -8431,7 +8431,7 @@ SWITCH_DECLARE(void) switch_core_media_set_udptl_image_sdp(switch_core_session_t if (insist) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=audio 0 RTP/AVP 19\n"); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "m=audio 0 RTP/AVP 19\r\n"); } switch_core_media_set_local_sdp(session, buf, SWITCH_TRUE);