[Javanetsim-cvs] javaNetSim/core ApplicationLayerDevice.java, 1.13, 1.14 CommandProcessor.java, 1.3
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/core ApplicationLayerDevice.java, 1.13, 1.14 CommandProcessor.java, 1.38, 1.39
|
From: QweR <qw...@us...> - 2008-10-29 19:36:38
|
Update of /cvsroot/javanetsim/javaNetSim/core In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12987/core Modified Files: ApplicationLayerDevice.java CommandProcessor.java Log Message: dhcp exclude was added some commands was fixed Index: CommandProcessor.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/CommandProcessor.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** CommandProcessor.java 27 Oct 2008 21:22:11 -0000 1.38 --- CommandProcessor.java 29 Oct 2008 19:36:20 -0000 1.39 *************** *** 282,286 **** commands.add("telnet", telnet_Command, "Open a telnet connection"); commands.add("telnet-server", telnet_server_Command, "Enable TELNET server; Specify server port"); ! commands.add("no telnet-server", telnet_server_Command, "Disable TELNET server"); commands.add("username", username_Command, "Add User"); commands.add("vlan", vlan_Command, "Create VLAN"); --- 282,286 ---- commands.add("telnet", telnet_Command, "Open a telnet connection"); commands.add("telnet-server", telnet_server_Command, "Enable TELNET server; Specify server port"); ! //commands.add("no telnet-server", telnet_server_Command, "Disable TELNET server"); commands.add("username", username_Command, "Add User"); commands.add("vlan", vlan_Command, "Create VLAN"); *************** *** 405,409 **** class clock_set_CommandClass extends CommandInterface{ public clock_set_CommandClass (){ ! modes = new Modes(CommandInterface.STD_CONF_MODE, CommandInterface.NETWORK_LAYER, CommandInterface.CALL_ONLY); call_params = "<hh:mm:ss> <1-31> <1-12> <1970-2100>"; } --- 405,409 ---- class clock_set_CommandClass extends CommandInterface{ public clock_set_CommandClass (){ ! modes = new Modes(CommandInterface.STD_CONF_MODE, CommandInterface.NO_LAYER, CommandInterface.CALL_ONLY); call_params = "<hh:mm:ss> <1-31> <1-12> <1970-2100>"; } *************** *** 506,539 **** } }; - class location_CommandClass extends CommandInterface{ - public location_CommandClass(){ - modes = new Modes(CommandInterface.CONF_MODE, CommandInterface.NO_LAYER, CommandInterface.NO_CALL); - call_params = "<cr>"; - } - public String call(Vector<String> params){ - String out = ""; - if(params.size()>=1){ - String desc = params.get(1); - for(int i=1; i<params.size(); i++){ - desc += " "+params.get(i); - } - device.location = desc; - } - else{ - out += "error: invalid parameters\n"; - } - return out; - } - public String no_call(Vector<String> params){ - String out = ""; - if(params.size()==0){ - device.location = ""; - } - else{ - out += "error: invalid parameters\n"; - } - return out; - } - }; class reload_CommandClass extends CommandInterface{ public reload_CommandClass(){ --- 506,509 ---- *************** *** 2004,2008 **** } //device.getConfig().add("ip access-list "+iacl+" "+permit_deny+" "+hosts); ! if((IPV4Address.validateDecIP(ip) || ip.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask)){ if(add){ device.getACL().addACL(iacl, iline, action, ip, mask, log); --- 1974,1978 ---- } //device.getConfig().add("ip access-list "+iacl+" "+permit_deny+" "+hosts); ! if((IPV4Address.isValidIp(ip) || ip.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask)){ if(add){ device.getACL().addACL(iacl, iline, action, ip, mask, log); *************** *** 2163,2168 **** if(port >= 0){ ! if((IPV4Address.validateDecIP(ip1) || ip1.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask1) && ! (IPV4Address.validateDecIP(ip2) || ip2.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask2)){ if(port==0 || (protocol == AccessListEngine.access_list.TCP || protocol == AccessListEngine.access_list.UDP)){ if(add){ --- 2133,2138 ---- if(port >= 0){ ! if((IPV4Address.isValidIp(ip1) || ip1.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask1) && ! (IPV4Address.isValidIp(ip2) || ip2.compareTo("0.0.0.0")==0) && IPV4Address.validateDecSubnetMask(mask2)){ if(port==0 || (protocol == AccessListEngine.access_list.TCP || protocol == AccessListEngine.access_list.UDP)){ if(add){ *************** *** 2224,2228 **** String poolname = params.get(0); String defrouter = params.get(1); ! if(IPV4Address.validateDecIP(defrouter)){ if(!dhcpd.pools.containsKey(poolname)){ dhcpd.pools.put(poolname, dhcpd.new_pool()); --- 2194,2198 ---- String poolname = params.get(0); String defrouter = params.get(1); ! if(IPV4Address.isValidIp(defrouter)){ if(!dhcpd.pools.containsKey(poolname)){ dhcpd.pools.put(poolname, dhcpd.new_pool()); *************** *** 2456,2460 **** String low_ip = params.get(0); String high_ip = params.get(1); ! if(IPV4Address.validateDecIP(low_ip) && IPV4Address.validateDecIP(high_ip)){ dhcpd.excludeAddress(low_ip, high_ip); } --- 2426,2430 ---- String low_ip = params.get(0); String high_ip = params.get(1); ! if(IPV4Address.isValidIp(low_ip) && IPV4Address.isValidIp(high_ip)){ dhcpd.excludeAddress(low_ip, high_ip); } *************** *** 2484,2488 **** String low_ip = params.get(0); String high_ip = params.get(1); ! if(IPV4Address.validateDecIP(low_ip) && IPV4Address.validateDecIP(high_ip)){ dhcpd.no_excludeAddress(low_ip, high_ip); } --- 2454,2458 ---- String low_ip = params.get(0); String high_ip = params.get(1); ! if(IPV4Address.isValidIp(low_ip) && IPV4Address.isValidIp(high_ip)){ dhcpd.no_excludeAddress(low_ip, high_ip); } *************** *** 2628,2632 **** public ip_dns_server_CommandClass(){ modes = new Modes(CommandInterface.CONF_MODE, CommandInterface.APPLICATION_LAYER, CommandInterface.NO_CALL); ! call_params = "(<port>|<cr>)"; no_call_params = "<cr>"; } --- 2598,2602 ---- public ip_dns_server_CommandClass(){ modes = new Modes(CommandInterface.CONF_MODE, CommandInterface.APPLICATION_LAYER, CommandInterface.NO_CALL); ! call_params = "[<port>]"; no_call_params = "<cr>"; } *************** *** 2707,2711 **** String first = params.get(0); String second = params.get(1); ! if(IPV4Address.validateDecIP(first) && DNS.isValidName(second)){ if(add) dns.addRecord(DNS.toInAddrArpa(first), second, DNS_Message.PTR_QUERY_TYPE); --- 2677,2681 ---- String first = params.get(0); String second = params.get(1); ! if(IPV4Address.isValidIp(first) && DNS.isValidName(second)){ if(add) dns.addRecord(DNS.toInAddrArpa(first), second, DNS_Message.PTR_QUERY_TYPE); *************** *** 2713,2717 **** dns.removeRecord(DNS.toInAddrArpa(first), second, DNS_Message.PTR_QUERY_TYPE); } ! else if(IPV4Address.validateDecIP(second) && DNS.isValidName(first)){ if(add) dns.addRecord(first, second, DNS_Message.A_QUERY_TYPE); --- 2683,2687 ---- dns.removeRecord(DNS.toInAddrArpa(first), second, DNS_Message.PTR_QUERY_TYPE); } ! else if(IPV4Address.isValidIp(second) && DNS.isValidName(first)){ if(add) dns.addRecord(first, second, DNS_Message.A_QUERY_TYPE); *************** *** 2866,2870 **** if(params.size()==1){ String ns = params.get(0); ! if(IPV4Address.validateDecIP(ns)){ ((ApplicationLayerDevice)device).setNameServer(ns); } --- 2836,2840 ---- if(params.size()==1){ String ns = params.get(0); ! if(IPV4Address.isValidIp(ns)){ ((ApplicationLayerDevice)device).setNameServer(ns); } *************** *** 3098,3102 **** valid = false; } ! if(valid && IPV4Address.validateDecIP(local_ip) && IPV4Address.validateDecIP(global_ip)){ if(add){ NAT_rule rule = device.getNAT().new NAT_rule(); --- 3068,3072 ---- valid = false; } ! if(valid && IPV4Address.isValidIp(local_ip) && IPV4Address.isValidIp(global_ip)){ if(add){ NAT_rule rule = device.getNAT().new NAT_rule(); *************** *** 3156,3160 **** String low_ip = params.get(1); String high_ip = params.get(2); ! if(IPV4Address.validateDecIP(low_ip) && IPV4Address.validateDecIP(high_ip)){ device.getNAT().addPool(poolname, new Pair(low_ip,high_ip)); } --- 3126,3130 ---- String low_ip = params.get(1); String high_ip = params.get(2); ! if(IPV4Address.isValidIp(low_ip) && IPV4Address.isValidIp(high_ip)){ device.getNAT().addPool(poolname, new Pair(low_ip,high_ip)); } *************** *** 3300,3303 **** --- 3270,3304 ---- } }; + class location_CommandClass extends CommandInterface{ + public location_CommandClass(){ + modes = new Modes(CommandInterface.CONF_MODE, CommandInterface.NO_LAYER, CommandInterface.NO_CALL); + call_params = "<location>"; + no_call_params = "<cr>"; + } + public String call(Vector<String> params){ + String out = ""; + if(params.size()>=1){ + String desc = params.get(1); + for(int i=1; i<params.size(); i++){ + desc += " "+params.get(i); + } + device.location = desc; + } + else{ + out += "error: invalid parameters\n"; + } + return out; + } + public String no_call(Vector<String> params){ + String out = ""; + if(params.size()==0){ + device.location = ""; + } + else{ + out += "error: invalid parameters\n"; + } + return out; + } + }; class router_rip_CommandClass extends CommandInterface{ public router_rip_CommandClass(){ *************** *** 4556,4560 **** } }; - class vlan_CommandClass extends CommandInterface{ public vlan_CommandClass(){ --- 4557,4560 ---- Index: ApplicationLayerDevice.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/ApplicationLayerDevice.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ApplicationLayerDevice.java 26 Oct 2008 22:02:46 -0000 1.13 --- ApplicationLayerDevice.java 29 Oct 2008 19:36:20 -0000 1.14 *************** *** 112,116 **** public boolean setNameServer(String ns){ ! if(IPV4Address.validateDecIP(ns)){ nameServer = ns; return true; --- 112,116 ---- public boolean setNameServer(String ns){ ! if(IPV4Address.isValidIp(ns)){ nameServer = ns; return true; |
