Browse Source

:seedling: Drop relay v1

Signed-off-by: mudler <[email protected]>
mudler 2 years ago
parent
commit
0407117d50
2 changed files with 0 additions and 10 deletions
  1. 0 6
      cmd/util.go
  2. 0 4
      pkg/config/config.go

+ 0 - 6
cmd/util.go

@@ -148,11 +148,6 @@ var CommonFlags []cli.Flag = []cli.Flag{
 		Usage:  "Automatically act as a relay if the node can accept inbound connections",
 		Usage:  "Automatically act as a relay if the node can accept inbound connections",
 		EnvVar: "EDGEVPNAUTORELAY",
 		EnvVar: "EDGEVPNAUTORELAY",
 	},
 	},
-	&cli.BoolFlag{
-		Name:   "autorelay-v1",
-		Usage:  "Enable autorelay v1 circuits",
-		EnvVar: "EDGEVPNAUTORELAYV1",
-	},
 	&cli.IntFlag{
 	&cli.IntFlag{
 		Name:  "concurrency",
 		Name:  "concurrency",
 		Usage: "Number of concurrent requests to serve",
 		Usage: "Number of concurrent requests to serve",
@@ -432,7 +427,6 @@ func cliToOpts(c *cli.Context) ([]node.Option, []vpn.Option, *logger.Logger) {
 		},
 		},
 		Connection: config.Connection{
 		Connection: config.Connection{
 			AutoRelay:                  c.Bool("autorelay"),
 			AutoRelay:                  c.Bool("autorelay"),
-			RelayV1:                    c.Bool("autorelay-v1"),
 			MaxConnections:             c.Int("max-connections"),
 			MaxConnections:             c.Int("max-connections"),
 			HolePunch:                  c.Bool("holepunch"),
 			HolePunch:                  c.Bool("holepunch"),
 			Mplex:                      c.Bool("mplex-multiplexer"),
 			Mplex:                      c.Bool("mplex-multiplexer"),

+ 0 - 4
pkg/config/config.go

@@ -113,7 +113,6 @@ type Connection struct {
 	AutoRelay bool
 	AutoRelay bool
 
 
 	AutoRelayDiscoveryInterval time.Duration
 	AutoRelayDiscoveryInterval time.Duration
-	RelayV1                    bool
 	StaticRelays               []string
 	StaticRelays               []string
 	OnlyStaticRelays           bool
 	OnlyStaticRelays           bool
 
 
@@ -248,9 +247,6 @@ func (c Config) ToOpts(l *logger.Logger) ([]node.Option, []vpn.Option, error) {
 	// AutoRelay section configuration
 	// AutoRelay section configuration
 	if c.Connection.AutoRelay {
 	if c.Connection.AutoRelay {
 		relayOpts := []autorelay.Option{}
 		relayOpts := []autorelay.Option{}
-		if c.Connection.RelayV1 {
-			relayOpts = append(relayOpts, autorelay.WithCircuitV1Support())
-		}
 
 
 		staticRelays := c.Connection.StaticRelays
 		staticRelays := c.Connection.StaticRelays