andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better names for SslHandler.unwrap*() methods

Browse Source 
Motivation:

The names of SslHandler.unwrap*() methods are somewhat ambiguous.

Modifications:

- Rename unwrap() to unwrapMultiple() and unwrapNonApp()
- Rename unwrap0() to unwrapSingle()

Result:

Readability
This commit is contained in:
Trustin Lee 2014-04-20 17:20:00 +09:00
parent 18b0e95659
commit 07266cbd0b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -918,7 +918,7 @@ public class SslHandler extends FrameDecoder
// //
// See https://github.com/netty/netty/issues/1534 // See https://github.com/netty/netty/issues/1534
assert recordLengths != null; assert recordLengths != null;
unwrapped = unwrap(ctx, channel, in, totalLength, recordLengths, nRecords); unwrapped = unwrapMultiple(ctx, channel, in, totalLength, recordLengths, nRecords);
} }
if (nonSslRecord) { if (nonSslRecord) {
@ -1227,7 +1227,17 @@ public class SslHandler extends FrameDecoder
return future; return future;
} }
private ChannelBuffer unwrap( /**
* Calls {@link SSLEngine#unwrap(ByteBuffer, ByteBuffer)} with an empty buffer to handle handshakes, etc.
*/
private void unwrapNonAppData(ChannelHandlerContext ctx, Channel channel) throws SSLException {
unwrapSingle(ctx, channel, ChannelBuffers.EMPTY_BUFFER, EMPTY_BUFFER, null, -1);
}
/**
* Unwraps multiple inbound SSL records.
*/
private ChannelBuffer unwrapMultiple(
ChannelHandlerContext ctx, Channel channel, ChannelHandlerContext ctx, Channel channel,
ChannelBuffer buffer, int totalLength, int[] recordLengths, int nRecords) throws SSLException { ChannelBuffer buffer, int totalLength, int[] recordLengths, int nRecords) throws SSLException {
@ -1236,18 +1246,17 @@ public class SslHandler extends FrameDecoder
for (int i = 0; i < nRecords; i ++) { for (int i = 0; i < nRecords; i ++) {
inNetBuf.limit(inNetBuf.position() + recordLengths[i]); inNetBuf.limit(inNetBuf.position() + recordLengths[i]);
frame = unwrap0(ctx, channel, buffer, inNetBuf, frame, totalLength); frame = unwrapSingle(ctx, channel, buffer, inNetBuf, frame, totalLength);
assert !inNetBuf.hasRemaining(); assert !inNetBuf.hasRemaining();
} }
return frame; return frame;
} }
private void unwrapNonAppData(ChannelHandlerContext ctx, Channel channel) throws SSLException { /**
unwrap0(ctx, channel, ChannelBuffers.EMPTY_BUFFER, EMPTY_BUFFER, null, -1); * Unwraps a single SSL record.
} */
private ChannelBuffer unwrapSingle(
private ChannelBuffer unwrap0(
ChannelHandlerContext ctx, Channel channel, ChannelHandlerContext ctx, Channel channel,
ChannelBuffer nettyInNetBuf, ByteBuffer nioInNetBuf, ChannelBuffer nettyInNetBuf, ByteBuffer nioInNetBuf,
ChannelBuffer nettyOutAppBuf, int initialNettyOutAppBufCapacity) throws SSLException { ChannelBuffer nettyOutAppBuf, int initialNettyOutAppBufCapacity) throws SSLException {