Code maintenance: remove unneeded defaultInterface in Shadowsocks

This commit is contained in:
Quentin McGaw
2020-12-30 21:43:45 +00:00
parent f385c4203a
commit fa7bda7ee4
2 changed files with 15 additions and 17 deletions

View File

@@ -265,7 +265,7 @@ func _main(background context.Context, buildInfo models.BuildInformation,
wg.Add(1)
go httpProxyLooper.Run(ctx, wg)
shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger, defaultInterface)
shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger)
restartShadowsocks := shadowsocksLooper.Restart
wg.Add(1)
go shadowsocksLooper.Run(ctx, wg)

View File

@@ -21,14 +21,13 @@ type Looper interface {
}
type looper struct {
settings settings.ShadowSocks
settingsMutex sync.RWMutex
logger logging.Logger
defaultInterface string
restart chan struct{}
start chan struct{}
stop chan struct{}
backoffTime time.Duration
settings settings.ShadowSocks
settingsMutex sync.RWMutex
logger logging.Logger
restart chan struct{}
start chan struct{}
stop chan struct{}
backoffTime time.Duration
}
func (l *looper) logAndWait(ctx context.Context, err error) {
@@ -47,15 +46,14 @@ func (l *looper) logAndWait(ctx context.Context, err error) {
const defaultBackoffTime = 10 * time.Second
func NewLooper(settings settings.ShadowSocks, logger logging.Logger, defaultInterface string) Looper {
func NewLooper(settings settings.ShadowSocks, logger logging.Logger) Looper {
return &looper{
settings: settings,
logger: logger.WithPrefix("shadowsocks: "),
defaultInterface: defaultInterface,
restart: make(chan struct{}),
start: make(chan struct{}),
stop: make(chan struct{}),
backoffTime: defaultBackoffTime,
settings: settings,
logger: logger.WithPrefix("shadowsocks: "),
restart: make(chan struct{}),
start: make(chan struct{}),
stop: make(chan struct{}),
backoffTime: defaultBackoffTime,
}
}