<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/19922">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support sending IPv6 Transport Address in Assignment Command<br><br>Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099<br>---<br>M src/libmsc/ran_msg_a.c<br>1 file changed, 40 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c</span><br><span>index 8158e91..c17eb3d 100644</span><br><span>--- a/src/libmsc/ran_msg_a.c</span><br><span>+++ b/src/libmsc/ran_msg_a.c</span><br><span>@@ -977,25 +977,48 @@</span><br><span> </span><br><span> /* Package RTP-Address data */</span><br><span> if (osmo_sockaddr_str_is_nonzero(ac->cn_rtp)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct sockaddr_in rtp_addr_in;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&rtp_addr_in, 0, sizeof(rtp_addr_in));</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_addr_in.sin_family = AF_INET;</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_addr_in.sin_port = osmo_htons(ac->cn_rtp->port),</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_addr_in.sin_addr.s_addr = inet_addr(ac->cn_rtp->ip);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rtp_addr_in.sin_addr.s_addr == INADDR_NONE) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_RAN_A_ENC(log_fi, LOGL_ERROR, "Assignment Command: Invalid RTP-Address\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_in *sin;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sockaddr_in6 *sin6;</span><br><span style="color: hsl(120, 100%, 40%);">+ int family = osmo_ip_str_type(ac->cn_rtp->ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ sin = (struct sockaddr_in *)&rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin->sin_family = AF_INET;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin->sin_port = osmo_htons(ac->cn_rtp->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inet_pton(AF_INET, ac->cn_rtp->ip, &sin->sin_addr) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_ENC(log_fi, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment Command: Invalid RTP-Address %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ac->cn_rtp->ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sin->sin_port == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_ENC(log_fi, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment Command: Invalid RTP-Port\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6 = (struct sockaddr_in6 *)&rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6->sin6_family = AF_INET6;</span><br><span style="color: hsl(120, 100%, 40%);">+ sin6->sin6_port = osmo_htons(ac->cn_rtp->port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inet_pton(AF_INET6, ac->cn_rtp->ip, &sin6->sin6_addr) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_ENC(log_fi, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment Command: Invalid RTP-Address %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ac->cn_rtp->ip);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sin6->sin6_port == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_ENC(log_fi, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment Command: Invalid RTP-Port\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_A_ENC(log_fi, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Assignment Command: Invalid RTP-Address type for %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ac->cn_rtp->ip);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (rtp_addr_in.sin_port == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_RAN_A_ENC(log_fi, LOGL_ERROR, "Assignment Command: Invalid RTP-Port\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&rtp_addr, 0, sizeof(rtp_addr));</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&rtp_addr, &rtp_addr_in, sizeof(rtp_addr_in));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> use_rtp_addr = &rtp_addr;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/19922">change 19922</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/c/osmo-msc/+/19922"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ida43f10a41afbd275233f0ef102287522a2e7099 </div>
<div style="display:none"> Gerrit-Change-Number: 19922 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>