Skip to content

Minor cleanup #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ok2c merged 2 commits into from
Jul 1, 2022
Merged

Minor cleanup #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91f5fb2
Minor cleanup
Jul 1, 2022
50e59df
Declare remainingResponseSize as final
Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions httpcore5/src/main/java/org/apache/hc/core5/reactor/SocksProxyProtocolHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ private enum State {
// a 32 byte buffer is enough for all usual SOCKS negotiations, we expand it if necessary during the processing
private ByteBuffer buffer = ByteBuffer.allocate(32);
private State state = State.SEND_AUTH;
private int remainingResponseSize = -1;

SocksProxyProtocolHandler(final ProtocolIOSession ioSession, final Object attachment, final InetSocketAddress targetAddress,
final String username, final String password, final IOEventHandlerFactory eventHandlerFactory) {
this.ioSession = ioSession;
Expand Down Expand Up @@ -220,10 +218,10 @@ public void inputReady(final IOSession session, final ByteBuffer src) throws IOE
} else {
throw new IOException("SOCKS server returned unsupported address type: " + aType);
}
this.remainingResponseSize = addressSize + 2;
final int remainingResponseSize = addressSize + 2;
this.buffer.compact();
// make sure we only read what we need to, don't read too much
this.buffer.limit(this.remainingResponseSize);
this.buffer.limit(remainingResponseSize);
this.state = State.RECEIVE_ADDRESS;
// deliberate fall-through
} else {
Expand Down Expand Up @@ -262,13 +260,12 @@ private void prepareConnectCommand() throws IOException {
this.buffer.put((byte) 0); // reserved
if (address instanceof Inet4Address) {
this.buffer.put(InetAddressUtils.IPV4);
this.buffer.put(address.getAddress());
} else if (address instanceof Inet6Address) {
this.buffer.put(InetAddressUtils.IPV6);
this.buffer.put(address.getAddress());
} else {
throw new IOException("Unsupported remote address class: " + address.getClass().getName());
}
this.buffer.put(address.getAddress());
this.buffer.putShort((short) port);
this.buffer.flip();
}
Expand Down