Changeset 3 for trunk

Timestamp:

Sep 16, 2016, 10:49:27 PM (8 years ago)

Author:

chronos

Message:

• Modified: Network address in each network interface should be full address not just single integer. Yet need to specify network subnets for routing.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (2 diffs)
• Forms/UFormMain.pas (modified) (1 diff)
• UNetwork.pas (modified) (15 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 458
+  Left = 262
   Height = 964
-  Top = 362
+  Top = 185
   Width = 1759
   Caption = 'ISP game'
@@ -10 +10 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
+  Position = poScreenCenter
   LCLVersion = '1.7'
+  WindowState = wsMaximized
   object PaintBox1: TPaintBox
     Left = 0

trunk/Forms/UFormMain.pas

@@ -59 +59 @@
   with Network do begin
     NodeRouter := AddRouter('router', Point(400, 300), 2, Log);
-    TNetworkInterface(NodeRouter.Interfaces[0]).Address := 1;
-    TNetworkInterface(NodeRouter.Interfaces[0]).Network := 3;
-    TNetworkInterface(NodeRouter.Interfaces[1]).Address := 8;
-    TNetworkInterface(NodeRouter.Interfaces[1]).Network := 4;
+    NodeRouter.Interfaces[0].Address := NetworkAddress([1]);
+    NodeRouter.Interfaces[0].Network := 3;
+    NodeRouter.Interfaces[1].Address := NetworkAddress([8]);;
+    NodeRouter.Interfaces[1].Network := 4;
     NodeSwitch := AddSwitch('switch', Point(200, 200), 4);
     NodeSwitch2 := AddSwitch('switch2', Point(700, 200), 4);
     NodeGeorge := AddHost('george', Point(100, 100), 1, Log);
-    TNetworkInterface(NodeGeorge.Interfaces[0]).Address := 2;
+    NodeGeorge.Interfaces[0].Address := NetworkAddress([2]);;
     NodeFranta := AddHost('franta', Point(200, 100), 1, Log);
-    TNetworkInterface(NodeFranta.Interfaces[0]).Address := 3;
+    NodeFranta.Interfaces[0].Address := NetworkAddress([3]);;
     NodeHonza := AddHost('honza', Point(300, 100), 1, Log);
-    TNetworkInterface(NodeHonza.Interfaces[0]).Address := 4;
+    NodeHonza.Interfaces[0].Address := NetworkAddress([4]);;
     NodeJakub := AddHost('jakub', Point(600, 100), 1, Log);
-    TNetworkInterface(NodeJakub.Interfaces[0]).Address := 2;
+    NodeJakub.Interfaces[0].Address := NetworkAddress([2]);;
     NodeMonika := AddHost('monika', Point(700, 100), 1, Log);
-    TNetworkInterface(NodeMonika.Interfaces[0]).Address := 3;
+    NodeMonika.Interfaces[0].Address := NetworkAddress([3]);;
 
-    TNetworkInterface(NodeFranta.Interfaces[0]).Connect(TNetworkInterface(NodeSwitch.Interfaces[1]));
-    TNetworkInterface(NodeGeorge.Interfaces[0]).Connect(TNetworkInterface(NodeSwitch.Interfaces[0]));
-    TNetworkInterface(NodeHonza.Interfaces[0]).Connect(TNetworkInterface(NodeSwitch.Interfaces[2]));
+    NodeFranta.Interfaces[0].Connect(NodeSwitch.Interfaces[1]);
+    NodeGeorge.Interfaces[0].Connect(NodeSwitch.Interfaces[0]);
+    NodeHonza.Interfaces[0].Connect(NodeSwitch.Interfaces[2]);
 
-    TNetworkInterface(NodeSwitch.Interfaces[3]).Connect(TNetworkInterface(NodeRouter.Interfaces[0]));
-    TNetworkInterface(NodeSwitch2.Interfaces[0]).Connect(TNetworkInterface(NodeRouter.Interfaces[1]));
+    NodeSwitch.Interfaces[3].Connect(NodeRouter.Interfaces[0]);
+    NodeSwitch2.Interfaces[0].Connect(NodeRouter.Interfaces[1]);
 
-    TNetworkInterface(NodeJakub.Interfaces[0]).Connect(TNetworkInterface(NodeSwitch2.Interfaces[1]));
-    TNetworkInterface(NodeMonika.Interfaces[0]).Connect(TNetworkInterface(NodeSwitch2.Interfaces[2]));
+    NodeJakub.Interfaces[0].Connect(NodeSwitch2.Interfaces[1]);
+    NodeMonika.Interfaces[0].Connect(NodeSwitch2.Interfaces[2]);
 
     NodeGeorge.Ping(NetworkAddress([1, 4]));

trunk/UNetwork.pas

@@ -19 +19 @@
     class operator Equal(A, B: TNetworkAddress): Boolean;
     function GetString: string;
+    procedure Clear;
   end;
 
@@ -44 +45 @@
   public
     Node: TNetworkNode;
-    Address: Integer;
+    Address: TNetworkAddress;
     Network: Integer;
     procedure Connect(Remote: TNetworkInterface);
@@ -50 +51 @@
     procedure SendPacket(Packet: TNetworkPacket);
     constructor Create;
+    destructor Destroy; override;
     property Remote: TNetworkInterface read FRemote
       write SetRemote;
@@ -112 +114 @@
 function NetworkAddress(AParts: array of Integer): TNetworkAddress;
 
+
 implementation
 
@@ -121 +124 @@
   for I := 0 to High(Result.Parts) do
     Result.Parts[I] := AParts[I];
-  Result.Context := 0;
 end;
 
@@ -142 +144 @@
   Result := '';
   for I := 0 to Length(Parts) - 1 do begin
-    if I = Context then Result := Result + ';'
-    else if I > 0 then Result := Result + '.';
+    if I > 0 then Result := Result + '.';
     Result := Result + IntToStr(Parts[I]);
   end;
+end;
+
+procedure TNetworkAddress.Clear;
+begin
+  SetLength(Parts, 0);
 end;
 
@@ -155 +161 @@
   I: Integer;
 begin
-  if Packet.Destination = NetworkAddress([Sender.Address]) then
+  if Packet.Destination = Sender.Address then
     DoLog(Self, 'Received ' + Packet.Data + ' from ' + Packet.Source.GetString)
   else begin
     if Length(Packet.Destination.Parts) > Packet.Destination.Context then
     for I := 0 to Interfaces.Count - 1 do
-    with TNetworkInterface(Interfaces[I]) do begin
+    with Interfaces[I] do begin
       if Network = Packet.Destination.Parts[Packet.Destination.Context + 1] then begin
         //Inc
@@ -177 +183 @@
 begin
   for I := 0 to Interfaces.Count - 1 do
-    if TNetworkInterface(Interfaces[I]) <> Sender then
-      TNetworkInterface(Interfaces[I]).SendPacket(Packet);
+    if Interfaces[I] <> Sender then
+      Interfaces[I].SendPacket(Packet);
 end;
 
@@ -263 +269 @@
   R = 30;
 begin
-  Canvas.Pen.Color := clBlack;
+  Canvas.Pen.Color := clRed;
   Canvas.Pen.Style := psSolid;
 
@@ -277 +283 @@
     for J := 0 to Interfaces.Count - 1 do
     if Assigned(Interfaces[J]) then begin
-      if Assigned(TNetworkInterface(Interfaces[J]).Remote) then begin
-        RemoteInterface := TNetworkInterface(Interfaces[J]).Remote;
+      if Assigned(Interfaces[J].Remote) then begin
+        RemoteInterface := Interfaces[J].Remote;
         RemoteNode := RemoteInterface.Node;
         RemoteInterfaceIndex := RemoteNode.Interfaces.IndexOf(RemoteInterface);
         Canvas.Line(Position.X + J * R - R * Interfaces.Count div 2 + R div 2, Position.Y,
-          RemoteInterface.Node.Position.X + RemoteInterfaceIndex * R - R * RemoteNode.Interfaces.Count div 2 + R div 2, RemoteNode.Position.Y);
+          RemoteInterface.Node.Position.X + RemoteInterfaceIndex * R - R *
+          RemoteNode.Interfaces.Count div 2 + R div 2, RemoteNode.Position.Y);
       end;
     end;
@@ -290 +297 @@
     for J := 0 to Interfaces.Count - 1 do
     if Assigned(Interfaces[J]) then begin
-      if TNetworkInterface(Interfaces[J]).Address > 0 then
-      Canvas.TextOut(Position.X + J * R - R * Interfaces.Count div 2 + R div 2 - Canvas.TextWidth(IntToStr(TNetworkInterface(Interfaces[J]).Address)) div 2,
-        Position.Y - Canvas.TextHeight(IntToStr(TNetworkInterface(Interfaces[J]).Address)) div 2,
-        IntToStr(TNetworkInterface(Interfaces[J]).Address));
-      if TNetworkInterface(Interfaces[J]).Network > 0 then
-      Canvas.TextOut(Position.X + J * R - R * Interfaces.Count div 2 + R div 2 - Canvas.TextWidth(IntToStr(TNetworkInterface(Interfaces[J]).Network)) div 2,
-        Position.Y - R - Canvas.TextHeight(IntToStr(TNetworkInterface(Interfaces[J]).Network)) div 2,
-        IntToStr(TNetworkInterface(Interfaces[J]).Network));
+      //if Interfaces[J].Address > 0 then
+      Canvas.TextOut(Position.X + J * R - R * Interfaces.Count div 2 + R div 2 - Canvas.TextWidth(Interfaces[J].Address.GetString) div 2,
+        Position.Y - Canvas.TextHeight(Interfaces[J].Address.GetString) div 2,
+        Interfaces[J].Address.GetString);
+      //if Interfaces[J].Network > 0 then
+      Canvas.TextOut(Position.X + J * R - R * Interfaces.Count div 2 + R div 2 - Canvas.TextWidth(IntToStr(Interfaces[J].Network)) div 2,
+        Position.Y - R - Canvas.TextHeight(IntToStr(Interfaces[J].Network)) div 2,
+        IntToStr(Interfaces[J].Network));
     end;
   end;
@@ -312 +319 @@
   Packet: TNetworkPacket);
 begin
-  if Packet.Destination = NetworkAddress([Sender.Address]) then
+  if Packet.Destination = Sender.Address then
     DoLog(Self, 'Received ' + Packet.Data + ' from ' + Packet.Source.GetString);
 end;
@@ -328 +335 @@
   UseInterface := TNetworkInterface(Interfaces[0]);
   NewPacket := TNetworkPacket.Create;
-  NewPacket.Source := NetworkAddress(UseInterface.Address);
+  NewPacket.Source := UseInterface.Address;
   NewPacket.Destination := Address;
   NewPacket.Data := 'ping';
@@ -340 +347 @@
   Result := TNetworkInterface.Create;
   Result.Node := Self;
-  Result.Address := 0;
+  Result.Address.Clear;
   Result.OnReceivePacket := ReceivePacket;
   Interfaces.Add(Result);
@@ -401 +408 @@
 begin
   FRemote := nil;
-  Address := 0;
+  Address.Clear;
+end;
+
+destructor TNetworkInterface.Destroy;
+begin
+  inherited Destroy;
 end;