lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 05:55:20 -05:00
Code Issues Releases Wiki Activity

simplify config directory

Browse Source
This commit is contained in:
v2ray
2015-12-06 18:21:15 +01:00
parent 8bee0c4a7b
commit 092217182a
21 changed files with 299 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
proxy/dokodemo/dokodemo.go
View File

@@ -10,40 +10,33 @@ import (
"github.com/v2ray/v2ray-core/common/log"
v2net "github.com/v2ray/v2ray-core/common/net"
"github.com/v2ray/v2ray-core/common/retry"
"github.com/v2ray/v2ray-core/proxy/dokodemo/config/json"
)
type DokodemoDoor struct {
config *json.DokodemoConfig
config Config
accepting bool
address v2net.Address
space *app.Space
}
func NewDokodemoDoor(space *app.Space, config *json.DokodemoConfig) *DokodemoDoor {
d := &DokodemoDoor{
config: config,
space: space,
func NewDokodemoDoor(space *app.Space, config Config) *DokodemoDoor {
return &DokodemoDoor{
config: config,
space: space,
address: config.Address(),
}
ip := net.ParseIP(config.Host)
if ip != nil {
d.address = v2net.IPAddress(ip, config.Port)
} else {
d.address = v2net.DomainAddress(config.Host, config.Port)
}
return d
}
func (this *DokodemoDoor) Listen(port v2net.Port) error {
this.accepting = true
if this.config.Network.HasNetwork(v2net.TCPNetwork) {
if this.config.Network().HasNetwork(v2net.TCPNetwork) {
err := this.ListenTCP(port)
if err != nil {
return err
}
}
if this.config.Network.HasNetwork(v2net.UDPNetwork) {
if this.config.Network().HasNetwork(v2net.UDPNetwork) {
err := this.ListenUDP(port)
if err != nil {
return err
@@ -126,7 +119,7 @@ func (this *DokodemoDoor) HandleTCPConnection(conn *net.TCPConn) {
inputFinish.Lock()
outputFinish.Lock()
reader := v2net.NewTimeOutReader(this.config.Timeout, conn)
reader := v2net.NewTimeOutReader(this.config.Timeout(), conn)
go dumpInput(reader, ray.InboundInput(), &inputFinish)
go dumpOutput(conn, ray.InboundOutput(), &outputFinish)