Commit fc8c2054 authored by bergengruen's avatar bergengruen
Browse files

LibSip_SMSTypes corresponds to the SMS types 3GPP 24.011 and 3GPP 23.040 

LibSip_SimpleMsgSummaryTypes to the types in RFC 3842
parent 5a4e8ab1

trunk/ttcn/LibSip_SIPTypesAndValues.ttcn

+14 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module LibSip_SIPTypesAndValues language "TTCN-3:2005" 
{

	import from LibSip_SDPTypes all;

	import from LibSip_XMLTypes all;

    import from LibSip_SMSTypes all;

    import from LibSip_SimpleMsgSummaryTypes all;



group Constants 

{
@@ -481,6 +481,7 @@ group SubTypes{// Subtypes 
		

		// [3841]

		ACCEPT_CONTACT_E,

		REQUEST_DISPOSITION_E,

		

		// [4028]

		MIN_SE_E,
@@ -1359,6 +1360,14 @@ group SubTypes{// Subtypes 
		  charstring wildcard(c_WILDCARD),

		  SemicolonParam_List acRcParams optional

	  }	

	  // [RFC 3841]

	  type charstring Directive;		

	  type set of Directive Directive_List;	

	  type record RequestDisposition {

		FieldName		fieldName (REQUEST_DISPOSITION_E),

		Directive_List	directives

	  }

	    	  

	  }// end group RFC3841HeaderFieldTypes



	  group RFC3891HeaderFieldTypes
@@ -1512,6 +1521,7 @@ group SubTypes{// Subtypes 
		RSeq 				rSeq optional, // 3262/7.1

		Reason 				reason optional, // 3326

        RecordRoute			recordRoute optional,

        RequestDisposition  requestDisposition optional, // 3841

		ReferredBy 			referredBy optional, // 3892 - REFER method	

		ReferTo 			referTo optional, // 3515 - REFER method

		Replaces			replaces optional, // 3891
@@ -1799,7 +1809,8 @@ group SubTypes{// Subtypes 
		MIME_Message mimeMessageBody, 	// if there is SDP and encapsulated ISUP part

		charstring sipfrag, 			// if content-Type is message/sipfrag (cp. NOTIFY, cp TS124147 A.4.3.1.2)

		charstring textplain,			// if content type is text/plain (for testing long messages)

		SMS sms

		SimpleMsgSummary simpleMsgSummary, // RFC 3842

		octetstring smsMessage          // encoded SMS message 3GPP 23.040, 24.011

	  };

 

	} // end group MessageBodyTypes

trunk/ttcn/LibSip_SMSTypes.ttcn

+748 −49

File changed.

Preview size limit exceeded, changes collapsed.

trunk/ttcn/LibSip_SimpleMsgSummaryTypes.ttcn

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/**

 *	@author 	STF 406

 *  @version    $Id: LibSip_SMSTypes.ttcn 488 2010-11-08 10:17:19Z pintar $

 *	@desc		This module provides the SMS type system for SIP tests.

 */

module LibSip_SimpleMsgSummaryTypes language "TTCN-3:2009" { // RFC 3842

    

    group SMSConstants{



        // IMS ETSI name MWI application

        const charstring c_imsEtsiMwiApplication := "application/simple-message-summary";

        

        // msg_status line	:= "Message-Waiting"

        const charstring c_messageWaiting	:= "Message-Waiting";

        

        // msg_summary line	:= "Voice-Message"

        const charstring c_voiceMessage	:= "Voice-Message";

    

    }

    

    group SMSTypes{

                   //TODO add (SMS sms) into type union MessageBody{ in module LibSIPTypesAndValues

	

        type record SimpleMsgSummary { //Simple_message_summary

            Msg_status_line msg_status_line,

            Msg_account msg_account optional,

            Msg_summary_line_list msg_summary_line_list optional,

            Opt_msg_headers opt_msg_headers optional	    

        }

	

        type record Msg_status_line {

            charstring msg_type,

            charstring msg_status

        }

	

        type record Msg_account {

            charstring msg_type_account,

            charstring account_URI

        }

	

        type set of Msg_summary_line Msg_summary_line_list;

    

        type record Msg_summary_line {

            charstring msg_context_class,

            charstring msgs,

            charstring urgent_msgs optional

        }

	

        type set of charstring Opt_msg_headers;

    

        //type integer msgcount length(1); //msgs and urgent_msgs can be dividet into subtypes

    }

    



} /* end module LibSip_XMLTypes */
 
 No newline at end of file

trunk/ttcn/LibSip_Templates.ttcn

+16 −13
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ module LibSip_Templates 
	import from LibSip_Interface all;

	import from LibSip_PIXITS all;

	import from LibSip_XMLTypes all;

    import from LibSip_SMSTypes all;

    import from LibSip_SimpleMsgSummaryTypes all;

	

	group ModuleParameters {
@@ -386,7 +386,8 @@ module LibSip_Templates 
			{id:="cause", paramValue:=p_cause}

			

        template GenericParam mw_Cause (template charstring p_cause):=

            {id:=?, paramValue:= pattern "*{p_cause}*"} 

            // {id:=?, paramValue:= p_cause} 

            {id:=?, paramValue:= pattern "*{p_cause}*"} // TODO - Expression does not work for all TTCN tools



		template Authorization m_Authorization (template Credentials p_Credentials):=

		{
@@ -996,6 +997,7 @@ group dummy_templates { 
		rSeq := omit,

		reason := omit,

		recordRoute := omit,

        requestDisposition := omit,

		referredBy := omit, //*  RFC3892 - REFER method

		referTo := omit, //*  RFC3515 - REFER method

		replaces := omit, //* RFC3891
@@ -1088,6 +1090,7 @@ group dummy_templates { 
		rSeq := *,

		reason := *,

		recordRoute := *,

        requestDisposition := *,

		referredBy := *, //*  RFC3892 - REFER method

		referTo := *, //*  RFC3515 - REFER method

		replaces := *, //* RFC 3891
@@ -2682,9 +2685,9 @@ group SDP_Templates { 


} //*  end group SDP_Templates



group SMS_Templates {

group SimpleMsgSummary_Templates {

    

    template SMS m_SMS(template Msg_summary_line_list p_summaryLineList, template charstring p_uri) :=

    template SimpleMsgSummary m_SMS(template Msg_summary_line_list p_summaryLineList, template charstring p_uri) :=

    {

        msg_status_line := m_msgStatusLine_yes,

        msg_account := m_msgAccount(p_uri),
@@ -2692,7 +2695,7 @@ group SMS_Templates { 
        opt_msg_headers := omit

    }

    

    template SMS mw_SMS :=

    template SimpleMsgSummary mw_SMS :=

    {

        msg_status_line := ?,

    	msg_account := *,
@@ -2700,7 +2703,7 @@ group SMS_Templates { 
        opt_msg_headers := *

    }

    

    template SMS mw_SMS_yes :=

    template SimpleMsgSummary mw_SMS_yes :=

    {

        msg_status_line := mw_msgStatusLine_yes,

        msg_account := *,
@@ -2708,7 +2711,7 @@ group SMS_Templates { 
        opt_msg_headers := *

    }

    

    template SMS mw_SMS_yesUri :=

    template SimpleMsgSummary mw_SMS_yesUri :=

    {

        msg_status_line := mw_msgStatusLine_yes,

        msg_account := mw_msgAccount,
@@ -2716,7 +2719,7 @@ group SMS_Templates { 
        opt_msg_headers := *

    }

    

    template SMS mw_SMS_yesVoice :=

    template SimpleMsgSummary mw_SMS_yesVoice :=

    {

        msg_status_line := mw_msgStatusLine_yes,

        msg_account := *,
@@ -2724,7 +2727,7 @@ group SMS_Templates { 
        opt_msg_headers := *

    }

    

    template SMS mw_SMS_yesUriVoice :=

    template SimpleMsgSummary mw_SMS_yesUriVoice :=

    {

        msg_status_line := mw_msgStatusLine_yes,

        msg_account := mw_msgAccount,
@@ -2784,9 +2787,9 @@ group MessageBodies { 
		xmlBody := p_xmlBody

	};

	

	template MessageBody m_mBody_SMS(template SMS p_SMS):=

	template MessageBody m_mBody_SMS(template SimpleMsgSummary p_SMS):=

	{

		sms :=  p_SMS

		simpleMsgSummary :=  p_SMS

	};

	

	template MessageBody m_MBody_longPlainText:=
@@ -2827,9 +2830,9 @@ group MessageBodies { 
		xmlBody := p_xmlBody

	};

        

    template MessageBody mw_mBody_SMS(template SMS p_SMS):=

    template MessageBody mw_mBody_SMS(template SimpleMsgSummary p_SMS):=

    {

        sms :=  p_SMS

        simpleMsgSummary :=  p_SMS

    };

	

	template MessageBody mw_MBody_MIMESdpXml(template SDP_Message p_sdp, template XmlBody p_xmlBody):=