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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208550 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2c06f676f2009c506a723d6e29bbf40a1b6ddff7..d5dabe19f6f8cb5254614c325ccb5d39e95ea591 100644 (file)
--- 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;
                }

diff --git a/include/asterisk/udptl.h b/include/asterisk/udptl.h
index 72b9af4aaab46a4b75a8bcb1410b1570c61aa861..ec96f7249ba6b8ce0c834c37bab58c54c0ae6c6e 100644 (file)
--- a/include/asterisk/udptl.h
+++ b/include/asterisk/udptl.h
@@ -87,7 +87,7 @@ void ast_udptl_set_m_type(struct ast_udptl *udptl, unsigned int pt);
 void ast_udptl_set_udptlmap_type(struct ast_udptl *udptl, unsigned int pt,
                                 char *mimeType, char *mimeSubtype);
 
-int ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl);
+enum ast_t38_ec_modes ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl);
 
 void ast_udptl_set_error_correction_scheme(struct ast_udptl *udptl, enum ast_t38_ec_modes ec);
 

diff --git a/main/udptl.c b/main/udptl.c
index 35211ccb0549096c4a9bcae61ab18f50f685aac5..ee80fee8d28c1ec5cd22911a69c68380be67a2b0 100644 (file)
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -769,7 +769,7 @@ static void calculate_far_max_ifp(struct ast_udptl *udptl)
        udptl->far_max_ifp = new_max * 0.75;
 }
 
-int ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl)
+enum ast_t38_ec_modes ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl)
 {
        if (udptl)
                return udptl->error_correction_scheme;