<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10195">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject: Update initial 2.8 patches to apply cleanly.<br><br>ASTERISK-28059<br><br>Change-Id: I027472f2753391646dde594a709a75f14422db93<br>---<br>M third-party/pjproject/patches/0000-configure-ssl-library-path.patch<br>M third-party/pjproject/patches/0000-remove-third-party.patch<br>M third-party/pjproject/patches/0000-set_apps_initial_log_level.patch<br>M third-party/pjproject/patches/0000-solaris.patch<br>R third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch<br>5 files changed, 86 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch</span><br><span>index 0ec0e7a..3c1f749 100644</span><br><span>--- a/third-party/pjproject/patches/0000-configure-ssl-library-path.patch</span><br><span>+++ b/third-party/pjproject/patches/0000-configure-ssl-library-path.patch</span><br><span>@@ -1,18 +1,47 @@</span><br><span>---- a/aconfigure.ac (PJSIP 2.7.2)</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/aconfigure.ac (working copy)</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1571 +1571,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From e8000cc80e5f8ba02cc52852edc02cdb0e949525 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Richard Mudgett <rmudgett@digium.com></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Mon, 6 Aug 2018 11:24:25 -0500</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 1/5] 0000-configure-ssl-library-path.patch</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ aconfigure | 6 +++++-</span><br><span style="color: hsl(120, 100%, 40%);">+ aconfigure.ac | 6 +++++-</span><br><span style="color: hsl(120, 100%, 40%);">+ 2 files changed, 10 insertions(+), 2 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/aconfigure b/aconfigure</span><br><span style="color: hsl(120, 100%, 40%);">+index 1c449b8..c4c6060 100755</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/aconfigure</span><br><span>++++ b/aconfigure</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -7954,7 +7954,11 @@ else</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS -I$with_ssl/include"</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="$CPPFLAGS -I$with_ssl/include"</span><br><span> - LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span> + if test -d $with_ssl/lib; then</span><br><span> + LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span> + else</span><br><span> + LDFLAGS="$LDFLAGS -L$with_ssl"</span><br><span> + fi</span><br><span>---- a/aconfigure (PJSIP 2.7.2)</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/aconfigure (working copy)</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -7884 +7884,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using SSL prefix... $with_ssl" >&5</span><br><span style="color: hsl(120, 100%, 40%);">+ $as_echo "Using SSL prefix... $with_ssl" >&6; }</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/aconfigure.ac b/aconfigure.ac</span><br><span style="color: hsl(120, 100%, 40%);">+index 2c272cd..a5d6d97 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/aconfigure.ac</span><br><span>++++ b/aconfigure.ac</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1580,7 +1580,11 @@ AC_ARG_ENABLE(ssl,</span><br><span style="color: hsl(120, 100%, 40%);">+ if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ CFLAGS="$CFLAGS -I$with_ssl/include"</span><br><span style="color: hsl(120, 100%, 40%);">+ CPPFLAGS="$CPPFLAGS -I$with_ssl/include"</span><br><span> - LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span> + if test -d $with_ssl/lib; then</span><br><span> + LDFLAGS="$LDFLAGS -L$with_ssl/lib"</span><br><span> + else</span><br><span> + LDFLAGS="$LDFLAGS -L$with_ssl"</span><br><span> + fi</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_MSG_RESULT([Using SSL prefix... $with_ssl])</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.7.4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch</span><br><span>index 54d8774..f25aeac 100644</span><br><span>--- a/third-party/pjproject/patches/0000-remove-third-party.patch</span><br><span>+++ b/third-party/pjproject/patches/0000-remove-third-party.patch</span><br><span>@@ -1,14 +1,14 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 1ec66eb253c603e06fedff5710e701dc0e55c697 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 665a2fbc3a09a71cd77988ae2deb3f5d3e205f63 Mon Sep 17 00:00:00 2001</span><br><span> From: Richard Mudgett <rmudgett@digium.com></span><br><span> Date: Thu, 23 Feb 2017 17:10:07 -0600</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH 1/3] 0000-remove-third-party.patch</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 2/5] 0000-remove-third-party.patch</span><br><span> </span><br><span> ---</span><br><span style="color: hsl(0, 100%, 40%);">- build.mak.in | 107 -----------------------------------------------------------</span><br><span style="color: hsl(0, 100%, 40%);">- 1 file changed, 107 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+ build.mak.in | 97 ------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 file changed, 97 deletions(-)</span><br><span> </span><br><span> diff --git a/build.mak.in b/build.mak.in</span><br><span style="color: hsl(0, 100%, 40%);">-index 80ccad12..41ec64ea 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 80ccad1..41ec64e 100644</span><br><span> --- a/build.mak.in</span><br><span> +++ b/build.mak.in</span><br><span> @@ -1,4 +1,3 @@</span><br><span>@@ -126,3 +126,6 @@</span><br><span> # Additional flags</span><br><span> @ac_build_mak_vars@</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.7.4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch b/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch</span><br><span>index 3eed240..b1fe02c 100644</span><br><span>--- a/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch</span><br><span>+++ b/third-party/pjproject/patches/0000-set_apps_initial_log_level.patch</span><br><span>@@ -1,7 +1,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 34f25c67f17be80814ddb16edc6c76d30213ca1b Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From c40ad6ba454fdf6456d8ffa92faa4cd49f2c807d Mon Sep 17 00:00:00 2001</span><br><span> From: Richard Mudgett <rmudgett@digium.com></span><br><span> Date: Thu, 23 Feb 2017 17:11:00 -0600</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH 2/3] 0000-set_apps_initial_log_level.patch</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 3/5] 0000-set_apps_initial_log_level.patch</span><br><span> </span><br><span> ---</span><br><span> pjsip-apps/src/pjsua/main.c | 2 ++</span><br><span>@@ -35,10 +35,10 @@</span><br><span> return 1;</span><br><span> </span><br><span> diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c</span><br><span style="color: hsl(0, 100%, 40%);">-index fb80e23..c9b21d8 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 31b835e..3e15030 100644</span><br><span> --- a/pjsip-apps/src/python/_pjsua.c</span><br><span> +++ b/pjsip-apps/src/python/_pjsua.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -4437,7 +4437,8 @@ init_pjsua(void)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -4434,7 +4434,8 @@ init_pjsua(void)</span><br><span> PyObject* m = NULL;</span><br><span> #define ADD_CONSTANT(mod,name) PyModule_AddIntConstant(mod,#name,name)</span><br><span> </span><br><span>diff --git a/third-party/pjproject/patches/0000-solaris.patch b/third-party/pjproject/patches/0000-solaris.patch</span><br><span>index 0e25c55..155cdbe 100644</span><br><span>--- a/third-party/pjproject/patches/0000-solaris.patch</span><br><span>+++ b/third-party/pjproject/patches/0000-solaris.patch</span><br><span>@@ -1,7 +1,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 8f8a9dc7203bfcd5557ad5c2f15359308535c4bb Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 1ac599a0f29500a15faf0dbbdc2565cc7dce2420 Mon Sep 17 00:00:00 2001</span><br><span> From: Shaun Ruffell <sruffell@digium.com></span><br><span> Date: Fri, 7 Sep 2012 14:31:19 -0500</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH] pjproject: Fix for Solaris builds. Do not undef s_addr.</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 4/5] pjproject: Fix for Solaris builds. Do not undef s_addr.</span><br><span> </span><br><span> pjproject, in order to solve build problems on Windows [1], undefines s_addr in</span><br><span> one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr is</span><br><span>@@ -38,15 +38,15 @@</span><br><span> </span><br><span> Updated by ASTERISK-27997</span><br><span> ---</span><br><span style="color: hsl(0, 100%, 40%);">- pjlib/include/pj/sock.h | 8 +++++++-</span><br><span style="color: hsl(0, 100%, 40%);">- pjlib/src/pj/sock_bsd.c | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- pjlib/src/pj/sock_symbian.cpp | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- pjlib/src/pj/sock_uwp.cpp | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- pjsip/src/test/transport_test.c | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- 6 files changed, 12 insertions(+), 6 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+ pjlib/include/pj/sock.h | 8 +++++++-</span><br><span style="color: hsl(120, 100%, 40%);">+ pjlib/src/pj/sock_bsd.c | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ pjlib/src/pj/sock_symbian.cpp | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ pjlib/src/pj/sock_uwp.cpp | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ pjsip/src/test/transport_test.c | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ 5 files changed, 11 insertions(+), 5 deletions(-)</span><br><span> </span><br><span> diff --git a/pjlib/include/pj/sock.h b/pjlib/include/pj/sock.h</span><br><span style="color: hsl(0, 100%, 40%);">-index 8fc833c..c415358 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 4daf298..c35833c 100644</span><br><span> --- a/pjlib/include/pj/sock.h</span><br><span> +++ b/pjlib/include/pj/sock.h</span><br><span> @@ -484,6 +484,7 @@ typedef enum pj_socket_sd_type</span><br><span>@@ -69,7 +69,7 @@</span><br><span> </span><br><span> /**</span><br><span> * Maximum length of text representation of an IPv4 address.</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -714,7 +720,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -712,7 +718,7 @@ PJ_DECL(char*) pj_inet_ntoa(pj_in_addr inaddr);</span><br><span> *</span><br><span> * @return nonzero if the address is valid, zero if not.</span><br><span> */</span><br><span>@@ -79,7 +79,7 @@</span><br><span> /**</span><br><span> * This function converts an address in its standard text presentation form</span><br><span> diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 95c3804..daefc54 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index e416991..940fce1 100644</span><br><span> --- a/pjlib/src/pj/sock_bsd.c</span><br><span> +++ b/pjlib/src/pj/sock_bsd.c</span><br><span> @@ -244,7 +244,7 @@ PJ_DEF(char*) pj_inet_ntoa(pj_in_addr inaddr)</span><br><span>diff --git a/third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch b/third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch</span><br><span>similarity index 94%</span><br><span>rename from third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch</span><br><span>rename to third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch</span><br><span>index 6c139ba..adde49b 100644</span><br><span>--- a/third-party/pjproject/patches/0080-timer-Clean-up-usage-of-timer-heap.patch</span><br><span>+++ b/third-party/pjproject/patches/0010-timer-Clean-up-usage-of-timer-heap.patch</span><br><span>@@ -1,7 +1,7 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 853005378de2ffecee7774e095d8cbfbfa0ab706 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From f7d91ca2a3c562066f95db066381a8b956ded98f Mon Sep 17 00:00:00 2001</span><br><span> From: George Joseph <gjoseph@digium.com></span><br><span> Date: Tue, 2 Jan 2018 06:36:46 -0700</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH] timer: Clean up usage of timer heap</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 5/5] timer: Clean up usage of timer heap</span><br><span> </span><br><span> Added a new pj_timer_entry_reset function that resets a timer_entry</span><br><span> for re-use.</span><br><span>@@ -29,14 +29,13 @@</span><br><span> 15 files changed, 64 insertions(+), 25 deletions(-)</span><br><span> </span><br><span> diff --git a/pjlib/include/pj/timer.h b/pjlib/include/pj/timer.h</span><br><span style="color: hsl(0, 100%, 40%);">-index df6155a81..90fc8ac85 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index df6155a..90fc8ac 100644</span><br><span> --- a/pjlib/include/pj/timer.h</span><br><span> +++ b/pjlib/include/pj/timer.h</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -212,6 +212,20 @@ PJ_DECL(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,</span><br><span style="color: hsl(0, 100%, 40%);">- void *user_data,</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -213,6 +213,20 @@ PJ_DECL(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,</span><br><span> pj_timer_heap_callback *cb );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-+/**</span><br><span style="color: hsl(120, 100%, 40%);">+ /**</span><br><span> + * Reset a timer entry. Application should call this function before reusing</span><br><span> + * the timer entry.</span><br><span> + *</span><br><span>@@ -50,14 +49,15 @@</span><br><span> +PJ_DECL(pj_timer_entry*) pj_timer_entry_reset( pj_timer_entry *entry,</span><br><span> + int id);</span><br><span> +</span><br><span style="color: hsl(0, 100%, 40%);">- /**</span><br><span style="color: hsl(120, 100%, 40%);">++/**</span><br><span> * Queries whether a timer entry is currently running.</span><br><span> *</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param entry The timer entry to query.</span><br><span> diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 969cc1420..ead1a8fbb 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 738fb8b..fb3b359 100644</span><br><span> --- a/pjlib/src/pj/ssl_sock_ossl.c</span><br><span> +++ b/pjlib/src/pj/ssl_sock_ossl.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -291,6 +291,7 @@ struct pj_ssl_cert_t</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -304,6 +304,7 @@ struct pj_ssl_cert_t</span><br><span> static write_data_t* alloc_send_data(pj_ssl_sock_t *ssock, pj_size_t len);</span><br><span> static void free_send_data(pj_ssl_sock_t *ssock, write_data_t *wdata);</span><br><span> static pj_status_t flush_delayed_send(pj_ssl_sock_t *ssock);</span><br><span>@@ -65,7 +65,7 @@</span><br><span> </span><br><span> /*</span><br><span> *******************************************************************</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1621,7 +1622,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1726,7 +1727,8 @@ static pj_bool_t on_handshake_complete(pj_ssl_sock_t *ssock,</span><br><span> pj_timer_heap_cancel(ssock->param.timer_heap,</span><br><span> &ssock->timer);</span><br><span> }</span><br><span>@@ -75,7 +75,7 @@</span><br><span> pj_time_val_normalize(&interval);</span><br><span> if (pj_timer_heap_schedule(ssock->param.timer_heap, </span><br><span> &ssock->timer, &interval) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -2387,7 +2389,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -2492,7 +2494,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,</span><br><span> ssock->param.timeout.msec != 0))</span><br><span> {</span><br><span> pj_assert(ssock->timer.id == TIMER_NONE);</span><br><span>@@ -84,7 +84,7 @@</span><br><span> status = pj_timer_heap_schedule(ssock->param.timer_heap, </span><br><span> &ssock->timer,</span><br><span> &ssock->param.timeout);</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -3405,7 +3407,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_start_connect( pj_ssl_sock_t *ssock,</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -3538,7 +3540,7 @@ PJ_DEF(pj_status_t) pj_ssl_sock_start_connect( pj_ssl_sock_t *ssock,</span><br><span> ssock->param.timeout.msec != 0))</span><br><span> {</span><br><span> pj_assert(ssock->timer.id == TIMER_NONE);</span><br><span>@@ -94,7 +94,7 @@</span><br><span> &ssock->timer,</span><br><span> &ssock->param.timeout);</span><br><span> diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 90a95e37b..13126116f 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 90a95e3..1312611 100644</span><br><span> --- a/pjlib/src/pj/timer.c</span><br><span> +++ b/pjlib/src/pj/timer.c</span><br><span> @@ -472,6 +472,18 @@ PJ_DEF(pj_timer_entry*) pj_timer_entry_init( pj_timer_entry *entry,</span><br><span>@@ -117,7 +117,7 @@</span><br><span> {</span><br><span> return (entry->_timer_id >= 1);</span><br><span> diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 63a0d1c9c..6d0e6abc9 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index c51dba7..cbee91d 100644</span><br><span> --- a/pjnath/src/pjnath/ice_session.c</span><br><span> +++ b/pjnath/src/pjnath/ice_session.c</span><br><span> @@ -1246,6 +1246,7 @@ done:</span><br><span>@@ -179,7 +179,7 @@</span><br><span> &clist->timer, &delay,</span><br><span> PJ_TRUE, ice->grp_lock);</span><br><span> diff --git a/pjnath/src/pjnath/nat_detect.c b/pjnath/src/pjnath/nat_detect.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 8a2408374..7bb364798 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 31b06c3..d1d7373 100644</span><br><span> --- a/pjnath/src/pjnath/nat_detect.c</span><br><span> +++ b/pjnath/src/pjnath/nat_detect.c</span><br><span> @@ -414,6 +414,7 @@ static void end_session(nat_detect_session *sess,</span><br><span>@@ -199,10 +199,10 @@</span><br><span> } else {</span><br><span> te->id = 0;</span><br><span> diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 6028e0c47..3aab27a1d 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 4031bb3..af3cc4a 100644</span><br><span> --- a/pjnath/src/pjnath/stun_sock.c</span><br><span> +++ b/pjnath/src/pjnath/stun_sock.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -864,7 +864,7 @@ static void start_ka_timer(pj_stun_sock *stun_sock)</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -880,7 +880,7 @@ static void start_ka_timer(pj_stun_sock *stun_sock)</span><br><span> </span><br><span> delay.sec = stun_sock->ka_interval;</span><br><span> delay.msec = 0;</span><br><span>@@ -212,7 +212,7 @@</span><br><span> &stun_sock->ka_timer,</span><br><span> &delay, PJ_TRUE,</span><br><span> diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 28f623005..ad87b7b6c 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 28f6230..ad87b7b 100644</span><br><span> --- a/pjnath/src/pjnath/stun_transaction.c</span><br><span> +++ b/pjnath/src/pjnath/stun_transaction.c</span><br><span> @@ -86,11 +86,8 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_create(pj_stun_config *cfg,</span><br><span>@@ -254,7 +254,7 @@</span><br><span> &tsx->retransmit_timer,</span><br><span> &tsx->retransmit_time,</span><br><span> diff --git a/pjnath/src/pjnath/turn_session.c b/pjnath/src/pjnath/turn_session.c</span><br><span style="color: hsl(0, 100%, 40%);">-index bbea027f3..e4685e625 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index bbea027..e4685e6 100644</span><br><span> --- a/pjnath/src/pjnath/turn_session.c</span><br><span> +++ b/pjnath/src/pjnath/turn_session.c</span><br><span> @@ -431,6 +431,7 @@ static void sess_shutdown(pj_turn_session *sess,</span><br><span>@@ -282,7 +282,7 @@</span><br><span> &delay, TIMER_KEEP_ALIVE,</span><br><span> sess->grp_lock);</span><br><span> diff --git a/pjnath/src/pjnath/turn_sock.c b/pjnath/src/pjnath/turn_sock.c</span><br><span style="color: hsl(0, 100%, 40%);">-index a30ab5153..507858048 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index a30ab51..5078580 100644</span><br><span> --- a/pjnath/src/pjnath/turn_sock.c</span><br><span> +++ b/pjnath/src/pjnath/turn_sock.c</span><br><span> @@ -928,6 +928,7 @@ static void turn_on_state(pj_turn_session *sess,</span><br><span>@@ -294,7 +294,7 @@</span><br><span> &turn_sock->timer,</span><br><span> &delay, TIMER_DESTROY,</span><br><span> diff --git a/pjnath/src/pjturn-srv/allocation.c b/pjnath/src/pjturn-srv/allocation.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 6c9c9ce11..88533926b 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 6c9c9ce..8853392 100644</span><br><span> --- a/pjnath/src/pjturn-srv/allocation.c</span><br><span> +++ b/pjnath/src/pjturn-srv/allocation.c</span><br><span> @@ -513,7 +513,7 @@ static void alloc_shutdown(pj_turn_allocation *alloc)</span><br><span>@@ -316,7 +316,7 @@</span><br><span> &alloc->relay.timer, &delay);</span><br><span> if (status != PJ_SUCCESS) {</span><br><span> diff --git a/pjnath/src/pjturn-srv/listener_tcp.c b/pjnath/src/pjturn-srv/listener_tcp.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 796ed471b..4a9550c2e 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 796ed47..4a9550c 100644</span><br><span> --- a/pjnath/src/pjturn-srv/listener_tcp.c</span><br><span> +++ b/pjnath/src/pjturn-srv/listener_tcp.c</span><br><span> @@ -475,7 +475,7 @@ static void tcp_dec_ref(pj_turn_transport *tp,</span><br><span>@@ -329,7 +329,7 @@</span><br><span> &tcp->timer, &delay);</span><br><span> }</span><br><span> diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c</span><br><span style="color: hsl(0, 100%, 40%);">-index eb666654f..7748853d2 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index eb66665..7748853 100644</span><br><span> --- a/pjsip/src/pjsip-simple/evsub.c</span><br><span> +++ b/pjsip/src/pjsip-simple/evsub.c</span><br><span> @@ -518,6 +518,7 @@ static void set_timer( pjsip_evsub *sub, int timer_id,</span><br><span>@@ -360,7 +360,7 @@</span><br><span> /* Set name. */</span><br><span> pj_ansi_snprintf(sub->obj_name, PJ_ARRAY_SIZE(sub->obj_name),</span><br><span> diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c</span><br><span style="color: hsl(0, 100%, 40%);">-index d810781d5..5c98a5bf6 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index d810781..5c98a5b 100644</span><br><span> --- a/pjsip/src/pjsip/sip_endpoint.c</span><br><span> +++ b/pjsip/src/pjsip/sip_endpoint.c</span><br><span> @@ -788,6 +788,7 @@ PJ_DEF(pj_status_t) pjsip_endpt_schedule_timer_dbg(pjsip_endpoint *endpt,</span><br><span>@@ -389,7 +389,7 @@</span><br><span> </span><br><span> /*</span><br><span> diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c</span><br><span style="color: hsl(0, 100%, 40%);">-index d52b12a72..5236e63f7 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 4b7f852..173bd6a 100644</span><br><span> --- a/pjsip/src/pjsip/sip_transaction.c</span><br><span> +++ b/pjsip/src/pjsip/sip_transaction.c</span><br><span> @@ -978,6 +978,7 @@ static pj_status_t tsx_schedule_timer(pjsip_transaction *tsx,</span><br><span>@@ -416,10 +416,10 @@</span><br><span> if (grp_lock) {</span><br><span> tsx->grp_lock = grp_lock;</span><br><span> diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 3d27d5d71..834babeae 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 17e9142..22f4dc1 100644</span><br><span> --- a/pjsip/src/pjsip/sip_transport.c</span><br><span> +++ b/pjsip/src/pjsip/sip_transport.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1092,8 +1092,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1139,8 +1139,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,</span><br><span> /* Init. */</span><br><span> tp->tpmgr = mgr;</span><br><span> pj_bzero(&tp->idle_timer, sizeof(tp->idle_timer));</span><br><span>@@ -430,5 +430,5 @@</span><br><span> /* </span><br><span> * Register to hash table (see Trac ticket #42).</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.14.3</span><br><span style="color: hsl(120, 100%, 40%);">+2.7.4</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10195">change 10195</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10195"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I027472f2753391646dde594a709a75f14422db93 </div>
<div style="display:none"> Gerrit-Change-Number: 10195 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>