Changeset 19

Timestamp:

May 14, 2010, 6:59:30 AM (15 years ago)

Author:

george

Message:

• Upraveno: Robustnější dekódování z řetězce.
• Přidáno: Metoda Assign pro přiřazení hodnoty do jiné proměnné.

File:

• IPAddress/UIPAddress.pas (modified) (4 diffs)

IPAddress/UIPAddress.pas

@@ -1 +1 @@
 unit UIPAddress;
+
+// Date: 2010-05-14
 
 {$mode objfpc}{$H+}
@@ -19 +21 @@
     procedure SetString(Value: string);
     constructor Create;
+    procedure Assign(Source: TObject);
     property AsString: string read GetString write SetString;
   end;
@@ -41 +44 @@
 var
   Part: string;
+  Octet: Integer;
+  TempValue: Integer;
 begin
   if Pos('/', Value) > 0 then begin
-    Prefix := StrToInt(Copy(Value, Pos('/', Value) + 1, Length(Value)));
+    if TryStrToInt(Copy(Value, Pos('/', Value) + 1, Length(Value)), TempValue) then
+      Prefix := TempValue else Prefix := 32;
     Delete(Value, Pos('/', Value), Length(Value));
   end else Prefix := 32;
-  Part := Copy(Value, 1, Pos('.', Value) - 1);
-  Delete(Value, 1, Pos('.', Value));
-  Address := Cardinal(StrToInt(Part) and $ff) shl 24;
-  Part := Copy(Value, 1, Pos('.', Value) - 1);
-  Delete(Value, 1, Pos('.', Value));
-  Address := Address or Cardinal((StrToInt(Part) and $ff) shl 16);
-  Part := Copy(Value, 1, Pos('.', Value) - 1);
-  Delete(Value, 1, Pos('.', Value));
-  Address := Address or Cardinal((StrToInt(Part) and $ff) shl 8);
-  Address := Address or Cardinal((StrToInt(Value) and $ff) shl 0);
+  if Pos('.', Value) > 0 then begin
+    Part := Copy(Value, 1, Pos('.', Value) - 1);
+    Delete(Value, 1, Pos('.', Value));
+    if TryStrToInt(Part, TempValue) then Octet := TempValue
+      else Octet := 0;
+    Address := Address or Cardinal((Octet and $ff) shl 24);
+  end;
+  if Pos('.', Value) > 0 then begin
+    Part := Copy(Value, 1, Pos('.', Value) - 1);
+    Delete(Value, 1, Pos('.', Value));
+    if TryStrToInt(Part, TempValue) then Octet := TempValue
+      else Octet := 0;
+    Address := Address or Cardinal((Octet and $ff) shl 16);
+  end;
+  if Pos('.', Value) > 0 then begin
+    Part := Copy(Value, 1, Pos('.', Value) - 1);
+    Delete(Value, 1, Pos('.', Value));
+    if TryStrToInt(Part, TempValue) then Octet := TempValue
+      else Octet := 0;
+    Address := Address or Cardinal((Octet and $ff) shl 8);
+  end;
+  if TryStrToInt(Value, TempValue) then Octet := TempValue
+    else Octet := 0;
+  Address := Address or Cardinal((Octet and $ff) shl 0);
 end;
 
@@ -64 +84 @@
 end;
 
+procedure TIPAddress.Assign(Source: TObject);
+begin
+  if Source is TIPAddress then begin
+    Address := TIPAddress(Source).Address;
+    Prefix := TIPAddress(Source).Prefix;
+  end;
+end;
+
 end.