lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-14 16:25:57 -05:00
Code Issues Releases Wiki Activity

reuse buffer

Browse Source
This commit is contained in:
Darien Raymond 2018-03-09 11:26:00 +01:00
parent 1179ecef27
commit fda85506c8
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/blackhole/config.go
View File

@ -27,7 +27,7 @@ func (*NoneResponse) WriteTo(buf.Writer) {}
// WriteTo implements ResponseConfig.WriteTo(). // WriteTo implements ResponseConfig.WriteTo().
func (*HTTPResponse) WriteTo(writer buf.Writer) { func (*HTTPResponse) WriteTo(writer buf.Writer) {
b := buf.NewLocal(512) b := buf.New()
common.Must(b.AppendSupplier(serial.WriteString(http403response))) common.Must(b.AppendSupplier(serial.WriteString(http403response)))
writer.WriteMultiBuffer(buf.NewMultiBufferValue(b)) writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
} }

4
proxy/shadowsocks/protocol.go
View File

@ -35,7 +35,7 @@ func ReadTCPSession(user *protocol.User, reader io.Reader) (*protocol.RequestHea
} }
account := rawAccount.(*MemoryAccount) account := rawAccount.(*MemoryAccount)
buffer := buf.NewLocal(512) buffer := buf.New()
defer buffer.Release() defer buffer.Release()
ivLen := account.Cipher.IVSize() ivLen := account.Cipher.IVSize()
@ -149,7 +149,7 @@ func WriteTCPRequest(request *protocol.RequestHeader, writer io.Writer) (buf.Wri
return nil, newError("failed to create encoding stream").Base(err).AtError() return nil, newError("failed to create encoding stream").Base(err).AtError()
} }
header := buf.NewLocal(512) header := buf.New()
if err := addrParser.WriteAddressPort(header, request.Address, request.Port); err != nil { if err := addrParser.WriteAddressPort(header, request.Address, request.Port); err != nil {
return nil, newError("failed to write address").Base(err) return nil, newError("failed to write address").Base(err)

19
proxy/socks/protocol.go
View File

@ -46,7 +46,9 @@ type ServerSession struct {
} }
func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol.RequestHeader, error) { func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol.RequestHeader, error) {
buffer := buf.NewLocal(512) buffer := buf.New()
defer buffer.Release()
request := new(protocol.RequestHeader) request := new(protocol.RequestHeader)
if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 2)); err != nil { if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, 2)); err != nil {
@ -177,7 +179,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
} }
func readUsernamePassword(reader io.Reader) (string, string, error) { func readUsernamePassword(reader io.Reader) (string, string, error) {
buffer := buf.NewLocal(512) buffer := buf.New()
defer buffer.Release() defer buffer.Release()
if err := buffer.Reset(buf.ReadFullFrom(reader, 2)); err != nil { if err := buffer.Reset(buf.ReadFullFrom(reader, 2)); err != nil {
@ -234,7 +236,9 @@ func writeSocks5AuthenticationResponse(writer io.Writer, version byte, auth byte
} }
func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error { func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error {
buffer := buf.NewLocal(64) buffer := buf.New()
defer buffer.Release()
buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */) buffer.AppendBytes(socks5Version, errCode, 0x00 /* reserved */)
if err := addrParser.WriteAddressPort(buffer, address, port); err != nil { if err := addrParser.WriteAddressPort(buffer, address, port); err != nil {
return err return err
@ -245,7 +249,9 @@ func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, po
} }
func writeSocks4Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error { func writeSocks4Response(writer io.Writer, errCode byte, address net.Address, port net.Port) error {
buffer := buf.NewLocal(32) buffer := buf.New()
defer buffer.Release()
buffer.AppendBytes(0x00, errCode) buffer.AppendBytes(0x00, errCode)
common.Must(buffer.AppendSupplier(serial.WriteUint16(port.Value()))) common.Must(buffer.AppendSupplier(serial.WriteUint16(port.Value())))
buffer.Append(address.IP()) buffer.Append(address.IP())
@ -282,6 +288,7 @@ func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) (*buf.Buffer,
b := buf.New() b := buf.New()
b.AppendBytes(0, 0, 0 /* Fragment */) b.AppendBytes(0, 0, 0 /* Fragment */)
if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil { if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil {
b.Release()
return nil, err return nil, err
} }
b.Append(data) b.Append(data)
@ -338,7 +345,9 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
authByte = byte(authPassword) authByte = byte(authPassword)
} }
b := buf.NewLocal(512) b := buf.New()
defer b.Release()
b.AppendBytes(socks5Version, 0x01, authByte) b.AppendBytes(socks5Version, 0x01, authByte)
if authByte == authPassword { if authByte == authPassword {
rawAccount, err := request.User.GetTypedAccount() rawAccount, err := request.User.GetTypedAccount()

2
proxy/vmess/encoding/commands.go
View File

@ -32,7 +32,7 @@ func MarshalCommand(command interface{}, writer io.Writer) error {
return ErrUnknownCommand return ErrUnknownCommand
} }
buffer := buf.NewLocal(512) buffer := buf.New()
defer buffer.Release() defer buffer.Release()
err := factory.Marshal(command, buffer) err := factory.Marshal(command, buffer)