<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10100">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jaco Kroon: Looks good to me, but someone else must approve
  Michael L. Young: 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;">res_pjproject: Fix sockaddr conversion routines for non-bundled PJSIP<br><br>The bundled version of pjproject has a patch for Solaris compatability<br>that changes the definition of various socket structures which we need<br>to account for when compiling against a non-bundled version.<br><br>ASTERISK-28049 #close<br><br>Change-Id: Ia1ea47c433fc2d915115193ee889a752373925f0<br>---<br>M res/res_pjproject.c<br>1 file changed, 10 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjproject.c b/res/res_pjproject.c</span><br><span>index 5b133ec..2bb5d3b 100644</span><br><span>--- a/res/res_pjproject.c</span><br><span>+++ b/res/res_pjproject.c</span><br><span>@@ -478,7 +478,11 @@</span><br><span>        if (addr->ss.ss_family == AF_INET) {</span><br><span>              struct sockaddr_in *sin = (struct sockaddr_in *) &addr->ss;</span><br><span>           pjaddr->ipv4.sin_family = pj_AF_INET();</span><br><span style="color: hsl(0, 100%, 40%);">-              pjaddr->ipv4.sin_addr   = sin->sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PJPROJECT_BUNDLED</span><br><span style="color: hsl(120, 100%, 40%);">+         pjaddr->ipv4.sin_addr = sin->sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+           pjaddr->ipv4.sin_addr.s_addr = sin->sin_addr.s_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>           pjaddr->ipv4.sin_port   = sin->sin_port;</span><br><span>       } else if (addr->ss.ss_family == AF_INET6) {</span><br><span>              struct sockaddr_in6 *sin = (struct sockaddr_in6 *) &addr->ss;</span><br><span>@@ -499,7 +503,11 @@</span><br><span>  if (pjaddr->addr.sa_family == pj_AF_INET()) {</span><br><span>             struct sockaddr_in *sin = (struct sockaddr_in *) &addr->ss;</span><br><span>           sin->sin_family = AF_INET;</span><br><span style="color: hsl(0, 100%, 40%);">-           sin->sin_addr   = pjaddr->ipv4.sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PJPROJECT_BUNDLED</span><br><span style="color: hsl(120, 100%, 40%);">+         sin->sin_addr = pjaddr->ipv4.sin_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+           sin->sin_addr.s_addr = pjaddr->ipv4.sin_addr.s_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span>           sin->sin_port   = pjaddr->ipv4.sin_port;</span><br><span>               addr->len = sizeof(struct sockaddr_in);</span><br><span>   } else if (pjaddr->addr.sa_family == pj_AF_INET6()) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10100">change 10100</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/10100"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia1ea47c433fc2d915115193ee889a752373925f0 </div>
<div style="display:none"> Gerrit-Change-Number: 10100 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jaco Kroon <jaco@uls.co.za> </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: Michael L. Young <elgueromexicano@gmail.com> </div>