Commit cb2d0bff authored by garciay's avatar garciay
Browse files

Add missing fields in received templates

parent 61a483ab
Loading
Loading
Loading
Loading
+37 −21
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ module LibMsrp_Templates {
                scheme := e_SCHEME 
            }, 
            authority := {
                userinfo := omit,
                host := "biloxi.example.com",
                portNumber := 12763
            }, 
@@ -231,6 +232,7 @@ module LibMsrp_Templates {
                scheme := e_SCHEME 
            }, 
            authority := {
                userinfo := omit,
                host := "atlanta.example.com",
            	portNumber := 7654
            }, 
@@ -455,12 +457,8 @@ module LibMsrp_Templates {
             *      ——-a786hjs2$
             * </pre>
             */
            template (value) SEND_request m_msrpReport_Dummy := { 
                startLine := { 
                    tagMsrp := e_MSRP, 
                    transactionID := "a786hjs2", 
                    method := REPORT_E 
                }, // End of 'startLine' field 
            template (value) SEND_request m_msrpReport_Dummy 
            modifies m_msrpSend_Dummy := { 
                headers := { 
                    toPath := m_msrpToPath_Dummy, 
                    fromPath := m_msrpFromPath_Dummy, 
@@ -468,12 +466,7 @@ module LibMsrp_Templates {
                        messageID := m_msrpMessageID_Dummy, 
                        byteRange := m_msrpByteRange_Dummy 
                    } 
                }, // End of 'headers' field 
                contentStuff := m_msrpContentStuff_Dummy, 
                endLine := { 
                    transactionID := "a786hjs2", 
                    continuationFlag := e_endMessage 
                } 
                } // End of 'headers' field 
            } // End of template m_msrpSend_Dummy
            
            /**
@@ -487,9 +480,9 @@ module LibMsrp_Templates {
            } // End of template mw_msrpSEND_any
            
            template SEND_request mw_msrpSEND_toPath_fromPath_contentType( 
                in template ToPath p_toPath,
                in template FromPath p_fromPath,
                in template MsrpContentType p_contentType
                in template (present) ToPath p_toPath,
                in template (present) FromPath p_fromPath,
                in template (present) MsrpContentType p_contentType
            ) modifies mw_msrpSEND_any := {
                headers := mw_Headers_toPath_FromPath(
                    p_toPath, 
@@ -503,12 +496,24 @@ module LibMsrp_Templates {
                startLine := mw_RequestLine_REPORT_any,
                headers := {
                    headers := {
                        messageID := *,
                        successReport := *, 
                        failureReport := *,
                        byteRange := *,
                        status := {
                        	headerName := STATUS_E, 
                            namespace := 0,
                            statusCode := c_OKCode, 
                            comment := c_OKComment
                        } // End of 'status' field
                        }, // End of 'status' field
                        expires := *,
                        minExpires := *,
                        maxExpires := *,
                        usePath := *,
                        wwwAuthenticate := *,
                        authorization := *,
                        authenticationInfo := *,
                        extHeaders := *
                    }
                } // End of 'headers' field
            } // End of template mw_msrpREPORT_success
@@ -567,8 +572,8 @@ module LibMsrp_Templates {
        } // End of template mw_msrpResponse_success
        
        template RECEIVE_response mw_msrpResponse_toPath_fromPath( 
            in template ToPath p_toPath, 
            in template FromPath p_fromPath 
            in template (present) ToPath p_toPath, 
            in template (present) FromPath p_fromPath 
        ) modifies mw_msrpResponse_success := {
            headers := { 
                toPath := p_toPath, 
@@ -577,11 +582,20 @@ module LibMsrp_Templates {
        } // End of template mw_msrpResponse_toPath_fromPath
        
        template RECEIVE_response mw_msrpResponse_toPath_fromPath_with_transferReports( // TODO Check if it it really used
            in template ToPath p_toPath, 
            in template FromPath p_fromPath 
            in template (present) ToPath p_toPath, 
            in template (present) FromPath p_fromPath 
        ) modifies mw_msrpResponse_toPath_fromPath := {
            headers := { 
                headers := {
					authenticationInfo := *,
					authorization := *,
					byteRange := *,
					expires := *,
					extHeaders := *,
					maxExpires := *,
					messageID := *,
					minExpires := *,
					status := *,
                    successReport := {
                        headerName := SUCCESS_REPORT_E,
                        reportStatus := e_YES
@@ -589,7 +603,9 @@ module LibMsrp_Templates {
                    failureReport := {
                        headerName := FAILURE_REPORT_E,
                        reportStatus := e_NO
                    }
                    },
					usePath := *,
					wwwAuthenticate := *
                } // End of 'header' field
            } // End of 'headers' field
        } // // End of template mw_msrpResponse_toPath_fromPath_with_transferReports