[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java, 1.49, 1.50

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv32099/core/protocolsuite/tcp_ip

Modified Files:
	Tcp.java 
Log Message:


Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Tcp.java	2 Sep 2006 11:39:19 -0000	1.49
--- Tcp.java	2 Sep 2006 14:50:50 -0000	1.50
***************
*** 359,363 ****
      private static final long TCP_SERVER_TIME = 1000; //msec   //server closing idle connection time
      private static final long TCP_CONNECT_SERVER_TIME = 250; //msec   //server closing idle connection time
!     private static final long TCP_SENDER_TIME = 1000; //msec time to resend all segments in SegmentsToresend queue
      private static final long TCP_CONNECT_TIME = 200; //msec time to resend all segments in SegmentsToresend queue whn connecting
      
--- 359,364 ----
      private static final long TCP_SERVER_TIME = 1000; //msec   //server closing idle connection time
      private static final long TCP_CONNECT_SERVER_TIME = 250; //msec   //server closing idle connection time
!     private static final long TCP_SENDER_TIME = 200; //msec time to resend all segments in SegmentsToresend queue
!     //
      private static final long TCP_CONNECT_TIME = 200; //msec time to resend all segments in SegmentsToresend queue whn connecting
      
***************
*** 1081,1088 ****
                              String s=new String();
  
!                             if (flags[4]) s="Created TCP SYN-packet for " + inDestIPAddress + ":" + indestPort +".";  
!                             if (flags[5]) s="Created TCP FIN-packet for " + inDestIPAddress + ":" + indestPort +"."; 
!                             if (!(flags[4] || flags[5])) s="Created TCP data packet for " + inDestIPAddress + ":" + indestPort +".";
!                             if (!(flags[4] || flags[5]) && flags[1]) s="Created TCP acknowledgement packet for " + inDestIPAddress + ":" + indestPort +".";
                              TCP_Info.setDescription(s);
                              Simulation.addLayerInfo(TCP_Info);
--- 1082,1089 ----
                              String s=new String();
  
!                             if (flags[4]) s="Created TCP SYN-packet for " + inDestIPAddress + ":" + indestPort +"." + "(SEQ=" + s_num + ")";  
!                             if (flags[5]) s="Created TCP FIN-packet for " + inDestIPAddress + ":" + indestPort +"." + "(SEQ=" + s_num + ")";  
!                             if (!(flags[4] || flags[5])) s="Created TCP data packet for " + inDestIPAddress + ":" + indestPort +"." + "(SEQ=" + s_num + ")";
!                             if (!(flags[4] || flags[5]) && flags[1]) s="Created TCP acknowledgement packet for " + inDestIPAddress + ":" + indestPort +"." + "(SEQ=" + s_num + ")";  
                              TCP_Info.setDescription(s);
                              Simulation.addLayerInfo(TCP_Info);
***************
*** 1142,1146 ****
                      switch(Elm.PortStatus)
                      {
!                         case 0: //port is free => Error: no application to receive TCP                            
                              //have to disconnect listener from port            
                              //System.out.println(mParentStack.getHostName() + ":" + "    !!       0 SEQ_numb==" + inPacket.get_sequence_number());
--- 1143,1150 ----
                      switch(Elm.PortStatus)
                      {
!                         case 0: //port is free => Error: no application to receive TCP    
!                             
!                             // >>> if FIN send ACK
!                             
                              //have to disconnect listener from port            
                              //System.out.println(mParentStack.getHostName() + ":" + "    !!       0 SEQ_numb==" + inPacket.get_sequence_number());
***************
*** 1180,1184 ****
                                              TCP_Info.setLayer("Transport");
  
!                                             TCP_Info.setDescription("TCP SYN-packet received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + "." + " TCP Port " + inPacket.get_destPort() + " has status \"busy\" from now.");
  
                                              Simulation.addLayerInfo(TCP_Info);
--- 1184,1188 ----
                                              TCP_Info.setLayer("Transport");
  
!                                             TCP_Info.setDescription("TCP SYN-packet received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + "." + " TCP Port " + inPacket.get_destPort() + " has status \"busy\" from now. (SEQ=" + inPacket.get_sequence_number() + ")");
  
                                              Simulation.addLayerInfo(TCP_Info);
***************
*** 1270,1274 ****
                                              TCP_Info.setLayer("Transport");
  
!                                             TCP_Info.setDescription("TCP SYN-packet with ACK received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + "." + " TCP Port " + inPacket.get_destPort() + " still has status \"busy\".");
  
                                              Simulation.addLayerInfo(TCP_Info);
--- 1274,1278 ----
                                              TCP_Info.setLayer("Transport");
  
!                                             TCP_Info.setDescription("TCP SYN-packet with ACK received from "+ inPacket.getSourceIPAddress() + ":" + inPacket.get_srcPort() + "." + " TCP Port " + inPacket.get_destPort() + " still has status \"busy\". (SEQ=" + inPacket.get_sequence_number() + ")");
  
                                              Simulation.addLayerInfo(TCP_Info);