ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

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 a9a52fff15.

Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
This commit is contained in:
Neels Hofmeyr 2019-09-18 19:43:28 +02:00
parent a9a52fff15
commit f6e991c61f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/MGCP_Types.ttcn
View File

@ -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