Commit 4aed5126 authored by Luke Mewburn's avatar Luke Mewburn
Browse files

Merge branch 'draft/lm_10223202_harmonise_messagingiri' into 'cr/102232-2/0038' 

EmailPDU: add SOIWSA, EOIWSA, expiry

See merge request !273
parents e531df05 8ddfba5a

102232-2/EmailPDU.asn

+25 −6
Changes for 102232-2/EmailPDU.asn: 25 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -120,7 +120,10 @@ E-mail-Event ::= ENUMERATED 
    e-mail-logon-failure(6),

    e-mail-logoff(7),

    e-mail-partial-download(8),

    e-mail-upload(9)

    e-mail-upload(9),

    e-mail-start-of-interception-with-session-active(10),

    e-mail-end-of-interception-with-session-active(11),

    e-mail-session-expired(12)

}



E-mail-Protocol ::= ENUMERATED
@@ -261,13 +264,24 @@ MessagingIRI ::= SEQUENCE 
    original-message            [9] OCTET STRING OPTIONAL,

    ...,

    box-identifier              [10] OCTET STRING OPTIONAL,

    total-recipient-count       [11] INTEGER (0..4294967295) OPTIONAL

    total-recipient-count       [11] INTEGER (0..4294967295) OPTIONAL,

    server-octets-sent          [12] INTEGER (0..18446744073709551615) OPTIONAL,

    client-octets-sent          [13] INTEGER (0..18446744073709551615) OPTIONAL

}



Messaging-System-Type ::= ENUMERATED

{

    unified-messaging(1),

    ...

    ...,

    unknown(0),

        -- The protocol is not known or not representable by the current enumeration

    smtp(2),

    pop3(3),

    imap4(4),

    webmail(5),

    mms(6),

    rcs(7),

    sms(8)

}



Messaging-Event-Category ::= CHOICE
@@ -288,7 +302,8 @@ Messaging-Event ::= ENUMERATED 
    slamdown(5),

    ...,

    calendar(6),

    contact(7)

    contact(7),

    partial-retrieve(8)

}



Messaging-Box-Event ::= ENUMERATED
@@ -325,7 +340,10 @@ Messaging-Box-Event ::= ENUMERATED 
    auto-play-enable(28),

    auto-play-disable(29),

    header-play-enable(30),

    header-play-disable(31)

    header-play-disable(31),

    start-of-interception-with-session-active(32),

    end-of-interception-with-session-active(33),

    session-expired(34)

}



Messaging-Notification-Event ::= ENUMERATED
@@ -436,7 +454,8 @@ Messaging-Party-Validity ::= ENUMERATED 
    unknown(0),

    trusted(1),

    untrusted(2),

    ...

    ...,

    rejected(3)

}



Messaging-Copy-Qualifier ::= ENUMERATED

testing/asn/asn_process.py

+1 −0
Changes for testing/asn/asn_process.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ def reconstrainInteger(filename): 


filesWithBigInts = [

    "102232-1/LI-PS-PDU.asn",

    "102232-2/EmailPDU.asn",

    "102232-3/IPAccessPDU.asn",

    "102232-4/L2AccessPDU.asn",

]