lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

format code

Browse Source
This commit is contained in:
V2Ray 2015-10-06 17:24:57 +02:00
parent 7a24dc3e09
commit 78daf8a879
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/net/transport.go
View File

@ -11,9 +11,9 @@ const (
func ReadFrom(reader io.Reader) ([]byte, error) { func ReadFrom(reader io.Reader) ([]byte, error) {
buffer := make([]byte, bufferSize) buffer := make([]byte, bufferSize)
nBytes, err := reader.Read(buffer) nBytes, err := reader.Read(buffer)
if nBytes == 0 { if nBytes == 0 {
buffer = nil buffer = nil
} }
return buffer[:nBytes], err return buffer[:nBytes], err
} }

2
proxy/freedom/freedom.go
View File

@ -69,7 +69,7 @@ func dumpOutput(conn net.Conn, output chan<- []byte, finish *sync.Mutex, udp boo
defer close(output) defer close(output)
response, err := v2net.ReadFrom(conn) response, err := v2net.ReadFrom(conn)
log.Info("Freedom receives %d bytes from %s", len(response), conn.RemoteAddr().String()) log.Info("Freedom receives %d bytes from %s", len(response), conn.RemoteAddr().String())
if len(response) > 0 { if len(response) > 0 {
output <- response output <- response
} }

10
proxy/socks/socks.go
View File

@ -5,7 +5,7 @@ import (
"net" "net"
"strconv" "strconv"
"sync" "sync"
"time" "time"
"github.com/v2ray/v2ray-core" "github.com/v2ray/v2ray-core"
"github.com/v2ray/v2ray-core/common/errors" "github.com/v2ray/v2ray-core/common/errors"
@ -198,10 +198,10 @@ func (server *SocksServer) handleUDP(reader *v2net.TimeOutReader, writer io.Writ
} }
reader.SetTimeOut(300) /* 5 minutes */ reader.SetTimeOut(300) /* 5 minutes */
v2net.ReadFrom(reader) // Just in case of anything left in the socket v2net.ReadFrom(reader) // Just in case of anything left in the socket
// The TCP connection closes after this method returns. We need to wait until // The TCP connection closes after this method returns. We need to wait until
// the client closes it. // the client closes it.
// TODO: get notified from UDP part // TODO: get notified from UDP part
<-time.After(5 * time.Minute) <-time.After(5 * time.Minute)
return nil return nil

18
proxy/socks/udp.go
View File

@ -25,7 +25,7 @@ func (server *SocksServer) ListenUDP(port uint16) error {
log.Error("Socks failed to listen UDP on port %d: %v", port, err) log.Error("Socks failed to listen UDP on port %d: %v", port, err)
return err return err
} }
// TODO: make this configurable // TODO: make this configurable
udpAddress = v2net.IPAddress([]byte{127, 0, 0, 1}, port) udpAddress = v2net.IPAddress([]byte{127, 0, 0, 1}, port)
go server.AcceptPackets(conn) go server.AcceptPackets(conn)
@ -44,7 +44,7 @@ func (server *SocksServer) AcceptPackets(conn *net.UDPConn) error {
log.Error("Socks failed to read UDP packets: %v", err) log.Error("Socks failed to read UDP packets: %v", err)
continue continue
} }
log.Info("Client UDP connection from %v", addr) log.Info("Client UDP connection from %v", addr)
request, err := protocol.ReadUDPRequest(buffer[:nBytes]) request, err := protocol.ReadUDPRequest(buffer[:nBytes])
if err != nil { if err != nil {
log.Error("Socks failed to parse UDP request: %v", err) log.Error("Socks failed to parse UDP request: %v", err)
@ -57,7 +57,7 @@ func (server *SocksServer) AcceptPackets(conn *net.UDPConn) error {
} }
udpPacket := v2net.NewPacket(request.Destination(), request.Data, false) udpPacket := v2net.NewPacket(request.Destination(), request.Data, false)
log.Info("Send packet to %s with %d bytes", udpPacket.Destination().String(), len(request.Data)) log.Info("Send packet to %s with %d bytes", udpPacket.Destination().String(), len(request.Data))
go server.handlePacket(conn, udpPacket, addr, request.Address) go server.handlePacket(conn, udpPacket, addr, request.Address)
} }
} }
@ -67,12 +67,12 @@ func (server *SocksServer) handlePacket(conn *net.UDPConn, packet v2net.Packet,
close(ray.InboundInput()) close(ray.InboundInput())
if data, ok := <-ray.InboundOutput(); ok { if data, ok := <-ray.InboundOutput(); ok {
response := &protocol.Socks5UDPRequest { response := &protocol.Socks5UDPRequest{
Fragment: 0, Fragment: 0,
Address: targetAddr, Address: targetAddr,
Data: data, Data: data,
} }
log.Info("Writing back UDP response with %d bytes from %s to %s", len(data), targetAddr.String(), clientAddr.String()) log.Info("Writing back UDP response with %d bytes from %s to %s", len(data), targetAddr.String(), clientAddr.String())
udpMessage := response.Bytes(nil) udpMessage := response.Bytes(nil)
nBytes, err := conn.WriteToUDP(udpMessage, clientAddr) nBytes, err := conn.WriteToUDP(udpMessage, clientAddr)
if err != nil { if err != nil {

12
proxy/vmess/config.go
View File

@ -60,12 +60,12 @@ func (config VNextConfig) ToVNextServer(network string) VNextServer {
panic(log.Error("Unable to parse VNext IP: %s", config.Address)) panic(log.Error("Unable to parse VNext IP: %s", config.Address))
} }
address := v2net.IPAddress(ip, config.Port) address := v2net.IPAddress(ip, config.Port)
var dest v2net.Destination var dest v2net.Destination
if network == "tcp" { if network == "tcp" {
dest = v2net.NewTCPDestination(address) dest = v2net.NewTCPDestination(address)
} else { } else {
dest = v2net.NewUDPDestination(address) dest = v2net.NewUDPDestination(address)
} }
return VNextServer{ return VNextServer{
Destination: dest, Destination: dest,
Users: users, Users: users,

2
proxy/vmess/vmessin_udp.go
View File

@ -93,6 +93,6 @@ func (handler *VMessInboundHandler) handlePacket(conn *net.UDPConn, request *pro
if hasData { if hasData {
conn.WriteToUDP(buffer.Bytes(), clientAddr) conn.WriteToUDP(buffer.Bytes(), clientAddr)
log.Info("VMessIn sending %d bytes to %s", len(buffer.Bytes()), clientAddr.String()) log.Info("VMessIn sending %d bytes to %s", len(buffer.Bytes()), clientAddr.String())
} }
} }

2
proxy/vmess/vmessout.go
View File

@ -181,7 +181,7 @@ func handleResponse(conn net.Conn, request *protocol.VMessRequest, output chan<-
log.Warning("VMessOut: unexepcted response header. The connection is probably hijacked.") log.Warning("VMessOut: unexepcted response header. The connection is probably hijacked.")
return return
} }
log.Info("VMessOut received %d bytes from %s", len(buffer) - 4, conn.RemoteAddr().String()) log.Info("VMessOut received %d bytes from %s", len(buffer)-4, conn.RemoteAddr().String())
output <- buffer[4:] output <- buffer[4:]