Change in ...osmo-ttcn3-hacks[master]: Revert "MGCP: fix pattern warning"

[neels]

neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570 )

Change subject: Revert "MGCP: fix pattern warning"
......................................................................

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
---
M library/MGCP_Types.ttcn
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  neels: Looks good to me, approved



diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn
index 6febc51..b56734c 100644
--- a/library/MGCP_Types.ttcn
+++ b/library/MGCP_Types.ttcn
@@ -54,7 +54,7 @@
 		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 @@
 	} 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 @@
 		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 @@
 		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 @@
 		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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15570
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I81d105b951590310c67f14f0b5d0c2777e206c5e
Gerrit-Change-Number: 15570
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190918/7191b015/attachment.htm>