Commit 9ce0b604 authored by canterburym's avatar canterburym
Browse files

Suggestion

parent 274730fb
Loading
Loading
Loading
Loading
Loading
+31 −109
Original line number Diff line number Diff line
@@ -3719,22 +3719,15 @@ IMSCCPDUPayload ::= OCTET STRING

IMSPayload ::= CHOICE
{
    encapsulatedSIPMessage            [1] SIPMessage,
    separatedSIPHeaderAndBody         [2] SeparatedSIPHeaderAndBody
    encapsulatedSIPMessage            [1] SIPMessage
}

SIPMessage ::= SEQUENCE
{
    iPSourceAddress       [1] IPAddress,
    iPDestinationAddress  [2] IPAddress,
    sIPContent            [3] OCTET STRING
}

SeparatedSIPHeaderAndBody ::= SEQUENCE
{
    iPSourceAddress       [1] IPAddress,
    iPDestinationAddress  [2] IPAddress,
    separatedSIPContent   [3] MIMEEntityContainer
    sIPContent            [3] OCTET STRING,
    redactions            [4] Redactions OPTIONAL
}

VoIPRoamingIndication ::= ENUMERATED
@@ -3762,8 +3755,7 @@ HeaderOnlyIndication ::= BOOLEAN
STIRSHAKENSignatureGeneration ::= SEQUENCE
{
    pASSporTs                 [1] SEQUENCE OF PASSporT,
    encapsulatedSIPMessage    [2] SIPMessage OPTIONAL,
    separatedSIPHeaderAndBody [3] SeparatedSIPHeaderAndBody OPTIONAL
    encapsulatedSIPMessage    [2] SIPMessage OPTIONAL
}

-- See clause 7.11.2.1.3 for details of this structure
@@ -3774,8 +3766,7 @@ STIRSHAKENSignatureValidation ::= SEQUENCE
    eCNAMTerminalDisplayInfo  [3] ECNAMDisplayInfo OPTIONAL,
    sHAKENValidationResult    [4] SHAKENValidationResult,
    sHAKENFailureStatusCode   [5] SHAKENFailureStatusCode OPTIONAL,
    encapsulatedSIPMessage    [6] SIPMessage OPTIONAL,
    separatedSIPHeaderAndBody [7] SeparatedSIPHeaderAndBody OPTIONAL
    encapsulatedSIPMessage    [6] SIPMessage OPTIONAL
}

-- ================================
@@ -6021,31 +6012,6 @@ MethodCode ::= INTEGER (16..31)
-- Structures to allow reuse of externally defined structures
-- ==========================================================

-- ===============================================
-- Externally Defined Structures - MSRP Parameters
-- ===============================================

EncapsulatedMSRP ::= OCTET STRING

MSRPContainer ::= CHOICE
{
    encapsulatedMSRP [1] EncapsulatedMSRP,
    separatedMSRP    [2] SeparatedMSRP
}

MSRPEndLine ::= UTF8String

MSRPHeaders ::= UTF8String

MSRPStartLine ::= UTF8String

SeparatedMSRP ::= SEQUENCE
{
    startLine [1] MSRPStartLine,
    headers   [2] MSRPHeaders,
    body      [3] MIMEEntityContainer OPTIONAL,
    endLine   [4] MSRPEndLine
}

-- ==================================================
-- Externally Defined Structures - SBIType Parameters
@@ -6064,7 +6030,8 @@ SBIReference ::= UTF8String
SBIType ::= SEQUENCE
{
    sBIReference         [1] SBIReference,
    sBIValue             [2] SBIValue
    sBIValue             [2] SBIValue,
    redactions           [3] Redactions OPTIONAL
}


@@ -6083,94 +6050,49 @@ XMLContainer ::= SEQUENCE
XMLType ::= SEQUENCE
{
    xMLNamespace [1] XMLNamespace,
    xMLValue     [2] XMLValue
    xMLValue     [2] XMLValue,
    redactions   [3] Redactions OPTIONAL
}

XMLNamespace ::= UTF8String

XMLValue ::= UTF8String

-- ======================================================
-- Externally Defined Structures - MIME Entity Parameters
-- ======================================================

EncapsulatedMIMEEntity ::= OCTET STRING

MIMEBody ::= UTF8String

MIMEBodyLength ::= INTEGER

MIMEEntityBody ::= CHOICE
{
    mIMEEntityContainer           [1] MIMEEntityContainer,
    bodyWithCommunicationsContent [2] MIMEEntityBodyWithCC,
    multipartBody                 [3] MultiPartMIMEBody,
    mSRPMessage                   [4] MSRPContainer,
    xMLBody                       [5] XMLType,
    sBIMessage                    [6] SBIType,
    body                          [7] MIMEBody
}

MIMEEntityBodyWithCC ::= CHOICE
{
    mIMEBodyWithOnlyContent        [1] MIMEBodyLength,
    mIMEBodyWithXML                [2] XMLContainer,
    mIMEBoodyWithSBIMessage        [3] SBIContainer
}

MIMEContentType ::= UTF8String

MIMEEntityContainer ::= SEQUENCE
{
    contentType [1] MIMEContentType,
    mIMEEntity  [2] MIMEEntity
}

MIMEEntity ::= CHOICE
{
    encapsulatedMIMEEntity      [1] EncapsulatedMIMEEntity,
    separatedMIMEHeadersAndBody [2] SeparatedMIMEHeadersAndBody
}

MIMEHeaderSection ::= SEQUENCE
{
    includedHeaderFields [1] MIMEHeaderFields,
    removedHeaderFields  [2] SEQUENCE OF RemovedMIMEHeaderField OPTIONAL
}

MIMEHeaderBodyLength ::= INTEGER

MIMEHeaderFieldName ::= UTF8String

MIMEHeaderHash ::= OCTET STRING
-- ==================================================
-- Redaction types
-- ==================================================

MIMEHeaderFields ::= UTF8String

MultiPartMIMEBody ::= SEQUENCE OF MIMEBodyPart
Redactions ::= SEQUENCE OF Redaction

MIMEBodyPart ::= CHOICE
Redaction ::= SEQUENCE 
{
    encapsulatedMIMEEntity [1] EncapsulatedMIMEEntity,
    separatedMIMEBodyPart  [2] SeparatedMIMEBodyPart
    location [1] RedactionLocation,
    type     [2] RedactionType
}

RemovedMIMEHeaderField ::= SEQUENCE
RedactionLocation ::= CHOICE
{
    headerFieldName  [1] MIMEHeaderFieldName,
    headerBodyLength [2] MIMEHeaderBodyLength,
    headerHash       [3] MIMEHeaderHash OPTIONAL
    predefined         [1] UTF8String,
    stringLocation     [2] NumberRange,
    octetLocation      [3] NumberRange,
    jsonPointer        [4] UTF8String,
    xpath              [5] UTF8String,
    sipHeader          [6] UTF8String
}

SeparatedMIMEHeadersAndBody ::= SEQUENCE
RedactionType ::= CHOICE
{
    entityHeaderSection [1] MIMEHeaderSection,
    entityBody          [2] MIMEEntityBody OPTIONAL
    predefined               [1] NULL,
    removed                  [2] NULL,
    replacedWithCharacter    [3] UTF8String,
    replacedWithOctets       [4] OCTET STRING 
}

SeparatedMIMEBodyPart ::= SEQUENCE
NumberRange ::= SEQUENCE
{
    bodyPartHeaderSection [1] MIMEHeaderSection OPTIONAL,
    bodyPartContents      [2] MIMEEntityBody OPTIONAL
    start [1] INTEGER,
    end   [2] INTEGER
}