Merge branch 'master' of https://github.com/thomas-v2/S7CommPlusDriver

# Conflicts:
#	src/S7CommPlusDriver/S7CommPlusConnection.cs
#	src/S7CommPlusDriver/S7CommPlusDriver.csproj
#	src/S7CommPlusGUIBrowser/Form1.Designer.cs
#	src/S7CommPlusGUIBrowser/Form1.cs
#	src/S7CommPlusGUIBrowser/Form1.resx

Author: jogibear9988

src/DriverTest/Program.cs

@@ -16,6 +16,7 @@ static void Main(string[] args)
         {
             string HostIp = "10.0.98.100";
             string Password = "";
+            string Username = "";
             int res;
             List<ItemAddress> readlist = new List<ItemAddress>();
             Console.WriteLine("Main - START");
@@ -29,10 +30,15 @@ static void Main(string[] args)
             {
                 Password = args[1];
             }
+            // Als Parameter lässt sich der Username übergeben, sonst Default-Wert von oben (kein Username)
+            if (args.Length >= 3)
+            {
+                Username = args[2];
+            }
             Console.WriteLine("Main - Versuche Verbindungsaufbau zu: " + HostIp);
 
             S7CommPlusConnection conn = new S7CommPlusConnection();
-            res = conn.Connect(HostIp, Password);
+            res = conn.Connect(HostIp, Password, Username);
             if (res == 0)
             {
                 Console.WriteLine("Main - Connect fertig");

src/S7CommPlusDriver/Core/Ids.cs

@@ -41,6 +41,7 @@ public static class Ids
         public const int ServerSessionRequest = 303;
         public const int ServerSessionResponse = 304;
         public const int ServerSessionVersion = 306;
+        public const int LID_SessionVersionSystemPAOMString = 319;
         public const int ClassTypeInfo = 511;
         public const int ClassOMSTypeInfoContainer = 534;
         public const int ObjectOMSTypeInfoContainer = 537;
@@ -54,6 +55,7 @@ public static class Ids
         public const int SystemLimits = 1037;
         public const int SubscriptionRouteMode = 1040;
         public const int SubscriptionActive = 1041;
+        public const int Legitimate = 1846;
         public const int SubscriptionReferenceList = 1048;
         public const int SubscriptionCycleTime = 1049;
         public const int SubscriptionDelayTime = 1050;
@@ -148,6 +150,10 @@ public static class Ids
         public const int AlarmSubscriptionRef_AlarmTextLanguages_Rid = 8181;
         public const int AlarmSubscriptionRef_SendAlarmTexts_Rid = 8173;
         public const int ReturnValue = 40305;
+        public const int LID_LegitimationPayloadStruct = 40400;
+        public const int LID_LegitimationPayloadType = 40401;
+        public const int LID_LegitimationPayloadUsername = 40402;
+        public const int LID_LegitimationPayloadPassword = 40403;
 
         public const uint ReleaseMngmtRoot_Rid = 2303328256;
 

src/S7CommPlusDriver/Core/AccessLevel.cs …mmPlusDriver/Legitimation/AccessLevel.cssrc/S7CommPlusDriver/Core/AccessLevel.cs renamed to src/S7CommPlusDriver/Legitimation/AccessLevel.cs src/S7CommPlusDriver/Core/AccessLevel.cs renamed to src/S7CommPlusDriver/Legitimation/AccessLevel.cs

@@ -4,8 +4,10 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace S7CommPlusDriver.Core {
-    public static class AccessLevel {
+namespace S7CommPlusDriver.Legitimation
+{
+    public static class AccessLevel 
+    {
         public const UInt32 FullAccess = 1;
         public const UInt32 ReadAccess = 2;
         public const UInt32 HMIAccess = 3;