[Javanetsim-cvs] javaNetSim/tests lab1_v1.jfst,1.1,1.2 lab1_v1_ready.jfst,1.1,1.2 rtest.jfst,1.1,1.2
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/tests lab1_v1.jfst,1.1,1.2 lab1_v1_ready.jfst,1.1,1.2 rtest.jfst,1.1,1.2 tes10.jfst,1.1,1.2 test1.jfst,1.1,1.2 test2.jfst,1.1,1.2 test3.jfst,1.1,1.2 test4.jfst,1.1,1.2 test5.jfst,1.1,1.2 test6.jfst,1.1,1.2 test7.jfst,1.1,1.2 test8.jfst,1.1,1.2
|
From: Alexander B. <da...@us...> - 2005-12-08 18:07:50
|
Update of /cvsroot/javanetsim/javaNetSim/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13963/tests Modified Files: lab1_v1.jfst lab1_v1_ready.jfst rtest.jfst tes10.jfst test1.jfst test2.jfst test3.jfst test4.jfst test5.jfst test6.jfst test7.jfst test8.jfst Log Message: Hub bug FIX, new save file format, route tables s/l and more... Index: lab1_v1.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/lab1_v1.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lab1_v1.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- lab1_v1.jfst 8 Dec 2005 18:07:39 -0000 1.2 *************** *** 8,29 **** eth3|null||| eth4|null||| r3 GuiRouter 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null ! eth1|r3-TO-pc4|null|0.0.0.0|null R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-PC2|129.64.127.253|255.255.0.0|192.168.100.2 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.0.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 Hub1 GuiHub --- 8,35 ---- eth3|null||| eth4|null||| + 0 r3 GuiRouter 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null|18:41:30:AA:22:22|100.0 ! eth1|r3-TO-pc4|null|0.0.0.0|null|5F:C0:1F:3A:3B:5A|100.0 ! 0 R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|46:44:79:9E:56:A7|100.0 ! eth1|R2-TO-PC2|129.64.127.253|255.255.0.0|192.168.100.2|84:B2:83:5D:B8:76|100.0 ! 1 ! default|192.168.100.2|255.255.255.0|0|eth0 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.0.0|192.168.100.1|80:77:28:96:83:96|100.0 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|39:12:B9:93:44:35|100.0 ! 1 ! default|192.168.100.1|255.255.255.0|0|eth0 Hub1 GuiHub *************** *** 35,58 **** eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.0.0|null PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|128.64.127.254|255.255.0.0|10.0.0.1 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.0.0|129.64.128.7 hub3 GuiHub --- 41,71 ---- eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| + 0 pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null|9F:AB:BF:15:26:45|100.0 ! 0 PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.0.0|null|B2:9B:26:29:15:88|100.0 ! 0 PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|128.64.127.254|255.255.0.0|10.0.0.1|3B:B5:19:3F:40:35|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.0.0|129.64.128.7|1D:AF:88:57:B4:54|100.0 ! 1 ! default|129.64.128.7|255.255.0.0|0|eth0 hub3 GuiHub *************** *** 64,65 **** --- 77,79 ---- eth3|null||| eth4|null||| + 0 Index: test8.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test8.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test8.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test8.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 3,52 **** 351,154 2 ! eth0|Hub1-TO-Router1|192.168.0.1|255.255.255.0|192.168.0.1 ! eth1|Router1-TO-Hub2|10.0.0.1|255.0.0.0|192.168.0.1 Hub2 GuiHub 450,200 ! 4 eth0|Router1-TO-Hub2||| eth1|Hub2-TO-PC4||| eth2|Hub2-TO-PC5||| eth3|Hub2-TO-PC6||| Hub1 GuiHub 250,200 ! 4 eth0|PC1-TO-Hub1||| eth1|PC2-TO-Hub1||| eth2|PC3-TO-Hub1||| eth3|Hub1-TO-Router1||| PC6 GuiPC 600,300 1 ! eth0|Hub2-TO-PC6|10.0.0.4|255.0.0.0|10.0.0.1 PC5 GuiPC 600,200 1 ! eth0|Hub2-TO-PC5|10.0.0.3|255.0.0.0|10.0.0.1 PC4 GuiPC 444,47 1 ! eth0|Hub2-TO-PC4|10.0.0.2|255.0.0.0|10.0.0.1 PC3 GuiPC 100,300 1 ! eth0|PC3-TO-Hub1|192.168.0.4|255.255.255.0|192.168.0.1 PC2 GuiPC 100,200 1 ! eth0|PC2-TO-Hub1|192.168.0.3|255.255.255.0|192.168.0.1 PC1 GuiPC 100,100 1 ! eth0|PC1-TO-Hub1|192.168.0.2|255.255.255.0|192.168.0.1 --- 3,70 ---- 351,154 2 ! eth0|Hub1-TO-Router1|192.168.0.1|255.255.255.0|192.168.0.1|5E:9D:95:13:7D:AD|100.0 ! eth1|Router1-TO-Hub2|10.0.0.1|255.0.0.0|192.168.0.1|C0:1C:94:1E:B0:2B|100.0 ! 1 ! default|192.168.0.1|255.255.255.0|0|eth0 Hub2 GuiHub 450,200 ! 5 eth0|Router1-TO-Hub2||| eth1|Hub2-TO-PC4||| eth2|Hub2-TO-PC5||| eth3|Hub2-TO-PC6||| + eth4|null||| + 0 Hub1 GuiHub 250,200 ! 5 eth0|PC1-TO-Hub1||| eth1|PC2-TO-Hub1||| eth2|PC3-TO-Hub1||| eth3|Hub1-TO-Router1||| + eth4|null||| + 0 PC6 GuiPC 600,300 1 ! eth0|Hub2-TO-PC6|10.0.0.4|255.0.0.0|10.0.0.1|5C:6B:42:4C:8C:3F|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC5 GuiPC 600,200 1 ! eth0|Hub2-TO-PC5|10.0.0.3|255.0.0.0|10.0.0.1|B7:7C:B0:63:78:26|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC4 GuiPC 444,47 1 ! eth0|Hub2-TO-PC4|10.0.0.2|255.0.0.0|10.0.0.1|41:29:54:5A:4B:48|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC3 GuiPC 100,300 1 ! eth0|PC3-TO-Hub1|192.168.0.4|255.255.255.0|192.168.0.1|90:57:89:19:46:55|100.0 ! 1 ! default|192.168.0.1|255.255.255.0|0|eth0 PC2 GuiPC 100,200 1 ! eth0|PC2-TO-Hub1|192.168.0.3|255.255.255.0|192.168.0.1|4F:91:9B:36:9C:B1|100.0 ! 1 ! default|192.168.0.1|255.255.255.0|0|eth0 PC1 GuiPC 100,100 1 ! eth0|PC1-TO-Hub1|192.168.0.2|255.255.255.0|192.168.0.1|18:30:53:48:1A:7B|100.0 ! 1 ! default|192.168.0.1|255.255.255.0|0|eth0 Index: test2.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test2.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test2.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test2.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 1,30 **** - Hub1 - GuiHub - 228,191 - 4 - eth0|PC1-TO-Hub1||| - eth1|Hub1-TO-R1||| - eth2|null||| - eth3|null||| R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 PC2 GuiPC 623,198 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1 --- 1,40 ---- R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|61:3A:34:AA:25:16|100.0 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2|A2:2A:55:20:75:42|100.0 ! 1 ! default|192.168.100.2|255.255.255.0|0|eth0 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1|21:B6:1B:AF:27:8E|100.0 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|AD:7A:C6:B1:57:C6|100.0 ! 1 ! default|192.168.100.1|255.255.255.0|0|eth0 ! Hub1 ! GuiHub ! 228,191 ! 5 ! eth0|PC1-TO-Hub1||| ! eth1|Hub1-TO-R1||| ! eth2|null||| ! eth3|null||| ! eth4|null||| ! 0 PC2 GuiPC 623,198 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1|14:6A:68:89:3F:A8|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1|A9:22:B4:C6:BA:51|100.0 ! 1 ! default|172.168.0.1|255.255.0.0|0|eth0 Index: test5.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test5.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test5.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test5.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 3,8 **** 357,330 2 ! eth0|Hub1-TO-r3|172.168.0.10|255.255.0.0|172.168.0.10 ! eth1|r3-TO-pc3|192.168.6.1|255.255.255.0|172.168.0.10 Hub1 GuiHub --- 3,10 ---- 357,330 2 ! eth0|Hub1-TO-r3|172.168.0.10|255.255.0.0|172.168.0.10|11:B1:58:38:39:4A|100.0 ! eth1|r3-TO-pc3|192.168.6.1|255.255.255.0|172.168.0.10|95:96:77:9F:5C:2C|100.0 ! 1 ! default|172.168.0.10|255.255.0.0|0|eth0 Hub1 GuiHub *************** *** 14,42 **** eth3|null||| eth4|null||| R2 GuiRouter 544,78 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2 R1 GuiRouter 362,79 2 ! eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 PC2 GuiPC 623,198 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1 ! pc3 ! GuiPC ! 545,360 1 ! eth0|r3-TO-pc3|192.168.6.2|255.255.255.0|192.168.6.1 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1 --- 16,55 ---- eth3|null||| eth4|null||| + 0 R2 GuiRouter 544,78 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|11:6E:14:1F:41:A1|100.0 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2|AC:9C:BB:4B:C1:93|100.0 ! 1 ! default|192.168.100.2|255.255.255.0|0|eth0 R1 GuiRouter 362,79 2 ! eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1|4B:BC:8E:1E:1B:C6|100.0 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|52:54:2F:4B:2F:1E|100.0 ! 1 ! default|192.168.100.1|255.255.255.0|0|eth0 PC2 GuiPC 623,198 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1|A4:BF:81:4A:46:7F|100.0 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1|40:69:1F:6B:75:66|100.0 ! 1 ! default|172.168.0.1|255.255.0.0|0|eth0 ! pc3 ! GuiPC ! 545,360 ! 1 ! eth0|r3-TO-pc3|192.168.6.2|255.255.255.0|192.168.6.1|82:1A:74:17:89:C5|100.0 ! 1 ! default|192.168.6.1|255.255.255.0|0|eth0 Index: rtest.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/rtest.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rtest.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- rtest.jfst 8 Dec 2005 18:07:39 -0000 1.2 *************** *** 1,2 **** --- 1,26 ---- + R3 + GuiRouter + 392,219 + 2 + eth0|Hub1-TO-R3|172.168.0.3|255.254.0.0|10.0.0.3|A9:19:67:54:91:43|100.0 + eth1|R3-TO-Hub2|10.0.0.3|255.0.0.0|10.0.0.3|BD:51:73:39:6A:79|100.0 + 1 + default|10.0.0.3|255.0.0.0|0|eth0 + R2 + GuiRouter + 512,92 + 2 + eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|2E:93:BE:26:AF:61|100.0 + eth1|R2-TO-Hub2|10.0.0.1|255.0.0.0|192.168.100.2|76:4E:1B:85:11:2B|100.0 + 1 + default|192.168.100.2|255.255.255.0|0|eth0 + R1 + GuiRouter + 363,69 + 2 + eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1|16:94:5A:59:24:6C|100.0 + eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|7C:6C:62:7E:1F:1E|100.0 + 1 + default|192.168.100.1|255.255.255.0|0|eth0 Hub2 GuiHub *************** *** 8,11 **** --- 32,36 ---- eth3|null||| eth4|null||| + 0 Hub1 GuiHub *************** *** 17,46 **** eth3|null||| eth4|null||| ! R3 ! GuiRouter ! 392,219 ! 2 ! eth0|Hub1-TO-R3|172.168.0.3|255.254.0.0|10.0.0.3 ! eth1|R3-TO-Hub2|10.0.0.3|255.0.0.0|10.0.0.3 ! R2 ! GuiRouter ! 512,92 ! 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-Hub2|10.0.0.1|255.0.0.0|192.168.100.2 ! R1 ! GuiRouter ! 363,69 ! 2 ! eth0|Hub1-TO-R1|172.168.0.1|255.254.0.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 PC2 GuiPC 657,157 1 ! eth0|PC2-TO-Hub2|10.0.0.2|255.0.0.0|10.0.0.1 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1 --- 42,58 ---- eth3|null||| eth4|null||| ! 0 PC2 GuiPC 657,157 1 ! eth0|PC2-TO-Hub2|10.0.0.2|255.0.0.0|10.0.0.1|69:43:55:B8:77:9F|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|172.168.0.2|255.254.0.0|172.168.0.1|7D:3A:8D:2E:11:3F|100.0 ! 1 ! default|172.168.0.1|255.255.0.0|0|eth0 Index: tes10.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/tes10.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tes10.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- tes10.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 1,17 **** MyPC GuiPC 120,95 1 ! eth0|MyPC-TO-D-Link|10.0.0.12|255.255.255.240|10.0.0.1 ! MyPcNb ! GuiPC ! 117,285 1 ! eth0|MyPcNb-TO-D-Link|10.0.0.10|255.255.255.240|null Server GuiPC 546,125 1 ! eth0|D-Link-TO-Server|10.0.0.1|255.255.255.240|null D-Link GuiHub --- 1,21 ---- + MyPcNb + GuiPC + 117,285 + 1 + eth0|MyPcNb-TO-D-Link|10.0.0.10|255.255.255.240|null|B2:96:9E:24:16:49|100.0 + 0 MyPC GuiPC 120,95 1 ! eth0|MyPC-TO-D-Link|10.0.0.12|255.255.255.240|10.0.0.1|4B:32:7F:A1:31:90|100.0 1 ! default|10.0.0.1|255.0.0.0|0|eth0 Server GuiPC 546,125 1 ! eth0|D-Link-TO-Server|10.0.0.1|255.255.255.240|null|8C:46:3C:9B:3C:31|100.0 ! 0 D-Link GuiHub *************** *** 23,24 **** --- 27,29 ---- eth3|null||| eth4|null||| + 0 Index: test1.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test1.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test1.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test1.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 3,10 **** 447,157 1 ! eth0|pc1-TO-pc2|192.168.0.2|255.255.255.0|null pc1 GuiPC 156,126 1 ! eth0|pc1-TO-pc2|192.168.0.1|255.255.255.0|null --- 3,12 ---- 447,157 1 ! eth0|pc1-TO-pc2|192.168.0.2|255.255.255.0|null|3E:82:32:A8:19:6B|100.0 ! 0 pc1 GuiPC 156,126 1 ! eth0|pc1-TO-pc2|192.168.0.1|255.255.255.0|null|5B:B3:8F:55:27:34|100.0 ! 0 Index: lab1_v1_ready.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/lab1_v1_ready.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lab1_v1_ready.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- lab1_v1_ready.jfst 8 Dec 2005 18:07:39 -0000 1.2 *************** *** 3,20 **** 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null ! eth1|r3-TO-pc4|null|0.0.0.0|null R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-PC2|129.64.127.253|255.255.128.0|192.168.100.2 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.128.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 Hub1 GuiHub --- 3,25 ---- 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null|44:43:A8:64:53:30|100.0 ! eth1|r3-TO-pc4|null|0.0.0.0|null|8E:8C:24:C4:29:47|100.0 ! 0 R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|B0:3B:82:82:28:89|100.0 ! eth1|R2-TO-PC2|129.64.127.253|255.255.128.0|192.168.100.2|8C:60:7F:83:A2:26|100.0 ! 1 ! default|192.168.100.2|255.255.255.0|0|eth0 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.128.0|192.168.100.1|BB:20:14:3F:AF:33|100.0 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|63:91:64:3A:AC:15|100.0 ! 1 ! default|192.168.100.1|255.255.255.0|0|eth0 Hub1 GuiHub *************** *** 26,49 **** eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.128.0|null PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|129.64.127.254|255.255.128.0|129.64.127.253 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.128.0|129.64.128.7 hub3 GuiHub --- 31,61 ---- eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| + 0 pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null|C6:BA:C7:3D:45:32|100.0 ! 0 PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.128.0|null|2F:79:94:70:C1:6E|100.0 ! 0 PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|129.64.127.254|255.255.128.0|129.64.127.253|44:2D:8D:93:2A:5D|100.0 ! 1 ! default|129.64.127.253|255.255.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.128.0|129.64.128.7|7D:6F:17:A3:25:2A|100.0 ! 1 ! default|129.64.128.7|255.255.0.0|0|eth0 hub3 GuiHub *************** *** 55,56 **** --- 67,69 ---- eth3|null||| eth4|null||| + 0 Index: test6.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test6.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test6.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test6.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 3,5 **** 117,101 1 ! eth0|null|null|0.0.0.0|0.0.0.0 --- 3,7 ---- 117,101 1 ! eth0|null|null|0.0.0.0|0.0.0.0|31:C1:86:9A:38:7D|100.00 ! 1 ! default|0.0.0.0|null|0|eth0 Index: test7.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test7.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test7.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test7.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 8,29 **** eth3|null||| eth4|null||| r3 GuiRouter 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null ! eth1|r3-TO-pc4|null|0.0.0.0|null R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.0.0|192.168.100.1 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1 Hub1 GuiHub --- 8,35 ---- eth3|null||| eth4|null||| + 0 r3 GuiRouter 430,212 2 ! eth0|Hub1-TO-r3|129.64.128.3|255.255.128.0|null|AD:57:87:8A:A5:82|100.0 ! eth1|r3-TO-pc4|null|0.0.0.0|null|B6:26:47:12:18:7E|100.0 ! 0 R2 GuiRouter 512,92 2 ! eth0|R1-TO-R2|192.168.100.1|255.255.255.0|192.168.100.2|B0:9C:68:42:3D:C4|100.0 ! eth1|R2-TO-PC2|10.0.0.1|255.0.0.0|192.168.100.2|70:2F:90:24:86:78|100.0 ! 1 ! default|192.168.100.2|255.255.255.0|0|eth0 R1 GuiRouter 363,69 2 ! eth0|Hub1-TO-R1|129.64.128.7|255.255.0.0|192.168.100.1|A1:58:35:7C:1D:BB|100.0 ! eth1|R1-TO-R2|192.168.100.2|255.255.255.0|192.168.100.1|68:85:80:68:82:32|100.0 ! 1 ! default|192.168.100.1|255.255.255.0|0|eth0 Hub1 GuiHub *************** *** 35,58 **** eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.128.0|null PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.128.0|129.64.128.7 hub3 GuiHub --- 41,71 ---- eth3|Hub1-TO-hub3||| eth4|Hub1-TO-r3||| + 0 pc4 GuiPC 612,213 1 ! eth0|r3-TO-pc4|null|0.0.0.0|null|5F:41:3A:56:C5:8C|100.0 ! 0 PC3 GuiPC 385,355 1 ! eth0|hub3-TO-PC3|129.64.128.2|255.255.128.0|null|49:BD:9B:21:8E:30|100.0 ! 0 PC2 GuiPC 628,31 1 ! eth0|R2-TO-PC2|10.0.0.2|255.0.0.0|10.0.0.1|B9:20:7C:4A:C7:65|100.0 ! 1 ! default|10.0.0.1|255.0.0.0|0|eth0 PC1 GuiPC 97,178 1 ! eth0|PC1-TO-Hub1|129.64.128.1|255.255.128.0|129.64.128.7|4B:4D:5B:30:B2:35|100.0 ! 1 ! default|129.64.128.7|255.255.0.0|0|eth0 hub3 GuiHub *************** *** 64,65 **** --- 77,79 ---- eth3|null||| eth4|null||| + 0 Index: test3.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test3.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test3.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test3.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 1,2 **** --- 1,18 ---- + R2 + GuiRouter + 472,264 + 2 + eth0|Hub1-TO-R2|10.0.0.2|255.0.0.0|192.168.1.2|3A:5D:74:AB:5A:74|100.0 + eth1|R2-TO-Hub2|192.168.1.2|255.255.255.0|192.168.1.2|69:41:99:5E:BC:A5|100.0 + 1 + default|192.168.1.2|255.255.255.0|0|eth0 + R1 + GuiRouter + 464,80 + 2 + eth0|Hub1-TO-R1|10.0.0.1|255.0.0.0|192.168.1.1|B9:7C:93:2B:7D:42|100.0 + eth1|R1-TO-Hub2|192.168.1.1|255.255.255.0|192.168.1.1|BE:83:7E:A1:37:48|100.0 + 1 + default|192.168.1.1|255.255.255.0|0|eth0 Hub2 GuiHub *************** *** 8,11 **** --- 24,28 ---- eth3|null||| eth4|null||| + 0 Hub1 GuiHub *************** *** 17,40 **** eth3|null||| eth4|null||| ! R2 ! GuiRouter ! 472,264 ! 2 ! eth0|Hub1-TO-R2|10.0.0.2|255.0.0.0|192.168.1.2 ! eth1|R2-TO-Hub2|192.168.1.2|255.255.255.0|192.168.1.2 ! R1 ! GuiRouter ! 464,80 ! 2 ! eth0|Hub1-TO-R1|10.0.0.1|255.0.0.0|192.168.1.1 ! eth1|R1-TO-Hub2|192.168.1.1|255.255.255.0|192.168.1.1 PC1 GuiPC 151,212 1 ! eth0|PC1-TO-Hub1|10.0.0.3|255.0.0.0|10.0.0.1 ! pc2 ! GuiPC ! 793,190 1 ! eth0|Hub2-TO-pc2|192.168.1.3|255.255.255.0|192.168.1.2 --- 34,50 ---- eth3|null||| eth4|null||| ! 0 ! pc2 ! GuiPC ! 793,190 ! 1 ! eth0|Hub2-TO-pc2|192.168.1.3|255.255.255.0|192.168.1.2|49:57:52:AC:45:5C|100.0 ! 1 ! default|192.168.1.2|255.255.255.0|0|eth0 PC1 GuiPC 151,212 1 ! eth0|PC1-TO-Hub1|10.0.0.3|255.0.0.0|10.0.0.1|13:AE:8F:A3:BF:2E|100.0 1 ! default|10.0.0.1|255.0.0.0|0|eth0 Index: test4.jfst =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/tests/test4.jfst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test4.jfst 1 Dec 2005 14:59:10 -0000 1.1 --- test4.jfst 8 Dec 2005 18:07:40 -0000 1.2 *************** *** 3,16 **** 457,179 2 ! eth0|pc1-TO-r1|129.64.127.254|255.255.128.0|129.64.128.1 ! eth1|r1-TO-pc2|129.64.128.1|255.255.128.0|129.64.128.1 pc2 GuiPC 309,23 1 ! eth0|r1-TO-pc2|129.64.128.2|255.255.128.0|129.64.128.1 pc1 GuiPC 192,197 1 ! eth0|pc1-TO-r1|129.64.127.253|255.255.128.0|129.64.127.254 --- 3,22 ---- 457,179 2 ! eth0|pc1-TO-r1|129.64.127.254|255.255.128.0|129.64.128.1|2C:5D:4E:5B:4A:42|100.0 ! eth1|r1-TO-pc2|129.64.128.1|255.255.128.0|129.64.128.1|24:69:23:3C:16:5F|100.0 ! 1 ! default|129.64.128.1|255.255.0.0|0|eth0 pc2 GuiPC 309,23 1 ! eth0|r1-TO-pc2|129.64.128.2|255.255.128.0|129.64.128.1|29:62:24:66:A9:4D|100.0 ! 1 ! default|129.64.128.1|255.255.0.0|0|eth0 pc1 GuiPC 192,197 1 ! eth0|pc1-TO-r1|129.64.127.253|255.255.128.0|129.64.127.254|7A:5E:A5:C2:A6:3C|100.0 ! 1 ! default|129.64.127.254|255.255.0.0|0|eth0 |
