[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip ProtocolStack.java, 1.47, 1.48 Tcp.java, 1.65, 1.66

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

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

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


Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** ProtocolStack.java	3 Sep 2006 10:38:20 -0000	1.47
--- ProtocolStack.java	3 Sep 2006 19:34:31 -0000	1.48
***************
*** 1899,1903 ****
                  System.out.println("catch...");
                  //try {
!                                 System.out.println("never be here...");
                                  LayerInfo TCP_Info = new LayerInfo(getClass().getName());
                                  TCP_Info.setObjectName(getParentNodeName());
--- 1899,1903 ----
                  System.out.println("catch...");
                  //try {
!                                 System.out.println("should never be here...");
                                  LayerInfo TCP_Info = new LayerInfo(getClass().getName());
                                  TCP_Info.setObjectName(getParentNodeName());

Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Tcp.java	3 Sep 2006 14:32:08 -0000	1.65
--- Tcp.java	3 Sep 2006 19:34:31 -0000	1.66
***************
*** 325,329 ****
      private Hashtable PortTable = new Hashtable();
      private ProtocolStack  mParentStack;
!     private int window_size=25;
      
      // private int total_received=0;
--- 325,329 ----
      private Hashtable PortTable = new Hashtable();
      private ProtocolStack  mParentStack;
!     private int window_size=25; 
      
      // private int total_received=0;
***************
*** 537,541 ****
                      ListenPort(application,localPort);
                  } catch (Exception e) {
!                     
                  }
                  
--- 537,541 ----
                      ListenPort(application,localPort);
                  } catch (Exception e) {
!                     Error.Report(e);
                  }
                  
***************
*** 1189,1192 ****
--- 1189,1193 ----
                                                  } else TCPsetTimer(Elm, 5);
                                              }catch(NullPointerException e){
+                                                 Error.Report(e);
                                                  //System.out.println(mParentStack.getHostName() + ":" + "TCP.java: case 2 - 1162 " + e.toString());
                                              }
***************
*** 1219,1222 ****
--- 1220,1224 ----
                                              }catch(NullPointerException e){
                                                  System.out.println("TCP.java: case 2 - 1191 " + e.toString());
+                                                 Error.Report(e);
                                              }
                                              
***************
*** 1244,1247 ****
--- 1246,1250 ----
                                              }catch(NullPointerException e){
                                                  System.out.println("TCP.java: case 2 - 1208 " + e.toString());
+                                                 Error.Report(e);
                                              }
                                              //listener.RecvData(inPacket.getTCP_message());  we do not receive segment because this is a SYN-packet
***************
*** 1270,1277 ****
                                                  }
                                              } 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());
                                      }
--- 1273,1281 ----
                                                  }
                                              } catch(NullPointerException e){
!                                                 System.out.println(mParentStack.getHostName() + ":" +  "TCP.java: case 2 - 1275 " + e.toString());
                                              }
                                          }
                                      }catch(NullPointerException e){
+                                         Error.Report(e);
                                          System.out.println(mParentStack.getHostName() + ":" +  "TCP.java: case 2 - 6 " + e.toString());
                                      }
***************
*** 1307,1311 ****
                                                          //init ServerTask
                                                          TCPsetServerTimer(Elm,inPacket.get_destPort(), 60);
!                                                     } else TCPsetTimer(Elm, 50);
                                                      Elm.received_segments++;
                                                      Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received
--- 1311,1315 ----
                                                          //init ServerTask
                                                          TCPsetServerTimer(Elm,inPacket.get_destPort(), 60);
!                                                     } else TCPsetTimer(Elm, 50); //???
                                                      Elm.received_segments++;
                                                      Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received
***************
*** 1443,1447 ****
                                                      Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received
                                                      
!                                                     AddOutputBuffer(Elm, inPacket);
                                                      
                                                      if (inPacket.get_ACK_flag()) {
--- 1447,1452 ----
                                                      Elm.ReceivedSegments.addElement(chk); //adding seq_number that we have received
                                                      
!                                                     AddOutputBuffer(Elm, inPacket); //??????? <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< !!!!!!
!                                                     //F#CKING SH*T!!! It ^ may be not DATA packet. (move to else{} block)
                                                      
                                                      if (inPacket.get_ACK_flag()) {
***************
*** 1561,1567 ****
                                                          Simulation.addLayerInfo(TCP_Info);
                                                          //now we have to resend our ACK again
!                                                         Integer ik = (Integer)inPacket.get_sequence_number();
                                                          
!                                                         TCP_packet Tpl = (TCP_packet) Elm.SentACKs.get(ik);
                                                          
                                                          System.out.println(mParentStack.getHostName() + ":" + "I=" + ik);
--- 1566,1573 ----
                                                          Simulation.addLayerInfo(TCP_Info);
                                                          //now we have to resend our ACK again
!                                                         Integer ik = (Integer)inPacket.get_sequence_number(); 
                                                          
!                                                         TCP_packet Tpl = (TCP_packet) Elm.SentACKs.get(ik); //wrong sequence????????????
!                                                         //F#CKING SH*T: is it right sequence???
                                                          
                                                          System.out.println(mParentStack.getHostName() + ":" + "I=" + ik);