[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPC.java, 1.3, 1.4 DHCPD.java, 1.5, 1.6 Pro
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPC.java, 1.3, 1.4 DHCPD.java, 1.5, 1.6 ProtocolStack.java, 1.62, 1.63 SNMP.java, 1.26, 1.27 Tcp.java, 1.103, 1.104 Telnet_server.java, 1.21, 1.22
Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8566/core/protocolsuite/tcp_ip Modified Files: DHCPC.java DHCPD.java ProtocolStack.java SNMP.java Tcp.java Telnet_server.java Log Message: console, ACLs and TCP fixed Index: Telnet_server.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_server.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Telnet_server.java 20 Oct 2007 22:54:40 -0000 1.21 --- Telnet_server.java 17 Nov 2007 21:38:58 -0000 1.22 *************** *** 28,31 **** --- 28,33 ---- } + public boolean running = false; + private ApplicationLayerDevice mDevice; private String cmdline = ""; *************** *** 60,63 **** --- 62,66 ---- mParentStack.SL().bind(appSock, mParentStack.getSrcIP(), listenPort); mParentStack.SL().listen(appSock); + running = true; }catch (TransportLayerException e){ System.out.println(e.toString());; *************** *** 80,83 **** --- 83,87 ---- public void Close() throws TransportLayerException { + running = false; mParentStack.SL().close(appSock); Enumeration keys = connections.keys(); *************** *** 327,331 **** else if(tokens[0].compareTo("snmp")==0){ if((m=Pattern.compile(" +(on|\\d+)( +([^ ]+))?$").matcher(cmd)).find()) { ! int l_port=161; String l_pass="public"; if(m.group(1).compareTo("on")!=0) l_port = Integer.parseInt(m.group(1)); --- 331,335 ---- else if(tokens[0].compareTo("snmp")==0){ if((m=Pattern.compile(" +(on|\\d+)( +([^ ]+))?$").matcher(cmd)).find()) { ! int l_port=SNMP.DEFAULT_PORT; String l_pass="public"; if(m.group(1).compareTo("on")!=0) l_port = Integer.parseInt(m.group(1)); Index: ProtocolStack.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** ProtocolStack.java 19 Oct 2007 08:52:27 -0000 1.62 --- ProtocolStack.java 17 Nov 2007 21:38:58 -0000 1.63 *************** *** 742,746 **** UDP_Info.setDataType("UDP Packet"); UDP_Info.setLayer("Transport"); ! UDP_Info.setDescription("Transport level doesn't dupport on this device."); Simulation.addLayerInfo(UDP_Info); } --- 742,746 ---- UDP_Info.setDataType("UDP Packet"); UDP_Info.setLayer("Transport"); ! UDP_Info.setDescription("Transport level doesn't support on this device."); Simulation.addLayerInfo(UDP_Info); } *************** *** 757,762 **** UDP_Info.setDataType("TCP Packet"); UDP_Info.setLayer("Transport"); ! UDP_Info.setDescription("Transport level doesn't dupport on this device."); ! Simulation.addLayerInfo(UDP_Info); } catch (CommunicationException ce) {} --- 757,762 ---- UDP_Info.setDataType("TCP Packet"); UDP_Info.setLayer("Transport"); ! UDP_Info.setDescription("Transport level doesn't support on this device."); ! Simulation.addLayerInfo(UDP_Info); } catch (CommunicationException ce) {} Index: Tcp.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** Tcp.java 11 Nov 2007 19:51:57 -0000 1.103 --- Tcp.java 17 Nov 2007 21:38:58 -0000 1.104 *************** *** 620,624 **** String pack_flags = (packet.get_ACK_flag()?"ACK,":"")+(packet.get_SYN_flag()?"SYN,":"")+(packet.get_FIN_flag()?"FIN,":"")+(packet.get_RST_flag()?"RST":""); System.out.println("|| <<< TCP send pack: src="+pack_src+" dst="+pack_dst+" flags="+pack_flags+" seq="+packet.get_sequence_number()+" ack="+packet.get_acknowledgment_number()+" data='"+packet.getTCP_message()+"'"); ! System.out.println("|| <<<< Host="+mParentStack.getHostName()+" IP="+mParentStack.getSrcIP()+" sock="+Elm.getSocket()+" state="+Elm.getStateString()); printLayerInfo("TCP packet send to "+pack_dst+" flags="+pack_flags+" seq="+packet.get_sequence_number()+" ack="+packet.get_acknowledgment_number()+" data='"+packet.getTCP_message()+"'"); --- 620,628 ---- String pack_flags = (packet.get_ACK_flag()?"ACK,":"")+(packet.get_SYN_flag()?"SYN,":"")+(packet.get_FIN_flag()?"FIN,":"")+(packet.get_RST_flag()?"RST":""); System.out.println("|| <<< TCP send pack: src="+pack_src+" dst="+pack_dst+" flags="+pack_flags+" seq="+packet.get_sequence_number()+" ack="+packet.get_acknowledgment_number()+" data='"+packet.getTCP_message()+"'"); ! try{ ! System.out.println("|| <<<< Host="+mParentStack.getHostName()+" IP="+mParentStack.getSrcIP()+" sock="+Elm.getSocket()+" state="+Elm.getStateString()); ! }catch(NullPointerException e){ ! System.out.println(e.getMessage()); ! } printLayerInfo("TCP packet send to "+pack_dst+" flags="+pack_flags+" seq="+packet.get_sequence_number()+" ack="+packet.get_acknowledgment_number()+" data='"+packet.getTCP_message()+"'"); *************** *** 1038,1047 **** readySegments = tcpp.get_sequence_number(); } if(readySegments>0){ mSL.recv(Elm.getSocket(), out); } - boolean flags[] = genFlags(ACK); - //sendTCPSegment(Elm.getSocket(), "", flags, readySegments+1, resendtimes_NULL); - sendTCPSegment(Elm.getSocket(), "", flags, Elm.getNextSequenceNumber(), resendtimes_NULL); } --- 1042,1053 ---- readySegments = tcpp.get_sequence_number(); } + if(packet!=null){ + boolean flags[] = genFlags(ACK); + //sendTCPSegment(Elm.getSocket(), "", flags, readySegments+1, resendtimes_NULL); + sendTCPSegment(Elm.getSocket(), "", flags, Elm.getNextSequenceNumber(), resendtimes_NULL); + } if(readySegments>0){ mSL.recv(Elm.getSocket(), out); } } Index: DHCPC.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DHCPC.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DHCPC.java 20 Oct 2007 13:27:20 -0000 1.3 --- DHCPC.java 17 Nov 2007 21:38:58 -0000 1.4 *************** *** 92,96 **** */ public void Close() throws TransportLayerException ! { printLayerInfo("DHCP Client", "DHCP Client application closed socket."); mParentStack.SL().close(appSock); --- 92,97 ---- */ public void Close() throws TransportLayerException ! { ! running = false; printLayerInfo("DHCP Client", "DHCP Client application closed socket."); mParentStack.SL().close(appSock); Index: DHCPD.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DHCPD.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DHCPD.java 20 Oct 2007 22:54:40 -0000 1.5 --- DHCPD.java 17 Nov 2007 21:38:58 -0000 1.6 *************** *** 9,15 **** --- 9,17 ---- import core.LowLinkException; import core.LayerInfo; + import core.Pair; import core.Simulation; import java.util.Hashtable; import java.util.Enumeration; + import java.util.Vector; /** *************** *** 57,60 **** --- 59,63 ---- public Hashtable pools = new Hashtable(); public Hashtable leases = new Hashtable(); + private Vector<Pair> exclude = new Vector<Pair>(0); /** Creates a new instance of DHCPD */ *************** *** 365,373 **** public void excludeAddress(String low_ip, String high_ip){ ! } public void no_excludeAddress(String low_ip, String high_ip){ ! } --- 368,395 ---- public void excludeAddress(String low_ip, String high_ip){ ! boolean found = false; ! for(int i=0; i<exclude.size() && !found; i++){ ! Pair el = exclude.get(i); ! if(el.getFirst().equals(low_ip) && el.getSecond().equals(high_ip)){ ! found = true; ! } ! } ! if(!found){ ! exclude.add(new Pair(low_ip, high_ip)); ! } } public void no_excludeAddress(String low_ip, String high_ip){ ! for(int i=0; i<exclude.size(); i++){ ! Pair el = exclude.get(i); ! if(el.getFirst().equals(low_ip) && el.getSecond().equals(high_ip)){ ! exclude.remove(i); ! break; ! } ! } ! } ! ! public Vector<Pair> getExcludeAddresses(){ ! return exclude; } Index: SNMP.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/SNMP.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** SNMP.java 20 Oct 2007 13:27:21 -0000 1.26 --- SNMP.java 17 Nov 2007 21:38:58 -0000 1.27 *************** *** 69,73 **** --- 69,75 ---- public final static int SNMP_TRAP = 4; public final static int SNMP_RESPONSE = 5; + public final static int DEFAULT_PORT = 161; private static int SNMPID = 0; + public boolean running = false; public Vector<SNMPInstance> SNMPgroups = new Vector<SNMPInstance>(0); private String current_password = ""; *************** *** 145,148 **** --- 147,151 ---- mParentStack.SL().bind(appSock, mParentStack.getSrcIP(), listenPort); mParentStack.SL().listen(appSock); + running = true; printInfo("SNMP agent starts listening on port " + listenPort); //<<-- FIXME!!! } *************** *** 170,173 **** --- 173,177 ---- printInfo("SNMP manager closed socket."); } + running = false; mParentStack.SL().close(appSock); } |
