STF160 proposed modifications applied to LibSIP (7da97032) · Commits · TTCN-3 Libraries / LibSip

branches/v3/ttcn/LibSip_MessageBodyTypes.ttcn

+10 −6

Original line number	Diff line number	Diff line
		@@ -15,12 +15,17 @@ module LibSip_MessageBodyTypes {
		import from LibSip_SimpleMsgSummaryTypes all;
		import from LibSip_XMLTypes all;

		/*
		* Simple body types that can be used instead of the more detailed XML and SDP
		* without codec support
		* */
		//type charstring XmlBody;
		//type charstring SDP_Message;

		group MIMETypes {
		type union MIME_Encapsulated_Parts {
		SDP_Message sdpMessageBody,
		XmlBody
		xmlBody // if there is XML body
		XmlBody xmlBody // if there is XML body
		}

		type record MIME_Encapsulated_Part {
		@@ -54,7 +59,6 @@ module LibSip_MessageBodyTypes {
		// if content type is text/plain (for testing long messages)
		SimpleMsgSummary simpleMsgSummary,
		// RFC 3842
		octetstring
		smsMessage // encoded SMS message 3GPP 23.040, 24.011
		octetstring smsMessage // encoded SMS message 3GPP 23.040, 24.011
		}
		}

branches/v3/ttcn/LibSip_PIXITS.ttcn

+6 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,12 @@ module LibSip_PIXITS {
		/**
		* @desc charstring for SDP media attribute encoding supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_ENCODING := "PCMU/8000";
		modulepar charstring PX_SIP_SDP_ENCODING := "PCMU";

		/**
		* @desc charstring for SDP media attribute encoding clockrate supported by the IUT
		*/
		modulepar charstring PX_SIP_SDP_CLOCKRATE := "8000";

		} // group SDP Parameter
		group XMLCOnfiguration{

branches/v3/ttcn/LibSip_SDPTypes.ttcn

+74 −3

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		* @remark Adding of new attributes types is ok; Adding of new optional attributes in @see SDP_attribute type is ok; Existing attribute types shall not be changed or removed - change requests shall be made to http://t-ort.etsi.org
		*/
		module LibSip_SDPTypes {
		import from LibSip_SIPTypesAndValues all;
		group Constants {
		group SimpleConstants {
		// SDP net_type
		@@ -107,8 +108,14 @@ module LibSip_SDPTypes {
		charstring attr_value
		}

		type union SDP_attribute_fmtp_format_specific_params {
		SemicolonParam_List paramList,
		charstring unstructured
		}

		type record SDP_attribute_fmtp {
		charstring attr_value
		charstring format,
		SDP_attribute_fmtp_format_specific_params params
		}

		type record SDP_attribute_curr {
		@@ -130,12 +137,20 @@ module LibSip_SDPTypes {
		charstring direction
		}

		type record SDP_attribute_rtpmap_codec {
		charstring encoding,
		charstring clockrate,
		charstring parameters optional
		}

		type record SDP_attribute_rtpmap {
		charstring attr_value
		charstring payload_type,
		SDP_attribute_rtpmap_codec codec
		}

		type record SDP_attribute_rtcp {
		charstring attr_value
		integer portnumber,
		SDP_connection connection optional
		}

		type record SDP_attribute_msrp {
		@@ -147,6 +162,52 @@ module LibSip_SDPTypes {
		charstring attr_value optional
		}

		type record SDP_attribute_maxptime {
		charstring attr_value
		}

		type record SDP_attribute_tcap {
		integer trpr_cap_num,
		Charstring_List proto_list
		}

		type record SDP_attribute_pcfg {
		integer config_number,
		Charstring_List pot_cfg_list optional
		}

		type record SDP_attribute_acfg {
		integer config_number,
		Charstring_List sel_cfg_list optional
		}

		type record SDP_attribute_ecn_capable_rtp {
		Charstring_List init_list,
		Charstring_List parm_list optional
		}

		type record SDP_attribute_rtcp_fb {
		charstring rtcp_fb_pt,
		charstring rtcp_fb_val
		}

		type record SDP_attribute_rtcp_xr {
		Charstring_List xr_format_list optional
		}

		type record SDP_attribute_rtcp_rsize {
		}

		type record SDP_attribute_3ge2ae {
		charstring indicator
		}

		type record SDP_attribute_crypto {
		charstring tag,
		charstring crypto_suite,
		charstring key_params,
		Charstring_List session_params optional
		}

		type union SDP_attribute {
		SDP_attribute_cat cat,
		@@ -171,6 +232,16 @@ module LibSip_SDPTypes {
		SDP_attribute_rtpmap rtpmap,
		SDP_attribute_rtcp rtcp,
		SDP_attribute_msrp msrp,
		SDP_attribute_maxptime maxptime,
		SDP_attribute_tcap tcap,
		SDP_attribute_pcfg pcfg,
		SDP_attribute_acfg acfg,
		SDP_attribute_ecn_capable_rtp ecn_capable_rtp,
		SDP_attribute_rtcp_fb rtcp_fb,
		SDP_attribute_rtcp_xr rtcp_xr,
		SDP_attribute_rtcp_rsize rtcp_rsize,
		SDP_attribute_3ge2ae e2ae,
		SDP_attribute_crypto crypto,
		//* unknown has to be the last else encoding/decoding won't work!
		SDP_attribute_unknown unknown
		}

branches/v3/ttcn/LibSip_SIPTypesAndValues.ttcn

+27 −6

Original line number	Diff line number	Diff line
		@@ -161,11 +161,11 @@ module LibSip_SIPTypesAndValues {

		const integer c_CRlen := 2;
		// length of new line (0d0a)
		const GenericParam c_Integrity_protected_yes := {"integrity-protected", "yes"};
		const GenericParam c_Integrity_protected_no := {"integrity-protected", "no"};
		const GenericParam c_Integrity_protected_ip_assoc_pending := {"integrity-protected", "ip-assoc-pending"};

		const GenericParam c_Integrity_protected_yes := {"integrity-protected", {tokenOrHost := "yes"}};
		const GenericParam c_Integrity_protected_no := {"integrity-protected", {tokenOrHost := "no"}};
		const GenericParam c_Integrity_protected_ip_assoc_pending := {"integrity-protected", {tokenOrHost := "ip-assoc-pending"}};

		const charstring c_algorithm := "MD5";

		} // end group SimpleConstants

		@@ -517,7 +517,8 @@ module LibSip_SIPTypesAndValues {
		GEOLOCATION_ROUTING_E,
		SESSION_ID_E,
		SIP_ETAG_E,
		SIP_IF_MATCH_E
		SIP_IF_MATCH_E,
		FEATURE_CAPS_E
		}

		// [7.1 ]
		@@ -546,11 +547,16 @@ module LibSip_SIPTypesAndValues {
		UNKNOWN_METHOD_E
		}

		type union GenValue {
		charstring tokenOrHost,
		charstring quotedString
		}

		// [20.1, 20.3, 20.4, 20.7, 20.9, 20.10, 20.11, 20.18, 20.20, 20.27, 20.28, 20.30, 20.31,
		// 20.33, 20.34, 20.39, 20.42, 20.44 ]
		type record GenericParam {
		charstring id,
		charstring paramValue optional
		GenValue paramValue optional
		}

		// [? ]
		@@ -562,6 +568,8 @@ module LibSip_SIPTypesAndValues {
		// [? ]
		type set of GenericParam CommaParam_List;

		type set length (1..infinity) of charstring Charstring_List;

		// [20.10, 20.20, 20.30, 20.31, 20.34, 20.39, 20.42, 20.43 ]
		type record HostPort {
		charstring host optional,
		@@ -834,6 +842,11 @@ module LibSip_SIPTypesAndValues {

		type record of PrivacyValue PrivacyValue_List;

		type set of FcValue FcValue_List;
		type record FcValue {
		charstring wildcard(c_WILDCARD),
		SemicolonParam_List fcParams optional
		}


		} // end group TokensType
		@@ -961,6 +974,12 @@ module LibSip_SIPTypesAndValues {
		DeltaSec deltaSec
		}

		//[6809]
		type record FeatureCaps {
		FieldName fieldName(FEATURE_CAPS_E),
		FcValue_List fcValues
		}

		// [20.20 ]
		type record From {
		FieldName fieldName (FROM_E) ,
		@@ -1440,6 +1459,8 @@ module LibSip_SIPTypesAndValues {
		SemicolonParam_List hiExtention optional
		}

		type record of charstring StringList;

		} // end group RFC4244HeaderFieldTypes

		group RFC5009PEarlyMediaHeader {

branches/v3/ttcn/LibSip_Steps.ttcn

+113 −82

File changed.

Preview size limit exceeded, changes collapsed.