Browse Source

add packet encoding support in simplified socks5 server config

Shelikhoo 3 years ago
parent
commit
e7ffcfd4f6
2 changed files with 6 additions and 3 deletions
  1. 4 3
      proxy/socks/simplified/config.go
  2. 2 0
      proxy/socks/simplified/config.proto

+ 4 - 3
proxy/socks/simplified/config.go

@@ -12,9 +12,10 @@ func init() {
 	common.Must(common.RegisterConfig((*ServerConfig)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
 		simplifiedServer := config.(*ServerConfig)
 		fullServer := &socks.ServerConfig{
-			AuthType:   socks.AuthType_NO_AUTH,
-			Address:    simplifiedServer.Address,
-			UdpEnabled: simplifiedServer.UdpEnabled,
+			AuthType:       socks.AuthType_NO_AUTH,
+			Address:        simplifiedServer.Address,
+			UdpEnabled:     simplifiedServer.UdpEnabled,
+			PacketEncoding: simplifiedServer.PacketEncoding,
 		}
 		return common.CreateObject(ctx, fullServer)
 	}))

+ 2 - 0
proxy/socks/simplified/config.proto

@@ -8,6 +8,7 @@ option java_multiple_files = true;
 
 import "common/protoext/extensions.proto";
 import "common/net/address.proto";
+import "common/net/packetaddr/config.proto";
 
 message ServerConfig{
   option (v2ray.core.common.protoext.message_opt).type = "inbound";
@@ -15,6 +16,7 @@ message ServerConfig{
 
   v2ray.core.common.net.IPOrDomain address = 3;
   bool udp_enabled = 4;
+  v2ray.core.net.packetaddr.PacketAddrType packet_encoding = 7;
 }
 
 message ClientConfig {