Changeset 68 for trunk/Components/CoolWeb/Common/UHtmlClasses.pas

Timestamp:

Dec 26, 2011, 12:07:37 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Testování varianty HTTP serveru jako přímé obsluhy přes TCP. Momentálně není odděleno generování stránek pro použití z více vláken.
• Upraveno: Třída uchování jména počítač nyní pro převod do IPv4 používá ověření správnosti namísto přímého převodu a zahlášení výjimky.

File:

• trunk/Components/CoolWeb/Common/UHtmlClasses.pas (modified) (6 diffs)

trunk/Components/CoolWeb/Common/UHtmlClasses.pas

@@ -9 +9 @@
 
 type
+
+  { TDomainAddress }
+
   TDomainAddress = class(TPersistent)
   private
@@ -14 +17 @@
     procedure SetAsString(const Value: string);
   public
-    Levels: array of string;
+    Levels: TListString;
+    constructor Create;
+    destructor Destroy; override;
     property AsString: string read GetAsString write SetAsString;
   end;
 
   TAddrClass = (acA, acB, acC, acD, acE);
+
+  { TIpAddress }
 
   TIpAddress = class(TPersistent)
@@ -32 +39 @@
     Octets: array[0..3] of Byte;
     procedure Assign(Source: TPersistent); override;
+    function IsAddressString(Value: string): Boolean;
     property AsCardinal: Cardinal read GetAsCardinal write SetAsCardinal;
     property AsString: string read GetAsString write SetAsString;
@@ -589 +597 @@
 end;
 
+function TIpAddress.IsAddressString(Value: string): Boolean;
+var
+  Parts: TListString;
+begin
+  Result := True;
+  try
+    Parts := TListString.Create;
+    Parts.Explode(Value, '.', StrToStr);
+    if Parts.Count = 4 then begin
+      if (StrToInt(Parts[3]) < 0) or (StrToInt(Parts[3]) > 255) then Result := False;
+      if (StrToInt(Parts[2]) < 0) or (StrToInt(Parts[2]) > 255) then Result := False;
+      if (StrToInt(Parts[1]) < 0) or (StrToInt(Parts[1]) > 255) then Result := False;
+      if (StrToInt(Parts[0]) < 0) or (StrToInt(Parts[0]) > 255) then Result := False;
+    end else Result := False;
+  finally
+    Parts.Free;
+  end;
+end;
+
 function TIpAddress.GetAddrClass: TAddrClass;
 begin
@@ -704 +731 @@
 
 function TDomainAddress.GetAsString: string;
-var
-  I: Integer;
-begin
-  Result := '';
-  for I := High(Levels) downto 0 do Result := Result + '.' + Levels[I];
-  Delete(Result, 1, 1);
+begin
+  try
+    Levels.Reverse;
+    Result := Levels.Implode('.', StrToStr);
+  finally
+    Levels.Reverse;
+  end;
 end;
 
 procedure TDomainAddress.SetAsString(const Value: string);
-var
-  StrArray: TListString;
-  I: Integer;
-begin
-  try
-    StrArray := TListString.Create;
-    StrArray.Explode(Value, '.', StrToStr);
-    SetLength(Levels, StrArray.Count);
-    for I := 0 to StrArray.Count - 1 do
-      Levels[StrArray.Count - 1 - I] := StrArray[I];
-  finally
-    StrArray.Free;
-  end;
+begin
+  Levels.Explode(Value, '.', StrToStr);
+  Levels.Reverse;
+end;
+
+constructor TDomainAddress.Create;
+begin
+  Levels := TListString.Create;
+end;
+
+destructor TDomainAddress.Destroy;
+begin
+  Levels.Free;
+  inherited Destroy;
 end;
 
@@ -792 +821 @@
 procedure THostAddress.SetAsString(const Value: string);
 begin
-  State := asIpAddress;
-  try
+  if IpAddress.IsAddressString(Value) then begin
+    State := asIpAddress;
     IpAddress.AsString := Value;
-  except
-    on EConvertError do State := asDomainName;
-  end;
-  if State = asDomainName then DomainName.AsString := Value;
+  end else begin
+    State := asDomainName;
+    DomainName.AsString := Value;
+  end;
 end;