lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-29 02:35:23 +00:00
Code Issues Releases Wiki Activity

remove unnecessary code

Browse Source
This commit is contained in:
Darien Raymond 2017-01-13 13:47:44 +01:00
parent 17504d2aac
commit 289c467a12
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/router/router.go
View File

@ -115,8 +115,6 @@ func (Router) Interface() interface{} {
return (*Router)(nil) return (*Router)(nil)
} }
type RouterFactory struct{}
func FromSpace(space app.Space) *Router { func FromSpace(space app.Space) *Router {
app := space.GetApplication((*Router)(nil)) app := space.GetApplication((*Router)(nil))
if app == nil { if app == nil {

17
transport/internet/headers/http/http.go
View File

@ -13,7 +13,6 @@ import (
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
"v2ray.com/core/common/serial" "v2ray.com/core/common/serial"
"v2ray.com/core/transport/internet"
) )
const ( const (
@ -259,20 +258,14 @@ func (v HttpAuthenticator) Server(conn net.Conn) net.Conn {
})) }))
} }
type HttpAuthenticatorFactory struct{} func NewHttpAuthenticator(ctx context.Context, config *Config) (HttpAuthenticator, error) {
func (HttpAuthenticatorFactory) Create(config interface{}) internet.ConnectionAuthenticator {
return HttpAuthenticator{ return HttpAuthenticator{
config: config.(*Config), config: config,
}
}
func NewHttpAuthenticator(ctx context.Context, config interface{}) (interface{}, error) {
return HttpAuthenticator{
config: config.(*Config),
}, nil }, nil
} }
func init() { func init() {
common.Must(common.RegisterConfig((*Config)(nil), NewHttpAuthenticator)) common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
return NewHttpAuthenticator(ctx, config.(*Config))
}))
} }

14
transport/internet/headers/http/http_test.go
View File

@ -1,9 +1,9 @@
package http_test package http_test
import ( import (
"context"
"net" "net"
"testing" "testing"
"time" "time"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
@ -34,8 +34,7 @@ func TestReaderWriter(t *testing.T) {
func TestRequestHeader(t *testing.T) { func TestRequestHeader(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
factory := HttpAuthenticatorFactory{} auth, err := NewHttpAuthenticator(context.Background(), &Config{
auth := factory.Create(&Config{
Request: &RequestConfig{ Request: &RequestConfig{
Uri: []string{"/"}, Uri: []string{"/"},
Header: []*Header{ Header: []*Header{
@ -45,10 +44,11 @@ func TestRequestHeader(t *testing.T) {
}, },
}, },
}, },
}).(HttpAuthenticator) })
assert.Error(err).IsNil()
cache := buf.New() cache := buf.New()
err := auth.GetClientWriter().Write(cache) err = auth.GetClientWriter().Write(cache)
assert.Error(err).IsNil() assert.Error(err).IsNil()
assert.String(cache.String()).Equals("GET / HTTP/1.1\r\nTest: Value\r\n\r\n") assert.String(cache.String()).Equals("GET / HTTP/1.1\r\nTest: Value\r\n\r\n")
@ -57,8 +57,8 @@ func TestRequestHeader(t *testing.T) {
func TestConnection(t *testing.T) { func TestConnection(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
factory := HttpAuthenticatorFactory{} auth, err := NewHttpAuthenticator(context.Background(), new(Config))
auth := factory.Create(new(Config)) assert.Error(err).IsNil()
listener, err := net.Listen("tcp", "127.0.0.1:0") listener, err := net.Listen("tcp", "127.0.0.1:0")
assert.Error(err).IsNil() assert.Error(err).IsNil()