[Asterisk-code-review] res pjproject.c: Upgrade bundled PJPROJECT to 2.7.2 (asterisk[master])

[Richard Mudgett]

Richard Mudgett has uploaded this change for review. ( https://gerrit.asterisk.org/8485


Change subject: res_pjproject.c: Upgrade bundled PJPROJECT to 2.7.2
......................................................................

res_pjproject.c: Upgrade bundled PJPROJECT to 2.7.2

Update patches included in bundled PJPROJECT for the new version.

ASTERISK-27730

Change-Id: Id3c8c8ad82126846bcd9768bc3d0a18d89be8944
---
D third-party/pjproject/patches/0070-sdp_media_fmt.patch
D third-party/pjproject/patches/0071-sdp_fmtp_attr.patch
M third-party/versions.mak
3 files changed, 1 insertion(+), 54 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/8485/1

diff --git a/third-party/pjproject/patches/0070-sdp_media_fmt.patch b/third-party/pjproject/patches/0070-sdp_media_fmt.patch
deleted file mode 100644
index 0a0977d..0000000
--- a/third-party/pjproject/patches/0070-sdp_media_fmt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c
-index a3dd80b..0a13206 100644
---- a/pjmedia/src/pjmedia/sdp.c
-+++ b/pjmedia/src/pjmedia/sdp.c
-@@ -1516,11 +1516,12 @@ PJ_DEF(pj_status_t) pjmedia_sdp_validate2(const pjmedia_sdp_session *sdp,
- 	     * RTC based programs sends "null" for instant messaging!
- 	     */
- 	    if (pj_isdigit(*m->desc.fmt[j].ptr)) {
--		unsigned pt = pj_strtoul(&m->desc.fmt[j]);
-+		unsigned long pt;
-+		pj_status_t status = pj_strtoul3(&m->desc.fmt[j], &pt, 10);
- 
- 		/* Payload type is between 0 and 127. 
- 		 */
--		CHECK( pt <= 127, PJMEDIA_SDP_EINPT);
-+		CHECK( status == PJ_SUCCESS && pt <= 127, PJMEDIA_SDP_EINPT);
- 
- 		/* If port is not zero, then for each dynamic payload type, an
- 		 * rtpmap attribute must be specified.
diff --git a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch b/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch
deleted file mode 100644
index 8228d5d..0000000
--- a/third-party/pjproject/patches/0071-sdp_fmtp_attr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/pjmedia/src/pjmedia/sdp.c b/pjmedia/src/pjmedia/sdp.c
-index a3dd80b..6117e07 100644
---- a/pjmedia/src/pjmedia/sdp.c
-+++ b/pjmedia/src/pjmedia/sdp.c
-@@ -256,7 +256,8 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtpmap( const pjmedia_sdp_attr *attr,
- 
-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtpmap")==0, PJ_EINVALIDOP);
- 
--    PJ_ASSERT_RETURN(attr->value.slen != 0, PJMEDIA_SDP_EINATTR);
-+    if (attr->value.slen == 0)
-+        return PJMEDIA_SDP_EINATTR;
- 
-     init_sdp_parser();
- 
-@@ -341,6 +342,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_fmtp( const pjmedia_sdp_attr *attr,
- 
-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "fmtp")==0, PJ_EINVALIDOP);
- 
-+    if (attr->value.slen == 0)
-+        return PJMEDIA_SDP_EINATTR;
-+
-     /* fmtp BNF:
-      *	a=fmtp:<format> <format specific parameter>
-      */
-@@ -379,6 +383,9 @@ PJ_DEF(pj_status_t) pjmedia_sdp_attr_get_rtcp(const pjmedia_sdp_attr *attr,
- 
-     PJ_ASSERT_RETURN(pj_strcmp2(&attr->name, "rtcp")==0, PJ_EINVALIDOP);
- 
-+    if (attr->value.slen == 0)
-+        return PJMEDIA_SDP_EINATTR;
-+
-     init_sdp_parser();
- 
-     /* fmtp BNF:
diff --git a/third-party/versions.mak b/third-party/versions.mak
index a90a523..b6daf19 100644
--- a/third-party/versions.mak
+++ b/third-party/versions.mak
@@ -1,2 +1,2 @@
 
-PJPROJECT_VERSION = 2.7.1
+PJPROJECT_VERSION = 2.7.2

-- 
To view, visit https://gerrit.asterisk.org/8485
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3c8c8ad82126846bcd9768bc3d0a18d89be8944
Gerrit-Change-Number: 8485
Gerrit-PatchSet: 1
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180308/d678ffbe/attachment-0001.html>