[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java,1.32,1.33
Status: Beta
Brought to you by:
darkkey
Menu
▾
▴
[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java,1.32,1.33
|
From: gift <gi...@us...> - 2006-02-23 10:44:35
|
Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8112/core/protocolsuite/tcp_ip Modified Files: Tcp.java Log Message: v.damp Index: Tcp.java =================================================================== RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Tcp.java 9 Dec 2005 14:50:35 -0000 1.32 --- Tcp.java 23 Feb 2006 10:44:26 -0000 1.33 *************** *** 315,319 **** * Used in timer */ ! private static final long TCP_TIME = 400; //msec /** --- 315,320 ---- * Used in timer */ ! private static final long TCP_TIME = 40; //msec ! private static final long TCP_SENDER_TIME = 400; //msec /** *************** *** 344,351 **** public void TCPsetTimer(TCP_HashTableElement Elm) { ! if(Elm.timer==null){ ! System.out.println("Timer init!"); ! Elm.timer=new Timer(); ! Elm.timer.schedule(new TCPTask(Elm,TCP_TIME,this),50,TCP_TIME); } --- 345,361 ---- public void TCPsetTimer(TCP_HashTableElement Elm) { ! if(Elm.timer==null) ! { ! System.out.println("Sender timer init!"); ! Elm.timer=new Timer(); ! Elm.timer.schedule(new TCPTask(Elm,TCP_TIME,this),50,TCP_TIME); ! } else ! { ! System.out.println("Sender Timer REinit due to new packet arrival!"); ! Elm.timer.cancel(); ! Elm.timer=null; ! Elm.timer=new Timer(); ! Elm.timer.schedule(new TCPTask(Elm,TCP_TIME,this),50,TCP_TIME); ! System.out.println(" Sender Timer REinit DONE!"); } *************** *** 355,359 **** public class TCPTask extends TimerTask { ! private int numRepeat=8; private TCP_HashTableElement Elm; private long repTime; --- 365,369 ---- public class TCPTask extends TimerTask { ! private int numRepeat=150; private TCP_HashTableElement Elm; private long repTime; *************** *** 443,452 **** public void TCPsetServerTimer(TCP_HashTableElement Elm, int inlocalPort) { - System.out.println("Server Timer IN!"); if(Elm.Servertimer==null) { ! System.out.println("Server Timer init!"); ! Elm.Servertimer=new Timer(); ! Elm.Servertimer.schedule(new TCPServerTask(Elm,inlocalPort,TCP_TIME,this),50,TCP_TIME); } --- 453,469 ---- public void TCPsetServerTimer(TCP_HashTableElement Elm, int inlocalPort) { if(Elm.Servertimer==null) { ! System.out.println("Server Timer init!"); ! Elm.Servertimer=new Timer(); ! Elm.Servertimer.schedule(new TCPServerTask(Elm,inlocalPort,TCP_TIME,this),50,TCP_TIME); ! } else ! { ! System.out.println("Server Timer REinit due to new packet arrival!"); ! Elm.Servertimer.cancel(); ! Elm.Servertimer=null; ! Elm.Servertimer=new Timer(); ! Elm.Servertimer.schedule(new TCPServerTask(Elm,inlocalPort,TCP_TIME,this),50,TCP_TIME); ! System.out.println(" Server Timer REinit DONE!"); } *************** *** 1117,1126 **** if (inPacket.get_SYN_flag()) { ! ! if (Elm.isServer) { //init ServerTask TCPsetServerTimer(Elm,inPacket.get_destPort()); } //we have received an answer for our SYN-segment --- 1134,1144 ---- if (inPacket.get_SYN_flag()) { ! /* ! if (Elm.isServer) { //init ServerTask TCPsetServerTimer(Elm,inPacket.get_destPort()); } + */ //we have received an answer for our SYN-segment *************** *** 1131,1135 **** Integer chk = (Integer)inPacket.get_sequence_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received --- 1149,1160 ---- Integer chk = (Integer)inPacket.get_sequence_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { ! ! if (Elm.isServer) ! { ! //init ServerTask ! TCPsetServerTimer(Elm,inPacket.get_destPort()); ! } else TCPsetTimer(Elm); ! Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received *************** *** 1172,1176 **** } else { //we have already received this segment ! System.out.println("tttttttt"); Elm.received_duplicates++; Elm.sent_ACK++; --- 1197,1206 ---- } else { //we have already received this segment ! //System.out.println("tttttttt"); ! if (Elm.isServer) ! { ! //init ServerTask ! TCPsetServerTimer(Elm,inPacket.get_destPort()); ! } else TCPsetTimer(Elm); Elm.received_duplicates++; Elm.sent_ACK++; *************** *** 1180,1184 **** TCP_Info.setObjectName(mParentStack.getParentNodeName()); TCP_Info.setDataType("TCP Protocol"); ! System.out.println("%%% - in here"); TCP_Info.setLayer("Transport"); TCP_Info.setDescription("Resending ACK packet due to duplicate arrival. Total duplicates received: " + Elm.received_duplicates + "."); --- 1210,1214 ---- TCP_Info.setObjectName(mParentStack.getParentNodeName()); TCP_Info.setDataType("TCP Protocol"); ! //System.out.println("%%% - in here"); TCP_Info.setLayer("Transport"); TCP_Info.setDescription("Resending ACK packet due to duplicate arrival. Total duplicates received: " + Elm.received_duplicates + "."); *************** *** 1198,1202 **** Integer chk = (Integer)inPacket.get_sequence_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received --- 1228,1237 ---- Integer chk = (Integer)inPacket.get_sequence_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { ! if (Elm.isServer) ! { ! //init ServerTask ! TCPsetServerTimer(Elm,inPacket.get_destPort()); ! } else TCPsetTimer(Elm); Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received *************** *** 1288,1300 **** } else { //we have already received this segment Elm.received_duplicates++; Elm.sent_ACK++; //Elm.sent_segments++; ! System.out.println("t+++++++++t"); //Create Layer info LayerInfo TCP_Info = new LayerInfo(getClass().getName()); TCP_Info.setObjectName(mParentStack.getParentNodeName()); TCP_Info.setDataType("TCP Protocol"); ! System.out.println("%%% - in here - !!!"); TCP_Info.setLayer("Transport"); TCP_Info.setDescription("Resending ACK packet due to duplicate arrival. Total duplicates received: " + Elm.received_duplicates + "."); --- 1323,1340 ---- } else { //we have already received this segment + if (Elm.isServer) + { + //init ServerTask + TCPsetServerTimer(Elm,inPacket.get_destPort()); + } else TCPsetTimer(Elm); Elm.received_duplicates++; Elm.sent_ACK++; //Elm.sent_segments++; ! //System.out.println("t+++++++++t"); //Create Layer info LayerInfo TCP_Info = new LayerInfo(getClass().getName()); TCP_Info.setObjectName(mParentStack.getParentNodeName()); TCP_Info.setDataType("TCP Protocol"); ! //System.out.println("%%% - in here - !!!"); TCP_Info.setLayer("Transport"); TCP_Info.setDescription("Resending ACK packet due to duplicate arrival. Total duplicates received: " + Elm.received_duplicates + "."); *************** *** 1314,1318 **** Integer our_ack = (Integer)inPacket.get_acknowledgment_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received --- 1354,1363 ---- Integer our_ack = (Integer)inPacket.get_acknowledgment_number(); if (!(Elm.ReceivedSegments.contains(chk))) ! { ! if (Elm.isServer) ! { ! //init ServerTask ! TCPsetServerTimer(Elm,inPacket.get_destPort()); ! } else TCPsetTimer(Elm); Elm.received_segments++; Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received *************** *** 1394,1401 **** } else { //we have already received this segment Elm.received_duplicates++; Elm.sent_ACK++; //Elm.sent_segments++; ! System.out.println("t------t"); //Create Layer info LayerInfo TCP_Info = new LayerInfo(getClass().getName()); --- 1439,1451 ---- } else { //we have already received this segment + if (Elm.isServer) + { + //init ServerTask + TCPsetServerTimer(Elm,inPacket.get_destPort()); + } else TCPsetTimer(Elm); Elm.received_duplicates++; Elm.sent_ACK++; //Elm.sent_segments++; ! //System.out.println("t------t"); //Create Layer info LayerInfo TCP_Info = new LayerInfo(getClass().getName()); *************** *** 1403,1407 **** TCP_Info.setDataType("TCP Protocol"); TCP_Info.setLayer("Transport"); ! 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); --- 1453,1457 ---- TCP_Info.setDataType("TCP Protocol"); TCP_Info.setLayer("Transport"); ! //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); |
