beepcore-java-commits Mailing List for Java BEEP Core (Page 4)
Status: Beta
Brought to you by:
huston
Menu
▾
▴
beepcore-java-commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
(1) |
Sep
|
Oct
(16) |
Nov
(60) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(3) |
Feb
|
Mar
(4) |
Apr
(2) |
May
(13) |
Jun
|
Jul
|
Aug
(10) |
Sep
(34) |
Oct
(27) |
Nov
(2) |
Dec
(2) |
| 2003 |
Jan
|
Feb
|
Mar
(3) |
Apr
(15) |
May
(11) |
Jun
(14) |
Jul
(5) |
Aug
(1) |
Sep
(24) |
Oct
(4) |
Nov
(26) |
Dec
(1) |
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Huston F. <hu...@us...> - 2003-06-03 02:52:17
|
Update of /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example In directory sc8-pr-cvs1:/tmp/cvs-serv10443/example/org/beepcore/beep/example Modified Files: Bing.java Log Message: imports cleanup Index: Bing.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/example/Bing.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Bing.java 5 Oct 2002 15:33:22 -0000 1.11 --- Bing.java 3 Jun 2003 02:52:14 -0000 1.12 *************** *** 25,29 **** import org.beepcore.beep.core.BEEPInterruptedException; import org.beepcore.beep.core.Channel; - import org.beepcore.beep.core.ProfileRegistry; import org.beepcore.beep.core.Session; import org.beepcore.beep.core.StringOutputDataStream; --- 25,28 ---- |
|
From: Huston F. <hu...@us...> - 2003-06-03 02:51:15
|
Update of /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/ptls In directory sc8-pr-cvs1:/tmp/cvs-serv10191/tls/org/beepcore/beep/profile/tls/ptls Modified Files: TLSProfilePureTLSHandshakeCompletedListener.java Log Message: imports cleanup Index: TLSProfilePureTLSHandshakeCompletedListener.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLSHandshakeCompletedListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TLSProfilePureTLSHandshakeCompletedListener.java 8 Nov 2001 05:51:35 -0000 1.2 --- TLSProfilePureTLSHandshakeCompletedListener.java 3 Jun 2003 02:51:12 -0000 1.3 *************** *** 23,28 **** import java.util.Vector; - import COM.claymoresystems.cert.X509Cert; - /** --- 23,26 ---- |
|
From: Huston F. <hu...@us...> - 2003-06-03 02:50:57
|
Update of /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/ptls
In directory sc8-pr-cvs1:/tmp/cvs-serv10075/tls/org/beepcore/beep/profile/tls/ptls
Modified Files:
TLSProfilePureTLS.java
Log Message:
imports cleanup
Index: TLSProfilePureTLS.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/ptls/TLSProfilePureTLS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** TLSProfilePureTLS.java 5 Oct 2002 15:45:56 -0000 1.6
--- TLSProfilePureTLS.java 3 Jun 2003 02:50:53 -0000 1.7
***************
*** 29,33 ****
import org.beepcore.beep.core.*;
- import org.beepcore.beep.profile.*;
import org.beepcore.beep.profile.tls.TLSProfile;
import org.beepcore.beep.transport.tcp.*;
--- 29,32 ----
***************
*** 37,42 ****
import COM.claymoresystems.cert.*;
- import java.io.FileInputStream;
- import java.io.ByteArrayInputStream;
import java.io.IOException;
--- 36,39 ----
***************
*** 459,463 ****
ht.put(SessionCredential.AUTHENTICATOR, URI);
ht.put(SessionCredential.ALGORITHM,
! policy.getCipherSuiteName(cs));
ht.put(SessionCredential.AUTHENTICATOR_TYPE, "TLS");
--- 456,460 ----
ht.put(SessionCredential.AUTHENTICATOR, URI);
ht.put(SessionCredential.ALGORITHM,
! SSLPolicyInt.getCipherSuiteName(cs));
ht.put(SessionCredential.AUTHENTICATOR_TYPE, "TLS");
***************
*** 631,635 ****
ht.put(SessionCredential.AUTHENTICATOR, URI);
ht.put(SessionCredential.ALGORITHM,
! policy.getCipherSuiteName(cs));
ht.put(SessionCredential.AUTHENTICATOR_TYPE, "TLS");
--- 628,632 ----
ht.put(SessionCredential.AUTHENTICATOR, URI);
ht.put(SessionCredential.ALGORITHM,
! SSLPolicyInt.getCipherSuiteName(cs));
ht.put(SessionCredential.AUTHENTICATOR_TYPE, "TLS");
|
|
From: Huston F. <hu...@us...> - 2003-06-03 02:43:47
|
Update of /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse In directory sc8-pr-cvs1:/tmp/cvs-serv8121/tls/org/beepcore/beep/profile/tls/jsse Modified Files: TLSProfileJSSEHandshakeCompletedListener.java TLSProfileJSSE.java Log Message: imports cleanup Index: TLSProfileJSSEHandshakeCompletedListener.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSEHandshakeCompletedListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** TLSProfileJSSEHandshakeCompletedListener.java 8 Nov 2001 05:51:35 -0000 1.3 --- TLSProfileJSSEHandshakeCompletedListener.java 3 Jun 2003 02:43:43 -0000 1.4 *************** *** 22,26 **** import javax.net.ssl.HandshakeCompletedEvent; - import javax.net.ssl.HandshakeCompletedListener; --- 22,25 ---- Index: TLSProfileJSSE.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** TLSProfileJSSE.java 5 Oct 2002 15:45:56 -0000 1.7 --- TLSProfileJSSE.java 3 Jun 2003 02:43:43 -0000 1.8 *************** *** 26,38 **** import org.beepcore.beep.profile.tls.TLSProfile; import org.beepcore.beep.transport.tcp.*; - import org.beepcore.beep.util.*; import javax.net.ssl.*; - - import com.sun.net.ssl.KeyManagerFactory; - import com.sun.net.ssl.TrustManagerFactory; - import com.sun.net.ssl.SSLContext; - import com.sun.net.ssl.KeyManager; - import com.sun.net.ssl.TrustManager; import java.security.NoSuchAlgorithmException; --- 26,31 ---- |
|
From: Huston F. <hu...@us...> - 2003-06-03 02:41:26
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory sc8-pr-cvs1:/tmp/cvs-serv7426/src/org/beepcore/beep/transport/tcp
Modified Files:
TCPSession.java
Log Message:
more windowing cleanup
Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** TCPSession.java 27 May 2003 21:38:01 -0000 1.31
--- TCPSession.java 3 Jun 2003 02:41:23 -0000 1.32
***************
*** 3,7 ****
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 3,7 ----
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001-2003 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 378,385 ****
throws BEEPException
{
- // If IO is disabled don't send SEQ
- if (running == false)
- return false;
-
StringBuffer sb = new StringBuffer(Frame.MAX_HEADER_SIZE);
--- 378,381 ----
***************
*** 449,453 ****
continue;
} else {
! processCoreFrame(headerBuffer, amountRead, is);
}
}
--- 445,452 ----
continue;
} else {
! if (processCoreFrame(headerBuffer, amountRead, is) == false)
! {
! break;
! }
}
}
***************
*** 471,476 ****
}
! private void processCoreFrame(byte[] headerBuffer, int amountRead,
! InputStream is)
throws SessionAbortedException, BEEPException, IOException
{
--- 470,475 ----
}
! private boolean processCoreFrame(byte[] headerBuffer, int amountRead,
! InputStream is)
throws SessionAbortedException, BEEPException, IOException
{
***************
*** 502,506 ****
// socket closed intentionally (session closing)
// so just return
! return;
}
--- 501,505 ----
// socket closed intentionally (session closing)
// so just return
! return false;
}
***************
*** 598,602 ****
f.addPayload(new BufferSegment(payload));
! super.postFrame(f);
}
--- 597,602 ----
f.addPayload(new BufferSegment(payload));
!
! return super.postFrame(f);
}
|
|
From: Huston F. <hu...@us...> - 2003-06-03 02:38:11
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory sc8-pr-cvs1:/tmp/cvs-serv5309/src/org/beepcore/beep/core
Modified Files:
ChannelImpl.java SessionImpl.java
Log Message:
more windowing cleanup
Index: ChannelImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ChannelImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ChannelImpl.java 27 May 2003 21:37:40 -0000 1.4
--- ChannelImpl.java 3 Jun 2003 02:33:21 -0000 1.5
***************
*** 123,126 ****
--- 123,130 ----
private boolean blockingMessageListener = false;
+ // tuningProfile indicates that the profile for this channel will
+ // request a tuning reset
+ private boolean tuningProfile = false;
+
// in shutting down the session
// something for waiting synchronous messages (semaphores or something)
***************
*** 524,531 ****
}
- if (frame.isLast() && getState() == STATE_TUNING) {
- this.session.disableIO();
- }
-
if (frame.getMessageType() == Message.MESSAGE_TYPE_NUL) {
synchronized (recvReplyQueue) {
--- 528,531 ----
***************
*** 659,663 ****
* @param frame - the frame received by the session
*/
! void postFrame(Frame frame) throws BEEPException
{
log.trace("Channel::postFrame");
--- 659,663 ----
* @param frame - the frame received by the session
*/
! boolean postFrame(Frame frame) throws BEEPException
{
log.trace("Channel::postFrame");
***************
*** 680,683 ****
--- 680,686 ----
receiveFrame(frame);
+
+ return !(frame.isLast() == true &&
+ getState() == STATE_TUNING || tuningProfile == true);
}
Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SessionImpl.java 27 May 2003 21:37:41 -0000 1.5
--- SessionImpl.java 3 Jun 2003 02:33:21 -0000 1.6
***************
*** 1,7 ****
/*
! * Session.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
* Copyright (c) 2002 Kevin Kress. All rights reserved.
*
--- 1,7 ----
/*
! * SessionImpl.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001-2003 Huston Franklin. All rights reserved.
* Copyright (c) 2002 Kevin Kress. All rights reserved.
*
***************
*** 638,653 ****
try {
this.changeState(SESSION_STATE_ABORTED);
- this.disableIO();
- channels.clear();
-
- zero = null;
-
- fireSessionTerminated();
} catch (BEEPException e) {
// Ignore this since we are terminating anyway.
}
- }
synchronized void changeState(int newState) throws BEEPException {
try {
--- 638,654 ----
try {
this.changeState(SESSION_STATE_ABORTED);
} catch (BEEPException e) {
// Ignore this since we are terminating anyway.
}
+ this.disableIO();
+ channels.clear();
+
+ zero = null;
+
+ fireSessionTerminated();
+ }
+
synchronized void changeState(int newState) throws BEEPException {
try {
***************
*** 756,761 ****
*
*/
! protected void postFrame(Frame f) throws BEEPException {
! ops[state].postFrame(this, f);
}
--- 757,773 ----
*
*/
! protected boolean postFrame(Frame f) throws BEEPException {
! try {
! return ops[state].postFrame(this, f);
! } catch (BEEPException e) {
! this.terminate(e.getMessage());
!
! return false;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! this.terminate("Uncaught exception, terminating session");
!
! return false;
! }
}
***************
*** 1773,1777 ****
interface SessionOperations {
void changeState(SessionImpl s, int newState) throws BEEPException;
! void postFrame(SessionImpl s, Frame f) throws BEEPException;
}
--- 1785,1789 ----
interface SessionOperations {
void changeState(SessionImpl s, int newState) throws BEEPException;
! boolean postFrame(SessionImpl s, Frame f) throws BEEPException;
}
***************
*** 1787,1809 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! // If we're in a PRE-GREETING state
! // only handle one frame at a time...
! // to avoid processing post-greeting
! // frames before the greeting has been
! // fully handled.
! synchronized (s) {
! ((ChannelImpl)f.getChannel()).postFrame(f);
! }
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
}
}
--- 1799,1810 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! // If we're in a PRE-GREETING state
! // only handle one frame at a time...
! // to avoid processing post-greeting
! // frames before the greeting has been
! // fully handled.
! synchronized (s) {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
}
***************
*** 1823,1845 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! // If we're in a PRE-GREETING state
! // only handle one frame at a time...
! // to avoid processing post-greeting
! // frames before the greeting has been
! // fully handled.
! synchronized (s) {
! ((ChannelImpl)f.getChannel()).postFrame(f);
! }
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
}
}
--- 1824,1835 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! // If we're in a PRE-GREETING state
! // only handle one frame at a time...
! // to avoid processing post-greeting
! // frames before the greeting has been
! // fully handled.
! synchronized (s) {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
}
***************
*** 1860,1876 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! ((ChannelImpl)f.getChannel()).postFrame(f);
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
! }
}
--- 1850,1855 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
***************
*** 1892,1909 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! ((ChannelImpl)f.getChannel()).postFrame(f);
!
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
! }
}
--- 1871,1876 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
***************
*** 1922,1939 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! ((ChannelImpl)f.getChannel()).postFrame(f);
!
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
! }
}
--- 1889,1894 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
***************
*** 1953,1960 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
}
--- 1908,1916 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
+ return false;
}
***************
*** 1973,1989 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
! try {
! ((ChannelImpl)f.getChannel()).postFrame(f);
! } catch (BEEPException e) {
! s.terminate(e.getMessage());
!
! return;
! } catch (Throwable e) {
! log.error("Error posting frame", e);
! s.terminate("Uncaught exception, terminating session");
!
! return;
! }
}
--- 1929,1934 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
! return ((ChannelImpl)f.getChannel()).postFrame(f);
}
***************
*** 1996,2003 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
}
--- 1941,1949 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
+ return false;
}
***************
*** 2010,2017 ****
}
! public void postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
}
--- 1956,1964 ----
}
! public boolean postFrame(SessionImpl s, Frame f) throws BEEPException {
// If we're in an error state
log.debug("Dropping a frame because the Session state is " +
"no longer active.");
+ return false;
}
|
|
From: Huston F. <hu...@us...> - 2003-05-27 21:38:07
|
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);
|
|
From: Huston F. <hu...@us...> - 2003-05-27 21:37:46
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory sc8-pr-cvs1:/tmp/cvs-serv19920/src/org/beepcore/beep/core
Modified Files:
ChannelImpl.java TuningProfile.java SessionImpl.java
Log Message:
initial windowing cleanup
Index: ChannelImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ChannelImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChannelImpl.java 16 May 2003 16:44:29 -0000 1.3
--- ChannelImpl.java 27 May 2003 21:37:40 -0000 1.4
***************
*** 115,121 ****
private int recvWindowUsed;
! private long prevAckno;
!
! private int prevWindowUsed;
private boolean notifyOnFirstFrame = true;
--- 115,119 ----
private int recvWindowUsed;
! private int recvWindowFreed;
private boolean notifyOnFirstFrame = true;
***************
*** 159,165 ****
state = STATE_INITIALIZED;
recvWindowUsed = 0;
recvWindowSize = DEFAULT_WINDOW_SIZE;
- prevAckno = 0;
- prevWindowUsed = 0;
peerWindowSize = DEFAULT_WINDOW_SIZE;
}
--- 157,162 ----
state = STATE_INITIALIZED;
recvWindowUsed = 0;
+ recvWindowFreed = 0;
recvWindowSize = DEFAULT_WINDOW_SIZE;
peerWindowSize = DEFAULT_WINDOW_SIZE;
}
***************
*** 235,247 ****
/**
- * Returns the size of the used portion of the receive buffer for this
- * channel.
- */
- public synchronized int getBufferUsed()
- {
- return recvWindowUsed;
- }
-
- /**
* Returns the encoding used on this <code>Channel</code>
* @todo look at removing this and adding the information to getProfile()
--- 232,235 ----
***************
*** 285,294 ****
// in the buffer right now.
if (size < recvWindowUsed) {
! throw new BEEPException("Size must be less than what is " +
"currently in use.");
}
- // @TODO what if they decide to shrink the buffer? Is that even
- // allowed?
// set the new size and copy the buffer
recvWindowSize = size;
--- 273,280 ----
// in the buffer right now.
if (size < recvWindowUsed) {
! throw new BEEPException("New size is less than what is " +
"currently in use.");
}
// set the new size and copy the buffer
recvWindowSize = size;
***************
*** 299,311 ****
}
! // send a new SEQ message to update the buffer size
! if (session.updateMyReceiveBufferSize(this, prevAckno,
! recvSequence,
! prevWindowUsed,
! recvWindowUsed,
! recvWindowSize)) {
! prevAckno = recvSequence;
! prevWindowUsed = recvWindowUsed;
! }
}
}
--- 285,289 ----
}
! sendWindowUpdate();
}
}
***************
*** 653,666 ****
// window is full, this is the last frame.
synchronized (m) {
! if (m.isNotified() || ((this.notifyOnFirstFrame == false)
! && (recvSequence - prevAckno)
! != (recvWindowSize - prevWindowUsed) &&
! (frame.isLast() == false)))
! {
! if (log.isDebugEnabled()) {
! log.debug("recvWindowUsed = " + recvWindowUsed
! + " recvWindowSize = " + recvWindowSize
! + "\t\r\nNot notifying frame listener.");
! }
return;
}
--- 631,635 ----
// window is full, this is the last frame.
synchronized (m) {
! if (m.isNotified()) {
return;
}
***************
*** 749,752 ****
--- 718,725 ----
}
+ if (this.recvWindowFreed != 0) {
+ sendWindowUpdate();
+ }
+
sendFrames(status);
***************
*** 872,875 ****
--- 845,860 ----
}
+ private void sendWindowUpdate() throws BEEPException
+ {
+ if (session.updateMyReceiveBufferSize(this, recvSequence,
+ recvWindowSize -
+ (recvWindowUsed -
+ recvWindowFreed)))
+ {
+ recvWindowUsed -= recvWindowFreed;
+ recvWindowFreed = 0;
+ }
+ }
+
/**
* Method setState
***************
*** 1027,1053 ****
synchronized void freeReceiveBufferBytes(int size)
{
! try {
! if (log.isTraceEnabled()) {
! log.trace("Freed up " + size + " bytes on channel " + number);
! }
! recvWindowUsed -= size;
! if (log.isTraceEnabled()) {
! log.trace("recvWindowUsed = " + recvWindowUsed);
! }
! if (session.updateMyReceiveBufferSize(this, prevAckno,
! recvSequence,
! prevWindowUsed,
! recvWindowUsed,
! recvWindowSize)) {
! prevAckno = recvSequence;
! prevWindowUsed = recvWindowUsed;
! }
! } catch (BEEPException e) {
! // do nothing
! log.fatal("Error updating receive buffer size", e);
}
}
--- 1012,1035 ----
synchronized void freeReceiveBufferBytes(int size)
{
! if (log.isTraceEnabled()) {
! log.trace("Freed up " + size + " bytes on channel " + number);
! }
! recvWindowFreed += size;
! if (log.isTraceEnabled()) {
! log.trace("recvWindowUsed = " + recvWindowUsed +
! " recvWindowFreed = " + recvWindowFreed +
! " recvWindowSize = " + recvWindowSize);
! }
! if (state == ChannelImpl.STATE_ACTIVE) {
! try {
! sendWindowUpdate();
! } catch (BEEPException e) {
! // do nothing
! log.fatal("Error updating receive buffer size", e);
! }
}
}
Index: TuningProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/TuningProfile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** TuningProfile.java 21 Apr 2003 15:09:10 -0000 1.9
--- TuningProfile.java 27 May 2003 21:37:41 -0000 1.10
***************
*** 105,108 ****
--- 105,109 ----
try {
tuningChannels.add(channel);
+ ((ChannelImpl)channel).setState(ChannelImpl.STATE_TUNING);
session.sendProfile(profile, data, (ChannelImpl)channel);
session.disableIO();
Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** SessionImpl.java 20 May 2003 17:10:51 -0000 1.4
--- SessionImpl.java 27 May 2003 21:37:41 -0000 1.5
***************
*** 854,862 ****
*/
protected abstract boolean updateMyReceiveBufferSize(Channel channel,
- long previouslySeq,
long currentSeq,
! int previouslyUsed,
! int currentlyUsed,
! int bufferSize)
throws BEEPException;
--- 854,859 ----
*/
protected abstract boolean updateMyReceiveBufferSize(Channel channel,
long currentSeq,
! int currentAvail)
throws BEEPException;
|
|
From: Huston F. <hu...@us...> - 2003-05-20 22:22:05
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl
In directory sc8-pr-cvs1:/tmp/cvs-serv15247/src/org/beepcore/beep/profile/sasl
Modified Files:
SASLSessionTable.java
Log Message:
Added sessionReset event handler.
Index: SASLSessionTable.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/SASLSessionTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** SASLSessionTable.java 5 Oct 2002 15:32:22 -0000 1.6
--- SASLSessionTable.java 20 May 2003 22:22:02 -0000 1.7
***************
*** 26,29 ****
--- 26,30 ----
import org.beepcore.beep.core.SessionCredential;
import org.beepcore.beep.core.event.SessionEvent;
+ import org.beepcore.beep.core.event.SessionResetEvent;
import org.beepcore.beep.core.event.SessionListener;
import org.beepcore.beep.profile.sasl.anonymous.SASLAnonymousProfile;
***************
*** 180,183 ****
--- 181,204 ----
{
log.error("Error removing entry", x);
+ }
+ }
+
+ /**
+ * Method receiveEvent is implemented here so the SASLSessionTable
+ * can receive events when a session is reset (so that it
+ * can update its information about what sessions are actively
+ * authenticated etc.
+ *
+ * @param event event the SessionResetEvent used.
+ */
+ public void sessionReset(SessionResetEvent event)
+ {
+ try {
+ removeEntry((Session)event.getSource());
+ addEntry(event.getNewSession());
+ }
+ catch(SASLException e)
+ {
+ log.error("Error replacing entry", e);
}
}
|
|
From: Huston F. <hu...@us...> - 2003-05-20 21:46:58
|
Update of /cvsroot/beepcore-java/beepcore-java
In directory sc8-pr-cvs1:/tmp/cvs-serv1004
Modified Files:
build.xml
Log Message:
added event directory for core target
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** build.xml 15 Oct 2002 05:00:53 -0000 1.24
--- build.xml 20 May 2003 21:46:54 -0000 1.25
***************
*** 98,101 ****
--- 98,102 ----
deprecation="${deprecation}">
<include name="**/core/*.java"/>
+ <include name="**/core/event/*.java"/>
<include name="**/lib/*.java"/>
<include name="**/profile/*.java"/>
|
|
From: Huston F. <hu...@us...> - 2003-05-20 21:44:59
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/event
In directory sc8-pr-cvs1:/tmp/cvs-serv32686/src/org/beepcore/beep/core/event
Modified Files:
SessionAdapter.java
Log Message:
added SessionResetEvent for tuning resets
Index: SessionAdapter.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/event/SessionAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SessionAdapter.java 22 Nov 2001 15:25:29 -0000 1.1
--- SessionAdapter.java 20 May 2003 21:44:56 -0000 1.2
***************
*** 28,30 ****
--- 28,31 ----
public void greetingReceived(SessionEvent e) {}
public void sessionClosed(SessionEvent e) {}
+ public void sessionReset(SessionResetEvent e) {}
}
|
|
From: Huston F. <hu...@us...> - 2003-05-20 17:10:54
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory sc8-pr-cvs1:/tmp/cvs-serv16579/src/org/beepcore/beep/core
Modified Files:
SessionImpl.java
Log Message:
added SessionResetEvent for tuning resets
Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** SessionImpl.java 20 May 2003 16:06:15 -0000 1.3
--- SessionImpl.java 20 May 2003 17:10:51 -0000 1.4
***************
*** 1053,1057 ****
SessionResetEvent e = new SessionResetEvent(this, newSession);
for (int i=0; i<l.length; ++i) {
! l[i].sessionClosed(e);
}
}
--- 1053,1057 ----
SessionResetEvent e = new SessionResetEvent(this, newSession);
for (int i=0; i<l.length; ++i) {
! l[i].sessionReset(e);
}
}
|
|
From: Huston F. <hu...@us...> - 2003-05-20 17:09:35
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/event
In directory sc8-pr-cvs1:/tmp/cvs-serv15914/src/org/beepcore/beep/core/event
Modified Files:
SessionListener.java
Log Message:
added SessionResetEvent for tuning resets
Index: SessionListener.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/event/SessionListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SessionListener.java 22 Nov 2001 15:25:29 -0000 1.1
--- SessionListener.java 20 May 2003 17:09:31 -0000 1.2
***************
*** 35,40 ****
/**
! * Invoked when the greeting has been received for a session.
*/
public void sessionClosed(SessionEvent e);
}
--- 35,45 ----
/**
! * Invoked when the session is closed.
*/
public void sessionClosed(SessionEvent e);
+
+ /**
+ * Invoked when the session is reset.
+ */
+ public void sessionReset(SessionResetEvent e);
}
|
|
From: Huston F. <hu...@us...> - 2003-05-20 16:42:42
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/event In directory sc8-pr-cvs1:/tmp/cvs-serv23684/src/org/beepcore/beep/core/event Added Files: SessionResetEvent.java Log Message: added SessionResetEvent for tuning resets --- NEW FILE: SessionResetEvent.java --- /* * SessionResetEvent.java $Revision: 1.1 $ $Date: 2003/05/20 16:06:16 $ * * Copyright (c) 2003 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the * "License"); You may not use this file except in compliance with the License. * * You may obtain a copy of the License at http://www.beepcore.org/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * */ package org.beepcore.beep.core.event; import org.beepcore.beep.core.Session; /** * @author Huston Franklin * @version $Revision: 1.1 $, $Date: 2003/05/20 16:06:16 $ */ public class SessionResetEvent extends SessionEvent { public final static int SESSION_RESET = 4; public SessionResetEvent(Session session, Session newSession) { super(session); this.newSession = newSession; } public Session getNewSession() { return this.newSession; } private Session newSession; } |
|
From: Huston F. <hu...@us...> - 2003-05-20 16:17:05
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory sc8-pr-cvs1:/tmp/cvs-serv23684/src/org/beepcore/beep/core
Modified Files:
SessionImpl.java
Log Message:
added SessionResetEvent for tuning resets
Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SessionImpl.java 23 Apr 2003 15:23:04 -0000 1.2
--- SessionImpl.java 20 May 2003 16:06:15 -0000 1.3
***************
*** 41,44 ****
--- 41,45 ----
import org.beepcore.beep.core.event.ChannelListener;
import org.beepcore.beep.core.event.SessionEvent;
+ import org.beepcore.beep.core.event.SessionResetEvent;
import org.beepcore.beep.core.event.SessionListener;
import org.beepcore.beep.util.StringUtil;
***************
*** 1039,1042 ****
--- 1040,1055 ----
SessionEvent e = new SessionEvent(this);
+ for (int i=0; i<l.length; ++i) {
+ l[i].sessionClosed(e);
+ }
+ }
+
+ protected void fireSessionReset(Session newSession)
+ {
+ SessionListener[] l = this.sessionListeners;
+ if (l.length == 0)
+ return;
+
+ SessionResetEvent e = new SessionResetEvent(this, newSession);
for (int i=0; i<l.length; ++i) {
l[i].sessionClosed(e);
|
|
From: Huston F. <hu...@us...> - 2003-05-20 16:13:57
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory sc8-pr-cvs1:/tmp/cvs-serv23684/src/org/beepcore/beep/transport/tcp
Modified Files:
TCPSession.java
Log Message:
added SessionResetEvent for tuning resets
Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** TCPSession.java 23 Apr 2003 15:23:04 -0000 1.29
--- TCPSession.java 20 May 2003 16:06:16 -0000 1.30
***************
*** 345,355 ****
}
! if (isInitiator()) {
! return new TCPSession(s, reg, CHANNEL_START_ODD,
! localCred, peerCred, tuning, null);
! } else {
! return new TCPSession(s, reg, CHANNEL_START_EVEN,
! localCred, peerCred, tuning, null);
! }
}
--- 345,356 ----
}
! Session newSession = new TCPSession(s, reg,
! (isInitiator() ? CHANNEL_START_ODD:
! CHANNEL_START_EVEN),
! localCred, peerCred, tuning, null);
!
! this.fireSessionReset(newSession);
!
! return newSession;
}
|
|
From: Huston F. <hu...@us...> - 2003-05-16 16:44:33
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory sc8-pr-cvs1:/tmp/cvs-serv21584/src/org/beepcore/beep/core
Modified Files:
ChannelImpl.java
Log Message:
first pass at cleanup of frame validation
Index: ChannelImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ChannelImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ChannelImpl.java 23 Apr 2003 15:23:04 -0000 1.2
--- ChannelImpl.java 16 May 2003 16:44:29 -0000 1.3
***************
*** 694,774 ****
log.trace("Channel::postFrame");
- boolean firstFrame = false;
- boolean createAndPostMessage = false;
- Message currentMessage = null;
- int msgno = frame.getMsgno();
-
if (state != STATE_ACTIVE && state != STATE_TUNING) {
throw new BEEPException("State is " + state);
}
! // Validate Frame
! synchronized (this) {
!
! // assume the frame has already been parsed by the session and
! // that the flags indicated are part of the frame object
!
! // is the message number correct?
! if (frame.getMessageType() == Message.MESSAGE_TYPE_MSG) {
! if (previousFrame != null) {
! if (frame.getMsgno() != previousFrame.getMsgno()) {
! throw new BEEPException("Incorrect message number: was "
! + frame.getMsgno()
! + "; expecting "
! + previousFrame.getMsgno());
! }
! } else {
! synchronized (recvMSGQueue) {
! ListIterator i =
! recvMSGQueue.listIterator(recvMSGQueue.size());
! while (i.hasPrevious()) {
! if (((Message) i.previous()).getMsgno()
! == frame.getMsgno())
! {
! throw new BEEPException("Received a frame " +
! "with a duplicate " +
! "msgno (" +
! frame.getMsgno() +
! ")");
! }
! }
! }
! }
! } else {
! MessageStatus mstatus;
!
! synchronized (sentMSGQueue) {
! if (sentMSGQueue.size() == 0) {
! throw new BEEPException("Received unsolicited reply");
! }
!
! mstatus = (MessageStatus) sentMSGQueue.get(0);
! }
!
! if (frame.getMsgno() != mstatus.getMsgno()) {
! throw new BEEPException("Incorrect message number: was "
! + frame.getMsgno()
! + "; expecting "
! + mstatus.getMsgno());
! }
! }
!
! // is the sequence number correct?
! if (frame.getSeqno() != recvSequence) {
! throw new BEEPException("Incorrect sequence number: was "
! + frame.getSeqno() + "; expecting "
! + recvSequence);
! }
!
! // is the message type the same as the previous frames?
! if ((previousFrame != null)
! && (previousFrame.getMessageType()
! != frame.getMessageType())) {
! throw new BEEPException("Incorrect message type: was "
! + frame.getMessageTypeString()
! + "; expecting "
! + previousFrame.getMessageTypeString());
! }
! }
recvSequence += frame.getSize();
--- 694,702 ----
log.trace("Channel::postFrame");
if (state != STATE_ACTIVE && state != STATE_TUNING) {
throw new BEEPException("State is " + state);
}
! validateFrame(frame);
recvSequence += frame.getSize();
***************
*** 782,819 ****
}
! if (frame.getMessageType() != Message.MESSAGE_TYPE_MSG) {
! MessageStatus mstatus;
!
! synchronized (sentMSGQueue) {
! if (sentMSGQueue.size() == 0) {
! throw new BEEPException("Received unsolicited reply");
! }
!
! mstatus = (MessageStatus) sentMSGQueue.get(0);
!
! if (mstatus.getMsgno() != frame.getMsgno()) {
! throw new BEEPException("Received reply out of order");
! }
! }
! }
!
! try {
! receiveFrame(frame);
! } catch (BEEPException e) {
! // @todo change this to do the right thing
! throw new BEEPException(e.getMessage());
! }
!
! // is this the last frame in the message?
! if (frame.isLast() == true) {
! log.trace("Got the last frame");
! }
!
! // save the previous frame to compare message types
! if (frame.isLast()) {
! previousFrame = null;
! } else {
! previousFrame = frame;
! }
}
--- 710,714 ----
}
! receiveFrame(frame);
}
***************
*** 1036,1039 ****
--- 931,1028 ----
}
+ private void validateFrame(Frame frame) throws BEEPException
+ {
+ synchronized (this) {
+
+ if (previousFrame == null) {
+ // is the message number correct?
+ if (frame.getMessageType() == Message.MESSAGE_TYPE_MSG) {
+ synchronized (recvMSGQueue) {
+ ListIterator i =
+ recvMSGQueue.listIterator(recvMSGQueue.size());
+ while (i.hasPrevious()) {
+ if (((Message) i.previous()).getMsgno()
+ == frame.getMsgno())
+ {
+ throw new BEEPException("Received a frame " +
+ "with a duplicate " +
+ "msgno (" +
+ frame.getMsgno() +
+ ")");
+ }
+ }
+ }
+ } else {
+ MessageStatus mstatus;
+
+ synchronized (sentMSGQueue) {
+ if (sentMSGQueue.size() == 0) {
+ throw new BEEPException("Received unsolicited reply");
+ }
+
+ mstatus = (MessageStatus) sentMSGQueue.get(0);
+ }
+
+ if (frame.getMsgno() != mstatus.getMsgno()) {
+ throw new BEEPException("Incorrect message number: was "
+ + frame.getMsgno()
+ + "; expecting "
+ + mstatus.getMsgno());
+ }
+ }
+ } else {
+ // is the message type the same as the previous frames?
+ if (previousFrame.getMessageType() != frame.getMessageType()) {
+ throw new BEEPException("Incorrect message type: was "
+ + frame.getMessageTypeString()
+ + "; expecting "
+ + previousFrame.getMessageTypeString());
+ }
+
+ // is the message number correct?
+ if (frame.getMessageType() == Message.MESSAGE_TYPE_MSG &&
+ frame.getMsgno() != previousFrame.getMsgno())
+ {
+ throw new BEEPException("Incorrect message number: was "
+ + frame.getMsgno()
+ + "; expecting "
+ + previousFrame.getMsgno());
+ }
+ }
+
+ // is the sequence number correct?
+ if (frame.getSeqno() != recvSequence) {
+ throw new BEEPException("Incorrect sequence number: was "
+ + frame.getSeqno() + "; expecting "
+ + recvSequence);
+ }
+
+ }
+
+ if (frame.getMessageType() != Message.MESSAGE_TYPE_MSG) {
+ MessageStatus mstatus;
+
+ synchronized (sentMSGQueue) {
+ if (sentMSGQueue.size() == 0) {
+ throw new BEEPException("Received unsolicited reply");
+ }
+
+ mstatus = (MessageStatus) sentMSGQueue.get(0);
+
+ if (mstatus.getMsgno() != frame.getMsgno()) {
+ throw new BEEPException("Received reply out of order");
+ }
+ }
+ }
+
+ // save the previous frame to compare message types
+ if (frame.isLast()) {
+ previousFrame = null;
+ } else {
+ previousFrame = frame;
+ }
+
+ }
+
synchronized void freeReceiveBufferBytes(int size)
{
|
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:38
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/core Modified Files: ChannelImpl.java MimeHeaders.java SessionImpl.java Frame.java InputDataStream.java Message.java BEEPError.java Session.java StringOutputDataStream.java Log Message: cleanup of imports Index: ChannelImpl.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ChannelImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ChannelImpl.java 21 Apr 2003 15:09:10 -0000 1.1 --- ChannelImpl.java 23 Apr 2003 15:23:04 -0000 1.2 *************** *** 19,24 **** - import java.io.*; - import java.util.*; --- 19,22 ---- Index: MimeHeaders.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/MimeHeaders.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MimeHeaders.java 31 Oct 2001 00:32:37 -0000 1.1 --- MimeHeaders.java 23 Apr 2003 15:23:04 -0000 1.2 *************** *** 157,161 **** } else { this.lenHeaders -= name.length() + value.length() ! + this.HEADER_FORMAT_LENGTH; } --- 157,161 ---- } else { this.lenHeaders -= name.length() + value.length() ! + MimeHeaders.HEADER_FORMAT_LENGTH; } *************** *** 198,202 **** } else { this.lenHeaders += name.length() + value.length() ! + this.HEADER_FORMAT_LENGTH; } } --- 198,202 ---- } else { this.lenHeaders += name.length() + value.length() ! + MimeHeaders.HEADER_FORMAT_LENGTH; } } *************** *** 254,270 **** // CRLF ! System.arraycopy(this.HEADER_SUFFIX.getBytes(), 0, headersBytes, offsetHeaders, ! this.HEADER_SUFFIX.length()); ! offsetHeaders += this.HEADER_SUFFIX.length(); } // read the CRLF that separates the headers and the data ! System.arraycopy(this.HEADER_SUFFIX.getBytes(), 0, headersBytes, offsetHeaders, ! this.HEADER_SUFFIX.length()); ! offsetHeaders += this.HEADER_SUFFIX.length(); return new BufferSegment(headersBytes); --- 254,270 ---- // CRLF ! System.arraycopy(MimeHeaders.HEADER_SUFFIX.getBytes(), 0, headersBytes, offsetHeaders, ! MimeHeaders.HEADER_SUFFIX.length()); ! offsetHeaders += MimeHeaders.HEADER_SUFFIX.length(); } // read the CRLF that separates the headers and the data ! System.arraycopy(MimeHeaders.HEADER_SUFFIX.getBytes(), 0, headersBytes, offsetHeaders, ! MimeHeaders.HEADER_SUFFIX.length()); ! offsetHeaders += MimeHeaders.HEADER_SUFFIX.length(); return new BufferSegment(headersBytes); Index: SessionImpl.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/SessionImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** SessionImpl.java 21 Apr 2003 15:09:10 -0000 1.1 --- SessionImpl.java 23 Apr 2003 15:23:04 -0000 1.2 *************** *** 22,26 **** import java.io.IOException; - import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; --- 22,25 ---- Index: Frame.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Frame.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** Frame.java 21 Apr 2003 15:09:10 -0000 1.20 --- Frame.java 23 Apr 2003 15:23:04 -0000 1.21 *************** *** 21,25 **** import java.util.Iterator; import java.util.LinkedList; - import java.util.StringTokenizer; import org.apache.commons.logging.Log; --- 21,24 ---- *************** *** 281,285 **** } ! header.append(this.CRLF); if (log.isTraceEnabled()) { --- 280,284 ---- } ! header.append(Frame.CRLF); if (log.isTraceEnabled()) { Index: InputDataStream.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/InputDataStream.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** InputDataStream.java 21 Apr 2003 15:09:10 -0000 1.5 --- InputDataStream.java 23 Apr 2003 15:23:04 -0000 1.6 *************** *** 18,23 **** - import java.util.Enumeration; - import java.util.Iterator; import java.util.LinkedList; --- 18,21 ---- Index: Message.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Message.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Message.java 21 Apr 2003 15:09:10 -0000 1.10 --- Message.java 23 Apr 2003 15:23:04 -0000 1.11 *************** *** 18,27 **** - import java.util.Hashtable; - import java.util.LinkedList; - - import java.lang.IndexOutOfBoundsException; - - /** * Message encapsulates the BEEP MSG, RPY, ERR and NUL message types. --- 18,21 ---- Index: BEEPError.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/BEEPError.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** BEEPError.java 7 Sep 2002 15:01:17 -0000 1.7 --- BEEPError.java 23 Apr 2003 15:23:04 -0000 1.8 *************** *** 19,23 **** - import java.io.ByteArrayInputStream; import java.io.IOException; --- 19,22 ---- Index: Session.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Session.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** Session.java 21 Apr 2003 15:09:10 -0000 1.34 --- Session.java 23 Apr 2003 15:23:04 -0000 1.35 *************** *** 20,26 **** import java.util.Collection; - import org.beepcore.beep.core.event.ChannelEvent; import org.beepcore.beep.core.event.ChannelListener; - import org.beepcore.beep.core.event.SessionEvent; import org.beepcore.beep.core.event.SessionListener; --- 20,24 ---- *************** *** 29,33 **** * This interface represents the operations available for all BEEP Sessions. * <p> ! * With BEEP a Session is the * * @author Huston Franklin --- 27,31 ---- * This interface represents the operations available for all BEEP Sessions. * <p> ! * A BEEP Session encapsulates a connection for a given transport. * * @author Huston Franklin Index: StringOutputDataStream.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/StringOutputDataStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** StringOutputDataStream.java 7 Sep 2002 14:57:37 -0000 1.2 --- StringOutputDataStream.java 23 Apr 2003 15:23:05 -0000 1.3 *************** *** 23,27 **** import java.io.UnsupportedEncodingException; - import java.io.IOException; import org.beepcore.beep.util.BufferSegment; --- 23,26 ---- |
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:38
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/transport/tcp Modified Files: TCPSession.java TCPSessionCreator.java Log Message: cleanup of imports Index: TCPSession.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** TCPSession.java 21 Apr 2003 15:09:11 -0000 1.28 --- TCPSession.java 23 Apr 2003 15:23:04 -0000 1.29 *************** *** 24,32 **** import java.net.Socket; - import java.net.SocketException; - - import java.util.Hashtable; - import java.util.Iterator; - import java.util.StringTokenizer; import org.apache.commons.logging.Log; --- 24,27 ---- *************** *** 36,40 **** import org.beepcore.beep.core.Channel; import org.beepcore.beep.core.Frame; - import org.beepcore.beep.core.Message; import org.beepcore.beep.core.ProfileRegistry; import org.beepcore.beep.core.Session; --- 31,34 ---- Index: TCPSessionCreator.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSessionCreator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** TCPSessionCreator.java 8 Mar 2003 16:39:18 -0000 1.6 --- TCPSessionCreator.java 23 Apr 2003 15:23:04 -0000 1.7 *************** *** 30,35 **** import org.beepcore.beep.core.BEEPException; import org.beepcore.beep.core.ProfileRegistry; - import org.beepcore.beep.core.SessionCredential; - import org.beepcore.beep.core.SessionTuningProperties; --- 30,33 ---- |
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:38
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp
In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/profile/sasl/otp
Modified Files:
SASLOTPProfile.java OTPAuthenticator.java OTPGenerator.java
Log Message:
cleanup of imports
Index: SASLOTPProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/SASLOTPProfile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** SASLOTPProfile.java 5 Oct 2002 15:32:06 -0000 1.9
--- SASLOTPProfile.java 23 Apr 2003 15:23:03 -0000 1.10
***************
*** 17,27 ****
package org.beepcore.beep.profile.sasl.otp;
- import java.security.MessageDigest;
-
import java.util.Hashtable;
- import java.util.StringTokenizer;
-
- import sun.misc.BASE64Decoder;
- import sun.misc.BASE64Encoder;
import org.apache.commons.logging.Log;
--- 17,21 ----
***************
*** 35,39 ****
import org.beepcore.beep.profile.sasl.otp.algorithm.sha1.SHA1;
import org.beepcore.beep.profile.sasl.otp.database.*;
- import org.beepcore.beep.transport.tcp.*;
--- 29,32 ----
***************
*** 101,106 ****
algorithms = new Hashtable();
! algorithms.put(md5.getAlgorithmName(), md5);
! algorithms.put(sha1.getAlgorithmName(), sha1);
userDatabase = new UserDatabasePool();
}
--- 94,99 ----
algorithms = new Hashtable();
! algorithms.put(MD5.getAlgorithmName(), md5);
! algorithms.put(SHA1.getAlgorithmName(), sha1);
userDatabase = new UserDatabasePool();
}
Index: OTPAuthenticator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/OTPAuthenticator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** OTPAuthenticator.java 5 Oct 2002 15:32:06 -0000 1.12
--- OTPAuthenticator.java 23 Apr 2003 15:23:03 -0000 1.13
***************
*** 20,24 ****
import java.io.InputStream;
import java.io.IOException;
- import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
--- 20,23 ----
***************
*** 31,38 ****
import org.beepcore.beep.profile.sasl.*;
import org.beepcore.beep.profile.sasl.otp.algorithm.*;
- import org.beepcore.beep.profile.sasl.otp.algorithm.md5.*;
- import org.beepcore.beep.profile.sasl.otp.algorithm.sha1.*;
import org.beepcore.beep.profile.sasl.otp.database.UserDatabase;
- import org.beepcore.beep.profile.sasl.otp.database.*;
/**
--- 30,34 ----
***************
*** 203,208 ****
try
{
! database = profile.getUserDatabase().getUser(authenticated);
! algorithm = profile.getAlgorithm(database.getAlgorithmName());
}
catch(SASLException x)
--- 199,204 ----
try
{
! database = SASLOTPProfile.getUserDatabase().getUser(authenticated);
! algorithm = SASLOTPProfile.getAlgorithm(database.getAlgorithmName());
}
catch(SASLException x)
***************
*** 292,297 ****
// get the last hash and that's how we verify. Semi-slick.
// So hooray for assymetric hash functions
! if (response.indexOf(profile.HEX_INIT) != -1 ||
! response.indexOf(profile.WORD_INIT) != -1 )
{
return validateInitResponse(response);
--- 288,293 ----
// get the last hash and that's how we verify. Semi-slick.
// So hooray for assymetric hash functions
! if (response.indexOf(SASLOTPProfile.HEX_INIT) != -1 ||
! response.indexOf(SASLOTPProfile.WORD_INIT) != -1 )
{
return validateInitResponse(response);
***************
*** 302,306 ****
response = response.substring(WORD.length());
long l = OTPDictionary.convertWordsToHash(response);
! responseHash = profile.convertLongToBytes(l);
if (log.isDebugEnabled()) {
log.debug("Hacked response=>" + response);
--- 298,302 ----
response = response.substring(WORD.length());
long l = OTPDictionary.convertWordsToHash(response);
! responseHash = SASLOTPProfile.convertLongToBytes(l);
if (log.isDebugEnabled()) {
log.debug("Hacked response=>" + response);
***************
*** 308,312 ****
} else if (response.indexOf(HEX) != -1) {
response = response.substring(HEX.length());
! responseHash = profile.convertHexToBytes(response);
if (log.isDebugEnabled()) {
log.debug("Hacked response=>" + response);
--- 304,308 ----
} else if (response.indexOf(HEX) != -1) {
response = response.substring(HEX.length());
! responseHash = SASLOTPProfile.convertHexToBytes(response);
if (log.isDebugEnabled()) {
log.debug("Hacked response=>" + response);
***************
*** 321,326 ****
SessionCredential cred = validateHash(responseHash);
! database.updateLastHash(profile.convertBytesToHex(responseHash));
! profile.getUserDatabase().updateUserDB(database);
return cred;
}
--- 317,322 ----
SessionCredential cred = validateHash(responseHash);
! database.updateLastHash(SASLOTPProfile.convertBytesToHex(responseHash));
! SASLOTPProfile.getUserDatabase().updateUserDB(database);
return cred;
}
***************
*** 337,342 ****
byte responseHash[] = algorithm.generateHash(hash);
if (log.isTraceEnabled()) {
! log.trace("Test====>"+profile.convertBytesToHex(responseHash));
! log.trace("Control=>"+profile.convertBytesToHex(nextHash));
}
boolean match = true;
--- 333,338 ----
byte responseHash[] = algorithm.generateHash(hash);
if (log.isTraceEnabled()) {
! log.trace("Test====>"+SASLOTPProfile.convertBytesToHex(responseHash));
! log.trace("Control=>"+SASLOTPProfile.convertBytesToHex(nextHash));
}
boolean match = true;
***************
*** 384,396 ****
// Validate login
! Algorithm a = profile.getAlgorithm(database.getAlgorithmName());
! if(profile.HEX_INIT.startsWith(command)) {
! log.debug("CMD is "+profile.HEX_INIT);
! oldHash = profile.convertHexToBytes(oldHashData);
! } else if(profile.WORD_INIT.startsWith(command)) {
! log.debug("CMD is "+profile.WORD_INIT);
// @todo obviate the 2nd step when you get a chance
long l = OTPDictionary.convertWordsToHash(oldHashData);
! oldHash = profile.convertLongToBytes(l);
} else {
abort(ERR_UNKNOWN_COMMAND+command);
--- 380,392 ----
// Validate login
! Algorithm a = SASLOTPProfile.getAlgorithm(database.getAlgorithmName());
! if(SASLOTPProfile.HEX_INIT.startsWith(command)) {
! log.debug("CMD is "+SASLOTPProfile.HEX_INIT);
! oldHash = SASLOTPProfile.convertHexToBytes(oldHashData);
! } else if(SASLOTPProfile.WORD_INIT.startsWith(command)) {
! log.debug("CMD is "+SASLOTPProfile.WORD_INIT);
// @todo obviate the 2nd step when you get a chance
long l = OTPDictionary.convertWordsToHash(oldHashData);
! oldHash = SASLOTPProfile.convertLongToBytes(l);
} else {
abort(ERR_UNKNOWN_COMMAND+command);
***************
*** 399,403 ****
if (log.isDebugEnabled()) {
log.debug("Retrieved from init-* oldHash=>" +
! profile.convertBytesToHex(oldHash));
}
--- 395,399 ----
if (log.isDebugEnabled()) {
log.debug("Retrieved from init-* oldHash=>" +
! SASLOTPProfile.convertBytesToHex(oldHash));
}
***************
*** 418,423 ****
log.debug("Hash=>"+newHashData);
}
! profile.getUserDatabase().addUser(authenticated, algorithm,
! newHashData, seed, sequence);
log.debug("Successful Authentication!");
return cred;
--- 414,420 ----
log.debug("Hash=>"+newHashData);
}
! SASLOTPProfile.getUserDatabase().addUser(authenticated, algorithm,
! newHashData, seed,
! sequence);
log.debug("Successful Authentication!");
return cred;
***************
*** 455,462 ****
log.debug("Dict.getA()" + database.getAlgorithmName());
log.debug("Dict.getA()"
! + profile.getAlgorithm(database.getAlgorithmName()));
}
! algorithm = profile.getAlgorithm(database.getAlgorithmName());
profile = otpProfile;
password = pwd;
--- 452,459 ----
log.debug("Dict.getA()" + database.getAlgorithmName());
log.debug("Dict.getA()"
! + SASLOTPProfile.getAlgorithm(database.getAlgorithmName()));
}
! algorithm = SASLOTPProfile.getAlgorithm(database.getAlgorithmName());
profile = otpProfile;
password = pwd;
***************
*** 575,579 ****
algo = st.nextToken();
! algorithm = profile.getAlgorithm(algo);
if (algorithm == null) {
--- 572,576 ----
algo = st.nextToken();
! algorithm = SASLOTPProfile.getAlgorithm(algo);
if (algorithm == null) {
***************
*** 616,621 ****
{
StringBuffer sb = new StringBuffer(128);
! sb.append(profile.HEX_INIT);
! sb.append(profile.convertBytesToHex(temp));
sb.append(initData);
phrase = sb.toString();
--- 613,618 ----
{
StringBuffer sb = new StringBuffer(128);
! sb.append(SASLOTPProfile.HEX_INIT);
! sb.append(SASLOTPProfile.convertBytesToHex(temp));
sb.append(initData);
phrase = sb.toString();
Index: OTPGenerator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/OTPGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** OTPGenerator.java 5 Oct 2002 15:32:06 -0000 1.5
--- OTPGenerator.java 23 Apr 2003 15:23:03 -0000 1.6
***************
*** 31,35 ****
import org.beepcore.beep.profile.sasl.SASLException;
import org.beepcore.beep.profile.sasl.otp.algorithm.Algorithm;
- import org.beepcore.beep.profile.sasl.otp.database.UserDatabase;
import org.beepcore.beep.profile.sasl.otp.database.UserDatabasePool;
--- 31,34 ----
|
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:37
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous
In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/profile/sasl/anonymous
Modified Files:
SASLAnonymousProfile.java AnonymousAuthenticator.java
Log Message:
cleanup of imports
Index: SASLAnonymousProfile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous/SASLAnonymousProfile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** SASLAnonymousProfile.java 5 Oct 2002 15:31:49 -0000 1.8
--- SASLAnonymousProfile.java 23 Apr 2003 15:23:03 -0000 1.9
***************
*** 20,26 ****
import java.util.Hashtable;
- import sun.misc.BASE64Decoder;
- import sun.misc.BASE64Encoder;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
--- 20,23 ----
Index: AnonymousAuthenticator.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/anonymous/AnonymousAuthenticator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** AnonymousAuthenticator.java 5 Oct 2002 15:31:49 -0000 1.13
--- AnonymousAuthenticator.java 23 Apr 2003 15:23:03 -0000 1.14
***************
*** 19,26 ****
import java.io.InputStream;
import java.io.IOException;
- import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
- import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
--- 19,24 ----
***************
*** 107,111 ****
credential.put(SessionCredential.AUTHENTICATOR_TYPE,
! profile.MECHANISM);
}
--- 105,109 ----
credential.put(SessionCredential.AUTHENTICATOR_TYPE,
! SASLAnonymousProfile.MECHANISM);
}
***************
*** 177,181 ****
credential.put(SessionCredential.AUTHENTICATOR, data);
credential.put(SessionCredential.AUTHENTICATOR_TYPE,
! profile.MECHANISM);
try
--- 175,179 ----
credential.put(SessionCredential.AUTHENTICATOR, data);
credential.put(SessionCredential.AUTHENTICATOR_TYPE,
! SASLAnonymousProfile.MECHANISM);
try
|
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:36
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/profile/sasl Modified Files: SASLProfile.java Blob.java Log Message: cleanup of imports Index: SASLProfile.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/SASLProfile.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** SASLProfile.java 29 Nov 2001 04:00:00 -0000 1.7 --- SASLProfile.java 23 Apr 2003 15:23:02 -0000 1.8 *************** *** 18,27 **** - import java.io.*; - import org.beepcore.beep.core.*; - import org.beepcore.beep.profile.*; - import org.beepcore.beep.transport.tcp.TCPSession; - import org.beepcore.beep.util.*; --- 18,22 ---- Index: Blob.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/Blob.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Blob.java 5 Oct 2002 15:32:22 -0000 1.7 --- Blob.java 23 Apr 2003 15:23:02 -0000 1.8 *************** *** 20,30 **** import java.io.IOException; - import java.util.Hashtable; - import javax.xml.parsers.*; import org.w3c.dom.*; - - import org.xml.sax.SAXException; import sun.misc.BASE64Decoder; --- 20,26 ---- |
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:35
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/lib Modified Files: SharedChannel.java Reply.java ChannelPool.java Log Message: cleanup of imports Index: SharedChannel.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/SharedChannel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** SharedChannel.java 21 Apr 2003 15:09:11 -0000 1.9 --- SharedChannel.java 23 Apr 2003 15:23:02 -0000 1.10 *************** *** 19,26 **** - import org.beepcore.beep.core.BEEPError; import org.beepcore.beep.core.BEEPException; import org.beepcore.beep.core.Channel; - import org.beepcore.beep.core.Message; import org.beepcore.beep.core.MessageListener; import org.beepcore.beep.core.MessageStatus; --- 19,24 ---- *************** *** 29,33 **** import org.beepcore.beep.core.Session; - import java.util.LinkedList; import java.util.Date; --- 27,30 ---- Index: Reply.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/Reply.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Reply.java 8 Nov 2001 05:51:34 -0000 1.6 --- Reply.java 23 Apr 2003 15:23:02 -0000 1.7 *************** *** 21,25 **** import java.lang.InterruptedException; - import java.util.Collection; import java.util.LinkedList; import java.util.NoSuchElementException; --- 21,24 ---- Index: ChannelPool.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/ChannelPool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** ChannelPool.java 5 Oct 2002 15:31:04 -0000 1.7 --- ChannelPool.java 23 Apr 2003 15:23:02 -0000 1.8 *************** *** 24,28 **** import java.util.LinkedList; - import java.util.NoSuchElementException; import java.util.Date; import java.util.Iterator; --- 24,27 ---- |
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:35
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/algorithm/sha1 In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/profile/sasl/otp/algorithm/sha1 Modified Files: SHA1.java Log Message: cleanup of imports Index: SHA1.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/algorithm/sha1/SHA1.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** SHA1.java 8 Nov 2001 05:51:34 -0000 1.2 --- SHA1.java 23 Apr 2003 15:23:00 -0000 1.3 *************** *** 19,26 **** - import java.security.MessageDigest; - import org.beepcore.beep.profile.sasl.InvalidParameterException; - import org.beepcore.beep.profile.sasl.otp.algorithm.Algorithm; import org.beepcore.beep.profile.sasl.otp.algorithm.AlgorithmImpl; --- 19,23 ---- |
|
From: Huston F. <hu...@us...> - 2003-04-23 15:23:11
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/echo In directory sc8-pr-cvs1:/tmp/cvs-serv31233/src/org/beepcore/beep/profile/echo Modified Files: EchoProfile.java Log Message: cleanup of imports Index: EchoProfile.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/echo/EchoProfile.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** EchoProfile.java 5 Oct 2002 15:31:35 -0000 1.15 --- EchoProfile.java 23 Apr 2003 15:23:07 -0000 1.16 *************** *** 19,26 **** - import java.io.ByteArrayOutputStream; - import java.io.IOException; - import java.io.InputStream; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; --- 19,22 ---- |
