Commit ec1bf08e authored by nikolajev's avatar nikolajev
Browse files

The rest of issues identified by T3Q

parent 6bf016f0
Loading
Loading
Loading
Loading

XSDAUX.ttcn

deleted100644 → 0
+0 −150
Original line number Diff line number Diff line
module XSDAUX {//MRO
	/* 0.anySimpleType */
	type anytype anySimpleType;

	/* 1.string */
	type charstring string;

	/* 2.boolean */
	type integer bitXSD (1, 0) ;
	
	type union booleanXSD {
		bitXSD bit, boolean bool
	}

	/* 3.decimal */
	type float decimal;

	/* 4.float */
	type float floatXSD;

	/* 5.double */
	type float double;

	/* 6.duration */
	type charstring duration;

	/* 7.dateTime */
	type charstring dateTime;

	/* 8.time */
	type charstring time;

	/* 9.date */
	type charstring date;

	/* 10.gYearMonth */
	type charstring gYearMonth;

	/* 11.gYear */
	type charstring gYear;

	/* 12.gMonthDay */
	type charstring gMonthDay;

	/* 13.gDay */
	type charstring gDay;

	/* 14.gMonth */
	type charstring gMonth;

	/* 15.hexBinary */
	type hexstring hexBinary;

	/* 16.base64Binary */
	type charstring base64Binary;

	/* 17.anyURI */
	type charstring anyURI;

	/* 18.QName */
	type charstring QName;

	/* 19.NOTATION */
	type charstring NOTATION;

	/* 20.normalizedString */
	type charstring normalizedString;

	/* 21.token */
	type charstring token;

	/* 22.language */
	type charstring languageXSD;

	/* 23.NMTOKEN */
	type charstring NMTOKEN;

	/* 24.NMTOKENS */
	type set of charstring NMTOKENS;

	/* 25.Name */
	type charstring Name;

	/* 27.NCName */
	type charstring NCName;

	/* 28.ID */
	type charstring ID;

	/* 29.IDREFS */
	type set of charstring IDREFS;

	/* 30.ENTITY */
	type charstring ENTITY;

	/* 31.ENTITIES */
	type set of charstring ENTITIES;

	/* 32.nonPositiveInteger */
	type integer nonPositiveInteger (- infinity .. 0) ;

	/* 33.negativeInteger */
	type integer negativeInteger (- infinity .. - 1) ;

	/* 34.long */
//	type integer long (- 9223372036854775808 .. 9223372036854775807) ;//MRO

	/* 35.int */
	type integer int (- 2147483648 .. 2147483647) ;

	/* 36.short */
	type integer short (- 32768 .. 32767) ;

	/* 37.byte */
	type integer byte (- 128 .. 127) ;

	/* 38.nonNegativeInteger */
	type integer nonNegativeInteger (0 .. infinity) ;

	/* 39.unsignedLong */
	type integer unsignedLong (0 .. 18446744073709551615) ;//MRO

	/* 40.unsignedInt */
	type integer unsignedInt (0 .. 4294967295) ;

	/* 41.unsignedShort */
	type integer unsignedShort (0 .. 65535) ;

	/* 42.unsignedByte */
	type integer unsignedByte (0 .. 255) ;

	/* 43.positiveInteger */
	type integer positiveInteger (1 .. infinity) ;

	/* 44.integer */
	type integer integerXSD;

	/* 45.anyAttributes */
	type record of record {
		charstring name, 
		charstring val
	} anyAttributes;

	/* 46. anyType */
	/**
	 * This is to represent elements without a given type
	 */
	type record anyType {
	}
}
+12 −0
Original line number Diff line number Diff line
@@ -90,6 +90,18 @@ module LibSip_PIXITS {
            modulepar charstring PX_SIP_SDP_ENCODING_ATTRIBUTE_PCMA := "8 " & PX_SIP_SDP_MEDIA_TRANSPORT_PCMA;

        } // group SDP Parameter
		group XMLCOnfiguration{
			
			/**
             * @desc boolean for MessageBody length calculation based on encvalue operation result
             */
			modulepar boolean PX_MB_LENGTH_FROM_ENCVAL := true;
	        
			/**
             * @desc boolean for MessageBody length calculation to be performed by external function
             */
			modulepar boolean PX_USE_FX_FOR_XML_LENGTH := false;
		}

        group ISUPinterworkingParameters {
            /**
+49 −58

File changed.

Preview size limit exceeded, changes collapsed.

+72 −131
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ module LibSip_Templates {
        extension "File:../xsd/cw.xsd";
    }

    group ModuleParameters {

        modulepar boolean MB_LENGTH_FROM_ENCVAL := true;
        //*     to get length of message body from ecoded value
        modulepar boolean USE_FX_FOR_XML_LENGTH := false;

    //*     To use external functions for calculation of XML message/body length
    } //*     group ModuleParameters

    group SubFields {

        template(value) Addr_Union m_AddrUnion_NameAddr(template(value) NameAddr p_nameAddr) := {nameAddr := p_nameAddr}
@@ -402,11 +393,9 @@ module LibSip_Templates {

        template(present) SipUrl mw_TelSip_unavailableUri(
            template(value) charstring p_host
        ) := (mw_TelSip_unavailableUri1(p_host), mw_TelSip_unavailableUri2(p_host));
        ) := (mw_TelSip_unavailableUri1, mw_TelSip_unavailableUri2(p_host));

        template(present) SipUrl mw_TelSip_unavailableUri1(
            template(value) charstring p_host
        ) modifies mw_TelUrl := {
        template(present) SipUrl mw_TelSip_unavailableUri1 modifies mw_TelUrl := {
            components := {tel := {subscriber := "unavailable"}},
            urlParameters := omit,  // TODO STF471: shall be *. If *, remove them die to modifies mw_BasicSipUrl
            headers :=
@@ -630,7 +619,6 @@ module LibSip_Templates {
        template(present) GenericParam mw_Cause(
            template(value) charstring p_cause
        ) := {
            // TODO - Expression does not work for all TTCN tools
            id := ?,
            paramValue := pattern "*{p_cause}*"
        }
@@ -1215,7 +1203,7 @@ module LibSip_Templates {
            fromParams := *
        }
        template(value) ViaBody m_ViaBody_currIpaddr(
            template(value) charstring branch_val,
            template(value) charstring p_branch_val,
            template(value) SipUserProfile p_userprofile
        ) := {
            sentProtocol := m_SentProtocol(PX_SIP_TRANSPORT),
@@ -1226,7 +1214,7 @@ module LibSip_Templates {
            viaParams := {
                {
                    id := c_branchId,
                    paramValue := branch_val
                    paramValue := p_branch_val
                }
            }
        }
@@ -1353,7 +1341,6 @@ module LibSip_Templates {
        }



    } //*     end of group HeaderFieldTemplates


@@ -1463,7 +1450,6 @@ module LibSip_Templates {
                }



            } //*     group dummy_parameter_send

            group dummy_parameter_receive {
@@ -1564,7 +1550,6 @@ module LibSip_Templates {
                }



            } //*     end group dummy_parameter_receive

            group dummy_request_templates_send {
@@ -1668,7 +1653,6 @@ module LibSip_Templates {
                }



            } //*     end group dummy_request_templates_send
            group dummy_request_templates_receive {

@@ -1771,7 +1755,6 @@ module LibSip_Templates {
                }

                

            } //*     end group dummy_request_templates_receive

            group dummy_response_templates_send {
@@ -1784,7 +1767,6 @@ module LibSip_Templates {
                }



            } //*     group dummy_response_templates_send

            group dummy_response_templates_receive {
@@ -2219,8 +2201,6 @@ module LibSip_Templates {
                }




            } //*     end of group message_send

            group request_receive {
@@ -2331,8 +2311,6 @@ module LibSip_Templates {
                template(present) UPDATE_Request mw_UPDATE_Request_Base(template CallId p_callId) modifies mw_UPDATE_Dummy := {msgHeader := {callId := p_callId}}




            } //*     end group request_receive

            group response_send {
@@ -2359,7 +2337,6 @@ module LibSip_Templates {
                }



            } //*     end group response_send

            group response_receive {
@@ -2464,6 +2441,7 @@ module LibSip_Templates {
                    }
                }


            } //*     end group message_receive

        
@@ -2688,7 +2666,6 @@ module LibSip_Templates {
                }



            } //*     end group request_send


@@ -2770,13 +2747,13 @@ module LibSip_Templates {

                template(present) INVITE_Request mw_INVITE_Request_noPaccessNetworkInfo(
                    template CallId p_callId
                ) modifies mw_INVITE_Request_Base := {
                ) modifies mw_INVITE_Request_callid := {
                    msgHeader := {pAccessNetworkInfo := omit}
                }

                template(present) INVITE_Request mw_INVITE_Request_PaccessNetworkInfo(
                    template CallId p_callId
                ) modifies mw_INVITE_Request_Base := {
                ) modifies mw_INVITE_Request_callid := {
                    msgHeader := {pAccessNetworkInfo := ?}
                }

@@ -2841,7 +2818,7 @@ module LibSip_Templates {
                template(present) UPDATE_Request mw_UPDATE_Request_SDP(
                    template CallId p_callId,
                    template MessageBody p_mb
                ) modifies mw_UPDATE_Dummy := {
                ) modifies mw_UPDATE_Request_Base := {
                    messageBody := p_mb
                }

@@ -2853,8 +2830,6 @@ module LibSip_Templates {
                }

            


            } //*     end group request_receive

            group response_send {
@@ -2993,8 +2968,6 @@ module LibSip_Templates {
                }

            


            } //*     end group response_send


@@ -3136,18 +3109,12 @@ module LibSip_Templates {
                }

            

            } //*     end group response_receive

        



        } //*     end group modified_templates

    


    } //*     end group MessageTemplates

    group SDP_Templates {
@@ -3261,9 +3228,9 @@ module LibSip_Templates {
                template(value) SDP_Message m_SDP_attribute(
                    template(value) SDP_media_desc p_media,
                    template(value) SipUserProfile p_userprofile,
                    template(value) SDP_attribute loc_attribute
                    template(value) SDP_attribute p_loc_attribute
                ) modifies m_SDP := {
                    attributes := {loc_attribute}
                    attributes := {p_loc_attribute}
                }

                template(present) SDP_Message mw_SDP := {
@@ -3289,9 +3256,6 @@ module LibSip_Templates {
                }





            } //*     end group base_templates

            group modified_templates {
@@ -3341,8 +3305,6 @@ module LibSip_Templates {
            } //*     end group modified_templates

        


        } //*     end group SDP_Messages

        group SDP_Fields {
@@ -3418,11 +3380,11 @@ module LibSip_Templates {
            }

            template(value) SDP_bandwidth m_bandwidth(
                template(value) charstring loc_m,
                template(value) integer loc_b
                template(value) charstring p_loc_m,
                template(value) integer p_loc_b
            ) := {
                modifier := loc_m,
                bandwidth := loc_b
                modifier := p_loc_m,
                bandwidth := p_loc_b
            }

            template(value) SDP_bandwidth m_bandwidth_as_64 := {
@@ -3598,12 +3560,9 @@ module LibSip_Templates {
            }

        

        } //*     end group SDP_Fields

    


    } //*     end group SDP_Templates

    group SimpleMsgSummary_Templates {
@@ -3683,8 +3642,6 @@ module LibSip_Templates {
        }




    } // end group Templates_SMS

    group MessageBodies {
@@ -3853,7 +3810,7 @@ module LibSip_Templates {
            ) return integer  {

                var integer v_result := 0;
                if (MB_LENGTH_FROM_ENCVAL) {
                if (PX_MB_LENGTH_FROM_ENCVAL) {
                    // by default it is set to true
                    // in case the codec encodes the variant selector, this
                    // needs to be changed to ischosen...
@@ -3875,7 +3832,7 @@ module LibSip_Templates {

                    // assume XML_Body ONLY in the message body
                    if (ischosen(p_mb_par.xmlBody)) {
                        v_result := f_XMLBody_Length(valueof(p_mb_par.xmlBody), USE_FX_FOR_XML_LENGTH);
                        v_result := f_XMLBody_Length(valueof(p_mb_par.xmlBody), PX_USE_FX_FOR_XML_LENGTH);
                    }

                    // assume simpleMsgSummary_Body ONLY in the message body
@@ -3918,9 +3875,8 @@ module LibSip_Templates {
                function f_SDPlength(
                    SDP_Message p_mb
                ) return integer  {
                    var integer i, j, k, v_len_con0, v_len_con1, v_len_con2, v_len_attr;
                    var integer v_result := 2;


                    //*     due to empty line beginning of message body
                    var charstring v_auxstring;

@@ -3937,7 +3893,7 @@ module LibSip_Templates {
                        v_result := v_result + 2 + c_CRlen + lengthof(v_auxstring);
                    } //*     "u="
                    if (isvalue(p_mb.emails)) {
                        for (var integer i := 0; i < lengthof(p_mb.emails); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.emails); i := i + 1) {
                            v_result := v_result + 2 + c_CRlen + lengthof(p_mb.emails[i].addr_or_phone); //*     "e="
                            if (isvalue(p_mb.emails[i].disp_name)) {
                                v_auxstring := valueof(p_mb.emails[i].disp_name);
@@ -3947,7 +3903,7 @@ module LibSip_Templates {
                    }

                    if (isvalue(p_mb.phone_numbers)) {
                        for (var integer i := 0; i < lengthof(p_mb.phone_numbers); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.phone_numbers); i := i + 1) {
                            v_result := v_result + 2 + c_CRlen + lengthof(p_mb.phone_numbers[i].addr_or_phone); //*     "p=
                                                                                                                //*     "
                            if (isvalue(p_mb.phone_numbers[i].disp_name)) {
@@ -3958,22 +3914,22 @@ module LibSip_Templates {
                    }

                    if (isvalue(p_mb.connection)) {
                        var integer v_len_con0 := f_SDPlength_connection(valueof(p_mb.connection));
                        v_len_con0 := f_SDPlength_connection(valueof(p_mb.connection));
                        v_result := v_result + v_len_con0;
                    } //*     "c="
                    if (isvalue(p_mb.bandwidth)) {
                        for (var integer i := 0; i < lengthof(p_mb.bandwidth); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.bandwidth); i := i + 1) {
                            //*     "b= "
                            v_auxstring := p_mb.bandwidth[i].modifier & " ";
                            v_result := v_result + 2 + c_CRlen + lengthof(v_auxstring) + lengthof(int2str(p_mb.bandwidth[i].bandwidth));
                        }
                    }

                    for (var integer i := 0; i < lengthof(p_mb.times); i := i + 1) {
                    for (i := 0; i < lengthof(p_mb.times); i := i + 1) {
                        v_auxstring := p_mb.times[i].time_field.start_time & " " & p_mb.times[i].time_field.stop_time;
                        v_result := v_result + 2 + c_CRlen + lengthof(v_auxstring); //*     "t="
                        if (isvalue(p_mb.times[i].time_repeat)) {
                            for (var integer j := 0; j < lengthof(p_mb.times[i].time_repeat); j := j + 1) {
                            for (j := 0; j < lengthof(p_mb.times[i].time_repeat); j := j + 1) {
                                v_result := v_result + 2 + c_CRlen + lengthof(int2str(p_mb.times[i].time_repeat[j].repeat_interval.time)); //*     "r="
                                if (isvalue(p_mb.times[i].time_repeat[j].repeat_interval.unit)) {
                                    v_auxstring := valueof(p_mb.times[i].time_repeat[j].repeat_interval.unit);
@@ -3986,7 +3942,7 @@ module LibSip_Templates {
                                    v_result := v_result + 1 + lengthof(v_auxstring);
                                }

                                for (var integer k := 0; k < lengthof(p_mb.times[i].time_repeat[j].offsets); k := k + 1) {
                                for (k := 0; k < lengthof(p_mb.times[i].time_repeat[j].offsets); k := k + 1) {
                                    v_result := v_result + 1 + lengthof(int2str(p_mb.times[i].time_repeat[j].offsets[k].time));
                                    if (isvalue(p_mb.times[i].time_repeat[j].offsets[k].unit)) {
                                        v_auxstring := valueof(p_mb.times[i].time_repeat[j].offsets[k].unit);
@@ -3998,7 +3954,7 @@ module LibSip_Templates {
                    }

                    if (isvalue(p_mb.timezone_adjustments)) {
                        log("timezone adjustments have not been considered in SDP length calculation yet");
                        log("*** " & __SCOPE__ & ": INFO: timezone adjustments have not been considered in SDP length calculation yet ***");
                    } //*     "z="
                    if (isvalue(p_mb.key)) {
                        v_result := v_result + 2 + c_CRlen + lengthof(p_mb.key.method); //*     "k=
@@ -4009,16 +3965,16 @@ module LibSip_Templates {
                        }
                    }
                    if (isvalue(p_mb.attributes)) {
                        for (var integer i := 0; i < lengthof(p_mb.attributes); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.attributes); i := i + 1) {


                            //*     "a= "
                            var integer v_len_con1 := f_SDPlength_attribute(p_mb.attributes[i]);
                            v_len_con1 := f_SDPlength_attribute(p_mb.attributes[i]);
                            v_result := v_result + v_len_con1;
                        }
                    } //*     "a="
                    if (isvalue(p_mb.media_list)) {
                        for (var integer i := 0; i < lengthof(p_mb.media_list); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.media_list); i := i + 1) {
                            //*     "m= "
                            //*     for each media_field
                            //*     log("p_mb.media_list[i ] ",p_mb.media_list[i
@@ -4030,7 +3986,7 @@ module LibSip_Templates {
                                v_result := v_result + 1 + lengthof(int2str(valueof(p_mb.media_list[i].media_field.ports.num_of_ports)));
                            }
                            v_result := v_result + 1 + lengthof(p_mb.media_list[i].media_field.transport);
                            for (var integer j := 0; j < lengthof(p_mb.media_list[i].media_field.fmts); j := j + 1) {
                            for (j := 0; j < lengthof(p_mb.media_list[i].media_field.fmts); j := j + 1) {
                                v_result := v_result + 1 + lengthof(p_mb.media_list[i].media_field.fmts[j]);
                            }

@@ -4039,14 +3995,14 @@ module LibSip_Templates {
                                v_result := v_result + 2 + c_CRlen + lengthof(v_auxstring); //*     "i= "
                            }
                            if (isvalue(p_mb.media_list[i].connections)) {
                                for (var integer j := 0; j < lengthof(p_mb.media_list[i].connections); j := j + 1) {
                                    var integer v_len_con2 := f_SDPlength_connection(p_mb.media_list[i].connections[j]);
                                for (j := 0; j < lengthof(p_mb.media_list[i].connections); j := j + 1) {
                                    v_len_con2 := f_SDPlength_connection(p_mb.media_list[i].connections[j]);
                                    v_result := v_result + v_len_con2;
                                } //*     end for
                            }
                            if (isvalue(p_mb.media_list[i].bandwidth)) {
                                //*     "b= "
                                for (var integer j := 0; j < lengthof(p_mb.media_list[i].bandwidth); j := j + 1) {
                                for (j := 0; j < lengthof(p_mb.media_list[i].bandwidth); j := j + 1) {
                                    v_result := v_result + 2 + c_CRlen + lengthof(p_mb.media_list[i].bandwidth[j].modifier) + 1 + lengthof(int2str(p_mb.media_list[i].bandwidth[j].bandwidth));
                                } //*     end for
                            }
@@ -4059,10 +4015,10 @@ module LibSip_Templates {
                                }
                            }
                            if (isvalue(p_mb.media_list[i].attributes)) {
                                for (var integer j := 0; j < lengthof(p_mb.media_list[i].attributes); j := j + 1) {
                                for (j := 0; j < lengthof(p_mb.media_list[i].attributes); j := j + 1) {

                                    //*     "a= "
                                    var integer v_len_attr := f_SDPlength_attribute(p_mb.media_list[i].attributes[j]);
                                    v_len_attr := f_SDPlength_attribute(p_mb.media_list[i].attributes[j]);
                                    v_result := v_result + v_len_attr;
                                } //*     end for j
                            }
@@ -4076,7 +4032,6 @@ module LibSip_Templates {
                ) return integer  {
                //*     "c="
                    var integer v_result := 0;
                    var charstring v_auxstring;
                    v_result := v_result + 2 + c_CRlen + lengthof(p_element.net_type & " " & p_element.addr_type & " " & p_element.conn_addr.addr);
                    if (isvalue(p_element.conn_addr.ttl) and p_element.conn_addr.ttl > 0) {
                        v_result := v_result + 1 + lengthof(int2str(valueof(p_element.conn_addr.ttl)));
@@ -4092,7 +4047,6 @@ module LibSip_Templates {
                ) return integer  {
                //*     "a="
                    var integer v_result := 0;
                    var charstring v_auxstring;
                    if (ischosen(p_element.cat)) {
                        v_result := v_result + 2 + c_CRlen + lengthof("cat:" & p_element.cat.attr_value);
                    }
@@ -4159,7 +4113,6 @@ module LibSip_Templates {
                    if (ischosen(p_element.unknown)) {
                        v_result := v_result + 2 + c_CRlen + lengthof(p_element.unknown.name);
                        if (isvalue(p_element.unknown.attr_value)) {
                            var charstring aux := valueof(p_element.unknown.attr_value);
                            v_result := v_result + lengthof(":" & p_element.unknown.attr_value);
                        }
                    }
@@ -4168,8 +4121,6 @@ module LibSip_Templates {
                } //*     f_SDPlength_attribute




            } //*     group SDPlen_calculation

            group XML_Len_calculation {
@@ -4362,13 +4313,9 @@ module LibSip_Templates {
                    } //*     f_XMLBody_Ims3GPP_Length




                } //*     XMLBodies_calculation




            } //*     group XMLlen_calculation

            group simpleMsgSummaryBody_Length {
@@ -4376,6 +4323,7 @@ module LibSip_Templates {
                function f_simpleMsgSummaryBody_Length(
                    SimpleMsgSummary p_mb
                ) return integer  {
                    var integer i;
                    var integer v_result := 2;


@@ -4390,7 +4338,7 @@ module LibSip_Templates {
                        v_result := v_result + 2 + lengthof(p_mb.msg_account.msg_type_account) + 2 + lengthof(p_mb.msg_account.account_URI) + c_CRlen;
                    }
                    if (isvalue(p_mb.msg_summary_line_list)) {
                        for (var integer i := 0; i < lengthof(p_mb.msg_summary_line_list); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.msg_summary_line_list); i := i + 1) {
                            v_result := v_result + 2 + c_CRlen + lengthof(p_mb.msg_summary_line_list[i].msg_context_class) + 2 + lengthof(p_mb.msg_summary_line_list[i].msgs);
                            if (isvalue(p_mb.msg_summary_line_list[i].urgent_msgs)) {
                                v_auxstring := valueof(p_mb.msg_summary_line_list[i].urgent_msgs);
@@ -4399,7 +4347,7 @@ module LibSip_Templates {
                        }
                    }
                    if (isvalue(p_mb.opt_msg_headers)) {
                        for (var integer i := 0; i < lengthof(p_mb.opt_msg_headers); i := i + 1) {
                        for (i := 0; i < lengthof(p_mb.opt_msg_headers); i := i + 1) {
                            v_result := v_result + 2 + c_CRlen + lengthof(p_mb.opt_msg_headers[i]);
                        }
                    }
@@ -4416,11 +4364,12 @@ module LibSip_Templates {
                function f_MIMElength(
                    MIME_Message p_mb
                ) return integer  {
                    var integer i;
                    var integer v_result := 2;
                    // 0d0a
                    v_result := v_result + lengthof(p_mb.boundary) + 2 /*0d0a*/;

                    for (var integer i := 0; i < lengthof(p_mb.mimeEncapsulatedList); i := i + 1) {
                    for (i := 0; i < lengthof(p_mb.mimeEncapsulatedList); i := i + 1) {

                        v_result := v_result + lengthof("Content-Type: ") + lengthof(p_mb.mimeEncapsulatedList[i].content_type) + 2 /*0d0a*/;

@@ -4436,7 +4385,7 @@ module LibSip_Templates {

                        // assume XML_Body ONLY in the message body
                        if (ischosen(p_mb.mimeEncapsulatedList[i].mime_encapsulated_part.xmlBody)) {
                            v_result := v_result + f_XMLBody_Length(p_mb.mimeEncapsulatedList[i].mime_encapsulated_part.xmlBody, USE_FX_FOR_XML_LENGTH);
                            v_result := v_result + f_XMLBody_Length(p_mb.mimeEncapsulatedList[i].mime_encapsulated_part.xmlBody, PX_USE_FX_FOR_XML_LENGTH);
                        }
                    // //assume XML_Message ONLY in the message body
                    // if (ischosen(p_mb.mimeEncapsulatedList[i ]
@@ -4455,8 +4404,6 @@ module LibSip_Templates {
                } //*     f_MIMElength




            } //*     group MIMElen_calculation

            group TextPlain_Len_calculation {
@@ -4476,13 +4423,9 @@ module LibSip_Templates {
                } //*     end function f_TextPlainLength

            


            } //*     end group TextPlainLen_calculation

        


        } //*     group MessageBody_Calculation


@@ -4494,7 +4437,7 @@ module LibSip_Templates {
            function f_recordroute(
            ) runs on SipComponent 
            return template(omit) RecordRoute  {
                template RecordRoute v_recordRoute := omit;
                var template RecordRoute v_recordRoute := omit;
                if (vc_boo_recordRoute) {
                    return vc_recordRoute;
                }
@@ -4510,7 +4453,7 @@ module LibSip_Templates {
            function f_route(
            ) runs on SipComponent 
            return template(omit) Route  {
                template(omit) Route v_route := omit;
                var template(omit) Route v_route := omit;
                if (vc_boo_route) {
                    return v_route;
                } //*     TODO: Route header need to be in reverse order than
@@ -4521,8 +4464,6 @@ module LibSip_Templates {
            }

        


        } //*     end group GiveHeaders

        group others {
@@ -4540,12 +4481,12 @@ module LibSip_Templates {
                template(value) CommaParam_List p_list2
            ) return template(value) CommaParam_List  {
                var template(value) CommaParam_List p_result;
                var integer limit1 := lengthof(p_list1);
                for (var integer i := 0; i < limit1; i := i + 1) {
                var integer i, v_limit1 := lengthof(p_list1);
                for (i := 0; i < v_limit1; i := i + 1) {
                    p_result[i] := p_list1[i];
                }
                for (var integer i := 0; i < lengthof(p_list2); i := i + 1) {
                    p_result[i + limit1] := p_list2[i];
                for (i := 0; i < lengthof(p_list2); i := i + 1) {
                    p_result[i + v_limit1] := p_list2[i];
                }
                return p_result;
            }