[Javanetsim-cvs] javaNetSim/core AccessListEngine.java, 1.8, 1.9 Laptop.java, 1.2, 1.3 Version.java
Status: Beta
Brought to you by:
darkkey
From: Alexander B. <da...@us...> - 2009-02-13 09:18:39
|
Update of /cvsroot/javanetsim/javaNetSim/core In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21599/core Modified Files: AccessListEngine.java Laptop.java Version.java Log Message: Index: Laptop.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Laptop.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Laptop.java 24 Oct 2008 16:18:48 -0000 1.2 --- Laptop.java 13 Feb 2009 09:18:27 -0000 1.3 *************** *** 67,86 **** - /** - - * A PC is considered to be a client PC in a network which only has one NetworkInterface. The addInterface - - * method of the inherited Node class is overridden to only allow one NetworkInterface to be added. - - * @author tristan_veness - - * @since 13 June 2004 - - * @version v0.10 - - */ - - - class Laptop extends ApplicationLayerDevice { --- 67,70 ---- *************** *** 90,99 **** private static final long serialVersionUID = -8692117217516199205L; - /** - * Constructs a PC with the specified name. - * @author tristan_veness - * @param inName - A name to give the new PC Node. eg: PC1 - * @version v0.10 - */ public Laptop(String inName, boolean inOn) { super(inName,7, inOn); --- 74,77 ---- Index: Version.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/Version.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Version.java 26 Oct 2008 15:37:40 -0000 1.17 --- Version.java 13 Feb 2009 09:18:27 -0000 1.18 *************** *** 40,55 **** */ public class Version { ! public final static String CORE_VERSION = "v0.40"; //version of the simulation core ! public final static String YEARS = "2005 - 2008"; public static final String TEAM_MEMBERS[] = { ! "http://sf.net/projects/javanetsim","release date: 1 Nov 2008", "", "fork of jFirewallSim project (http://sf.net/projects/jfirewallsim/)", "from 03 Nov 2005","", ! "Alexander Bolshev [Key]", "Project Leader / Developer / Maintainer", ! "Konstantin Karpov [QweR]", "Developer / Tester", ! "","Contributors & Old Developers:", "Ilgar Alekperov [Gift]", "\t First version of TCP, Echo TCP, Export to HTML, Testing & Bugfixing", ! "Igor Goroshkov", "\t RIP protocol core & GUI", "", "If you found a bug, please post it to: http://sf.net/tracker/?atid=784685&group_id=152576", --- 40,58 ---- */ public class Version { ! public final static String CORE_VERSION = "v0.41"; //version of the simulation core ! public final static String YEARS = "2005 - 2009"; public static final String TEAM_MEMBERS[] = { ! "http://sf.net/projects/javanetsim","release date: 12 Feb 2009", "", "fork of jFirewallSim project (http://sf.net/projects/jfirewallsim/)", "from 03 Nov 2005","", ! "Maintainer", ! "Alexander Bolshev [Key]", ! "","Contributors & Other Developers:", ! "Konstantin Karpov [QweR]", "\t Developer / Tester", ! "Anatoly Chekh [achekh]", "\t OSPF, Testing & Bugfixing", "Ilgar Alekperov [Gift]", "\t First version of TCP, Echo TCP, Export to HTML, Testing & Bugfixing", ! "Igor Goroshkov", "\t RIP protocol core & GUI", ! "Oleg Listov [listov]", "\t DNS", "", "If you found a bug, please post it to: http://sf.net/tracker/?atid=784685&group_id=152576", Index: AccessListEngine.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/AccessListEngine.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AccessListEngine.java 16 Dec 2008 15:14:23 -0000 1.8 --- AccessListEngine.java 13 Feb 2009 09:18:27 -0000 1.9 *************** *** 9,13 **** import core.protocolsuite.tcp_ip.TCP_packet; import core.protocolsuite.tcp_ip.UDP_packet; ! /** * --- 9,13 ---- import core.protocolsuite.tcp_ip.TCP_packet; import core.protocolsuite.tcp_ip.UDP_packet; ! /** * *************** *** 229,233 **** || temp_acl.protocol==protocol) && IPV4Address.IPandMask(binNetwork1, binMask1).equals(IPV4Address.IPandMask(binIP1,binMask1)) && ! (binNetwork2==null || (binIP2!=null && IPV4Address.IPandMask(binNetwork2, binMask2).equals(IPV4Address.IPandMask(binIP2,binMask2)))) && (temp_acl.Port2 == 0 || temp_acl.Port2 == port2) --- 229,233 ---- || temp_acl.protocol==protocol) && IPV4Address.IPandMask(binNetwork1, binMask1).equals(IPV4Address.IPandMask(binIP1,binMask1)) && ! (binNetwork2==null || (binIP2!=null && IPV4Address.IPandMask(binNetwork2, binMask2).equals(IPV4Address.IPandMask(binIP2,binMask2)))) && (temp_acl.Port2 == 0 || temp_acl.Port2 == port2) |