updates

from http://www.3gpp2.org/Public_html/Specs/X.S0011-005-E_v1.0_091116.pdf
among others

diff --git a/share/dictionary.3gpp2 b/share/dictionary.3gpp2
index 771c4480f6e1472da07ddc30ed79d2d40cb11802..988f693679de3f3e1d0cd4cae405e479921a7989 100644 (file)
--- a/share/dictionary.3gpp2
+++ b/share/dictionary.3gpp2
@@ -80,18 +80,39 @@ ATTRIBUTE   3GPP2-S-Lifetime                        56      date
 ATTRIBUTE      3GPP2-MN-HA-SPI                         57      integer
 ATTRIBUTE      3GPP2-MN-HA-Shared-Key                  58      string encrypt=2
 
-# The next set of attributes contain sub-types
-ATTRIBUTE      3GPP2-Remote-IP-Address                 59      octets
+ATTRIBUTE      3GPP2-Remote-IP-Address                 59      tlv
+ATTRIBUTE      3GPP2-Remote-IP-Address-Value           59.1    ipaddr
+ATTRIBUTE      3GPP2-Remote-IP-Address-Mask            59.2    integer
+ATTRIBUTE      3GPP2-Remote-IP-Qualifier               59.3    short
 
 # 60 - 69 are marked "reserved"
 
-ATTRIBUTE      3GPP2-Remote-IPv6-Address               70      octets
-ATTRIBUTE      3GPP2-Remote-Address-Table-Index        71      octets
-ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count      72      octets
-ATTRIBUTE      3GPP2-Allowed-Diffserv-Marking          73      octets
-ATTRIBUTE      3GPP2-Service-Option-Profile            74      octets
+ATTRIBUTE      3GPP2-Remote-IPv6-Address               70      tlv
+ATTRIBUTE      3GPP2-Remote-IPv6-Address-Value         70.1    ipv6addr
+ATTRIBUTE      3GPP2-Remote-IPv6-Address-Prefix-Length 70.2    integer
+ATTRIBUTE      3GPP2-Remote-IPv6-Address               70.3    tlv
+
+ATTRIBUTE      3GPP2-Remote-Address-Table-Index        71      tlv
+ATTRIBUTE      3GPP2-Remote-Address-Table-Index-Value  71.1    short
+ATTRIBUTE      3GPP2-Remote-Address-Table-Index-Qualifier 71.2 short
+
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count      72      tlv
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Address 72.1 ipaddr
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Mask 72.2    integer
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Forward 72.3 integer
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Reverse 72.4 integer
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Table-Index 72.5     short
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Forward-Overflow 72.6        short
+ATTRIBUTE      3GPP2-Remote-IPv4-Addr-Octet-Count-Reverse-Overflow 72.7        short
+
+ATTRIBUTE      3GPP2-Allowed-Diffserv-Marking          73      tlv
+ATTRIBUTE      3GPP2-Allowed-Diffserv-Marking-Allowed  73.1    short
+ATTRIBUTE      3GPP2-Allowed-Diffserv-Marking-Max-Class 73.2   short
+ATTRIBUTE      3GPP2-Allowed-Diffserv-Marking-Reverse-Runnel 73.3      short
+
+ATTRIBUTE      3GPP2-Service-Option-Profile            74      tlv
+ATTRIBUTE      3GPP2-Service-Option-Profile-Option     74.1    short
 
-# the following don't contain subtypes
 ATTRIBUTE      3GPP2-DNS-Update-Required               75      integer
 
 # Is this 76 or 78?  Check...
@@ -125,17 +146,38 @@ ATTRIBUTE 3GPP2-MIP-Lifetime                      92      octets
 
 ATTRIBUTE      3GPP2-Acct-Stop-Trigger                 93      integer
 
-# contains subtypes
-ATTRIBUTE      3GPP2-Service-Reference-Id              94      octets
+ATTRIBUTE      3GPP2-Service-Reference-Id              94      tlv
+ATTRIBUTE      3GPP2-Service-Reference-Id-Value        94.1    short
+ATTRIBUTE      3GPP2-Service-Reference-Main-SC-Indicator 94.2  short
 
 ATTRIBUTE      3GPP2-DNS-Update-Capability             95      integer
 ATTRIBUTE      3GPP2-Disconnect-Reason                 96      integer
 
-# The next set of attributes contain sub-types
-ATTRIBUTE      3GPP2-Remote-IPv6-Octet-Count           97      octets
-ATTRIBUTE      3GPP2-PrePaid-Tariff-Switching          98      octets
-ATTRIBUTE      3GPP2-MEID                              116     octets
-ATTRIBUTE      3GPP2-DNS-Server-IP-Address             117     octets
+ATTRIBUTE      3GPP2-Remote-IPv6-Octet-Count           97      tlv
+ATTRIBUTE      3GPP2-Remote-IPv6-Address               97.1    ipv6addr
+ATTRIBUTE      3GPP2-Remote-IPv6-Prefix-Length         97.2    short
+ATTRIBUTE      3GPP2-Remote-IPv6-Forward-Octet-Count   97.3    integer
+ATTRIBUTE      3GPP2-Remote-IPv6-Reverse-Octet-Count   97.4    integer
+ATTRIBUTE      3GPP2-Remote-IPv6-Table-Index           97.5    short
+ATTRIBUTE      3GPP2-Remote-IPv6-Reverse-Octet-Count-Overflow 97.6     short
+
+ATTRIBUTE      3GPP2-PrePaid-Tariff-Switching          98      tlv
+ATTRIBUTE      3GPP2-Prepaid-Quota-Identifier          98.1    integer
+ATTRIBUTE      3GPP2-Prepaid-Volume-Used-After-Tariff-Switch 98.2      integer
+ATTRIBUTE      3GPP2-Prepaid-Volume-Used-ATS-Overflow  98.3    short
+ATTRIBUTE      3GPP2-Prepaid-Tariff-Switch-Interval    98.4    integer
+ATTRIBUTE      3GPP2-Prepaid-Time-Interval-After-Tariff-Switch-Update 98.5     integer
+
+ATTRIBUTE      3GPP2-MEID                              116     octets  # sub tlvs?
+
+ATTRIBUTE      3GPP2-DNS-Server-IP-Address             117     tlv
+ATTRIBUTE      3GPP2-DNS-Server-Primary-IP-Address     117.1   ipaddr
+ATTRIBUTE      3GPP2-DNS-Server-Secondary-IP-Address   117.2   ipaddr
+ATTRIBUTE      3GPP2-DNS-Server-Flag                   117.3   byte
+ATTRIBUTE      3GPP2-DNS-Server-Entity-Type            117.4   byte
+
+VALUE  3GPP2-DNS-Server-Entity-Type    HAAA                    1
+VALUE  3GPP2-DNS-Server-Entity-Type    VAAA                    2
 
 ATTRIBUTE      3GPP2-Carrier-ID                        142     string