Commit eb41232b authored by Pau Espin Pedrol's avatar Pau Espin Pedrol
Browse files

NAS_CommonTypeDefs.ttcn: Use specific type instead of 'record of' 

This fixes build errors with titan 11.0.0:

NAS_CommonTemplates.ttcn:1448.20-39: error: Type mismatch: a value or template of type `@NAS_CommonTypeDefs.ExtdProtocolConfigOptions.pco' was expected instead of `@NAS_CommonTypeDefs.NAS_ExtdProtocolConfigOptions_Type'

NAS_AuxiliaryDefsAndFunctions.ttcn:124.42-50: error: Type mismatch: a value or template of type `@NAS_CommonTypeDefs.ProtocolConfigOptions.pco' was expected instead of `@NAS_CommonTypeDefs.NAS_ExtdProtocolConfigOptions_Type

NAS_AuxiliaryDefsAndFunctions.ttcn:124.42-50: error: Type mismatch: a value or template of type `@NAS_CommonTypeDefs.NAS_ProtocolConfigOptions_Type' was expected instead of `@NAS_CommonTypeDefs.NAS_ExtdProtocolConfigOptions_Type'
parent 7adf9a92

ttcn/Lib3GPP/NAS/NAS_AuxiliaryDefsAndFunctions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ module NAS_AuxiliaryDefsAndFunctions { 
  function f_ExtdProtocolConfigOptions_Get(template (omit) ExtdProtocolConfigOptions p_Pco,

                                       O2_Type p_ProtocolID) return template (omit) octetstring

  {

    var NAS_ProtocolConfigOptions_Type v_ProtocolConfigOptions;

    var NAS_ExtdProtocolConfigOptions_Type v_ProtocolConfigOptions;

    var integer i;



    if (isvalue(p_Pco.pco)) {

ttcn/Lib3GPP/NAS/NAS_CommonTypeDefs.ttcn

+3 −4
Original line number Diff line number Diff line
@@ -637,8 +637,7 @@ type record Non3GPP_NW_ProvidedPolicies { 
    B1_Type                     ext,

    B4_Type                     spare,

    B3_Type                     configProtocol,

    record length (0..83) of

    ProtocolContainer         pco optional

    NAS_ProtocolConfigOptions_Type pco optional

  } with {

    variant "FIELDORDER(msb)";

    // FIXME variant (pco) "FORCEOMIT(protocolLongLength)";
@@ -658,7 +657,7 @@ type record Non3GPP_NW_ProvidedPolicies { 
    variant (content) "BYTEORDER(last)";

  };



  type ProtocolConfigOptions.pco NAS_ProtocolConfigOptions_Type;

  type record length (0..83) of ProtocolContainer NAS_ProtocolConfigOptions_Type;



  type record APNRateControlParams { // 3GPP 24.008 /  10.5.6.3.2

    B4_Type     spare,
@@ -1202,7 +1201,7 @@ type record NBIFOMContainer { 
    B1_Type                     ext,

    B4_Type                     spare,

    B3_Type                     configProtocol,

    record of ProtocolContainer pco optional

    NAS_ExtdProtocolConfigOptions_Type pco optional

  } with {

    variant "FIELDORDER(msb)";

    variant (iel) "LENGTHTO (ext, spare, configProtocol, configProtocol)";