Change in osmo-iuh[master]: fix transport layer addr again, for nano3g

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/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Oct 1 13:35:40 UTC 2018


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11167 )

Change subject: fix transport layer addr again, for nano3g
......................................................................

fix transport layer addr again, for nano3g

The nano3G sends the RAB Assignment Response's Transport Layer Address in X.213
NSAP padded to 20 bytes (160bit). Do not interpret it as 4-byte IP address,
which currently breaks nano3G voice calls (wrong RTP IP address).

Recent commit I2cd1b2d8e1c1ae707cfc0dc7961a2b31ecdf29e0 fixed decoding of X.213
NSAP that is exactly seven bytes, but broke decoding of the padded version from
the nano3G.

A proper X.213 NSAP decoding would still be more welcome than this patching
back and forth, but this is (another) quick fix without spending too much time
on it.

Related: OS#3420
Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3
---
M src/iu_helpers.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/iu_helpers.c b/src/iu_helpers.c
index 39b0521..bf82fde 100644
--- a/src/iu_helpers.c
+++ b/src/iu_helpers.c
@@ -109,7 +109,7 @@
 	buf = trasp_layer_addr->buf;
 	len = trasp_layer_addr->size;
 
-	if (buf[0] == 0x35 && len == 7)
+	if (buf[0] == 0x35 && len >= 7)
 		rc = inet_ntop(AF_INET, buf + 3, addr, addr_len);
 	else if (len > 3)
 		rc = inet_ntop(AF_INET, buf, addr, addr_len);

-- 
To view, visit https://gerrit.osmocom.org/11167
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ad8bce6fcfd3829394c39490058c1ab85cdfde3
Gerrit-Change-Number: 11167
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181001/b2104cb2/attachment.htm>


More information about the gerrit-log mailing list