Feat: rename network to networks for JsonV5

v2fly · Aug 19, 2022 · 8b7d283 · 8b7d283
1 parent adb7871
commit 8b7d283
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 72 deletions.
diff --git a/proxy/dokodemo/config.pb.go b/proxy/dokodemo/config.pb.go
diff --git a/proxy/dokodemo/config.proto b/proxy/dokodemo/config.proto
@@ -31,6 +31,6 @@ message SimplifiedConfig {
 
   v2ray.core.common.net.IPOrDomain address = 1;
   uint32 port = 2;
-  v2ray.core.common.net.NetworkList network = 3;
+  v2ray.core.common.net.NetworkList networks = 3;
   bool follow_redirect = 4;
 }
diff --git a/proxy/dokodemo/dokodemo.go b/proxy/dokodemo/dokodemo.go
@@ -35,7 +35,7 @@ func init() {
 		fullConfig := &Config{
 			Address:        simplifiedServer.Address,
 			Port:           simplifiedServer.Port,
-			Networks:       simplifiedServer.Network.Network,
+			Networks:       simplifiedServer.Networks.Network,
 			FollowRedirect: simplifiedServer.FollowRedirect,
 		}
 

diff --git a/proxy/shadowsocks/simplified/config.go b/proxy/shadowsocks/simplified/config.go
@@ -19,7 +19,7 @@ func init() {
 					CipherType: simplifiedServer.Method,
 				}),
 			},
-			Network:        simplifiedServer.Network.Network,
+			Network:        simplifiedServer.Networks.Network,
 			PacketEncoding: simplifiedServer.PacketEncoding,
 		}
 

diff --git a/proxy/shadowsocks/simplified/config.pb.go b/proxy/shadowsocks/simplified/config.pb.go
diff --git a/proxy/shadowsocks/simplified/config.proto b/proxy/shadowsocks/simplified/config.proto
@@ -18,7 +18,7 @@ message ServerConfig{
 
   v2ray.core.proxy.shadowsocks.CipherType method = 1;
   string password = 2;
-  v2ray.core.common.net.NetworkList network = 3;
+  v2ray.core.common.net.NetworkList networks = 3;
   v2ray.core.net.packetaddr.PacketAddrType packet_encoding = 4;
 }