Commit c879aadd authored by Luke Mewburn's avatar Luke Mewburn Committed by Luke Mewburn
Browse files

whitespace fixes

Remove trailing spaces and tabs.
Consistently use a 4 space tab instead of spaces.
Ensure comment marker has space (or tab) before text.

No functional change except for change in whitespace.
parent cb141957
...@@ -95,7 +95,7 @@ IMPORTS ...@@ -95,7 +95,7 @@ IMPORTS
FROM CONFHI2Operations FROM CONFHI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)}
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
IRI-Parameters, IRI-Parameters,
...@@ -112,60 +112,60 @@ IMPORTS ...@@ -112,60 +112,60 @@ IMPORTS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)}
-- The relevant module (including the 3GPP release and version number) needs -- The relevant module (including the 3GPP release and version number) needs
-- to be chosen when compiling the application. -- to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
CC-PDU CC-PDU
FROM Umts-HI3-PS FROM Umts-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9]
CC-PDU
FROM Eps-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}
-- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
Conf-CC-PDU CC-PDU
FROM CONF-HI3-IMS FROM Eps-HI3-PS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
Voip-CC-PDU Conf-CC-PDU
FROM VoIP-HI3-IMS FROM CONF-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
Gcse-CC-PDU Voip-CC-PDU
FROM GCSE-HI3 FROM VoIP-HI3-IMS
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation Gcse-CC-PDU
FROM ThreeGPP-HI1NotificationOperations FROM GCSE-HI3
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- from 3GPP TS 33.108 [9]
ThreeGPP-HI1-Operation
FROM ThreeGPP-HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)}
-- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application.
-- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are
-- corresponding to different implementations and exclusive usage each other. -- corresponding to different implementations and exclusive usage each other.
-- The implementation depends of national regulations or LEA/CSP negotiations. -- The implementation depends of national regulations or LEA/CSP negotiations.
-- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- 3GPP HI1 may be used with other services/networks than 3GPP's one.
-- from 3GPP TS 33.108 [9] -- from 3GPP TS 33.108 [9]
CSvoice-CC-PDU CSvoice-CC-PDU
FROM CSvoice-HI3-IP FROM CSvoice-HI3-IP
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)}
-- The relevant module (including the 3GPP release and version number) -- The relevant module (including the 3GPP release and version number)
-- needs to be chosen when compiling the application. -- needs to be chosen when compiling the application.
-- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9]. -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9].
-- from ETSI TS 101 909-20-1 [33] -- from ETSI TS 101 909-20-1 [33]
TARGETACTIVITYMONITOR-1, TARGETACTIVITYMONITOR-1,
...@@ -223,7 +223,7 @@ PSHeader ::= SEQUENCE ...@@ -223,7 +223,7 @@ PSHeader ::= SEQUENCE
-- As of ASN.1 version 26 this parameter is included from ETSI TS 103 280 [44] -- As of ASN.1 version 26 this parameter is included from ETSI TS 103 280 [44]
authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL,
-- see clause 5.2.3 -- see clause 5.2.3
communicationIdentifier [3] CommunicationIdentifier, communicationIdentifier [3] CommunicationIdentifier,
sequenceNumber [4] INTEGER (0..4294967295), sequenceNumber [4] INTEGER (0..4294967295),
timeStamp [5] GeneralizedTime OPTIONAL, timeStamp [5] GeneralizedTime OPTIONAL,
-- see clause 5.2.6 -- see clause 5.2.6
...@@ -266,7 +266,7 @@ TimeStampQualifier ::= ENUMERATED ...@@ -266,7 +266,7 @@ TimeStampQualifier ::= ENUMERATED
HI4Payload ::= CHOICE HI4Payload ::= CHOICE
{ {
threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
... ...
} }
-- ==================================== -- ====================================
...@@ -347,7 +347,7 @@ CCContents ::= CHOICE ...@@ -347,7 +347,7 @@ CCContents ::= CHOICE
messagingCC [14] EmailPDU.MessagingCC, messagingCC [14] EmailPDU.MessagingCC,
ePSCC [15] OCTET STRING, ePSCC [15] OCTET STRING,
uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU,
ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU,
messagingMMCC [18] EmailPDU.MessagingMMCC, messagingMMCC [18] EmailPDU.MessagingMMCC,
confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU,
voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU,
...@@ -380,12 +380,12 @@ IRIPayload ::= SEQUENCE ...@@ -380,12 +380,12 @@ IRIPayload ::= SEQUENCE
-- For aggregated payloads (see clause 6.2.3) -- For aggregated payloads (see clause 6.2.3)
timeStampQualifier [4] TimeStampQualifier OPTIONAL, timeStampQualifier [4] TimeStampQualifier OPTIONAL,
sessionDirection [5] PayloadDirection OPTIONAL, sessionDirection [5] PayloadDirection OPTIONAL,
-- If the sessionDirection field is to be used for a given service then -- If the sessionDirection field is to be used for a given service then
-- the exact meaning and use of the field will be described in the -- the exact meaning and use of the field will be described in the
-- relevant service-specific details -- relevant service-specific details
payloadDirection [6] PayloadDirection OPTIONAL payloadDirection [6] PayloadDirection OPTIONAL
-- If the payloadDirection field is to be used for a given service then -- If the payloadDirection field is to be used for a given service then
-- the exact meaning and use of the field will be described in the -- the exact meaning and use of the field will be described in the
-- relevant service-specific details -- relevant service-specific details
} }
...@@ -511,7 +511,7 @@ IntegrityCheck ::= SEQUENCE ...@@ -511,7 +511,7 @@ IntegrityCheck ::= SEQUENCE
checkValue [3] OCTET STRING, checkValue [3] OCTET STRING,
-- Network byte order -- Network byte order
-- If checkValue contains a signature, the octet string field space may be -- If checkValue contains a signature, the octet string field space may be
-- used to insert the appropriate ASN.1 DER or BER encoded structure for the -- used to insert the appropriate ASN.1 DER or BER encoded structure for the
-- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2.
..., ...,
hashAlgorithm [4] HashAlgorithm OPTIONAL hashAlgorithm [4] HashAlgorithm OPTIONAL
...@@ -627,11 +627,11 @@ EncryptedPayload ::= SEQUENCE ...@@ -627,11 +627,11 @@ EncryptedPayload ::= SEQUENCE
-- multiplied by 2^32 at first use. -- multiplied by 2^32 at first use.
-- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N))
-- as defined in annex G: -- as defined in annex G:
-- IF N > 0 THEN -- IF N > 0 THEN
-- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1])
-- ELSE -- ELSE
-- PDU[N].byteCounter = ( unixTime(now) << 32 ) -- PDU[N].byteCounter = ( unixTime(now) << 32 )
-- ENDIF -- ENDIF
payload [1] Payload, payload [1] Payload,
... ...
} }
...@@ -672,16 +672,16 @@ Location ::= SEQUENCE ...@@ -672,16 +672,16 @@ Location ::= SEQUENCE
WlanLocationAttributes ::= SEQUENCE WlanLocationAttributes ::= SEQUENCE
{ {
wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL,
-- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID
... ...
} }
IPAddress ::= SEQUENCE IPAddress ::= SEQUENCE
-- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied
-- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in
-- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44] -- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44]
-- instead. -- instead.
{ {
iP-type [1] ENUMERATED iP-type [1] ENUMERATED
{ {
...@@ -732,4 +732,4 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID ...@@ -732,4 +732,4 @@ LawfulInterceptionIdentifier ::= Common-Parameters.LIID
-- module to preserve the original type name during the -- module to preserve the original type name during the
-- removal of imports from ETSI TS 101 671 [4]. -- removal of imports from ETSI TS 101 671 [4].
END --end of LI-PS-PDU END -- end of LI-PS-PDU
...@@ -28,11 +28,11 @@ IMPORTS ...@@ -28,11 +28,11 @@ IMPORTS
emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version19(19)} emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version19(19)}
emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)}
emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)}
messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)}
messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)}
messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)}
-- definitions are relative to -- definitions are relative to
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
...@@ -52,7 +52,7 @@ EmailCC ::= SEQUENCE ...@@ -52,7 +52,7 @@ EmailCC ::= SEQUENCE
Email-Format ::= ENUMERATED Email-Format ::= ENUMERATED
{ {
ip-packet(1), ip-packet(1),
-- When this is the email format, the content will contain the bytes of the IP packet from -- When this is the email format, the content will contain the bytes of the IP packet from
-- the IP header through to the end of the IP packet -- the IP header through to the end of the IP packet
-- Meets requirement E.2.7 -- Meets requirement E.2.7
application(2) application(2)
...@@ -87,7 +87,7 @@ EmailIRI ::= SEQUENCE ...@@ -87,7 +87,7 @@ EmailIRI ::= SEQUENCE
-- Not available in some cases; if a value is available, it shall be provided -- Not available in some cases; if a value is available, it shall be provided
-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
status [11] E-mail-Status, status [11] E-mail-Status,
total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL,
message-ID [13] OCTET STRING OPTIONAL, message-ID [13] OCTET STRING OPTIONAL,
-- Network byte order -- Network byte order
nationalParameter [14] OCTET STRING OPTIONAL, nationalParameter [14] OCTET STRING OPTIONAL,
...@@ -148,7 +148,7 @@ National-EM-ASN1parameters ::= SEQUENCE ...@@ -148,7 +148,7 @@ National-EM-ASN1parameters ::= SEQUENCE
-- the country to which the parameters inserted after the extension marker apply -- the country to which the parameters inserted after the extension marker apply
... ...
-- In case a given country wants to use additional national parameters according to its law, -- In case a given country wants to use additional national parameters according to its law,
-- these national parameters should be defined using the ASN.1 syntax and added after the -- these national parameters should be defined using the ASN.1 syntax and added after the
-- extension marker (...) -- extension marker (...)
} }
...@@ -376,10 +376,10 @@ Messaging-Party-Qualifier ::= ENUMERATED ...@@ -376,10 +376,10 @@ Messaging-Party-Qualifier ::= ENUMERATED
unknown-party(0), unknown-party(0),
-- In this case the party cannot be classified as either originating or terminating -- In this case the party cannot be classified as either originating or terminating
originating-party(1), originating-party(1),
-- In this case, the partyInformation parameter provides the identities related to -- In this case, the partyInformation parameter provides the identities related to
-- the originating party and all information provided by this party. -- the originating party and all information provided by this party.
terminating-party(2), terminating-party(2),
-- In this case, the partyInformation parameter provides the identities related to -- In this case, the partyInformation parameter provides the identities related to
-- the terminating party and all information provided by this party. -- the terminating party and all information provided by this party.
..., ...,
associated-party(3) associated-party(3)
...@@ -393,7 +393,7 @@ Messaging-Party-Identity ::= CHOICE ...@@ -393,7 +393,7 @@ Messaging-Party-Identity ::= CHOICE
-- MSISDN of the target, encoded in the same format as the AddressString -- MSISDN of the target, encoded in the same format as the AddressString
-- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8.
e164-format [1] OCTET STRING (SIZE (1..25)), e164-format [1] OCTET STRING (SIZE (1..25)),
-- E.164 address of the node in international format. Coded in the same format as -- E.164 address of the node in international format. Coded in the same format as
-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])
email-address [2] E-mail-Address-List, email-address [2] E-mail-Address-List,
-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
...@@ -402,26 +402,26 @@ Messaging-Party-Identity ::= CHOICE ...@@ -402,26 +402,26 @@ Messaging-Party-Identity ::= CHOICE
-- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
alphanumeric [4] UTF8String, alphanumeric [4] UTF8String,
ip-address-and-port [5] IP-Address-And-Port, ip-address-and-port [5] IP-Address-And-Port,
imsi [6] OCTET STRING (SIZE (3..8)), imsi [6] OCTET STRING (SIZE (3..8)),
-- International Mobile Subscriber Identity of the target, encoded in the same format as the -- International Mobile Subscriber Identity of the target, encoded in the same format as the
-- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.
-- It is described in 3GPP TS 23.003 [37] clause 2.2. -- It is described in 3GPP TS 23.003 [37] clause 2.2.
imei [7] OCTET STRING (SIZE (8)), imei [7] OCTET STRING (SIZE (8)),
-- International Mobile Equipment Identity of the target, encoded in the same format as the -- International Mobile Equipment Identity of the target, encoded in the same format as the
-- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.
-- It is defined in 3GPP TS 23.003 [37] clause 6. -- It is defined in 3GPP TS 23.003 [37] clause 6.
fax-url [8] OCTET STRING, fax-url [8] OCTET STRING,
-- see format defined in RFC 2806 [29]. -- see format defined in RFC 2806 [29].
tel-url [9] OCTET STRING, tel-url [9] OCTET STRING,
-- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29]. -- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29].
modem-url [10] OCTET STRING, modem-url [10] OCTET STRING,
-- see format defined in RFC 2806 [29]. -- see format defined in RFC 2806 [29].
sip-uri [11] OCTET STRING, sip-uri [11] OCTET STRING,
-- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32].
sips-uri [12] OCTET STRING, sips-uri [12] OCTET STRING,
-- see format defined in RFC 3261 [32]. -- see format defined in RFC 3261 [32].
nai [13] OCTET STRING nai [13] OCTET STRING
-- Network Access Identity of the party, encoded in the same format as used EPS -- Network Access Identity of the party, encoded in the same format as used EPS
-- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. -- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33].
} }
......
...@@ -6,7 +6,7 @@ BEGIN ...@@ -6,7 +6,7 @@ BEGIN
IMPORTS IMPORTS
-- from ETSI TS 102 232-1 [2] -- from ETSI TS 102 232-1 [2]
IPAddress, IPAddress,
Location Location
FROM LI-PS-PDU FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)};
...@@ -61,7 +61,7 @@ IPIRIContents ::= SEQUENCE ...@@ -61,7 +61,7 @@ IPIRIContents ::= SEQUENCE
targetIPAddress [4] LI-PS-PDU.IPAddress OPTIONAL, targetIPAddress [4] LI-PS-PDU.IPAddress OPTIONAL,
-- IP address may not be available in case of failed logon attempts. -- IP address may not be available in case of failed logon attempts.
-- If it is available, it must be sent. -- If it is available, it must be sent.
-- This field will carry the first IPv4 or IPv6 target IP address with or without -- This field will carry the first IPv4 or IPv6 target IP address with or without
-- subnet. Use of this field is fully described in section 6.2.1. -- subnet. Use of this field is fully described in section 6.2.1.
targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL,
-- Target network ID (e.g. MAC address, PSTN number) -- Target network ID (e.g. MAC address, PSTN number)
...@@ -85,7 +85,7 @@ IPIRIContents ::= SEQUENCE ...@@ -85,7 +85,7 @@ IPIRIContents ::= SEQUENCE
-- The number of octets the target received -- The number of octets the target received
octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL,
-- The number of octets the target transmitted -- The number of octets the target transmitted
rawAAAData [15] OCTET STRING OPTIONAL, rawAAAData [15] OCTET STRING OPTIONAL,
-- Content of the raw AAA record -- Content of the raw AAA record
..., ...,
expectedEndTime [16] GeneralizedTime OPTIONAL, expectedEndTime [16] GeneralizedTime OPTIONAL,
...@@ -99,7 +99,7 @@ IPIRIContents ::= SEQUENCE ...@@ -99,7 +99,7 @@ IPIRIContents ::= SEQUENCE
nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL,
-- National IP IRI Parameters -- National IP IRI Parameters
additionalIPAddress [21] LI-PS-PDU.IPAddress OPTIONAL, additionalIPAddress [21] LI-PS-PDU.IPAddress OPTIONAL,
-- This field will carry the first IPv6 target IP address with or without prefix when the -- This field will carry the first IPv6 target IP address with or without prefix when the
-- iPVersion parameter is set to iPV4andV6. -- iPVersion parameter is set to iPV4andV6.
-- Use of this field is fully described in section 6.2.1 -- Use of this field is fully described in section 6.2.1
authenticationType [22] AuthenticationType OPTIONAL, authenticationType [22] AuthenticationType OPTIONAL,
...@@ -141,7 +141,7 @@ AccessEventType ::= ENUMERATED ...@@ -141,7 +141,7 @@ AccessEventType ::= ENUMERATED
accessEnd(8), accessEnd(8),
-- A target stops using the IAS, the session ends -- A target stops using the IAS, the session ends
endOfInterceptionWithSessionActive(9), endOfInterceptionWithSessionActive(9),
-- LI is ended on a target who still has an active session -- LI is ended on a target who still has an active session
unknown(10) unknown(10)
} }
...@@ -218,7 +218,7 @@ NationalIPIRIParameters ::= SEQUENCE ...@@ -218,7 +218,7 @@ NationalIPIRIParameters ::= SEQUENCE
-- extension marker (...). -- extension marker (...).
-- It is recommended that "version parameter" and "vendor identification parameter" are -- It is recommended that "version parameter" and "vendor identification parameter" are
-- included in the national parameters definition. Vendor identifications can be -- included in the national parameters definition. Vendor identifications can be
-- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended
-- to avoid using tags from 240 to 255 in a formal type definition. -- to avoid using tags from 240 to 255 in a formal type definition.
} }
...@@ -240,11 +240,11 @@ AuthenticationType ::= ENUMERATED ...@@ -240,11 +240,11 @@ AuthenticationType ::= ENUMERATED
OtherTargetIdentifiers ::= CHOICE OtherTargetIdentifiers ::= CHOICE
{ {
-- Additional target identifiers associated with the target service -- Additional target identifiers associated with the target service
-- This list is extensible to accommodate other target identifiers which -- This list is extensible to accommodate other target identifiers which
-- may be required in future. -- may be required in future.
iPAddress [0] LI-PS-PDU.IPAddress, iPAddress [0] LI-PS-PDU.IPAddress,
-- IPAddress imported from TS 102 232 [2]. -- IPAddress imported from TS 102 232 [2].
-- This can be an IPv4 address (with or without a subnet range defined) or -- This can be an IPv4 address (with or without a subnet range defined) or
-- an IPv6 address (with or without a prefix range defined). -- an IPv6 address (with or without a prefix range defined).
... ...
} }
...@@ -254,8 +254,8 @@ FramedRoute ::= CHOICE ...@@ -254,8 +254,8 @@ FramedRoute ::= CHOICE
-- Additional Framed Route prefix information associated with the target service -- Additional Framed Route prefix information associated with the target service
framedRoute [0] OCTET STRING, framedRoute [0] OCTET STRING,
-- This could contain an IPv4 as well as IPv6 FramedRoute information -- This could contain an IPv4 as well as IPv6 FramedRoute information
-- including additional information such Gateway address and -- including additional information such Gateway address and
-- one or more metrics in texual format. -- one or more metrics in texual format.
-- This parameter shall be populated with the RADIUS value. -- This parameter shall be populated with the RADIUS value.
... ...
...@@ -347,7 +347,7 @@ PDSRInformation::= SEQUENCE ...@@ -347,7 +347,7 @@ PDSRInformation::= SEQUENCE
summaryTrigger [0] PDSRSummaryTrigger, summaryTrigger [0] PDSRSummaryTrigger,
firstPacketTimestamp [1] GeneralizedTime, firstPacketTimestamp [1] GeneralizedTime,
lastPacketTimestamp [2] GeneralizedTime, lastPacketTimestamp [2] GeneralizedTime,
packetCount [3] INTEGER, packetCount [3] INTEGER,
byteCount [4] INTEGER, byteCount [4] INTEGER,
... ...
} }
...@@ -364,4 +364,3 @@ PDSRSummaryTrigger ::= ENUMERATED ...@@ -364,4 +364,3 @@ PDSRSummaryTrigger ::= ENUMERATED
END -- end of IPAccessPDU END -- end of IPAccessPDU
L2AccessPDU L2AccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)
li-ps(5) l2Access(4) version7(7)} li-ps(5) l2Access(4) version7(7)}
...@@ -21,7 +21,7 @@ l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRIOnly(3)} ...@@ -21,7 +21,7 @@ l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRIOnly(3)}
L2CC ::= SEQUENCE L2CC ::= SEQUENCE
{ {
l2CCObjId [0] RELATIVE-OID, l2CCObjId [0] RELATIVE-OID,
l2CCContents [1] CHOICE l2CCContents [1] CHOICE
{ {
l2TP [1] OCTET STRING, l2TP [1] OCTET STRING,
...@@ -48,7 +48,7 @@ L2CC ::= SEQUENCE ...@@ -48,7 +48,7 @@ L2CC ::= SEQUENCE
L2IRI ::= SEQUENCE L2IRI ::= SEQUENCE
{ {
l2IRIObjId [0] RELATIVE-OID, l2IRIObjId [0] RELATIVE-OID,
l2IRIContents [1] L2IRIContents, l2IRIContents [1] L2IRIContents,
... ...
} }
...@@ -90,7 +90,7 @@ AccessEventType ::= ENUMERATED ...@@ -90,7 +90,7 @@ AccessEventType ::= ENUMERATED
accessAttempt(0), accessAttempt(0),
-- A target requests access to the IAS -- A target requests access to the IAS
accessAccept(1), accessAccept(1),
-- IAS access is granted to the target, the session begins -- IAS access is granted to the target, the session begins
accessReject(2), accessReject(2),
-- IAS access is refused to the target -- IAS access is refused to the target
accessFailed(3), accessFailed(3),
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- ==================================== -- ====================================
IPMultimediaPDU IPMultimediaPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -11,7 +11,7 @@ BEGIN ...@@ -11,7 +11,7 @@ BEGIN
IMPORTS IMPORTS
-- from ETSI TS 102 232-1 [2] -- from ETSI TS 102 232-1 [2]
IPAddress, IPAddress,
Location Location
FROM LI-PS-PDU FROM LI-PS-PDU
{itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)}; {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)};
...@@ -24,7 +24,7 @@ IMPORTS ...@@ -24,7 +24,7 @@ IMPORTS
iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)}
iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)}
-- both definitions relative to: -- both definitions relative to:
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
-- ===================================== -- =====================================
...@@ -45,7 +45,7 @@ IPMMCC ::= SEQUENCE ...@@ -45,7 +45,7 @@ IPMMCC ::= SEQUENCE
-- The module is defined as OPTIONAL because of backwards compatibility reasons -- The module is defined as OPTIONAL because of backwards compatibility reasons
-- For new implementations the module is MANDATORY to be used as defined in clause 5.5 -- For new implementations the module is MANDATORY to be used as defined in clause 5.5
streamIdentifier [3] OCTET STRING OPTIONAL, streamIdentifier [3] OCTET STRING OPTIONAL,
-- Used to identify the media stream within the current CIN, typically in case of -- Used to identify the media stream within the current CIN, typically in case of
-- multiple media streams communications -- multiple media streams communications
-- May be used to correlate each media stream with the relevant SDP media description of IRI -- May be used to correlate each media stream with the relevant SDP media description of IRI
-- May contain c= and m= lines extracts for instance -- May contain c= and m= lines extracts for instance
...@@ -107,15 +107,15 @@ IPIRIContents ::= CHOICE ...@@ -107,15 +107,15 @@ IPIRIContents ::= CHOICE
originalIPMMMessage [0] OCTET STRING, originalIPMMMessage [0] OCTET STRING,
-- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers
sIPMessage [1] SIPMessage, sIPMessage [1] SIPMessage,
-- Copy of the SIP content and the source and destination IP address of the intercepted -- Copy of the SIP content and the source and destination IP address of the intercepted
-- SIP message as transmitted on the network layer (see clause 5.2.7). -- SIP message as transmitted on the network layer (see clause 5.2.7).
h323Message [2] H323Message, h323Message [2] H323Message,
-- Copy of the H.323 content and the source and destination IP address of the intercepted -- Copy of the H.323 content and the source and destination IP address of the intercepted
-- H.323 message as transmitted on the network layer (see clause 5.2.7). -- H.323 message as transmitted on the network layer (see clause 5.2.7).
..., ...,
nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, nationalIPMMIRIParameters [3] NationalIPMMIRIParameters,
-- This parameter is used according to national regulations