From f6e991c61fd1174770b4da58e7353c7452b33ca3 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 18 Sep 2019 19:43:28 +0200 Subject: Revert "MGCP: fix pattern warning" For me this change causes MGCP parsing errors: setverdict(fail): pass -> fail reason: "Could not extract parameters for code "C"" Apparently the \r is after all necessary to parse MGCP. Maybe the '\r' is implicit when an '\n' occurs, but the non-SDP part of MGCP has *only* '\r' line breaks. This reverts commit a9a52fff15227710e1a3a2e6222a388a3da11168. Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e --- library/MGCP_Types.ttcn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn index 6febc51c..b56734cf 100644 --- a/library/MGCP_Types.ttcn +++ b/library/MGCP_Types.ttcn @@ -54,7 +54,7 @@ module MGCP_Types { MgcpVersion ver } with { variant "SEPARATOR(' ', '[\t ]+')" - variant "END('\n', '([\n])|(\n)')" + variant "END('\r\n', '([\r\n])|(\r\n)')" } type record MgcpParameter { @@ -63,7 +63,7 @@ module MGCP_Types { } with { variant "BEGIN('')" variant "SEPARATOR(': ', ':[\t ]+')" - variant "END('\n', '([\n])|(\n)')" + variant "END('\r\n', '([\r\n])|(\r\n)')" } type set of MgcpParameter MgcpParameterList with { @@ -76,7 +76,7 @@ module MGCP_Types { SDP_Message sdp optional } with { variant "BEGIN('')" - variant (sdp) "BEGIN('\n','([\n])|(\n)')" + variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')" } external function enc_MgcpCommand(in MgcpCommand id) return charstring @@ -90,7 +90,7 @@ module MGCP_Types { charstring string optional } with { variant "SEPARATOR(' ', '[\t ]+')" - variant "END('\n', '([\n])|(\n)')" + variant "END('\r\n', '([\r\n])|(\r\n)')" } type record MgcpResponse { @@ -99,7 +99,7 @@ module MGCP_Types { SDP_Message sdp optional } with { variant "BEGIN('')" - variant (sdp) "BEGIN('\n','([\n])|(\n)')" + variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')" } external function enc_MgcpResponse(in MgcpResponse id) return charstring -- cgit v1.2.3