From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 15 Aug 2019 14:12:11 +0000 (-0400)
Subject: use substructs
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e126c1491e2c601dabcbe36787935fa73bb88098;p=thirdparty%2Ffreeradius-server.git

use substructs

It's not *entirely* clear if these are correct, but they should
be close.  We're not going to read 400 pages of 3GPP specs to
figure out a few bytes.
---

diff --git a/share/dictionary/radius/dictionary.3gpp b/share/dictionary/radius/dictionary.3gpp
index 16581d687bf..3ba1ba01577 100644
--- a/share/dictionary/radius/dictionary.3gpp
+++ b/share/dictionary/radius/dictionary.3gpp
@@ -44,7 +44,44 @@ ATTRIBUTE	3GPP-SGSN-MCC-MNC			18	string
 ATTRIBUTE	3GPP-Teardown-Indicator			19	byte
 ATTRIBUTE	3GPP-IMEISV				20	string
 ATTRIBUTE	3GPP-RAT-Type				21	byte
-ATTRIBUTE	3GPP-User-Location-Info			22	octets
+
+ATTRIBUTE	3GPP-User-Location-Info			22	struct
+MEMBER		3GPP-User-Location-Type			uint8	key
+
+#
+#  Encoded with nibbles broken up into bizarreness and confusion.
+#
+#  wire:    12 34 56
+#  Meaning: 214 653
+#
+MEMBER		3GPP-User-Location-PLMN-ID		octets[3]
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-CGI	0
+MEMBER		3GPP-User-Location-CGI-LAC		uint16
+MEMBER		3GPP-User-Location-CGI-CAI		uint16
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-SAI	1
+MEMBER		3GPP-User-Location-SAI-LAC		uint16
+MEMBER		3GPP-User-Location-SAI-SAC		uint16
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-RAI	2
+MEMBER		3GPP-User-Location-RAI-RAI		uint16
+MEMBER		3GPP-User-Location-RAI-RAC		uint16
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-LAI	32
+MEMBER		3GPP-User-Location-LAI-LAI		uint16
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-TAI	128
+MEMBER		3GPP-User-Location-TAI-TAC		uint16
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-ECGI	129
+MEMBER		3GPP-User-Location-ECGI-ECI		octets[4]
+
+STRUCT	3GPP-User-Location-Type		3GPP-User-Location-TAI-ECGI 130
+MEMBER		3GPP-User-Location-TAI-ECGI-TAC		uint16
+MEMBER		3GPP-User-Location-TAI-ECGI-PLMN-ID	octets[3]
+MEMBER		3GPP-User-Location-TAI-ECGI-ECI		octets[4]
+
 ATTRIBUTE	3GPP-MS-TimeZone			23	octets[2]
 ATTRIBUTE	3GPP-CAMEL-Charging-Info		24	octets
 ATTRIBUTE	3GPP-Packet-Filter			25	octets