rename interfaces

app/policy/manager/manager.go

@@ -52,7 +52,7 @@ func (m *Instance) Close() {
 }
 
 func (m *Instance) Interface() interface{} {
-	return (*policy.Interface)(nil)
+	return (*policy.Manager)(nil)
 }
 
 func init() {

app/policy/policy.go

@@ -4,14 +4,17 @@ import (
 	"v2ray.com/core/app"
 )
 
-type Interface interface {
+// Manager is an utility to manage policy per user level.
+type Manager interface {
+	// GetPolicy returns the Policy for the given user level.
 	GetPolicy(level uint32) Policy
 }
 
-func PolicyFromSpace(space app.Space) Interface {
+// FromSpace returns the policy.Manager in a space.
-	app := space.GetApplication((*Interface)(nil))
+func FromSpace(space app.Space) Manager {
+	app := space.GetApplication((*Manager)(nil))
 	if app == nil {
 		return nil
 	}
-	return app.(Interface)
+	return app.(Manager)
 }

proxy/dokodemo/dokodemo.go

@@ -39,7 +39,7 @@ func New(ctx context.Context, config *Config) (*DokodemoDoor, error) {
 		port:    net.Port(config.Port),
 	}
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/freedom/freedom.go

@@ -47,7 +47,7 @@ func New(ctx context.Context, config *Config) (*Handler, error) {
 				return newError("DNS server is not found in the space")
 			}
 		}
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/http/server.go

@@ -38,7 +38,7 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
 		config: config,
 	}
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/shadowsocks/client.go

@@ -20,7 +20,7 @@ import (
 // Client is a inbound handler for Shadowsocks protocol
 type Client struct {
 	serverPicker  protocol.ServerPicker
-	policyManager policy.Interface
+	policyManager policy.Manager
 }
 
 // NewClient create a new Shadowsocks client.
@@ -40,7 +40,7 @@ func NewClient(ctx context.Context, config *ClientConfig) (*Client, error) {
 		return nil, newError("Space not found.")
 	}
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/shadowsocks/server.go

@@ -22,7 +22,7 @@ type Server struct {
 	config        *ServerConfig
 	user          *protocol.User
 	account       *ShadowsocksAccount
-	policyManager policy.Interface
+	policyManager policy.Manager
 }
 
 // NewServer create a new Shadowsocks server.
@@ -48,7 +48,7 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
 	}
 
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/socks/server.go

@@ -35,7 +35,7 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
 		config: config,
 	}
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy not found in space.")
 		}

proxy/vmess/inbound/inbound.go

@@ -79,7 +79,7 @@ type Handler struct {
 	usersByEmail          *userByEmail
 	detours               *DetourConfig
 	sessionHistory        *encoding.SessionHistory
-	policyManager         policy.Interface
+	policyManager         policy.Manager
 }
 
 // New creates a new VMess inbound handler.
@@ -108,7 +108,7 @@ func New(ctx context.Context, config *Config) (*Handler, error) {
 		if handler.inboundHandlerManager == nil {
 			return newError("InboundHandlerManager is not found is space.")
 		}
-		handler.policyManager = policy.PolicyFromSpace(space)
+		handler.policyManager = policy.FromSpace(space)
 		if handler.policyManager == nil {
 			return newError("Policy is not found in space.")
 		}

proxy/vmess/outbound/outbound.go

@@ -26,7 +26,7 @@ import (
 type Handler struct {
 	serverList    *protocol.ServerList
 	serverPicker  protocol.ServerPicker
-	policyManager policy.Interface
+	policyManager policy.Manager
 }
 
 func New(ctx context.Context, config *Config) (*Handler, error) {
@@ -45,7 +45,7 @@ func New(ctx context.Context, config *Config) (*Handler, error) {
 	}
 
 	space.OnInitialize(func() error {
-		pm := policy.PolicyFromSpace(space)
+		pm := policy.FromSpace(space)
 		if pm == nil {
 			return newError("Policy is not found in space.")
 		}

v2ray.go

@@ -118,7 +118,7 @@ func newSimpleServer(config *Config) (*simpleServer, error) {
 		common.Must(space.AddApplication(d))
 	}
 
-	if p := policy.PolicyFromSpace(space); p == nil {
+	if p := policy.FromSpace(space); p == nil {
 		p, err := app.CreateAppFromConfig(ctx, &policy.Config{
 			Level: map[uint32]*policy.Policy{
 				1: &policy.Policy{