Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16534/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.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** Tcp.java 4 Sep 2006 18:43:27 -0000 1.67
--- Tcp.java 4 Sep 2006 19:19:03 -0000 1.68
***************
*** 1431,1435 ****
}
-
} else {
// no FIN flag, no SYN flag
--- 1431,1434 ----
***************
*** 1485,1491 ****
//we do not have to send ACK for ACK-segment
//deleting from SegmentsToResend the segmet with the acknowledgment number we have received NOTE: dec by 1 is used see RFC
Elm.SegmentsToResend.remove((Integer)our_ack-1);
! // if (Elm.SegmentsToResend.remove((Integer)our_ack-1)==null) {System.out.println("Error here");}
} else {
--- 1484,1493 ----
//we do not have to send ACK for ACK-segment
+ System.out.println("[*** TCP ***] ACK received, port status: 2.");
+ PassUpstairs( (Application) Elm.application, Elm);
+
//deleting from SegmentsToResend the segmet with the acknowledgment number we have received NOTE: dec by 1 is used see RFC
Elm.SegmentsToResend.remove((Integer)our_ack-1);
! // if (Elm.SegmentsToResend.remove((Integer)our_ack-1)==null) {System.out.println("Error here");}
} else {
***************
*** 1538,1541 ****
--- 1540,1544 ----
// if (Elm.received_segments>2)
// listener.RecvData(inPacket.getTCP_message());
+ System.out.println("[*** TCP ***] Data received, port status: 2.");
PassUpstairs(listener, Elm);
System.out.println("5");
***************
*** 1545,1550 ****
! } else { //we have already received this segment
!
if (Elm.isServer) {
//init ServerTask
--- 1548,1552 ----
! } else { //we have already received this segment
if (Elm.isServer) {
//init ServerTask
***************
*** 1832,1835 ****
--- 1834,1839 ----
System.out.println(" [*** TCP ***] Pass upstairs call.");
System.out.println(" [*** TCP ***] Last passed: " + Elm.last_passed + ", going to pass: " + kkey + ".");
+ System.out.println(" [*** TCP ***] Buffer isEmpty: " + Elm.OutputBuffer.isEmpty() + ".");
+ System.out.println(" [*** TCP ***] While condition: " + Elm.OutputBuffer.containsKey(kkey) + ".");
while(Elm.OutputBuffer.containsKey(kkey)) {
|
