Skip to content

Commit 206ae74

Browse files
Copilotchrjohn
andauthored
Update Netty to 4.2.13.Final and sync SocksServerHandler with upstream
- Bump netty.version property from 4.2.12.Final to 4.2.13.Final in root pom.xml - Reorder Socks5InitialRequest import to match upstream order in SocksServerHandler.java - Add auth support example comments from 4.2.13.Final upstream SocksServerHandler Agent-Logs-Url: https://github.com/quickfix-j/quickfixj/sessions/71c5d3a5-3685-44b1-a6d2-a42a1d2ab4ca Co-authored-by: chrjohn <6644028+chrjohn@users.noreply.github.com>
1 parent 20da1d2 commit 206ae74

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<jmh.version>1.37</jmh.version>
106106
<jcstress.version>0.16</jcstress.version>
107107
<hsqldb.version>1.8.0.10</hsqldb.version>
108-
<netty.version>4.2.12.Final</netty.version>
108+
<netty.version>4.2.13.Final</netty.version>
109109
<class-pruner-plugin.version>3.0.1</class-pruner-plugin.version>
110110
</properties>
111111

quickfixj-core/src/test/java/quickfix/mina/socksproxy/SocksServerHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import io.netty.handler.codec.socksx.v5.DefaultSocks5PasswordAuthResponse;
2626
import io.netty.handler.codec.socksx.v5.DefaultSocks5PrivateAuthResponse;
2727
import io.netty.handler.codec.socksx.v5.Socks5AuthMethod;
28+
import io.netty.handler.codec.socksx.v5.Socks5InitialRequest;
2829
import io.netty.handler.codec.socksx.v5.Socks5CommandRequest;
2930
import io.netty.handler.codec.socksx.v5.Socks5CommandRequestDecoder;
3031
import io.netty.handler.codec.socksx.v5.Socks5CommandType;
31-
import io.netty.handler.codec.socksx.v5.Socks5InitialRequest;
3232
import io.netty.handler.codec.socksx.v5.Socks5PasswordAuthRequest;
3333
import io.netty.handler.codec.socksx.v5.Socks5PasswordAuthStatus;
3434
import io.netty.handler.codec.socksx.v5.Socks5PrivateAuthRequest;
@@ -56,6 +56,9 @@ public void channelRead0(ChannelHandlerContext ctx, SocksMessage socksRequest) t
5656
break;
5757
case SOCKS5:
5858
if (socksRequest instanceof Socks5InitialRequest) {
59+
// auth support example
60+
//ctx.pipeline().addFirst(new Socks5PasswordAuthRequestDecoder());
61+
//ctx.write(new DefaultSocks5AuthMethodResponse(Socks5AuthMethod.PASSWORD));
5962
ctx.pipeline().addFirst(new Socks5CommandRequestDecoder());
6063
ctx.write(new DefaultSocks5InitialResponse(Socks5AuthMethod.NO_AUTH));
6164
} else if (socksRequest instanceof Socks5PasswordAuthRequest) {

0 commit comments

Comments
 (0)