Commit b1c56587 authored by canterburym's avatar canterburym
Browse files

Merge remote-tracking branch 'trial/main' into clearing_down

parents 76ac3c8e a7f1d716

.gitignore

0 → 100644
+125 −0
Original line number Diff line number Diff line 
# Editors

.vscode/

.idea/



# Vagrant

.vagrant/



# Mac/OSX

.DS_Store



# Windows

Thumbs.db



# Source for the following rules: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore

# Byte-compiled / optimized / DLL files

__pycache__/

*.py[cod]

*$py.class



# C extensions

*.so



# Distribution / packaging

.Python

build/

develop-eggs/

dist/

downloads/

eggs/

.eggs/

lib/

lib64/

parts/

sdist/

var/

wheels/

*.egg-info/

.installed.cfg

*.egg

MANIFEST



# PyInstaller

#  Usually these files are written by a python script from a template

#  before PyInstaller builds the exe, so as to inject date/other infos into it.

*.manifest

*.spec



# Installer logs

pip-log.txt

pip-delete-this-directory.txt



# Unit test / coverage reports

htmlcov/

.tox/

.nox/

.coverage

.coverage.*

.cache

nosetests.xml

coverage.xml

*.cover

.hypothesis/

.pytest_cache/



# Translations

*.mo

*.pot



# Django stuff:

*.log

local_settings.py

db.sqlite3



# Flask stuff:

instance/

.webassets-cache



# Scrapy stuff:

.scrapy



# Sphinx documentation

docs/_build/



# PyBuilder

target/



# Jupyter Notebook

.ipynb_checkpoints



# IPython

profile_default/

ipython_config.py



# pyenv

.python-version



# celery beat schedule file

celerybeat-schedule



# SageMath parsed files

*.sage.py



# Environments

.env

.venv

env/

venv/

ENV/

env.bak/

venv.bak/



# Spyder project settings

.spyderproject

.spyproject



# Rope project settings

.ropeproject



# mkdocs documentation

/site



# mypy

.mypy_cache/

.dmypy.json

dmypy.json
 
 No newline at end of file

.gitlab-ci.yml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
image: "mcanterb/forge-cicd:latest"



before_script:

  - python3 --version



stages:

  - Syntax

  - CompileAndLint

  - Merge



checkXSD:

  stage: Syntax

  script:

  - python3 testing/check_xsd.py



parseASN1:

  stage: Syntax

  script:

  - python3 testing/parse_asn1.py



compileASN1:

  stage: CompileAndLint

  script:

  - python3 testing/compile_asn1.py



lintASN1:

  stage: CompileAndLint

  script:

  - python3 testing/lint_asn1.py

  allow_failure: true



MergeTest:

  stage: Merge

  script:

  - python3 testing/merge_test.py

33108/r10/CONF-HI3-IMS.asn

0 → 100644
+101 −0
Original line number Diff line number Diff line 
CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r10(10) version-1(1)}

 

DEFINITIONS IMPLICIT TAGS ::=



BEGIN







IMPORTS



LawfulInterceptionIdentifier,

	

TimeStamp

	FROM HI2Operations 

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}-- from ETSI HI2Operations TS 101 671



ConfCorrelation

	

	FROM CONFHI2Operations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)

    threeGPP(4) hi2conf(10) r8(8) version-0 (0)};

    -- Imported from Conf HI2 Operations part of this standard



-- Object Identifier Definitions



-- Security DomainId

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0)

securityDomain(2) lawfulIntercept(2)}



-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3confDomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3conf(11) r10(10) version-1(1)}



Conf-CC-PDU	::= SEQUENCE 

{

 	confULIC-header		[1] ConfULIC-header, 

	payload			[2] OCTET STRING

}



ConfULIC-header ::= SEQUENCE 

{

	hi3DomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI3 Domain

	lIID					[2] LawfulInterceptionIdentifier OPTIONAL,

	correlation				[3]	ConfCorrelation,

	timeStamp				[4]	TimeStamp OPTIONAL,

	sequence-number			[5]	INTEGER (0..65535),

	t-PDU-direction			[6] TPDU-direction,

	national-HI3-ASN1parameters		[7] National-HI3-ASN1parameters OPTIONAL,

	--  encoded per national requirements

	mediaID			[9] MediaID  OPTIONAL,

		-- Identifies the media being exchanged by parties on the conference.

...

	

}





MediaID ::= SEQUENCE 

{

		sourceUserID	[1] PartyIdentity 	OPTIONAL,  -- include SDP information 

			-- describing Conf Server Side characteristics.



		streamID		[2] OCTET STRING 	OPTIONAL,  -- include streamID from SDP information. 

			

	...

}





TPDU-direction ::= ENUMERATED

{

	from-target 	(1),

	to-target 		(2),

	unknown 		(3),

	conftarget      (4),

      -- When the conference is the target of interception (4) is used to denote there is no

      -- directionality.

	from-mixer		(5),

	  -- Indicates the stream sent from the conference server towards the conference party.

	to-mixer		(6),

	  -- Indicates the stream sent from the conference party towards the conference party server.

	combined		(7)

	  -- Indicates that combined CC delivery is used.



}



National-HI3-ASN1parameters	::= SEQUENCE

{

	countryCode		[1] PrintableString (SIZE (2)),

		-- Country Code according to ISO 3166-1 [39],

		-- 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,

		-- these national parameters should be defined using the ASN.1 syntax and added after the

		-- extension marker (...).

		-- It is recommended that "version parameter" and "vendor identification parameter" are

		-- included in the national parameters definition. Vendor identifications can be

		-- retrieved from IANA web site. It is recommended to avoid

		-- using tags from 240 to 255 in a formal type definition.

}





END
 
 No newline at end of file

33108/r10/CONFHI2Operations.asn

0 → 100644
+251 −0
Original line number Diff line number Diff line 
CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10) r8(8) version-1 (1)} 



DEFINITIONS IMPLICIT TAGS ::=



BEGIN



IMPORTS 



		OPERATION, 

		ERROR 

			FROM Remote-Operations-Information-Objects 

			{joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}



		LawfulInterceptionIdentifier,

		TimeStamp,

		Network-Identifier,

		National-Parameters,

		National-HI2-ASN1parameters



			FROM HI2Operations

			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

 				  lawfulIntercept(2) hi2(1) version12 (12)} -- Imported from TS 101 671





		CorrelationValues

	

			FROM UmtsHI2Operations

			{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)

 				  lawfulIntercept(2) threeGPP(4) hi2(1) r8(8) version-1(1)}; -- Imported from PS 

				-- ASN.1 Portion of this standard



			



-- Object Identifier Definitions



-- Security DomainId

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0)

securityDomain(2) lawfulIntercept(2)}



-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi2confDomainId OBJECT IDENTIFIER	::= {threeGPPSUBDomainId hi2conf(10) r8(8) version-1(1)}



conf-sending-of-IRI  OPERATION ::= 

{

	ARGUMENT	ConfIRIsContent

	ERRORS		{ OperationErrors }

	CODE		global:{threeGPPSUBDomainId hi2conf(10) opcode(1)}

}

-- Class 2 operation . The timer shall be set to a value between 3 s and 240 s. 

-- The timer.default value is 60s.

-- NOTE:	The same note as for HI management operation applies.



ConfIRIsContent		::= CHOICE

{

	confiRIContent			ConfIRIContent,

	confIRISequence			ConfIRISequence

}



ConfIRISequence		::= SEQUENCE OF ConfIRIContent



-- Aggregation of ConfIRIContent is an optional feature.

-- It may be applied in cases when at a given point in time

-- several IRI records are available for delivery to the same LEA destination.

-- As a general rule, records created at any event shall be sent

-- immediately and not withheld in the DF or MF in order to

-- apply aggragation.

-- When aggregation is not to be applied,  

-- ConfIRIContent needs to be chosen.

ConfIRIContent		::= CHOICE 

{

	iRI-Begin-record		[1] IRI-Parameters,	-- include at least one optional parameter 

	iRI-End-record			[2] IRI-Parameters,

	iRI-Continue-record		[3] IRI-Parameters,	-- include at least one optional parameter 

	iRI-Report-record		[4] IRI-Parameters,	-- include at least one optional parameter 

   ...

}



unknown-version 		ERROR ::= { CODE local:0}

missing-parameter		ERROR ::= { CODE local:1}

unknown-parameter-value	ERROR ::= { CODE local:2}

unknown-parameter		ERROR ::= { CODE local:3}



OperationErrors ERROR ::= 

{ 

	unknown-version | 

	missing-parameter | 

	unknown-parameter-value | 

	unknown-parameter 

}

-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood.



IRI-Parameters		::= SEQUENCE 

{

	hi2confDomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI2 Conf domain

	lawfulInterceptionIdentifier	[1] LawfulInterceptionIdentifier,

		-- This identifier is associated to the target.

	timeStamp				[2] TimeStamp, 

		-- date and time of the event triggering the report. 



	partyInformation 		[3] SET SIZE (1..10) OF PartyIdentity OPTIONAL, 

		-- This is the identity of the target.

        -- The sender shall only use one instance of PartyIdentity, the "SET SIZE" structure is

        -- kept for ASN.1 backward compatibility reasons only.



	national-Parameters		[4] National-Parameters OPTIONAL,

	networkIdentifier		[5] Network-Identifier OPTIONAL,

	confEvent				[6] ConfEvent,	

	correlation				[7] ConfCorrelation OPTIONAL,

	confID					[8] IMSIdentity	  OPTIONAL,

	tempConfID				[9] IMSIdentity	  OPTIONAL,

	listOfPotConferees		[10] SET OF PartyIdentity 	OPTIONAL,

	listOfConferees			[11] SET OF ConfPartyInformation 	OPTIONAL,

	joinPartyID				[12] ConfPartyInformation	OPTIONAL,

	leavePartyID			[13] ConfPartyInformation	OPTIONAL,

	listOfBearerAffectedParties		[14] SET OF ConfPartyInformation	OPTIONAL,

	confEventInitiator		[15] ConfEventInitiator	OPTIONAL,

	confEventFailureReason	[16] ConfEventFailureReason	OPTIONAL,

	confEndReason			[17] Reason	OPTIONAL,

	potConfStartInfo		[18] TimeStamp  OPTIONAL,

	potConfEndInfo			[19] TimeStamp  OPTIONAL,

	recurrenceInfo			[20] RecurrenceInfo  OPTIONAL,

	confControllerIDs		[21] SET OF PartyIdentity 	OPTIONAL,

	mediamodification		[23] MediaModification OPTIONAL,

	bearerModifyPartyID		[24] ConfPartyInformation OPTIONAL,

    listOfWaitConferees		[25] SET OF ConfPartyInformation OPTIONAL,



...

 

}





-- PARAMETERS FORMATS







ConfEvent ::= ENUMERATED 

{

	confStartSuccessfull 					(1),

	confStartUnsuccessfull					(2),

	startOfInterceptionConferenceActive		(3),

	confPartyJoinSuccessfull				(4),

	confPartyJoinUnsuccessfull				(5),

	confPartyLeaveSuccessfull				(6),

	confPartyLeaveUnsuccessfull				(7),

	confPartyBearerModifySuccessfull		(8),

	confPartyBearerModifyUnsuccessfull		(9),

	confEndSuccessfull 						(10),

	confEndUnsuccessfull					(11),

	confServCreation 						(12),

	confServUpdate	 						(13),

	...

}



ConfPartyInformation ::= SEQUENCE 

{

		partyIdentity			[1] PartyIdentity OPTIONAL,



		supportedmedia			[2] SupportedMedia OPTIONAL,

			

	...

}





ConfCorrelation ::= CHOICE



{

	correlationValues [1] CorrelationValues,

	correlationNumber [2] OCTET STRING

}





PartyIdentity ::= SEQUENCE 

{

		

		iMPU			[3]	SET OF IMSIdentity  OPTIONAL,



		iMPI			[4]	SET OF IMSIdentity  OPTIONAL,

		

	...

}



IMSIdentity ::= SEQUENCE 

{

		sip-uri					[1] OCTET STRING 	OPTIONAL,

			-- See [REF 26 of 33.108]



		tel-url					[2] OCTET STRING 	OPTIONAL,

			-- See [REF 36 of 33.108]



	...

}



SupportedMedia ::= SEQUENCE 

{

		confServerSideSDP		[1] OCTET STRING 	OPTIONAL,  -- include SDP information 

			-- describing Conf Server Side characteristics.



		confUserSideSDP			[2] OCTET STRING 	OPTIONAL,  -- include SDP information 

			-- describing Conf User Side characteristics



	...

}



MediaModification ::= ENUMERATED 

{

		add (1),

		remove (2),

		change (3),

		unknown (4),

	...

}



ConfEventFailureReason ::= CHOICE 

{

		failedConfStartReason		[1] Reason,



		failedPartyJoinReason		[2] Reason,



		failedPartyLeaveReason		[3] Reason,



		failedBearerModifyReason	[4] Reason,



		failedConfEndReason			[5] Reason,



	...

}



ConfEventInitiator ::= CHOICE 

{

		confServer		[1] NULL,

			

		confTargetID	[2] PartyIdentity,



		confPartyID		[3] PartyIdentity,

	...

}



RecurrenceInfo ::= SEQUENCE 

{

	recurrenceStartDateAndTime			 	[1] TimeStamp OPTIONAL,

	recurrenceEndDateAndTime				[2] TimeStamp OPTIONAL,

	recurrencePattern						[3] UTF8String OPTIONAL, -- includes a description of 

               -- the recurrence pattern, for example, "Yearly, on Jan 23" or "Weekly, on Monday"

	

	...

}



Reason ::= OCTET STRING



END
 
 No newline at end of file

33108/r10/Eps-HI3-PS.asn

0 → 100644
+84 −0
Original line number Diff line number Diff line 
Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r8(8) version-0(0)}

 

DEFINITIONS IMPLICIT TAGS ::=



BEGIN



IMPORTS

		

EPSCorrelationNumber

	FROM EpsHI2Operations

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) 	hi2eps(8) r8(8) version-0(0)}    -- Imported from TS 33.108 v.8.6.0



LawfulInterceptionIdentifier,

	

TimeStamp

	FROM HI2Operations 

	{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) 	version10(10)};  -- from ETSI HI2Operations TS 101 671 v3.3.1



-- Object Identifier Definitions



-- Security DomainId

lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0)

securityDomain(2) lawfulIntercept(2)}



-- Security Subdomains

threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}

hi3DomainId OBJECT IDENTIFIER  ::= {threeGPPSUBDomainId hi3eps(9) r8(8) version-0(0)}



CC-PDU	::= SEQUENCE 

{

 	uLIC-header		[1] ULIC-header, 

	payload			[2] OCTET STRING

}



ULIC-header ::= SEQUENCE 

{

	hi3DomainId				[0]	OBJECT IDENTIFIER,  -- 3GPP HI3 Domain

	lIID					[2] LawfulInterceptionIdentifier OPTIONAL,

	correlation-Number		[3]	EPSCorrelationNumber,

	timeStamp				[4]	TimeStamp OPTIONAL,

	sequence-number			[5]	INTEGER (0..65535),

	t-PDU-direction			[6] TPDU-direction,

	...,

	national-HI3-ASN1parameters		[7] National-HI3-ASN1parameters OPTIONAL,

	--  encoded per national requirements

	ice-type				[8] ICE-type OPTIONAL

		-- The ICE-type indicates the applicable Intercepting Control Element(see ref [19]) in which

		-- the T-PDU is intercepted.

}





TPDU-direction ::= ENUMERATED

{

	from-target 	(1),

	to-target 		(2),

	unknown 		(3)

}



National-HI3-ASN1parameters	::= SEQUENCE

{

	countryCode		[1] PrintableString (SIZE (2)),

		-- Country Code according to ISO 3166-1 [39],

		-- 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,

		-- these national parameters should be defined using the ASN.1 syntax and added after the

		-- extension marker (...).

		-- It is recommended that "version parameter" and "vendor identification parameter" are

		-- included in the national parameters definition. Vendor identifications can be

		-- retrieved from IANA web site. It is recommended to avoid

		-- using tags from 240 to 255 in a formal type definition.

}



ICE-type ::= ENUMERATED

{

	sgsn			(1),

	ggsn			(2),

	...,

    s-GW            (3),

    pDN-GW          (4),

    colocated-SAE-GWs (5)

}



END
 
 No newline at end of file