[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Echo_tcp.java, 1.27, 1.28 Tcp.java, 1.64, 1.65

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

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

Modified Files:
	Echo_tcp.java Tcp.java 
Log Message:


Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Tcp.java	3 Sep 2006 13:49:15 -0000	1.64
--- Tcp.java	3 Sep 2006 14:32:08 -0000	1.65
***************
*** 1518,1530 ****
                                                          TCP_Info.setDescription(s);
                                                          
!                                                         Simulation.addLayerInfo(TCP_Info);                                                                                                               
                                                          
                                                           if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) {
                                                              Elm.SentACKs.remove(inPacket.get_sequence_number());
!                                                         }   
!                                                         
                                                          // if (Elm.received_segments>2)
                                                          // listener.RecvData(inPacket.getTCP_message());
                                                          PassUpstairs(listener, Elm);
                                                          
                                                      }
--- 1518,1539 ----
                                                          TCP_Info.setDescription(s);
                                                          
!                                                         Simulation.addLayerInfo(TCP_Info);                                                                                                              
!                                                                            
!                                                         System.out.println("1");
!                                                         Simulation.addLayerInfo(new LayerInfo(getClass().getName(), mParentStack.getParentNodeName(), "TCP Protocol", "Transport",  "1"));                                                                                                              
                                                          
                                                           if (!(mParentStack.sendTCPSegment(listener,msg,flags,ack_num))) {
+                                                             Simulation.addLayerInfo(new LayerInfo(getClass().getName(), mParentStack.getParentNodeName(), "TCP Protocol", "Transport",  "2"));                                                                                                              
                                                              Elm.SentACKs.remove(inPacket.get_sequence_number());
!                                                             Simulation.addLayerInfo(new LayerInfo(getClass().getName(), mParentStack.getParentNodeName(), "TCP Protocol", "Transport",  "3"));
!                                                          }
!                                                             
!                                                         System.out.println("4");
!                                                         Simulation.addLayerInfo(new LayerInfo(getClass().getName(), mParentStack.getParentNodeName(), "TCP Protocol", "Transport",  "4"));
                                                          // if (Elm.received_segments>2)
                                                          // listener.RecvData(inPacket.getTCP_message());
                                                          PassUpstairs(listener, Elm);
+                                                         System.out.println("5");
+                                                         Simulation.addLayerInfo(new LayerInfo(getClass().getName(), mParentStack.getParentNodeName(), "TCP Protocol", "Transport",  "5"));
                                                          
                                                      }

Index: Echo_tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Echo_tcp.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Echo_tcp.java	3 Sep 2006 14:00:58 -0000	1.27
--- Echo_tcp.java	3 Sep 2006 14:32:08 -0000	1.28
***************
*** 183,188 ****
              protInfo.setDescription("Recieving echo message '" + Data + "' from server.");
              Simulation.addLayerInfo(protInfo);
!             crecv++;
!             System.out.println("***************************************************" + Data + ":" + crecv);
              /*
              LayerInfo protInfo = new LayerInfo(getClass().getName());
--- 183,188 ----
              protInfo.setDescription("Recieving echo message '" + Data + "' from server.");
              Simulation.addLayerInfo(protInfo);
!             protInfo = null;
!             
              /*
              LayerInfo protInfo = new LayerInfo(getClass().getName());
***************
*** 210,214 ****
                      protInfo3.setLayer("Application ");
                      protInfo3.setDescription("Sending echo message '" + Data + "' to server...");
!                     Simulation.addLayerInfo(protInfo);
                      
                      SendData(Data);                
--- 210,214 ----
                      protInfo3.setLayer("Application ");
                      protInfo3.setDescription("Sending echo message '" + Data + "' to server...");
!                     Simulation.addLayerInfo(protInfo3);
                      
                      SendData(Data);                
***************
*** 258,263 ****
          mParentStack.FreeTCPApplication(this);
  
!         crecv = 0;
!         
          this.counts = counts;
          
--- 258,262 ----
          mParentStack.FreeTCPApplication(this);
  
!                
          this.counts = counts;