[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Application.java,1.15,1.16 Echo.java,1.18,1.19
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Application.java,1.15,1.16 Echo.java,1.18,1.19 Echo_tcp.java,1.20,1.21 IP_packet.java,1.2,1.3 IpV4.java,1.6,1.7 ProtocolStack.java,1.41,1.42 SNMP.java,1.10,1.11 Tcp.java,1.36,1.37 Telnet_client.java,1.2,1.3 Telnet_server.java,1.3,1.4
|
From: Alexander B. <da...@us...> - 2006-02-24 10:20:24
|
Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31924/core/protocolsuite/tcp_ip Modified Files: Application.java Echo.java Echo_tcp.java IP_packet.java IpV4.java ProtocolStack.java SNMP.java Tcp.java Telnet_client.java Telnet_server.java Log Message: Index: Telnet_client.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_client.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Telnet_client.java 23 Feb 2006 23:25:19 -0000 1.2 --- Telnet_client.java 24 Feb 2006 10:20:11 -0000 1.3 *************** *** 105,108 **** --- 105,116 ---- /** + * This method is called when client disconnected from server. + * @author key + * @version v0.01 + */ + + public void DisconnectEvent(){ } + + /** * This method disconnects from server. * @author key Index: Telnet_server.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Telnet_server.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Telnet_server.java 23 Feb 2006 23:25:19 -0000 1.3 --- Telnet_server.java 24 Feb 2006 10:20:11 -0000 1.4 *************** *** 87,90 **** --- 87,98 ---- /** + * This method is called when client disconnected from server. + * @author key + * @version v0.01 + */ + + public void DisconnectEvent(){ } + + /** * This method disconnects from server. * @author key *************** *** 227,231 **** } else { ! outData = "<" + (ch<16?"0":"") + Integer.toHexString(ch) + ">"; } } --- 235,239 ---- } else { ! outData = "<" + ( ch < 16 ? "0" : "" ) + Integer.toHexString(ch) + ">"; } } Index: ProtocolStack.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** ProtocolStack.java 23 Feb 2006 19:36:33 -0000 1.41 --- ProtocolStack.java 24 Feb 2006 10:20:11 -0000 1.42 *************** *** 177,181 **** } ! /** --- 177,183 ---- } ! public String getHostName(){ ! return mParentNode.getName(); ! } /** *************** *** 207,224 **** String destMAC = null; ! // try{ ! try{ ! String outInterface[] = mIPprotocol.router(inPacket.getDestIPAddress()); ! } ! catch(NullPointerException e){ ! System.out.println("ProtocolStack.java: 216 " + e.toString()); ! } ! ! String outInterface[] = mIPprotocol.router(inPacket.getDestIPAddress()); if(outInterface[0] == null) { //Create layer info --- 209,228 ---- String destMAC = null; ! String GatewayAddress = null; ! ! String outInterface[] = new String[2]; try{ ! ! ! outInterface = mIPprotocol.router(inPacket.getDestIPAddress()); ! ! try{ ! if(outInterface[0] == null) { + + try{ //Create layer info *************** *** 241,244 **** --- 245,252 ---- Simulation.addLayerInfo(protocolInfo); + }catch(NullPointerException e){ + System.out.println("ProtocolStack.java: SendPacket 1 " + e.toString()); + } + } *************** *** 246,255 **** { ! String sourceIP = mIPprotocol.getIPAddress(outInterface[0]); inPacket.setSourceIPAddress(sourceIP); ! String GatewayAddress = null; // test if on local of remote network --- 254,265 ---- { ! ! try{ ! String sourceIP = mIPprotocol.getIPAddress(outInterface[0]); inPacket.setSourceIPAddress(sourceIP); ! // test if on local of remote network *************** *** 274,278 **** } ! if(destMAC == null){ //if there is no matching entry in arp throw an error --- 284,288 ---- } ! if(destMAC == null){ //if there is no matching entry in arp throw an error *************** *** 304,314 **** Simulation.addLayerInfo(protocolInfo); ! try{ ! NetworkLayerDevice temp = (NetworkLayerDevice)mParentNode; ! temp.sendPacket(destMAC, inPacket, outInterface[0]); if(inPacket instanceof ARP_packet){ packetARPCounter++; --- 314,327 ---- Simulation.addLayerInfo(protocolInfo); ! }catch(NullPointerException e){ ! System.out.println("ProtocolStack.java: SendPacket 1 " + e.toString()); ! } try{ ! try{ NetworkLayerDevice temp = (NetworkLayerDevice)mParentNode; ! temp.sendPacket(destMAC, inPacket, outInterface[0]); + if(inPacket instanceof ARP_packet){ packetARPCounter++; *************** *** 316,319 **** --- 329,335 ---- packetoutputIPCounter++; } + }catch(NullPointerException e){ + System.out.println("ProtocolStack.java: SendPacket NLD " + e.toString()); + } }catch(InvalidNetworkInterfaceNameException ex){ *************** *** 321,329 **** throw new CommunicationException("The Interface " + outInterface + "was unable to send the Packet."); ! } } ! --- 337,347 ---- throw new CommunicationException("The Interface " + outInterface + "was unable to send the Packet."); ! }catch(NullPointerException e){ System.out.println("ProtocolStack.java: SendPacket 11! " + e.toString()); ! } } ! }catch(NullPointerException e){ System.out.println("ProtocolStack.java: SendPacket 1!!! " + e.toString()); ! } *************** *** 335,340 **** }catch(InvalidIPAddressException e){ //UGLY!!! FIXME!!! System.out.println(e.toString()); } ! } --- 353,361 ---- }catch(InvalidIPAddressException e){ //UGLY!!! FIXME!!! System.out.println(e.toString()); + }catch(NullPointerException e){ + System.out.println("::" + inPacket + "::"); + System.out.println("ProtocolStack.java: SendPacket " + e.toString()); } ! } *************** *** 849,854 **** TCP_packet temp = (TCP_packet)inPacket; try{ ! mTCPprotocol.receiveTCPPacket(temp); }catch(TransportLayerException te){} catch (CommunicationException ce) {} catch(TransportLayerPortException tpe){ --- 870,878 ---- TCP_packet temp = (TCP_packet)inPacket; try{ ! mTCPprotocol.receiveTCPPacket(temp); }catch(TransportLayerException te){} + catch(NullPointerException e){ + System.out.println("ProtocolStack.java: " + e.toString()); + } catch (CommunicationException ce) {} catch(TransportLayerPortException tpe){ Index: Tcp.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Tcp.java 23 Feb 2006 19:36:34 -0000 1.36 --- Tcp.java 24 Feb 2006 10:20:11 -0000 1.37 *************** *** 385,388 **** --- 385,389 ---- public void run() { + try{ // System.out.println("Timer start!"); if(!Elm.SegmentsToResend.isEmpty() && numRepeat>0) *************** *** 442,445 **** --- 443,447 ---- } } + }catch(NullPointerException e){ System.out.println(e.toString()); } } } *************** *** 1054,1060 **** public void receiveTCPPacket(TCP_packet inPacket) throws TransportLayerPortException, TransportLayerException, LowLinkException, CommunicationException { ! ! System.out.println(" !!!!!!!!!!! SEQ_numb==" + inPacket.get_sequence_number()); ! //test: check sum of TCP packet if (inPacket.getCheck_Sum() == 1) { --- 1056,1062 ---- public void receiveTCPPacket(TCP_packet inPacket) throws TransportLayerPortException, TransportLayerException, LowLinkException, CommunicationException { ! System.out.println(mParentStack.getHostName() + ":" + " !!!!!!!!!!! SEQ_numb==" + inPacket.get_sequence_number()); ! ! //test: check sum of TCP packet if (inPacket.getCheck_Sum() == 1) { *************** *** 1072,1075 **** --- 1074,1079 ---- Elm=(TCP_HashTableElement)PortTable.get(inPacket.get_destPort()); + + switch(Elm.PortStatus) { *************** *** 1080,1083 **** --- 1084,1088 ---- case 1: // port is being listened to by a new application. //Check for SYN + try{ if (inPacket.get_SYN_flag()) { *************** *** 1120,1127 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: SYN-flags I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("SYN-flags EVERYTHING IS OK 1-st place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1125,1132 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: SYN-flags I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("SYN-flags EVERYTHING IS OK 1-st place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1135,1138 **** --- 1140,1146 ---- } else { //not a SYN packet - have to wait until SYN packet will come } + }catch(NullPointerException e){ + System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 1 " + e.toString()); + } break; *************** *** 1145,1148 **** --- 1153,1157 ---- if (inPacket.get_SYN_flag()) { + try{ /* if (Elm.isServer) *************** *** 1168,1172 **** } else TCPsetTimer(Elm); }catch(NullPointerException e){ ! System.out.println("TCP.java: case 2 - 1162 " + e.toString()); } --- 1177,1181 ---- } else TCPsetTimer(Elm); }catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1162 " + e.toString()); } *************** *** 1210,1217 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: SYN-flags with ACK must be I=1, I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("SYN-flags with ACK EVERYTHING IS OK 2-nd place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1219,1226 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: SYN-flags with ACK must be I=1, I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("SYN-flags with ACK EVERYTHING IS OK 2-nd place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1248,1259 **** } catch(NullPointerException e){ ! System.out.println("TCP.java: case 2 - 1235 " + e.toString()); } } ! } else { //NOT SYN-segment //check for FIN if (inPacket.get_FIN_flag()) { --- 1257,1271 ---- } catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1235 " + e.toString()); } } ! }catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 6 " + e.toString()); ! } } else { //NOT SYN-segment //check for FIN + try{ if (inPacket.get_FIN_flag()) { *************** *** 1265,1268 **** --- 1277,1281 ---- { + if (Elm.isServer) { *************** *** 1314,1321 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 3-rd place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" 3-rd place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1327,1334 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 3-rd place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " 3-rd place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1335,1342 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 4-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" 4-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1348,1355 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 4-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " 4-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1354,1361 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 5-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" 5-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1367,1374 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 5-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " 5-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1399,1403 **** } catch(NullPointerException e){ ! System.out.println("TCP.java: case 2 - 1368 " + e.toString()); } } --- 1412,1416 ---- } catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1368 " + e.toString()); } } *************** *** 1406,1412 **** } catch(NullPointerException e){ ! System.out.println("TCP.java: case 2 - 1375 " + e.toString()); } } else { // no FIN flag, no SYN flag --- 1419,1426 ---- } catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1375 " + e.toString()); } + } else { // no FIN flag, no SYN flag *************** *** 1416,1420 **** Integer our_ack = (Integer)inPacket.get_acknowledgment_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { if (Elm.isServer) { --- 1430,1435 ---- Integer our_ack = (Integer)inPacket.get_acknowledgment_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { ! if (Elm.isServer) { *************** *** 1478,1485 **** //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println("BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 6-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(" 6-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) --- 1493,1500 ---- //we are going to send ACK for received segment => adding it to SentACKs ! System.out.println(mParentStack.getHostName() + ":" + "BEFORE: I=" + inPacket.get_sequence_number()); if (inPacket.get_sequence_number() == 1) System.out.println("EVERYTHING IS OK, ready 6-th place I==1"); Elm.SentACKs.put(new Integer(inPacket.get_sequence_number()), (TCP_packet) mParentStack.getTCPSegment_clone(listener,msg,flags,ack_num)); ! System.out.println(mParentStack.getHostName() + ":" + " 6-th place DONE I=" + inPacket.get_sequence_number()); if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) *************** *** 1505,1510 **** --- 1520,1527 ---- listener.RecvData(inPacket.getTCP_message()); } + } else { //we have already received this segment + try{ if (Elm.isServer) { *************** *** 1514,1517 **** --- 1531,1538 ---- Elm.received_duplicates++; Elm.sent_ACK++; + }catch(NullPointerException e){ + System.out.println("TCP.java: case 2 - 11 " + e.toString()); + } + //Elm.sent_segments++; //System.out.println("t------t"); *************** *** 1523,1526 **** --- 1544,1548 ---- //System.out.println("%%% - in here ^^^"); TCP_Info.setDescription("Resending ACK packet due to duplicate arrival. Total duplicates received: " + Elm.received_duplicates + "."); + Simulation.addLayerInfo(TCP_Info); //now we have to resend our ACK again *************** *** 1529,1534 **** TCP_packet Tpl = (TCP_packet) Elm.SentACKs.get(ik); ! System.out.println("I=" + ik); ! if (Tpl==null) {System.out.println("Error: PACKET = null when I=" + ik); } mParentStack.sendPacket(Tpl); /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PARASITE PLACE*/ --- 1551,1556 ---- TCP_packet Tpl = (TCP_packet) Elm.SentACKs.get(ik); ! System.out.println(mParentStack.getHostName() + ":" + "I=" + ik); ! if (Tpl==null) {System.out.println(mParentStack.getHostName() + ":" + "Error: PACKET = null when I=" + ik); } mParentStack.sendPacket(Tpl); /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PARASITE PLACE*/ *************** *** 1536,1555 **** } catch(NullPointerException e){ ! System.out.println("TCP.java: case 2 - 1492 " + e.toString()); } } } ! } else { //have to disconnect listener from port throw new TransportLayerPortException("TCP Error: port is busy! Port is connected to another host or/and port and is busy by another application." + "Port "+inPacket.get_destPort() +" on host \""+ mParentStack.getParentNodeName()+"\"."); } break; - default: //TCP Error: unknown port status :( //have to disconnect listener from port throw new TransportLayerPortException("TCP Error: unknown port status! Port "+inPacket.get_destPort() +" on host \""+ mParentStack.getParentNodeName()+"\"."); ! } } else { throw new TransportLayerPortException("TCP Error: port " + inPacket.get_destPort() + " does not exist. Host \"" + mParentStack.getParentNodeName()+"\"."); --- 1558,1581 ---- } catch(NullPointerException e){ ! System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1492 " + e.toString()); } } + }catch(NullPointerException e){ + System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 7 " + e.toString()); } ! } ! } else { //have to disconnect listener from port throw new TransportLayerPortException("TCP Error: port is busy! Port is connected to another host or/and port and is busy by another application." + "Port "+inPacket.get_destPort() +" on host \""+ mParentStack.getParentNodeName()+"\"."); } + break; default: //TCP Error: unknown port status :( //have to disconnect listener from port throw new TransportLayerPortException("TCP Error: unknown port status! Port "+inPacket.get_destPort() +" on host \""+ mParentStack.getParentNodeName()+"\"."); ! } ! } else { throw new TransportLayerPortException("TCP Error: port " + inPacket.get_destPort() + " does not exist. Host \"" + mParentStack.getParentNodeName()+"\"."); *************** *** 1559,1562 **** --- 1585,1589 ---- throw new TransportLayerException("TCP Error: incorrect checksum on receiving!"); //comment this line if you have implemented check sum tests :) } + } Index: IP_packet.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IP_packet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IP_packet.java 17 Nov 2005 20:13:56 -0000 1.2 --- IP_packet.java 24 Feb 2006 10:20:11 -0000 1.3 *************** *** 220,226 **** { ! ! return mDestIPAddress; ! } --- 220,224 ---- { ! return mDestIPAddress; } Index: Application.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Application.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Application.java 10 Jan 2006 16:23:01 -0000 1.15 --- Application.java 24 Feb 2006 10:20:11 -0000 1.16 *************** *** 76,79 **** --- 76,87 ---- /** + * This method is called when client disconnected from server. + * @author key + * @version v0.01 + */ + + public abstract void DisconnectEvent(); + + /** * This method sends data to the other side. * @param data to send Index: Echo_tcp.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Echo_tcp.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Echo_tcp.java 1 Feb 2006 21:38:59 -0000 1.20 --- Echo_tcp.java 24 Feb 2006 10:20:11 -0000 1.21 *************** *** 135,139 **** } ! /** * This method sends data to the other side. --- 135,146 ---- } ! /** ! * This method is called when client disconnected from server. ! * @author key ! * @version v0.01 ! */ ! ! public void DisconnectEvent(){ } ! /** * This method sends data to the other side. Index: IpV4.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/IpV4.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IpV4.java 3 Dec 2005 12:20:52 -0000 1.6 --- IpV4.java 24 Feb 2006 10:20:11 -0000 1.7 *************** *** 159,162 **** --- 159,164 ---- String FLAG[] = {null,null}; + try{ + Enumeration keys = ipAddress.keys(); while(keys.hasMoreElements()){ *************** *** 189,192 **** --- 191,199 ---- } } + }catch(NullPointerException e){ + System.out.println("IPV4.java: route 1 " + e.toString()); + + } + return FLAG; } Index: Echo.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Echo.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Echo.java 1 Feb 2006 21:38:59 -0000 1.18 --- Echo.java 24 Feb 2006 10:20:11 -0000 1.19 *************** *** 87,90 **** --- 87,98 ---- /** + * This method is called when client disconnected from server. + * @author key + * @version v0.01 + */ + + public void DisconnectEvent(){ } + + /** * This method disconnects from server. * @author key Index: SNMP.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/SNMP.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SNMP.java 23 Feb 2006 23:25:19 -0000 1.10 --- SNMP.java 24 Feb 2006 10:20:11 -0000 1.11 *************** *** 176,179 **** --- 176,187 ---- /** + * This method is called when client disconnected from server. + * @author key + * @version v0.01 + */ + + public void DisconnectEvent(){ } + + /** * This method disconnects from server. * @author QweR |
