Commit 499a64d8 authored by juvancic's avatar juvancic
Browse files

Corrections - prevalidation phase

parent 257ec1a6

ISUPAts/ttcn/SIPI_ISUP_Constants.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -976,9 +976,9 @@ group functions 
	*   	 Filler and End-of-Pulsing charaters (if p_eop is TRUE) are taken into account

	*  		 Works for address lengths starting from 0 (i.e. empty string)

	*/

	function f_calc_oddeven(in charstring p_char, in boolean p_eop) return bitstring {

	function f_calc_oddeven(in charstring p_char, in boolean p_eop) return Bit1/*bitstring*/ {

		var integer v_string_length := lengthof(p_char);

		var bitstring v_odd_even_ind;

		var /*bitstring*/Bit1 v_odd_even_ind;

	

		if (p_eop) // End of Pulsing required

		{
@@ -1014,9 +1014,9 @@ group functions 
	*  		 An offset (p_offset) is added dependant on the presence of octets 3 and 4

	*/

	function f_calc_paramLen(in charstring p_char, in boolean p_eop, in integer p_offset) 

		return bitstring {

		return /*bitstring*/Bit8 {

		var integer v_string_length := lengthof(p_char);

		var bitstring v_paramLen;

		var /*bitstring*/Bit8 v_paramLen;

	

		if (p_eop) // End of Pulsing required

		{

ISUPAts/ttcn/SIPI_ISUP_MsgTemplates.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ group SipIsup_ISUP_Receive_MsgsTempl_AnyOptional 
	/* RX template for Release complete message (RLC) with 'any'-optional parameters */

	{

	 msgType := '00010000'B,                                /* Message Type '00010000'B */

	 pOptional := ?,                                        /* Pointer to optional parameters. */

	 optionalParameters := mw_RLC_OPTIONAL_PARAMS_any,      /* SET: optional parameters of Release complete message (RLC) */

	 pOptional := ? ifpresent,                                        /* Pointer to optional parameters. */

	 optionalParameters := mw_RLC_OPTIONAL_PARAMS_any ifpresent,      /* SET: optional parameters of Release complete message (RLC) */

	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */

	}
@@ -1217,7 +1217,7 @@ group SipIsup_ISUP_Receive_MsgsTempl 
	 pCAUI := '00000010'B,                                  /* Pointer to parameter 'Cause indicators'. */

	 pOptional := ?,                                        /* Pointer to optional parameters. */

	 causeIndicators := mw_CAUI_PAR_lv_any,                 /* Cause indicators, V, len=3-? */

	 optionalParameters := mw_REL_OPTIONAL_PARAMS_any,      /* SET: optional parameters of Release message (REL) */

	 optionalParameters := mw_REL_OPTIONAL_PARAMS_any ifpresent,      /* SET: optional parameters of Release message (REL) */

	 endOfOptionalParameters := '00000000'B ifpresent       /* End of optional parameters, O, len=1 */

	}
@@ -2410,11 +2410,11 @@ group SipIsup_ISUP_GeneralTempl 
	template ISUP_BICC_MSG_ind mw_ISUP_BICC_MSG_ind(SelectIsupOrBicc p_isupBiccSel, template Bit12 p_cic, template CallInstanceCode p_CallInstCode, template ISUP_BICC_MSG p_ISUP_BICC_MSG) :=

	/* ASP template used to receive an ISUP/BICC message */

	{

		isupBiccSelection := p_isupBiccSel,               /* selector used to distinguish between ISUP/BICC*/

		isupBiccSelection := omit,//p_isupBiccSel,               /* selector used to distinguish between ISUP/BICC*/

		serviceIndicatorOctet := m_SIO,                   /* contents only used if ISUP selected */

		routingLabel := m_RoutingLabel(PX_ISUP_PC_SUT, PX_ISUP_PC_TS, PX_ISUP_SLS),   /* contents only evaluated if ISUP selected */

		routingLabel := m_RoutingLabel(PX_ISUP_PC_TS, PX_ISUP_PC_SUT, PX_ISUP_SLS),   /* contents only evaluated if ISUP selected */

		circuitIdentityCode := m_CIC(p_cic),              /* contents only evaluated if ISUP selected */

		callInstanceCode := p_CallInstCode,               /* contents only evaluated if BICC selected */

		callInstanceCode := omit,//p_CallInstCode,               /* contents only evaluated if BICC selected */

		iSUP_BICC_MSG  := p_ISUP_BICC_MSG                 /* common part of ISUP/BICC message */

	}

ISUPAts/ttcn/SIPI_ISUP_MsgTypes.ttcn

+10 −10
Original line number Diff line number Diff line
@@ -901,11 +901,11 @@ type enumerated SelectIsupOrBicc {selectIsup, selectBicc}; 


type record ISUP_BICC_MSG_req /* ASP used to send an ISUP/BICC message */

{

 SelectIsupOrBicc          isupBiccSelection,      /* selector used to distinguish between ISUP/BICC*/

 ServiceIndicatorOctet     serviceIndicatorOctet,  /* contents only evaluated if ISUP selected */

 RoutingLabel              routingLabel,           /* contents only evaluated if ISUP selected */

 CircuitIdentityCode       circuitIdentityCode,    /* contents only evaluated if ISUP selected */

 CallInstanceCode          callInstanceCode,       /* contents only evaluated if BICC selected */

 SelectIsupOrBicc          isupBiccSelection optional,      /* selector used to distinguish between ISUP/BICC*/

 ServiceIndicatorOctet     serviceIndicatorOctet optional,  /* contents only evaluated if ISUP selected */

 RoutingLabel              routingLabel optional,           /* contents only evaluated if ISUP selected */

 CircuitIdentityCode       circuitIdentityCode optional,    /* contents only evaluated if ISUP selected */

 CallInstanceCode          callInstanceCode optional,       /* contents only evaluated if BICC selected */

 ISUP_BICC_MSG             iSUP_BICC_MSG           /* common part of ISUP/BICC message */

} with { encode "ISUPCodec" }
@@ -918,11 +918,11 @@ so constructed message at the ISUP or BICC interface respectively.*/ 


type record ISUP_BICC_MSG_ind /* ASP used to receive an ISUP/BICC message */

{

	SelectIsupOrBicc          isupBiccSelection,      /* selector used to distinguish between ISUP/BICC*/

	ServiceIndicatorOctet     serviceIndicatorOctet,  /* contents only evaluated if ISUP selected */

	RoutingLabel              routingLabel,           /* contents only evaluated if ISUP selected */

	CircuitIdentityCode       circuitIdentityCode,    /* contents only evaluated if ISUP selected */

	CallInstanceCode          callInstanceCode,       /* contents only evaluated if BICC selected */

	SelectIsupOrBicc          isupBiccSelection optional,   /* selector used to distinguish between ISUP/BICC*/

	ServiceIndicatorOctet     serviceIndicatorOctet optional,  /* contents only evaluated if ISUP selected */

	RoutingLabel              routingLabel optional,           /* contents only evaluated if ISUP selected */

	CircuitIdentityCode       circuitIdentityCode optional,    /* contents only evaluated if ISUP selected */

	CallInstanceCode          callInstanceCode optional,       /* contents only evaluated if BICC selected */

	ISUP_BICC_MSG             iSUP_BICC_MSG           /* common part of ISUP/BICC message */

} with { encode "ISUPCodec" }

/* Additional comments:

ISUPAts/ttcn/SIPI_ISUP_ParamTemplates.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -2516,8 +2516,8 @@ group ReceivParams { 
	 discardParameterIndicator := ?,      /* bit E: Discard parameter indicator */

	 passOnNotPossibleIndicator := ?,     /* bits G F: Pass on not possible indicator */

	 ext := ?,                            /* c: Extension indicator (ext.) */

	 broadNarrowBandInterwIndicator := ?, /* bits J I: Broadband/narrowband interworking indicator */

	 spare := '000000'B,                  /* bits O-K: spare */

	 broadNarrowBandInterwIndicator := ? ifpresent, /* bits J I: Broadband/narrowband interworking indicator */

	 spare := '000000'B ifpresent,                  /* bits O-K: spare */

	 moreInstructionIndicators := omit    /* to be defined when required */

	}
@@ -2526,7 +2526,7 @@ group ReceivParams { 
	{

	 paramType := '00111001'B,                                              /* Parameter Type '00111001'B */

	 paramLen := ?,                                                         /* Parameter Length field */

	 parameterInstructionIndicators := mw_ParameterInstructionIndicator_any 

	 parameterInstructionIndicators := {mw_ParameterInstructionIndicator_any} 

	}



	template PDC_PAR_tlv mw_PDC_PAR_tlv_any :=
@@ -3601,7 +3601,7 @@ group TransmitParams{ 
	 spare := '0000'B,                                           /* spare */

	 numberingPlanIndicator := PX_ISUP_TX_CDN_numbPlanInd,       /* Numbering plan indicator */

	 iNN := PX_ISUP_TX_CDN_iNN,                                  /* Internal Network Number indicator */

	 addressSignals := '92200F'O //axr f_char_to_BCD(p_digits, true)             /* address signals */

	 addressSignals := /*'92200F'O //axr*/ f_char_to_BCD(p_digits, true)             /* address signals */

	}



	template CDN_PAR_lv m_CalledNum_Inat(charstring p_digits, boolean p_sendCmpl) :=
@@ -4252,7 +4252,7 @@ group TransmitParams{ 
	{

	 paramType := '00111001'B,     /* Parameter Type '00111001'B */

	 paramLen := int2bit((lengthof(valueof(p_paramInstructInds.moreInstructionIndicators))+ 3), 8), /* Parameter Length field */

	 parameterInstructionIndicators := p_paramInstructInds 

	 parameterInstructionIndicators := {p_paramInstructInds} 

	}



	template RAS_PAR_lv m_RangeStat1(Bit8 p_Range, octetstring p_Status) :=

ISUPAts/ttcn/SIPI_ISUP_ParamTypes.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ type record PCI_PAR_tlv /* Parameter compatibility information parameter (PCI); 
{

 Bit8 paramType ('00111001'B),        /* Parameter Type '00111001'B */

 Bit8 paramLen,                       /* Parameter Length field */

 ParameterInstructionIndicator parameterInstructionIndicators

 ParameterInstructionIndicators parameterInstructionIndicators

}

with { encode "present=bytes(1,0x39)";

       encode (paramLen) "tag=""PCI_paramLen"";";
@@ -605,8 +605,8 @@ type record ParameterInstructionIndicator 
 Bit1 discardParameterIndicator,                /* bit E: Discard parameter indicator */

 Bit2 passOnNotPossibleIndicator,               /* bits G F: Pass on not possible indicator */

 Bit1 ext,                                      /* c: Extension indicator (ext.) */

 Bit2 broadNarrowBandInterwIndicator,           /* bits J I: Broadband/narrowband interworking indicator */

 Bit6 spare,                                    /* bits O-K: spare */

 Bit2 broadNarrowBandInterwIndicator optional,  /* bits J I: Broadband/narrowband interworking indicator */

 Bit6 spare optional,                           /* bits O-K: spare */

 octetstring moreInstructionIndicators optional /* to be defined when required */

}

type set of ParameterInstructionIndicator ParameterInstructionIndicators;