3 new revisions:
Revision: 62b0ce3c6345
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Thu Jul 5 22:32:44 2012
Log: Backprt to TelScale branch...
http://code.google.com/p/jain-sip/source/detail?r=62b0ce3c6345
Revision: 9a16de258a91
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 6 15:35:32 2012
Log: Backport to TelScale branch...
http://code.google.com/p/jain-sip/source/detail?r=9a16de258a91
Revision: a2e7d3ac0857
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 6 15:40:57 2012
Log: Backport to TelScale branch...
http://code.google.com/p/jain-sip/source/detail?r=a2e7d3ac0857
==============================================================================
Revision: 62b0ce3c6345
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Thu Jul 5 22:32:44 2012
Log: Backprt to TelScale branch
Tolerate TLS Record packetization http://java.net/jira/browse/JSIP-416
git-svn-id:
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2127
8e71dc83-d81e-6649-80f2-80b843a9b2be
(cherry picked from commit 8a21594af345a19c0568e71d36b542671a444484)
http://code.google.com/p/jain-sip/source/detail?r=62b0ce3c6345
Modified:
/src/gov/nist/javax/sip/stack/NIOHandler.java
/src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java
/src/gov/nist/javax/sip/stack/NioTlsMessageChannel.java
=======================================
--- /src/gov/nist/javax/sip/stack/NIOHandler.java Fri Apr 27 05:16:21 2012
+++ /src/gov/nist/javax/sip/stack/NIOHandler.java Thu Jul 5 22:32:44 2012
@@ -427,7 +427,7 @@
if(channel != null && !channel.isConnected()) {
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG))
logger.logDebug("Channel disconnected " +
channel);
-
+ logger.logError("HERE " + channel);
channel = null;
}
if(channel == null) { // this is where the threads will race
=======================================
--- /src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java Fri Apr 27
05:16:21 2012
+++ /src/gov/nist/javax/sip/stack/NioTcpMessageChannel.java Thu Jul 5
22:32:44 2012
@@ -71,6 +71,7 @@
byteBuffer.flip();
msg = new byte[byteBuffer.remaining()];
byteBuffer.get(msg);
+ boolean streamError = nbytes == -1;
nbytes = msg.length;
byteBuffer.clear();
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
@@ -82,8 +83,10 @@
"This is usually an indication we are stuck and it is better to
disconnect?");
// TODO: This happens on weird conditions when a dead socket suddenly
resurrects but we already have another socket
- if (nbytes == -1) {
-
+ if (streamError) {
+ if
(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+ logger.logDebug("Stream error. We will clean up, but the call may
continue on the other socket.");
+ }
nioParser.addBytes("\r\n\r\n".getBytes("UTF-8"));
try {
nioParser.close();
=======================================
--- /src/gov/nist/javax/sip/stack/NioTlsMessageChannel.java Wed Apr 11
12:02:54 2012
+++ /src/gov/nist/javax/sip/stack/NioTlsMessageChannel.java Thu Jul 5
22:32:44 2012
@@ -160,6 +160,7 @@
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
logger.logDebug("Adding TLS bytes for decryption " +
bytes.length);
}
+ if(bytes.length <= 0) return;
ByteBuffer buffer = ByteBuffer.wrap(bytes);
sslStateMachine.unwrap(buffer);
}
==============================================================================
Revision: 9a16de258a91
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 6 15:35:32 2012
Log: Backport to TelScale branch
Tolerate TLS Record packetization http://java.net/jira/browse/JSIP-416
git-svn-id:
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2128
8e71dc83-d81e-6649-80f2-80b843a9b2be
(cherry picked from commit 63deb2018b56039aa926f071a96e1d81b9c21918)
http://code.google.com/p/jain-sip/source/detail?r=9a16de258a91
Modified:
/src/gov/nist/javax/sip/stack/SSLStateMachine.java
=======================================
--- /src/gov/nist/javax/sip/stack/SSLStateMachine.java Wed Mar 28 22:55:58
2012
+++ /src/gov/nist/javax/sip/stack/SSLStateMachine.java Fri Jul 6 15:35:32
2012
@@ -36,7 +36,7 @@
protected Queue<MessageSendItem> pendingOutboundBuffers =
new LinkedList<MessageSendItem>();
protected NioTlsMessageChannel channel;
-
+ protected ByteBuffer tlsRecordBuffer;
public SSLStateMachine(SSLEngine sslEngine, NioTlsMessageChannel channel)
{
this.sslEngine = sslEngine;
@@ -174,8 +174,53 @@
unwrap(src, outputBuffer);
}
+ private void startBuffer(ByteBuffer src) {
+ if(tlsRecordBuffer == null) {
+
+ // Begin buffering, if there is already a buffer the normalization will
take of adding the bytes
+ tlsRecordBuffer = ByteBuffer.allocateDirect(33270); // max record size
in other implementations
+
+ // Append the current buffer
+ tlsRecordBuffer.put(src);
+
+ // Prepare the buffer for reading
+ tlsRecordBuffer.flip();
+
+ if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+ logger.logDebug("Allocated record buffer for reading " +
tlsRecordBuffer + " for src = " + src);
+ }
+ }
+ }
+ private void clearBuffer() {
+ tlsRecordBuffer = null;
+ if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+ logger.logDebug("Buffer cleared");
+ }
+ }
+ private ByteBuffer normalizeTlsRecordBuffer(ByteBuffer src) {
+ if(tlsRecordBuffer == null) {
+ return src;
+ } else {
+ if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+ logger.logDebug("Normalize buffer " + src + " into
record buffer "
+ + tlsRecordBuffer);
+ }
+
+ // Reverse flip() to prepare the buffer to writing in
append mode
+ tlsRecordBuffer.position(tlsRecordBuffer.limit());
+ tlsRecordBuffer.limit(tlsRecordBuffer.capacity());
+
+ // Append data
+ tlsRecordBuffer.put(src);
+
+ // And prepare it for reading again as if it came from
the network
+ tlsRecordBuffer.flip();
+ return tlsRecordBuffer;
+ }
+ }
private synchronized void unwrap(ByteBuffer src, ByteBuffer dst) throws
Exception {
loop:while(true) {
+ src = normalizeTlsRecordBuffer(src);
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
logger.logDebug("Unwrap src " + src + " dst "
+ dst);
@@ -185,6 +230,16 @@
logger.logDebug("Unwrap result " + result + "
buffers size "
+ pendingOutboundBuffers.size() + " src="
+ src + " dst=" + dst);
}
+
+ if(result.getStatus().equals(Status.BUFFER_UNDERFLOW)) {
+
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
+ logger.logDebug("Buffer underflow, wait for the next inbound chunk of
data to feed the SSL engine");
+ }
+ startBuffer(src);
+ break;
+ } else {
+ clearBuffer();
+ }
if(result.getStatus().equals(Status.BUFFER_OVERFLOW)) {
if(logger.isLoggingEnabled(LogWriter.TRACE_WARN)) {
logger.logWarning("Buffer overflow , must prepare the buffer again.
Check for continious overflow here?");
@@ -192,12 +247,6 @@
dst = channel.prepareAppDataBuffer();
continue;
}
- if(result.getStatus().equals(Status.BUFFER_UNDERFLOW)) {
-
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
- logger.logDebug("Buffer underflow, wait for the next inbound chunk of
data to feed the SSL engine");
- }
- break;
- }
if(result.bytesProduced()>0) {
// There is actual application data in this
chunk
dst.flip();
==============================================================================
Revision: a2e7d3ac0857
Author: vralev <vralev@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Jul 6 15:40:57 2012
Log: Backport to TelScale branch
undo bad check in
git-svn-id:
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2129
8e71dc83-d81e-6649-80f2-80b843a9b2be
(cherry picked from commit a23e1cb0843373f2f8637f2e405fe7d47d22255f)
http://code.google.com/p/jain-sip/source/detail?r=a2e7d3ac0857
Modified:
/src/gov/nist/javax/sip/stack/NIOHandler.java
=======================================
--- /src/gov/nist/javax/sip/stack/NIOHandler.java Thu Jul 5 22:32:44 2012
+++ /src/gov/nist/javax/sip/stack/NIOHandler.java Fri Jul 6 15:40:57 2012
@@ -427,7 +427,6 @@
if(channel != null && !channel.isConnected()) {
if(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG))
logger.logDebug("Channel disconnected " +
channel);
- logger.logError("HERE " + channel);
channel = null;
}
if(channel == null) { // this is where the threads will race