Changeset 412

Timestamp:

Aug 16, 2012, 10:46:01 AM (12 years ago)

Author:

chronos

Message:

• Fixed: Telnet Com Port option now working without telnet option negotiation.

Location:

PinConnection

Files:

• UCommTelnet.pas (modified) (5 diffs)
• UCommTelnetComPortOption.pas (modified) (3 diffs)

PinConnection/UCommTelnet.pas

@@ -85 +85 @@
     PortType: TTelnetPortType;
     ErrorCount: Integer;
+    OptionsNegotationEnable: Boolean;
     procedure Register(Option: TTelnetOption);
     procedure Unregister(Option: TTelnetOption);
@@ -147 +148 @@
   I: Integer;
 begin
-  CheckOption;
+  if Telnet.OptionsNegotationEnable then CheckOption;
   try
     RequestData := TBinarySerializer.Create;
@@ -158 +159 @@
     RequestData.WriteByte(Byte(Code));
     RequestData.WriteList(Request, 0, Request.Count);
-    Telnet.SendCommand(tcSB, RequestData.List, ResponseData.List);
-    if ResponseData.List[0] <> Byte(Code) then
-      raise Exception.Create(SWrongResponseOption);
-    ResponseData.List.Delete(0);
-    Response.Assign(ResponseData.List);
+    if Assigned(Response) then begin
+      Telnet.SendCommand(tcSB, RequestData.List, ResponseData.List);
+      if ResponseData.List[0] <> Byte(Code) then
+        raise Exception.Create(SWrongResponseOption);
+      ResponseData.List.Delete(0);
+      Response.Assign(ResponseData.List);
+    end else Telnet.SendCommand(tcSB, RequestData.List, nil);
   finally
     RequestData.Free;
-    RequestData.Free;
+    ResponseData.Free;
   end;
 end;
@@ -201 +204 @@
   FActive := AValue;
   for I := 0 to Options.Count - 1 do
-    TTelnetOption(Options[I]).Active := AValue;
+  with TTelnetOption(Options[I]) do begin
+    if (not ServerChecked) and OptionsNegotationEnable then CheckOption;
+    Active := AValue;
+  end;
 end;
 
@@ -224 +230 @@
       end else
       if FState = tsIAC then begin
+        if Data = Byte(tcIAC) then begin
+          RawData.WriteByte(Data);
+          FState := tsNormal;
+        end else
         if Data = Byte(tcSB) then begin
           // Subnegotation

PinConnection/UCommTelnetComPortOption.pas

@@ -88 +88 @@
 begin
   inherited;
-  //SetBaudRate(FBaudRate);
-  //SetDTR(FDTR);
-  //SetRTS(FRTS);
+  if AValue then begin
+    SetBaudRate(FBaudRate);
+    SetDTR(FDTR);
+    SetRTS(FRTS);
+  end;
 end;
 
@@ -101 +103 @@
   try
     Request := TBinarySerializer.Create;
+    Request.Endianness := enBig;
     Request.List := TListByte.Create;
     Request.OwnsList := True;
@@ -121 +124 @@
     Request.List := TListByte.Create;
     Request.OwnsList := True;
+    Request.Endianness := enBig;
     Response := TBinarySerializer.Create;
     Response.List := TListByte.Create;
     Response.OwnsList := True;
+    Response.Endianness := enBig;
     Request.WriteByte(Byte(cpcSetBaudRate));
     Request.WriteCardinal(0);