[Beepcore-java-commits] CVS: beepcore-java/src/org/beepcore/beep/transport/tcp TCPSession.java,1.30,1.31

[Huston F. <hu...@us...>]

Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory sc8-pr-cvs1:/tmp/cvs-serv20062a/src/org/beepcore/beep/transport/tcp

Modified Files:
	TCPSession.java 
Log Message:
initial windowing cleanup

Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** TCPSession.java	20 May 2003 16:06:16 -0000	1.30
--- TCPSession.java	27 May 2003 21:38:01 -0000	1.31
***************
*** 374,404 ****
       */
      protected boolean updateMyReceiveBufferSize(Channel channel,
-                                                 long previouslySeq,
                                                  long currentSeq,
!                                                 int previouslyUsed,
!                                                 int currentlyUsed,
!                                                 int bufferSize)
              throws BEEPException
      {
-         if (log.isDebugEnabled()) {
-             log.debug("update SEQ channel=" + channel.getNumber()
-                       + " prevSeq=" + previouslySeq + " curSeq="
-                       + currentSeq + " prevUsed=" + previouslyUsed
-                       + " curUsed=" + currentlyUsed + " bufSize="
-                       + bufferSize);
-         }
- 
          // If IO is disabled don't send SEQ
          if (running == false)
              return false;
-         // @todo update the java-doc to correctly identify the params
-         /*
-         if (currentSeq > 0) {    // don't send it the first time
-             if (((currentSeq - previouslySeq) < (bufferSize / 2))
-                     || (currentlyUsed > (bufferSize / 2))) {
-                 return false;
-             }
-         }
-         */
  
          StringBuffer sb = new StringBuffer(Frame.MAX_HEADER_SIZE);
--- 374,384 ----
       */
      protected boolean updateMyReceiveBufferSize(Channel channel,
                                                  long currentSeq,
!                                                 int currentAvail)
              throws BEEPException
      {
          // If IO is disabled don't send SEQ
          if (running == false)
              return false;
  
          StringBuffer sb = new StringBuffer(Frame.MAX_HEADER_SIZE);
***************
*** 410,414 ****
          sb.append(Long.toString(currentSeq));
          sb.append(' ');
!         sb.append(Integer.toString(bufferSize - currentlyUsed));
          sb.append(CRLF);
  
--- 390,394 ----
          sb.append(Long.toString(currentSeq));
          sb.append(' ');
!         sb.append(Integer.toString(currentAvail));
          sb.append(CRLF);