diff options
author | Richard Mudgett <rmudgett@digium.com> | 2017-10-17 10:53:52 -0500 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2017-10-20 14:28:13 -0500 |
commit | 0f3dcb250ab264c849a4bb0214a22966379cee70 (patch) | |
tree | fc44617b8f68d43c09d80e950096912ba05f33d9 /third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch | |
parent | f2c95fb7e409c1ef289f1eb96dde915221d636f1 (diff) |
res_pjproject.c: Upgrade bundled PJPROJECT to 2.7
Update patches included in bundled PJPROJECT for the new version.
ASTERISK-27355
Change-Id: I9ac5dbbffaadca25ad24fac8b9ab615e5ace6083
Diffstat (limited to 'third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch')
-rw-r--r-- | third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch b/third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch deleted file mode 100644 index 796473a3c..000000000 --- a/third-party/pjproject/patches/0014-Add-pjsip-transport-register-type-ipv6.patch +++ /dev/null @@ -1,62 +0,0 @@ -From daeb0956524606b597704a90b54d81340e10b3e4 Mon Sep 17 00:00:00 2001 -From: Joshua Colp <jcolp@digium.com> -Date: Tue, 7 Mar 2017 12:32:49 +0000 -Subject: [PATCH] Add support for registering IPv6 transport type. - -This change allows an IPv6 transport type to be registered -and used. The IPv4 transport is found (if available) and the -IPv4 flag added to its type to match how the finding of -IPv6 transport types works. ---- - pjsip/src/pjsip/sip_transport.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c -index 7df6138..ce72814 100644 ---- a/pjsip/src/pjsip/sip_transport.c -+++ b/pjsip/src/pjsip/sip_transport.c -@@ -236,6 +236,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register_type( unsigned tp_flag, - int *p_tp_type) - { - unsigned i; -+ pjsip_transport_type_e parent = 0; - - PJ_ASSERT_RETURN(tp_flag && tp_name && def_port, PJ_EINVAL); - PJ_ASSERT_RETURN(pj_ansi_strlen(tp_name) < -@@ -243,6 +244,11 @@ PJ_DEF(pj_status_t) pjsip_transport_register_type( unsigned tp_flag, - PJ_ENAMETOOLONG); - - for (i=1; i<PJ_ARRAY_SIZE(transport_names); ++i) { -+ if (tp_flag & PJSIP_TRANSPORT_IPV6 && -+ pj_stricmp2(&transport_names[i].name, tp_name) == 0) -+ { -+ parent = transport_names[i].type; -+ } - if (transport_names[i].type == 0) - break; - } -@@ -250,14 +256,19 @@ PJ_DEF(pj_status_t) pjsip_transport_register_type( unsigned tp_flag, - if (i == PJ_ARRAY_SIZE(transport_names)) - return PJ_ETOOMANY; - -- transport_names[i].type = (pjsip_transport_type_e)i; -+ if (tp_flag & PJSIP_TRANSPORT_IPV6 && parent) { -+ transport_names[i].type = parent | PJSIP_TRANSPORT_IPV6; -+ } else { -+ transport_names[i].type = (pjsip_transport_type_e)i; -+ } -+ - transport_names[i].port = (pj_uint16_t)def_port; - pj_ansi_strcpy(transport_names[i].name_buf, tp_name); - transport_names[i].name = pj_str(transport_names[i].name_buf); - transport_names[i].flag = tp_flag; - - if (p_tp_type) -- *p_tp_type = i; -+ *p_tp_type = transport_names[i].type; - - return PJ_SUCCESS; - } --- -2.7.4 - |