Commit f315c79b authored by petre's avatar petre
Browse files

toPath and fromPath headers can appear only once

parent 109b024c
Loading
Loading
Loading
Loading
+13 −33
Original line number Diff line number Diff line
@@ -305,21 +305,17 @@ module LibMsrp_Templates {
        } // End of template m_msrpByteRange_Dummy
        
        template Headers mw_Headers_any := {
            toPaths := ?, 
            fromPaths := ?, 
            headers := ? 
            toPath := ?, 
            fromPath := ?, 
            headers := * 
        } // End of template mw_Headers_any
        
        template Headers mw_Headers_toPath_FromPath(
            in template ToPath p_toPath,
            in template FromPath p_fromPath
        ) modifies mw_Headers_any := {
            toPaths := {
                p_toPath
            }, 
            fromPaths := {
                p_fromPath
            } 
            toPath := p_toPath,
            fromPath := p_fromPath
        } // End of template mw_Headers_toPath_FromPath
        
    } // End of group msrpHeaders
@@ -421,12 +417,8 @@ module LibMsrp_Templates {
                    method := SEND_E 
                }, // End of 'startLine' field 
                headers := { 
                    toPaths := { 
                        m_msrpToPath_Dummy 
                    }, 
                    fromPaths := { 
                        m_msrpFromPath_Dummy 
                    }, 
                    toPath := m_msrpToPath_Dummy, 
                    fromPath := m_msrpFromPath_Dummy, 
                    headers := { 
                        authenticationInfo := omit,
						authorization := omit,
@@ -470,12 +462,8 @@ module LibMsrp_Templates {
                    method := REPORT_E 
                }, // End of 'startLine' field 
                headers := { 
                    toPaths := { 
                        m_msrpToPath_Dummy 
                    }, 
                    fromPaths := { 
                        m_msrpFromPath_Dummy 
                    }, 
                    toPath := m_msrpToPath_Dummy, 
                    fromPath := m_msrpFromPath_Dummy, 
                    headers := { 
                        messageID := m_msrpMessageID_Dummy, 
                        byteRange := m_msrpByteRange_Dummy 
@@ -543,12 +531,8 @@ module LibMsrp_Templates {
                    comment := c_OKComment
                }, // End of 'startLine' field 
                headers := { 
                    toPaths := { 
                        m_msrpToPath_Dummy 
                    }, 
                    fromPaths := { 
                        m_msrpFromPath_Dummy 
                    }, 
                    toPath := m_msrpToPath_Dummy, 
                    fromPath := m_msrpFromPath_Dummy,
                    headers := { 
						authenticationInfo := omit,
						authorization := omit,
@@ -587,12 +571,8 @@ module LibMsrp_Templates {
            in template FromPath p_fromPath 
        ) modifies mw_msrpResponse_success := {
            headers := { 
                toPaths := { 
                    p_toPath 
                }, 
                fromPaths := { 
                    p_fromPath 
                } 
                toPath := p_toPath, 
                fromPath := p_fromPath 
            } // End of 'headers' field
        } // End of template mw_msrpResponse_toPath_fromPath
        
+2 −6
Original line number Diff line number Diff line
@@ -244,8 +244,8 @@ module LibMsrp_TypesAndValues {
        type set of ExtHeader ExtHeaderList;
        
        type record Headers {
            ToPaths toPaths,
            FromPaths fromPaths,
            ToPath toPath,
            FromPath fromPath,
            HeaderList headers optional		// for AUTH, a request with only To-Path and From-Path is valid
        } // End of type Headers

@@ -372,10 +372,6 @@ module LibMsrp_TypesAndValues {
            MsrpURIs msrpURIs
        } // End of type Path
        
        type set of ToPath ToPaths;// length (1..infinity);
        
        type set of FromPath FromPaths;// length (1..infinity);
        
    } // End of group msrpAddressing
    
    group msrpContent {