<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/19982">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support handling IPv6 Transport Address in Handover Request (ack)<br><br>Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774<br>---<br>M src/libmsc/ran_msg_a.c<br>1 file changed, 12 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/1</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 b13cc17..bf5fc68 100644</span><br><span>--- a/src/libmsc/ran_msg_a.c</span><br><span>+++ b/src/libmsc/ran_msg_a.c</span><br><span>@@ -607,23 +607,13 @@</span><br><span>   }</span><br><span> </span><br><span>        if (ie_aoip_transp_addr) {</span><br><span style="color: hsl(0, 100%, 40%);">-              do {</span><br><span>                         struct sockaddr_storage rtp_addr;</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0)</span><br><span>                             LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                           break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (rtp_addr.ss_family != AF_INET) {</span><br><span style="color: hsl(0, 100%, 40%);">-                            LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:"</span><br><span style="color: hsl(0, 100%, 40%);">-                                             " unsupported addressing scheme (only IPV4 supported)\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                           break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (osmo_sockaddr_str_from_sockaddr_in(&rtp_ran_local, (struct sockaddr_in*)&rtp_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     else if (osmo_sockaddr_str_from_sockaddr(&rtp_ran_local, (struct sockaddr*)&rtp_addr) < 0)</span><br><span>                                LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                            break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                       r->rtp_ran_local = &rtp_ran_local;</span><br><span style="color: hsl(0, 100%, 40%);">-               } while(0);</span><br><span style="color: hsl(120, 100%, 40%);">+                   else</span><br><span style="color: hsl(120, 100%, 40%);">+                          r->rtp_ran_local = &rtp_ran_local;</span><br><span>    }</span><br><span> </span><br><span>        if (ie_codec_list_msc_preferred</span><br><span>@@ -689,24 +679,14 @@</span><br><span>      }</span><br><span> </span><br><span>        if (ie_aoip_transp_addr) {</span><br><span style="color: hsl(0, 100%, 40%);">-              do {</span><br><span style="color: hsl(0, 100%, 40%);">-                    struct sockaddr_storage rtp_addr;</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                              LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                           break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (rtp_addr.ss_family != AF_INET) {</span><br><span style="color: hsl(0, 100%, 40%);">-                            LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:"</span><br><span style="color: hsl(0, 100%, 40%);">-                                             " unsupported addressing scheme (only IPV4 supported)\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                           break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.handover_request_ack.remote_rtp,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                          (struct sockaddr_in*)&rtp_addr)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                            ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){};</span><br><span style="color: hsl(0, 100%, 40%);">-                             break;</span><br><span style="color: hsl(0, 100%, 40%);">-                  }</span><br><span style="color: hsl(0, 100%, 40%);">-               } while(0);</span><br><span style="color: hsl(120, 100%, 40%);">+           struct sockaddr_storage rtp_addr;</span><br><span style="color: hsl(120, 100%, 40%);">+             if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         } else if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.handover_request_ack.remote_rtp,</span><br><span style="color: hsl(120, 100%, 40%);">+                                            (struct sockaddr*)&rtp_addr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                  ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){};</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span>    }</span><br><span> </span><br><span>        if (ie_speech_codec) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/19982">change 19982</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/+/19982"/><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: Ie4d07826362d651cd42dc2b4e0af82368a74c774 </div>
<div style="display:none"> Gerrit-Change-Number: 19982 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>