Fixed regex for plc type detection

Ich-Eben · Ich-Eben · commit cdaad8a97d52 · 2025-04-09T17:54:59.000+02:00
diff --git a/src/S7CommPlusDriver/Legitimation/Legitimation.cs b/src/S7CommPlusDriver/Legitimation/Legitimation.cs
@@ -25,7 +25,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna
         {
             // Parse device and firmware version
             string sessionVersionPAOMString = ((ValueWString)serverSession.GetStructElement((uint)Ids.LID_SessionVersionSystemPAOMString)).GetValue();
-            Regex reVersions = new Regex("^.*;.*(1[52]\\d\\d).+;S(\\d\\.\\d)$");
+            Regex reVersions = new Regex("^.*;.*[17]\\s?([52]\\d\\d).+;[VS](\\d\\.\\d)$");
             Match m = reVersions.Match(sessionVersionPAOMString);
             if (!m.Success)
             {
@@ -39,7 +39,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna
 
             // Check if we have to use legacy legitimation via the firmware version
             bool legacyLegitimation = false;
-            if (deviceVersion.StartsWith("15"))
+            if (deviceVersion.StartsWith("5"))
             {
                 if (fwVerNo < 209)
                 {
@@ -51,7 +51,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna
                     legacyLegitimation = true;
                 }
             }
-            else if (deviceVersion.StartsWith("12"))
+            else if (deviceVersion.StartsWith("2"))
             {
                 if (fwVerNo < 403)
                 {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna`
`25`	`25`	`{`
`26`	`26`	`// Parse device and firmware version`
`27`	`27`	`string sessionVersionPAOMString = ((ValueWString)serverSession.GetStructElement((uint)Ids.LID_SessionVersionSystemPAOMString)).GetValue();`
`28`		`- Regex reVersions = new Regex("^.;.(1[52]\\d\\d).+;S(\\d\\.\\d)$");`
	`28`	`+ Regex reVersions = new Regex("^.;.[17]\\s?([52]\\d\\d).+;[VS](\\d\\.\\d)$");`
`29`	`29`	`Match m = reVersions.Match(sessionVersionPAOMString);`
`30`	`30`	`if (!m.Success)`
`31`	`31`	`{`
`@@ -39,7 +39,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna`
`39`	`39`
`40`	`40`	`// Check if we have to use legacy legitimation via the firmware version`
`41`	`41`	`bool legacyLegitimation = false;`
`42`		`- if (deviceVersion.StartsWith("15"))`
	`42`	`+ if (deviceVersion.StartsWith("5"))`
`43`	`43`	`{`
`44`	`44`	`if (fwVerNo < 209)`
`45`	`45`	`{`
`@@ -51,7 +51,7 @@ private int legitimate(ValueStruct serverSession, string password, string userna`
`51`	`51`	`legacyLegitimation = true;`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- else if (deviceVersion.StartsWith("12"))`
	`54`	`+ else if (deviceVersion.StartsWith("2"))`
`55`	`55`	`{`
`56`	`56`	`if (fwVerNo < 403)`
`57`	`57`	`{`