Change in osmo-msc[master]: Support handling IPv6 Transport Address in Assignment Complete

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/19949 )


Change subject: Support handling IPv6 Transport Address in Assignment Complete
......................................................................

Support handling IPv6 Transport Address in Assignment Complete

Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe
---
M src/libmsc/ran_msg_a.c
1 file changed, 3 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/49/19949/1

diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c
index 936cd5b..4bfd8dc 100644
--- a/src/libmsc/ran_msg_a.c
+++ b/src/libmsc/ran_msg_a.c
@@ -278,8 +278,7 @@
 	struct tlv_p_entry *ie_speech_codec = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC);
 	struct tlv_p_entry *ie_codec_list_bss_supported = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC_LIST);
 	struct tlv_p_entry *ie_osmux_cid = TLVP_GET(tp, GSM0808_IE_OSMO_OSMUX_CID);
-	struct sockaddr_storage rtp_addr;
-	struct sockaddr_in *rtp_addr_in;
+	struct osmo_sockaddr rtp_addr;
 	struct gsm0808_speech_codec sc;
 	struct gsm0808_speech_codec_list codec_list_bss_supported;
 	int rc;
@@ -290,21 +289,13 @@
 
 	if (ie_aoip_transp_addr) {
 		/* Decode AoIP transport address element */
-		rc = gsm0808_dec_aoip_trasp_addr(&rtp_addr, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len);
+		rc = gsm0808_dec_aoip_trasp_addr(&rtp_addr.u.sa, ie_aoip_transp_addr->val, ie_aoip_transp_addr->len);
 		if (rc < 0) {
 			LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Unable to decode AoIP Transport Layer Address\n");
 			return -EINVAL;
 		}
 
-		rtp_addr_in = (struct sockaddr_in*)&rtp_addr;
-
-		if (rtp_addr.ss_family != AF_INET) {
-			LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: IE AoIP Transport Address:"
-				 " unsupported addressing scheme (only IPV4 supported)\n");
-			return -EINVAL;
-		}
-
-		if (osmo_sockaddr_str_from_sockaddr_in(&ran_dec_msg.assignment_complete.remote_rtp, rtp_addr_in)) {
+		if (osmo_sockaddr_str_from_sockaddr(&ran_dec_msg.assignment_complete.remote_rtp, &rtp_addr.u.sa)) {
 			LOG_RAN_A_DEC_MSG(LOGL_ERROR, "Assignment Complete: unable to decode remote RTP IP address\n");
 			return -EINVAL;
 		}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19949
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ib650bb063404a3068b4cf3c376c6080dc29bebfe
Gerrit-Change-Number: 19949
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/20200902/3f0d89f4/attachment.htm>