diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..59104aa2a75292999ca6203fdeceea39cfe78a80 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xsd/*.ttcn3view diff --git a/ttcn/LibSip_Templates.ttcn b/ttcn/LibSip_Templates.ttcn index 115a7e2a14c8b5a0f11e3933a8f37562e1b90dfb..aa50f55947b33f245ed417ef228f6d32659809af 100644 --- a/ttcn/LibSip_Templates.ttcn +++ b/ttcn/LibSip_Templates.ttcn @@ -451,7 +451,7 @@ module LibSip_Templates { } template(present) SipUrl mw_SipUrl_Host( - template charstring p_host + template(present) charstring p_host := ? ) modifies mw_SipUrl := { components := { sip := { @@ -463,7 +463,7 @@ module LibSip_Templates { template(present) SipUrl mw_SipUrl_User_Host( template(present) charstring p_user := ?, - template charstring p_host + template(present) charstring p_host := ? ) modifies mw_SipUrl := { components := { sip := { @@ -474,7 +474,7 @@ module LibSip_Templates { } } }, - urlParameters := {m_UserPhone} + urlParameters := * // FSCOM Strange {m_UserPhone} } template(present) SipUrl mw_SipUrl_Anonymous modifies mw_SipUrl := { @@ -560,7 +560,7 @@ module LibSip_Templates { } } }, - urlParameters := {m_UserPhone}, + urlParameters := *, // FSCOM: Strange: {m_UserPhone}, headers := * } } @@ -580,6 +580,12 @@ module LibSip_Templates { addrSpecUnion := mw_SipUrl_User_Host(p_user, p_host) } + template(present) Addr_Union mw_AddrUnion_TelUrl( + template(present) charstring p_number := ? + ) := { + addrSpecUnion := mw_TelSipUrl_Number(p_number) + } + } //* end group Subfields @@ -626,6 +632,13 @@ module LibSip_Templates { body := {p_credentials} } + template(present) Authorization mw_Authorization( + template(present) Credentials p_credentials := ? + ) := { + fieldName := AUTHORIZATION_E, + body := {p_credentials} + } + template(value) Authorization m_Authorization_digest( template(value) CommaParam_List p_commaParam_List ) := { @@ -1156,7 +1169,7 @@ module LibSip_Templates { template(present) To mw_To_NameAddr_SipUrl( template DisplayName p_dn, template(present) charstring p_user := ?, - template charstring p_host + template charstring p_host := ? ) := { fieldName := TO_E, addressField := (mw_AddrUnion_Nameaddr(p_dn, p_user, p_host), mw_AddrUnion_SipUrl(p_user, p_host)), @@ -1378,6 +1391,7 @@ module LibSip_Templates { geolocation := omit, geolocationRouting := omit, historyInfo := omit, //* RFC4244 + infoPackage := omit, inReplyTo := omit, maxForwards := c_maxForwards70, mimeVersion := omit, @@ -1406,6 +1420,7 @@ module LibSip_Templates { rSeq := omit, reason := omit, recordRoute := omit, + recvInfo := omit, requestDisposition := omit, referredBy := omit, //* RFC3892 - REFER method referTo := omit, //* RFC3515 - REFER method @@ -1435,7 +1450,12 @@ module LibSip_Templates { via := c_empty_Via, warning := omit, wwwAuthenticate := omit, - undefinedHeader_List := omit + resourcePriority := omit, + answerMode := omit, + privAnswerMode := omit, + targetDialog := omit, + pAnswerState := omit, + undefinedHeader_List := omit } @@ -1479,6 +1499,7 @@ module LibSip_Templates { geolocation := *, geolocationRouting := *, historyInfo := *, //* RFC4244 + infoPackage := *, inReplyTo := *, maxForwards := *, mimeVersion := *, @@ -1507,6 +1528,7 @@ module LibSip_Templates { rSeq := *, reason := *, recordRoute := *, + recvInfo := *, requestDisposition := *, referredBy := *, //* RFC3892 - REFER method referTo := *, //* RFC3515 - REFER method @@ -1536,6 +1558,11 @@ module LibSip_Templates { via := ?, warning := *, wwwAuthenticate := *, + resourcePriority := *, + answerMode := *, + privAnswerMode := *, + targetDialog := *, + pAnswerState := *, undefinedHeader_List := * } @@ -1791,17 +1818,21 @@ module LibSip_Templates { } template(value) ContentType m_contentType( - template(value) charstring p_mTypeSubtype + template(value) charstring p_mTypeSubtype, + template(omit) SemicolonParam_List p_mParams := omit ) := { fieldName := CONTENT_TYPE_E, - mTypeSubtype := p_mTypeSubtype + mTypeSubtype := p_mTypeSubtype, + mParams := p_mParams } template(present) ContentType mw_contentType( - in template(present) charstring p_mTypeSubtype := ? + in template(present) charstring p_mTypeSubtype := ?, + in template SemicolonParam_List p_mParams := * ) := { fieldName := CONTENT_TYPE_E, - mTypeSubtype := p_mTypeSubtype + mTypeSubtype := p_mTypeSubtype, + mParams := p_mParams } group request_send { @@ -2193,25 +2224,25 @@ module LibSip_Templates { group request_receive { template(present) ACK_Request mw_ACK_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_ACK_Dummy := { msgHeader := {callId := p_callId} } template(present) BYE_Request mw_BYE_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_BYE_Dummy := { msgHeader := {callId := p_callId} } template(present) CANCEL_Request mw_CANCEL_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_CANCEL_Dummy := { msgHeader := {callId := p_callId} } template(present) INFO_Request mw_INFO_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_INFO_Dummy := { msgHeader := {callId := p_callId} } @@ -2221,37 +2252,37 @@ module LibSip_Templates { template(present) MESSAGE_Request mw_MESSAGE_Request_Base modifies mw_MESSAGE_Dummy := {msgHeader := {contact := *}} template(present) NOTIFY_Request mw_NOTIFY_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_NOTIFY_Dummy := { msgHeader := {callId := p_callId} } template(present) OPTIONS_Request mw_OPTIONS_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_OPTIONS_Dummy := { msgHeader := {callId := p_callId} } template(present) PRACK_Request mw_PRACK_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_PRACK_Dummy := { msgHeader := {callId := p_callId} } template(present) PUBLISH_Request mw_PUBLISH_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_PUBLISH_Dummy := { msgHeader := {callId := p_callId} } template(present) REFER_Request mw_REFER_Request_Base( - template CallId p_callId + template CallId p_callId := ? ) modifies mw_REFER_Dummy := { msgHeader := {callId := p_callId} } template(present) REFER_Request mw_REFER_Request( - template CallId p_callId, + template CallId p_callId := ?, template(value) SipUrl p_requestUri, template(value) SipUrl p_referredBy ) modifies mw_REFER_Request_Base := { @@ -2330,8 +2361,8 @@ module LibSip_Templates { template(present) Response mw_Response_Base( template(present) StatusLine p_statusLine := ?, - template CallId p_callId, - template CSeq p_cSeq + template CallId p_callId := *, + template CSeq p_cSeq := * ) modifies mw_Response_Dummy := { statusLine := p_statusLine, msgHeader := { @@ -2378,9 +2409,9 @@ module LibSip_Templates { } } - template(present) Response mw_Response_2xx_Base( - template CallId p_callId, - template CSeq p_cSeq + template (present) Response mw_Response_2xx_Base( + template (present) CallId p_callId := ?, + template (present) CSeq p_cSeq := ? ) modifies mw_Response_1xx_Base := { statusLine := mw_statusLine2xx } @@ -3742,11 +3773,13 @@ module LibSip_Templates { { content_type := c_sdpApplication, content_disposition := omit, + content_id := omit, mime_encapsulated_part := {sdpMessageBody := p_sdp} }, { content_type := c_ims3gppCwApplication, content_disposition := omit, + content_id := omit, mime_encapsulated_part := {xmlBody := p_xmlBody} } } @@ -3762,6 +3795,7 @@ module LibSip_Templates { { content_type := "application/sdp", content_disposition := "attachment;handling=required;filename=smime.p7", + content_id := omit, mime_encapsulated_part := {sdpMessageBody := p_sdp} } } @@ -3796,11 +3830,13 @@ module LibSip_Templates { { content_type := ?, content_disposition := *, + content_id := *, mime_encapsulated_part := {sdpMessageBody := p_sdp} }, { content_type := ?, content_disposition := *, + content_id := *, mime_encapsulated_part := {xmlBody := p_xmlBody} } } @@ -3818,6 +3854,7 @@ module LibSip_Templates { { content_type := c_ims3gppApplication, content_disposition := p_disposition, + content_id := *, mime_encapsulated_part := {xmlBody := {ims3gpp := p_ims3gpp}} }, * @@ -3836,6 +3873,7 @@ module LibSip_Templates { { content_type := c_ims3gppCwApplication, content_disposition := p_disposition, + content_id := *, mime_encapsulated_part := {xmlBody := {ims3gpp := p_ims3gpp}} }, *