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

Cleanup DefaultHttp2FrameReader about verifyUnknownFrame

Browse Source 
Motivation:

In previous PR about handling unknwon frame in the middle of header
block, I didn't notice and re-use about checking is processing header
. And I added a redundant method for same functionality.
I think that the redundant method would lead to some misleading
situation.

Modifications:

Removed redundant code on DefaultHttp2FrameReader

Result:

The code is more readable
This commit is contained in:
chhsiao90 2017-02-18 13:14:54 +08:00 committed by Scott Mitchell
parent e08a3b1f35
commit b1436e80ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2FrameReader.java
View File

@ -227,6 +227,7 @@ public class DefaultHttp2FrameReader implements Http2FrameReader, Http2FrameSize
break; break;
default: default:
// Unknown frame type, could be an extension. // Unknown frame type, could be an extension.
verifyUnknownFrame();
break; break;
} }
} }
@ -404,12 +405,7 @@ public class DefaultHttp2FrameReader implements Http2FrameReader, Http2FrameSize
} }
private void verifyUnknownFrame() throws Http2Exception { private void verifyUnknownFrame() throws Http2Exception {
if (headersContinuation != null) { verifyNotProcessingHeaders();
int streamId = headersContinuation.getStreamId();
closeHeadersContinuation();
throw connectionError(PROTOCOL_ERROR, "Extension frames must not be in the middle of headers "
+ "on stream %d", streamId);
}
} }
private void readDataFrame(ChannelHandlerContext ctx, ByteBuf payload, private void readDataFrame(ChannelHandlerContext ctx, ByteBuf payload,
@ -617,7 +613,6 @@ public class DefaultHttp2FrameReader implements Http2FrameReader, Http2FrameSize
private void readUnknownFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener) private void readUnknownFrame(ChannelHandlerContext ctx, ByteBuf payload, Http2FrameListener listener)
throws Http2Exception { throws Http2Exception {
verifyUnknownFrame();
payload = payload.readSlice(payload.readableBytes()); payload = payload.readSlice(payload.readableBytes());
listener.onUnknownFrame(ctx, frameType, streamId, flags, payload); listener.onUnknownFrame(ctx, frameType, streamId, flags, payload);
} }
@ -768,9 +763,14 @@ public class DefaultHttp2FrameReader implements Http2FrameReader, Http2FrameSize
} }
} }
/**
* Verify that current state is not processing on header block
* @throws Http2Exception thrown if {@link #headersContinuation} is not null
*/
private void verifyNotProcessingHeaders() throws Http2Exception { private void verifyNotProcessingHeaders() throws Http2Exception {
if (headersContinuation != null) { if (headersContinuation != null) {
throw connectionError(PROTOCOL_ERROR, "Received frame of type %s while processing headers.", frameType); throw connectionError(PROTOCOL_ERROR, "Received frame of type %s while processing headers on stream %d.",
frameType, headersContinuation.getStreamId());
} }
} }