Changeset 440 for PinConnection/UCommTelnet.pas

Timestamp:

Nov 19, 2012, 2:43:40 PM (12 years ago)

Author:

chronos

Message:

• Fixed: Thread safe access to serial port pin interface using lock.

File:

• PinConnection/UCommTelnet.pas (modified) (8 diffs)

PinConnection/UCommTelnet.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UCommPin, SpecializedList, DateUtils, UStreamHelper,
-  SpecializedStream, UBinarySerializer;
+  Classes, SysUtils, UCommPin, SpecializedList, DateUtils, Dialogs,
+  UBinarySerializer;
 
 type
@@ -74 +74 @@
     FState: TTelnetState;
     FCommandData: TBinarySerializer;
-    procedure SetActive(AValue: Boolean);
     procedure TelnetDataReceive(Sender: TCommPin; Stream: TListByte);
     procedure RawDataReceive(Sender: TCommPin; Stream: TListByte);
@@ -80 +79 @@
     function ResponseCount: Integer;
   protected
+    procedure SetActive(const AValue: Boolean); override;
     procedure AssignTo(Dest: TPersistent); override;
   public
@@ -153 +153 @@
     RequestData.Free;
   end;
+  Result := SupportedByServer;
 end;
 
@@ -159 +160 @@
   RequestData: TBinarySerializer;
   ResponseData: TBinarySerializer;
-  I: Integer;
 begin
   if Telnet.OptionsNegotationEnable then CheckOption;
@@ -210 +210 @@
 end;
 
-procedure TCommTelnet.SetActive(AValue: Boolean);
+procedure TCommTelnet.SetActive(const AValue: Boolean);
 var
   I: Integer;
@@ -376 +376 @@
 end;
 
+function ByteToStr(Value: Byte): string;
+begin
+  Result := IntToStr(Value);
+end;
+
 procedure TCommTelnet.SendCommand(Code: TTelnetCode; Request,
   Response: TListByte);
@@ -405 +410 @@
       if Code = tcSB then begin
         if (Response[Response.Count - 2] <> Byte(tcIAC)) or
-        (Response[Response.Count - 1] <> Byte(tcSE)) then
+        (Response[Response.Count - 1] <> Byte(tcSE)) then begin
+          ShowMessage(Response.Implode(' ', ByteToStr));
+          ReadResponse(Response);
+          ShowMessage(Response.Implode(' ', ByteToStr));
           raise Exception.Create(SWrongResponse);
+        end;
         Response.DeleteItems(Response.Count - 2, 2);
       end;
       // Remove IAC escape character from data
       I := 0;
+      LastIAC := False;
       while (I < Response.Count) do begin
         if Response[I] = Byte(tcIAC) then begin