<p>Kevin Harwell <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16521">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, approved; Verified
  Kevin Harwell: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_rtp_asterisk.c: Fix build failure when not building with pjproject.<br><br>Some code has been added referencing symbols defined in a block<br>protected by #ifdef HAVE_PJPROJECT. Protect those code parts in<br>ifdef blocks too.<br><br>ASTERISK-29660<br><br>Change-Id: Ib18d4392d51ac80ca5481dabf6e498a4e3e49e6f<br>---<br>M res/res_rtp_asterisk.c<br>1 file changed, 6 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c</span><br><span>index 6da4824..8ede400 100644</span><br><span>--- a/res/res_rtp_asterisk.c</span><br><span>+++ b/res/res_rtp_asterisk.c</span><br><span>@@ -655,8 +655,10 @@</span><br><span> </span><br><span> static int __rtp_sendto(struct ast_rtp_instance *instance, void *buf, size_t size, int flags, struct ast_sockaddr *sa, int rtcp, int *via_ice, int use_srtp);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PJPROJECT</span><br><span> static void stunaddr_resolve_callback(const struct ast_dns_query *query);</span><br><span> static int store_stunaddr_resolved(const struct ast_dns_query *query);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #if defined(HAVE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_SRTP)</span><br><span> static int dtls_bio_new(BIO *bio)</span><br><span>@@ -9026,6 +9028,7 @@</span><br><span>        return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PJPROJECT</span><br><span> static void stunaddr_resolve_callback(const struct ast_dns_query *query)</span><br><span> {</span><br><span>   const int lowest_ttl = ast_dns_result_get_lowest_ttl(ast_dns_query_get_result(query));</span><br><span>@@ -9091,6 +9094,7 @@</span><br><span>       memset(&stunaddr, 0, sizeof(stunaddr));</span><br><span>  ast_rwlock_unlock(&stunaddr_lock);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #if defined(HAVE_OPENSSL) && (OPENSSL_VERSION_NUMBER >= 0x10001000L) && !defined(OPENSSL_NO_SRTP)</span><br><span> /*! \pre instance is locked */</span><br><span>@@ -9189,7 +9193,9 @@</span><br><span> </span><br><span> static char *handle_cli_rtp_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PJPROJECT</span><br><span>  struct sockaddr_in stunaddr_copy;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>    switch (cmd) {</span><br><span>       case CLI_INIT:</span><br><span>               e->command = "rtp show settings";</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16521">change 16521</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/c/asterisk/+/16521"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18.7 </div>
<div style="display:none"> Gerrit-Change-Id: Ib18d4392d51ac80ca5481dabf6e498a4e3e49e6f </div>
<div style="display:none"> Gerrit-Change-Number: 16521 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-CC: Guido Falsi <madpilot@freebsd.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>