Skip to content

Commit 7496413

Browse files
Remove remnants of global transport (#3792)
* Remove remenants * Generate pb.go * Remove function
1 parent 297a9ae commit 7496413

File tree

7 files changed

+62
-298
lines changed

7 files changed

+62
-298
lines changed

core/config.pb.go

Lines changed: 57 additions & 80 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/config.proto

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ option java_package = "com.xray.core";
77
option java_multiple_files = true;
88

99
import "common/serial/typed_message.proto";
10-
import "transport/global/config.proto";
1110

1211
// Config is the master config of Xray. Xray takes this config as input and
1312
// functions accordingly.
@@ -26,15 +25,15 @@ message Config {
2625
// through common.RegisterConfig.
2726
repeated xray.common.serial.TypedMessage app = 4;
2827

29-
// Transport settings.
30-
// Deprecated. Each inbound and outbound should choose their own transport
31-
// config. Date to remove: 2020-01-13
32-
xray.transport.Config transport = 5 [deprecated = true];
33-
3428
// Configuration for extensions. The config may not work if corresponding
3529
// extension is not loaded into Xray. Xray will ignore such config during
3630
// initialization.
3731
repeated xray.common.serial.TypedMessage extension = 6;
32+
33+
// Transport settings.
34+
// Deprecated. Each inbound and outbound should choose their own transport
35+
// config. Date to remove: 2020-01-13
36+
// xray.transport.Config transport = 5 [deprecated = true];
3837
}
3938

4039
// InboundHandlerConfig is the configuration for inbound handler.

core/xray.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,6 @@ func initInstanceWithConfig(config *Config, server *Instance) (bool, error) {
185185
server.ctx = context.WithValue(server.ctx, "cone",
186186
platform.NewEnvFlag(platform.UseCone).GetValue(func() string { return "" }) != "true")
187187

188-
if config.Transport != nil {
189-
features.PrintDeprecatedFeatureWarning("global transport settings")
190-
}
191-
if err := config.Transport.Apply(); err != nil {
192-
return true, err
193-
}
194-
195188
for _, appSettings := range config.App {
196189
settings, err := appSettings.GetInstance()
197190
if err != nil {

transport/global/config.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)