move connhandler to proxy

This commit is contained in:
v2ray
2016-01-02 23:32:18 +01:00
parent 54ce82fbfa
commit 0780db7999
21 changed files with 76 additions and 81 deletions
+2 -2
View File
@@ -1,9 +1,9 @@
package app
import (
"github.com/v2ray/v2ray-core/proxy/common/connhandler"
"github.com/v2ray/v2ray-core/proxy"
)
type InboundHandlerManager interface {
GetHandler(tag string) (connhandler.InboundConnectionHandler, int)
GetHandler(tag string) (proxy.InboundConnectionHandler, int)
}
+3 -3
View File
@@ -2,11 +2,11 @@ package internal
import (
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/proxy/common/connhandler"
"github.com/v2ray/v2ray-core/proxy"
)
type InboundHandlerManagerWithContext interface {
GetHandler(context app.Context, tag string) (connhandler.InboundConnectionHandler, int)
GetHandler(context app.Context, tag string) (proxy.InboundConnectionHandler, int)
}
type inboundHandlerManagerWithContext struct {
@@ -14,6 +14,6 @@ type inboundHandlerManagerWithContext struct {
manager InboundHandlerManagerWithContext
}
func (this *inboundHandlerManagerWithContext) GetHandler(tag string) (connhandler.InboundConnectionHandler, int) {
func (this *inboundHandlerManagerWithContext) GetHandler(tag string) (proxy.InboundConnectionHandler, int) {
return this.manager.GetHandler(this.context, tag)
}