format code

This commit is contained in:
V2Ray committed 2015-09-11 14:12:26 +02:00
1 parent 262eb4f985
commit 9e6b746e86
7 files changed
+70 -71

No files matched your search

+5 -5
View File
@@ -2,8 +2,8 @@ package freedom
import (
"io"
"log"
"net"
"log"
"github.com/v2ray/v2ray-core"
v2net "github.com/v2ray/v2ray-core/net"
@@ -26,10 +26,10 @@ func (vconn *VFreeConnection) Start(vRay core.OutboundVRay) error {
output := vRay.OutboundOutput()
conn, err := net.Dial("tcp", vconn.dest.String())
if err != nil {
log.Print(err)
log.Print(err)
return err
}
log.Print("Working on tcp:" + vconn.dest.String())
log.Print("Working on tcp:" + vconn.dest.String())
finish := make(chan bool, 2)
go vconn.DumpInput(conn, input, finish)
@@ -54,11 +54,11 @@ func (vconn *VFreeConnection) DumpOutput(conn net.Conn, output chan<- []byte, fi
buffer := make([]byte, 128)
nBytes, err := conn.Read(buffer)
if err == io.EOF {
close(output)
close(output)
finish <- true
break
}
log.Print(buffer[:nBytes])
log.Print(buffer[:nBytes])
output <- buffer[:nBytes]
}
}
+1 -1
View File
@@ -2,7 +2,7 @@ package freedom
import (
"github.com/v2ray/v2ray-core"
v2net "github.com/v2ray/v2ray-core/net"
v2net "github.com/v2ray/v2ray-core/net"
)
type FreedomFactory struct {
+27 -28
View File
@@ -3,9 +3,9 @@ package socks
import (
"errors"
"io"
"log"
"log"
"net"
"strconv"
"strconv"
"github.com/v2ray/v2ray-core"
socksio "github.com/v2ray/v2ray-core/io/socks"
@@ -42,7 +42,7 @@ func (server *SocksServer) AcceptConnections(listener net.Listener) error {
for server.accepting {
connection, err := listener.Accept()
if err != nil {
log.Print(err)
log.Print(err)
return err
}
go server.HandleConnection(connection)
@@ -55,14 +55,14 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
auth, err := socksio.ReadAuthentication(connection)
if err != nil {
log.Print(err)
log.Print(err)
return err
}
log.Print(auth)
log.Print(auth)
if !auth.HasAuthMethod(socksio.AuthNotRequired) {
// TODO send response with FF
log.Print(ErrorAuthenticationFailed)
// TODO send response with FF
log.Print(ErrorAuthenticationFailed)
return ErrorAuthenticationFailed
}
@@ -71,33 +71,32 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
request, err := socksio.ReadRequest(connection)
if err != nil {
log.Print(err)
log.Print(err)
return err
}
response := socksio.NewSocks5Response()
response := socksio.NewSocks5Response()
if request.Command == socksio.CmdBind || request.Command == socksio.CmdUdpAssociate {
response := socksio.NewSocks5Response()
response.Error = socksio.ErrorCommandNotSupported
socksio.WriteResponse(connection, response)
log.Print(ErrorCommandNotSupported)
log.Print(ErrorCommandNotSupported)
return ErrorCommandNotSupported
}
response.Error = socksio.ErrorSuccess
response.Port = request.Port
response.AddrType = request.AddrType
switch response.AddrType {
case socksio.AddrTypeIPv4:
copy(response.IPv4[:], request.IPv4[:])
case socksio.AddrTypeIPv6:
copy(response.IPv6[:], request.IPv6[:])
case socksio.AddrTypeDomain:
response.Domain = request.Domain
}
socksio.WriteResponse(connection, response)
response.Error = socksio.ErrorSuccess
response.Port = request.Port
response.AddrType = request.AddrType
switch response.AddrType {
case socksio.AddrTypeIPv4:
copy(response.IPv4[:], request.IPv4[:])
case socksio.AddrTypeIPv6:
copy(response.IPv6[:], request.IPv6[:])
case socksio.AddrTypeDomain:
response.Domain = request.Domain
}
socksio.WriteResponse(connection, response)
ray := server.vPoint.NewInboundConnectionAccepted(request.Destination())
input := ray.InboundInput()
@@ -115,9 +114,9 @@ func (server *SocksServer) dumpInput(conn net.Conn, input chan<- []byte, finish
for {
buffer := make([]byte, 256)
nBytes, err := conn.Read(buffer)
log.Printf("Reading %d bytes, with error %v", nBytes, err)
log.Printf("Reading %d bytes, with error %v", nBytes, err)
if err == io.EOF {
close(input)
close(input)
finish <- true
break
}
@@ -133,7 +132,7 @@ func (server *SocksServer) dumpOutput(conn net.Conn, output <-chan []byte, finis
break
}
nBytes, _ := conn.Write(buffer)
log.Printf("Writing %d bytes", nBytes)
log.Printf("Writing %d bytes", nBytes)
}
}
+5 -5
View File
@@ -50,11 +50,11 @@ func (addr VAddress) String() string {
var host string
switch addr.Type {
case AddrTypeIP:
host = addr.IP.String()
if len(addr.IP) == net.IPv6len {
host = "[" + host + "]"
}
host = addr.IP.String()
if len(addr.IP) == net.IPv6len {
host = "[" + host + "]"
}
case AddrTypeDomain:
host = addr.Domain
default: