Commit 59a14e59 authored by juvancic's avatar juvancic
Browse files

enc/dec

parent ed3907b7
Loading
Loading
Loading
Loading
+49 −28
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ module NG_NAS_TypeDefs {
    AUTN                                autn                     optional,      /* cl. 9.11.3.15 O TLV 18 IEI=20 */
    EAP_Message                         eapMessage               optional       /* cl. 9.11.2.2  O TLV-E 7-1503 IEI=78 */
   }with {
    variant "PRESENCE(spareHalfOctet='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H , messageType = '01010110'B)";
  }
//}with{variant "FIELDORDER(msb)"};
//  }
@@ -86,7 +86,7 @@ module NG_NAS_TypeDefs {
    ABBA                                abba                     optional       /* cl. 9.11.3.10 O TLV 3-n IEI=38 Dec18 */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01011010'B)";
  }
//with{variant "FIELDORDER(msb)"};
//  } 
@@ -117,7 +117,7 @@ module NG_NAS_TypeDefs {
    EAP_Message                         eapMessage                optional      /* cl. 9.11.2.2  O TLV-E 7-1503 IEI=78 Dec18 */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H , messageType = '01011000'B)";
  }
//with{variant "FIELDORDER(msb)"};
 // } 
@@ -231,7 +231,8 @@ module NG_NAS_TypeDefs {
    NG_TrackingAreaIdList               forbidTAIList_RegProvService  optional, /* cl. 9.11.3.9   O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */
    ExtdCAGInfoList                     extdCAGInfoList               optional, /* cl. 9.11.3.86  O TLV-E 3-n IEI=71 Sep22 @sic R5s221179 Baseline Moving sic@ */
    NSAG_Info                           nsagInfo                      optional  /* cl. 9.11.3.87  O TLV-E 10-n IEI=7C Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H , messageType = '01000010'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_REGISTRATION_COMPLETE {                           /* 24.501 cl. 8.2.8
                                                                   Significance:  dual
@@ -262,7 +263,11 @@ module NG_NAS_TypeDefs {
    GPRS_Timer3                         lowerBoundTimerValue          optional, /* cl. 9.11.2.5  O TLV 3 IEI=3A Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_Roaming         optional, /* cl. 9.11.3.9   O TLV 9-114 IEI=1D Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_RegProvService  optional  /* cl. 9.11.3.9   O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{
    //variant (protocolDiscriminator, spareHalfOctet, securityHeaderType, messageType) "FIELDORDER(msb)"
    variant "FIELDORDER(msb)"
    variant "PRESENCE(protocolDiscriminator = '01111110'B, spareHalfOctet='0'H , securityHeaderType = '0000'B, messageType = '01000100'B)"};
    //variant "FIELDORDER(msb) , PRESENCE(messageType='01000100'B)"};

  type record NG_UL_NAS_TRANSPORT {                                 /* 24.501 cl. 8.2.10
                                                                    Significance:  local
@@ -306,7 +311,7 @@ module NG_NAS_TypeDefs {
    GPRS_Timer3                         lowerBoundTimerValue         optional   /* cl. 9.11.2.5  O TLV 3 IEI=3A Sep22 @sic R5s221179 Baseline Moving sic@ */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01101000'B)";
  }
//with{variant "FIELDORDER(msb)"};
 // } 
@@ -330,7 +335,8 @@ module NG_NAS_TypeDefs {
    SpareHalfOctet                      spareHalfOctet,                         /* cl. 9.5       M V 1/2 */
    SecurityHeaderType                  securityHeaderType,                     /* cl. 9.3       M V 1/2 */
    MessageType                         messageType                             /* cl. 9.7       M V 1   */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H, messageType = '01000110'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_DEREGISTRATION_REQUEST_MT {                       /* 24.501 cl. 8.2.14 (UE terminated deregister)
                                                                   Significance:  dual
@@ -353,7 +359,7 @@ module NG_NAS_TypeDefs {
    NG_TrackingAreaIdList               forbidTAIList_RegProvService  optional  /* cl. 9.11.3.9   O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01000111'B)";
  }
//with{variant "FIELDORDER(msb)"};
//  } 
@@ -391,7 +397,8 @@ module NG_NAS_TypeDefs {
    NG_AddReqResult                     ngAddRequestResult            optional, /* cl. 9.11.3.81  O TLV 3 IEI=34 Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_Roaming         optional, /* cl. 9.11.3.9   O TLV 9-114 IEI=1D Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_RegProvService  optional  /* cl. 9.11.3.9   O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */
    }with{variant "FIELDORDER(msb)"};
    }with{variant "PRESENCE(spareHalfOctet='0'H,  messageType = '01001110'B)"};
      //variant "FIELDORDER(msb)"};

  type record NG_SERVICE_REJECT {                                  /* 24.501 cl. 8.2.18
                                                                   Significance:  dual
@@ -411,7 +418,8 @@ module NG_NAS_TypeDefs {
    GPRS_Timer3                         lowerBoundTimerValue          optional, /* cl. 9.11.2.5   O TLV 3 IEI=3A Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_Roaming         optional, /* cl. 9.11.3.9   O TLV 9-114 IEI=1D Sep22 @sic R5s221179 Baseline Moving sic@ */
    NG_TrackingAreaIdList               forbidTAIList_RegProvService  optional  /* cl. 9.11.3.9   O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H,  messageType = '01001101'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_CONFIGURATION_UPDATE_COMMAND {                    /* 24.501 cl. 8.2.19
                                                                   Significance:  local
@@ -454,7 +462,8 @@ module NG_NAS_TypeDefs {
    PEIPS_AssistInfo                    updatedPEIPS_AssistInfo       optional, /* cl. 9.11.3.80  O TLV 3-n IEI=1F Sep22 @sic R5s221179 Baseline Moving sic@ */
    NSAG_Info                           nsagInfo                      optional, /* cl. 9.11.3.87  O TLV 10-n IEI=73 Sep22 @sic R5s221179 Baseline Moving sic@ */
    PriorityInd                         priorityInd                   optional  /* cl. 9.11.3.91  O TV  1 IEI=E- Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H,  messageType = '01010100'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_CONFIGURATION_UPDATE_COMPLETE {                   /* 24.301 cl. 8.2.20
                                                                   Significance:  local
@@ -476,7 +485,7 @@ module NG_NAS_TypeDefs {
    IdentityType                        identityType                            /* cl. 9.11.3.3 M V 1/2 */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01011011'B)";
  }
//with{variant "FIELDORDER(msb)"};
//  } 
@@ -502,7 +511,7 @@ module NG_NAS_TypeDefs {
    AccessType                          accessType                              /* cl. 9.11.3.11 M V 1/2 */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01100101'B)";
  }
//with{variant "FIELDORDER(msb)"};
//  } 
@@ -536,7 +545,7 @@ module NG_NAS_TypeDefs {
    S1_UE_SecurityCapability            replayedUESecurityCap         optional  /* cl. 9.11.3.48A O TLV 4-7 IEI=19 Dec18 @sic R5s190421 sic@*/

  }with {
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H, messageType = '01011101'B)";
  }
//with{variant "FIELDORDER(msb)"};
 // } 
@@ -574,7 +583,7 @@ module NG_NAS_TypeDefs {
    NG_NAS_Message                      plainNASMessage                         /* cl. 9.9       M V 3-n */

  }with {
    variant "PRESENCE(spareHalfOctet='0'H)";
    variant "PRESENCE(spareHalfOctet='0'H, securityHeaderType = '0001'B, securityHeaderType = '0010'B, securityHeaderType = '0011'B, securityHeaderType = '0100'B)";
  }
//with{variant "FIELDORDER(msb)"};
//  } 
@@ -588,7 +597,8 @@ module NG_NAS_TypeDefs {
    SecurityHeaderType                  securityHeaderType,                     /* cl. 9.3       M V 1/2 */
    MessageType                         messageType,                            /* cl. 9.7       M V 1   */
    GMM_GSM_Cause                       gmmCause                                /* cl. 9.11.3.2  M V 1   */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H, messageType = '01100100'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_CP_SERVICE_REQUEST {               /* 24.501 cl. 8.2.30         @sic R5s201387 Baseline Moving sic@
                                                                   Significance:  dual
@@ -622,7 +632,8 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType,                            /* cl. 9.7       M V 1   */
    S_NSSAI_LV                          sNSSAI,                                 /* cl. 9.11.2.8  M LV 2-5 @sic R5s221179 Baseline Moving sic@  */
    EAP_Message                         eapMessage                              /* cl. 9.11.2.2  M LV-E 6-1502 */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H, messageType = '01010000'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_NETWORK_SLICE_SPECIFIC_AUTHENTICATION_COMPLETE {   /* 24.501 cl. 8.2.32         @sic R5s201387 Baseline Moving sic@
                                                                   Significance:  dual
@@ -644,7 +655,8 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType,                            /* cl. 9.7       M V 1   */
    S_NSSAI_LV                          sNSSAI,                                 /* cl. 9.11.2.8  M LV 2-5 @sic R5s221179 Baseline Moving sic@  */
    EAP_Message                         eapMessage                              /* cl. 9.11.2.2  M LV-E 6-1502 */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(spareHalfOctet='0'H, messageType = '01010010'B)"};
    //variant "FIELDORDER(msb)"};

  //----------------------------------------------------------------------------
  // NG session management messages (24.501 cl. 8.3)
@@ -706,7 +718,8 @@ module NG_NAS_TypeDefs {
    EthernetHeaderCompressConfig        ethernetHeaderCompressConfig  optional,  /* cl. 9.11.4.28 O TLV 3 IEI=1F Sep20 @sic R5s201387 Baseline Moving sic@ */
    ServiceLvlAAContainer               serviceLvlAA                  optional,  /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
    ReceivedMBSContainer                receivedMBS                   optional   /* cl. 9.11.4.31 O TLV-E 9-65538 IEI=71 Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11000010'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_ESTABLISHMENT_REJECT {                /* 24.501 cl. 8.3.3
                                                                   Significance:  dual
@@ -723,7 +736,8 @@ module NG_NAS_TypeDefs {
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional, /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=7B */
    ReAttemptIndicator                  reattemptInd                  optional,  /* cl. 9.11.4.17 O TLV 3 IEI=1D Sep20 @sic R5s201387 Baseline Moving sic@ */
    ServiceLvlAAContainer               serviceLvlAA                  optional   /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11000011'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_AUTHENTICATION_COMMAND {              /* 24.501 cl. 8.3.4
                                                                   Significance:  dual
@@ -734,7 +748,8 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType,                               /* cl. 9.7       M V 1   */
    EAP_Message                         eapMessage,                                /* cl. 9.11.2.2  M LV-E 6-1502 */
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional  /* cl. 9.11.4.6  O TLV-E 4-65538 IEI=0x7B */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11000101'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_AUTHENTICATION_COMPLETE {             /* 24.501 cl. 8.3.5
                                                                   Significance:  dual
@@ -756,7 +771,8 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType,                               /* cl. 9.7       M V 1   */
    EAP_Message                         eapMessage                       optional, /* cl. 9.11.2.2  O TLV-E 7-1503 IEI=78 */
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional  /* cl. 9.11.4.6  O TLV-E 4-65538 IEI=0x7B */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11000111'B)"};
    //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_MODIFICATION_REQUEST {                  /* 24.501 cl. 8.3.7
                                                                     Significance:  dual
@@ -793,7 +809,8 @@ module NG_NAS_TypeDefs {
    NGSM_CongestionReattemptInd         ngsmCongestionReattemptInd    optional,  /* cl. 9.11.4.21 O TLV 3 IEI=61 Sep20 @sic R5s201387, R5s210444 Baseline Moving sic@ */
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional, /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */
    ReAttemptIndicator                  reattemptInd                  optional   /* cl. 9.11.4.17 O TLV 3 IEI=1D Sep20 @sic R5s201387 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11001101'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_MODIFICATION_COMMAND {                /* 24.501 cl. 8.3.9
                                                                   Significance:  dual
@@ -817,7 +834,8 @@ module NG_NAS_TypeDefs {
    EthernetHeaderCompressConfig        ethernetHeaderCompressConfig  optional, /* cl. 9.11.4.28  O TLV 3 IEI=1F Sep20 @sic R5s201387 Baseline Moving sic@ */
    ReceivedMBSContainer                receivedMBS                   optional, /* cl. 9.11.4.31  O TLV-E 9-65538 IEI=71 Sep22 @sic R5s221179 Baseline Moving sic@ */
    ServiceLvlAAContainer               serviceLvlAA                  optional  /* cl. 9.11.2.10  O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11001011'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_MODIFICATION_COMPLETE {                /* 24.501 cl. 8.3.10
                                                                     Significance:  dual
@@ -861,7 +879,8 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType,                             /* cl. 9.7       M V 1   */
    GMM_GSM_Cause                       gsmCause,                                /* cl. 9.11.4.2  M V 1   */
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11010010'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_RELEASE_COMMAND {                     /* 24.501 cl. 8.3.14
                                                                   Significance:  dual
@@ -877,7 +896,8 @@ module NG_NAS_TypeDefs {
    ExtdProtocolConfigOptions           extdProtocolConfigurationOptions optional, /* cl. 9.11.4.6 O TLV-E 4-65538 IEI=0x7B */
    AccessType                          accessType                    optional,  /* cl. 9.11.2.1A O TV 1 IEI=D Sep20 @sic R5s201387 Baseline Moving sic@ */
    ServiceLvlAAContainer               serviceLvlAA                  optional   /* cl. 9.11.2.10 O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11010011'B)"};
  //variant "FIELDORDER(msb)"};

  type record NG_PDU_SESSION_RELEASE_COMPLETE {                    /* 24.501 cl. 8.3.15
                                                                   Significance:  dual
@@ -898,7 +918,8 @@ module NG_NAS_TypeDefs {
    ProcedureTransactionIdentifier      procedureTransactionIdentifier,         /* cl. 9.6       M V 1   */
    MessageType                         messageType,                            /* cl. 9.7       M V 1   */
    GMM_GSM_Cause                       gsmCause                                /* cl. 9.11.4.2  M V 1   */
  }with{variant "FIELDORDER(msb)"};
  }with{variant "PRESENCE(messageType = '11010110'B)"};
  //variant "FIELDORDER(msb)"};

  //----------------------------------------------------------------------------
  // NG Mobility Management (GMM) information elements (24.501 cl. 9.11.3)
@@ -2069,4 +2090,4 @@ module NG_NAS_TypeDefs {
    MessageType                         messageType                     /*    M V 1      */
  };
  
} with { encode "RAW"/*"NAS Types"*/}
} with { encode "RAW"/*"NAS Types"*/extension "errorbehavior(ALL:WARNING)"}