<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/12809">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_unistim: Fix clang warning: variable sized type not at end of a struct<br><br>On reading information about initial client packet unistim use dirty<br>implementation of destination ip address retrieval. This fix uses<br>CMSG_*(..) to get ip address and make clang compile without warning.<br><br>ASTERISK-25592 #close<br>Reported-by: Alexander Traud<br><br>Change-Id: Ic1fd34c2c2bcc951da65bf62e3f7a8adff8351b1<br>---<br>M channels/chan_unistim.c<br>1 file changed, 31 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c</span><br><span>index 539d935..0ed190b 100644</span><br><span>--- a/channels/chan_unistim.c</span><br><span>+++ b/channels/chan_unistim.c</span><br><span>@@ -1003,27 +1003,36 @@</span><br><span> {</span><br><span> #ifdef HAVE_PKTINFO</span><br><span> int err;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msghdr msg;</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cmsghdr cm;</span><br><span style="color: hsl(0, 100%, 40%);">- int len;</span><br><span style="color: hsl(0, 100%, 40%);">- struct in_addr address;</span><br><span style="color: hsl(0, 100%, 40%);">- } ip_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Zero out the structures before we use them */</span><br><span style="color: hsl(0, 100%, 40%);">- /* This sets several key values to NULL */</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&msg, 0, sizeof(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&ip_msg, 0, sizeof(ip_msg));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Initialize the message structure */</span><br><span style="color: hsl(0, 100%, 40%);">- msg.msg_control = &ip_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- msg.msg_controllen = sizeof(ip_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ char cmbuf[0x100];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cmsghdr *cmsg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_in peeraddr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msghdr mh = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .msg_name = &peeraddr,</span><br><span style="color: hsl(120, 100%, 40%);">+ .msg_namelen = sizeof(peeraddr),</span><br><span style="color: hsl(120, 100%, 40%);">+ .msg_control = cmbuf,</span><br><span style="color: hsl(120, 100%, 40%);">+ .msg_controllen = sizeof(cmbuf),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&addr, 0, sizeof(addr));</span><br><span> /* Get info about the incoming packet */</span><br><span style="color: hsl(0, 100%, 40%);">- err = recvmsg(fd, &msg, MSG_PEEK);</span><br><span style="color: hsl(120, 100%, 40%);">+ err = recvmsg(fd, &mh, MSG_PEEK);</span><br><span> if (err == -1) {</span><br><span> ast_log(LOG_WARNING, "recvmsg returned an error: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return err;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&toAddr->sin_addr, &ip_msg.address, sizeof(struct in_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ for(cmsg = CMSG_FIRSTHDR(&mh);</span><br><span style="color: hsl(120, 100%, 40%);">+ cmsg != NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ cmsg = CMSG_NXTHDR(&mh, cmsg))</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_PKTINFO) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_pktinfo *pkt = (struct in_pktinfo*)CMSG_DATA(cmsg);</span><br><span style="color: hsl(120, 100%, 40%);">+ addr = pkt->ipi_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (unistimdebug) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_verb(0, "message received on address %s\n", ast_inet_ntoa(addr));</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%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&toAddr->sin_addr, &addr, sizeof(struct in_addr));</span><br><span> return err;</span><br><span> #else</span><br><span> memcpy(toAddr, &public_ip, sizeof(*toAddr));</span><br><span>@@ -1031,6 +1040,7 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Allocate memory & initialize structures for a new phone */</span><br><span> /* addr_from : ip address of the phone */</span><br><span> static struct unistimsession *create_client(const struct sockaddr_in *addr_from)</span><br><span>@@ -1042,7 +1052,10 @@</span><br><span> return NULL;</span><br><span> </span><br><span> memcpy(&s->sin, addr_from, sizeof(struct sockaddr_in));</span><br><span style="color: hsl(0, 100%, 40%);">- get_to_address(unistimsock, &s->sout);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_to_address(unistimsock, &s->sout) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(s);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> s->sout.sin_family = AF_INET;</span><br><span> if (unistimdebug) {</span><br><span> ast_verb(0, "Creating a new entry for the phone from %s received via server ip %s\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/12809">change 12809</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/+/12809"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: Ic1fd34c2c2bcc951da65bf62e3f7a8adff8351b1 </div>
<div style="display:none"> Gerrit-Change-Number: 12809 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Igor Goncharovsky <igor.goncharovsky@gmail.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: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>