Changeset 3 for trunk/Forms

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/Forms

Files:

• UFormMain.lfm (modified) (2 diffs)
• UFormMain.pas (modified) (1 diff)

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]));