From 1cc91efc731654e3a71151fc53f2598bcda5f1e6 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Fri, 24 Jul 2009 15:05:40 +0000 Subject: Merged revisions 208548 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r208548 | kpfleming | 2009-07-24 10:02:53 -0500 (Fri, 24 Jul 2009) | 8 lines Resolve a T.38 negotiation issue left over from the udptl-updates merge. The udptl-updates branch that was merged yesterday failed to properly send back T.38 SDP responses with the correct error correction mode, if the incoming SDP from the other end caused us to change error correction modes. This patch corrects that situation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@208550 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2c06f676f..d5dabe19f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -9083,13 +9083,13 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int break; } ast_str_append(&a_modem, 0, "a=T38FaxMaxDatagram:%d\r\n", ast_udptl_get_local_max_datagram(p->udptl)); - switch (ast_test_flag(&p->flags[1], SIP_PAGE2_T38SUPPORT)) { - case SIP_PAGE2_T38SUPPORT_UDPTL: + switch (ast_udptl_get_error_correction_scheme(p->udptl)) { + case UDPTL_ERROR_CORRECTION_NONE: break; - case SIP_PAGE2_T38SUPPORT_UDPTL_FEC: + case UDPTL_ERROR_CORRECTION_FEC: ast_str_append(&a_modem, 0, "a=T38FaxUdpEC:t38UDPFEC\r\n"); break; - case SIP_PAGE2_T38SUPPORT_UDPTL_REDUNDANCY: + case UDPTL_ERROR_CORRECTION_REDUNDANCY: ast_str_append(&a_modem, 0, "a=T38FaxUdpEC:t38UDPRedundancy\r\n"); break; } -- cgit v1.2.3