This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19982 ) Change subject: Support handling IPv6 Transport Address in Handover Request (ack) ...................................................................... Support handling IPv6 Transport Address in Handover Request (ack) Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 --- M src/libmsc/ran_msg_a.c 1 file changed, 12 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/19982/1 diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index b13cc17..bf5fc68 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -607,23 +607,13 @@ } if (ie_aoip_transp_addr) { - do { struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&rtp_ran_local, (struct sockaddr_in*)&rtp_addr)) { + else if (osmo_sockaddr_str_from_sockaddr(&rtp_ran_local, (struct sockaddr*)&rtp_addr) < 0) LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - break; - } - r->rtp_ran_local = &rtp_ran_local; - } while(0); + else + r->rtp_ran_local = &rtp_ran_local; } if (ie_codec_list_msc_preferred @@ -689,24 +679,14 @@ } if (ie_aoip_transp_addr) { - do { - struct sockaddr_storage rtp_addr; - if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); - break; - } - if (rtp_addr.ss_family != AF_INET) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "IE AoIP Transport Address:" - " unsupported addressing scheme (only IPV4 supported)\n"); - break; - } - if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.handover_request_ack.remote_rtp, - (struct sockaddr_in*)&rtp_addr)) { - LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); - ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; - break; - } - } while(0); + struct sockaddr_storage rtp_addr; + if (gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len) < 0) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode AoIP transport address\n"); + } else if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.handover_request_ack.remote_rtp, + (struct sockaddr*)&rtp_addr)) { + LOG_RAN_A_DEC_MSG(LOGL_ERROR, "unable to decode remote RTP IP address\n"); + ran_dec_msg.handover_request_ack.remote_rtp = (struct osmo_sockaddr_str){}; + } } if (ie_speech_codec) { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie4d07826362d651cd42dc2b4e0af82368a74c774 Gerrit-Change-Number: 19982 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200904/959b6db9/attachment.htm>