Use &struct{} instead of new

This commit is contained in:
Charles committed 2015-09-16 22:27:36 +08:00
1 parent cc3f374623
commit 12ea3b8e28
7 files changed
+53 -50

No files matched your search

+8 -8
View File
@@ -15,10 +15,10 @@ type CryptionReader struct {
}
func NewCryptionReader(stream cipher.Stream, reader io.Reader) *CryptionReader {
this := new(CryptionReader)
this.stream = stream
this.reader = reader
return this
return &CryptionReader{
stream: stream,
reader: reader,
}
}
// Read reads blocks from underlying reader, the length of blocks must be
@@ -42,10 +42,10 @@ type CryptionWriter struct {
}
func NewCryptionWriter(stream cipher.Stream, writer io.Writer) *CryptionWriter {
this := new(CryptionWriter)
this.stream = stream
this.writer = writer
return this
return &CryptionWriter{
stream: stream,
writer: writer,
}
}
// Write writes the give blocks to underlying writer. The length of the blocks
+14 -13
View File
@@ -71,10 +71,10 @@ type Socks5AuthenticationResponse struct {
}
func NewAuthenticationResponse(authMethod byte) *Socks5AuthenticationResponse {
response := new(Socks5AuthenticationResponse)
response.version = socksVersion
response.authMethod = authMethod
return response
return &Socks5AuthenticationResponse{
version: socksVersion,
authMethod: authMethod,
}
}
func (r *Socks5AuthenticationResponse) ToBytes() []byte {
@@ -158,7 +158,7 @@ type Socks5Request struct {
}
func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
request = new(Socks5Request)
buffer := make([]byte, 4)
nBytes, err := reader.Read(buffer)
if err != nil {
@@ -168,11 +168,12 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
err = fmt.Errorf("Unable to read request.")
return
}
request.Version = buffer[0]
request.Command = buffer[1]
// buffer[2] is a reserved field
request.AddrType = buffer[3]
request = &Socks5Request{
Version: buffer[0],
Command: buffer[1],
// buffer[2] is a reserved field
AddrType: buffer[3],
}
switch request.AddrType {
case AddrTypeIPv4:
nBytes, err = reader.Read(request.IPv4[:])
@@ -264,9 +265,9 @@ type Socks5Response struct {
}
func NewSocks5Response() *Socks5Response {
response := new(Socks5Response)
response.Version = socksVersion
return response
return &Socks5Response{
Version: socksVersion,
}
}
func (r *Socks5Response) SetIPv4(ipv4 []byte) {
+9 -8
View File
@@ -51,13 +51,12 @@ type VMessRequestReader struct {
}
func NewVMessRequestReader(vUserSet core.UserSet) *VMessRequestReader {
reader := new(VMessRequestReader)
reader.vUserSet = vUserSet
return reader
return &VMessRequestReader{
vUserSet: vUserSet,
}
}
func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
request := new(VMessRequest)
buffer := make([]byte, 256)
@@ -72,7 +71,6 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
if !valid {
return nil, ErrorInvalidUser
}
request.UserId = *userId
aesCipher, err := aes.NewCipher(userId.CmdKey())
if err != nil {
@@ -104,7 +102,11 @@ func (r *VMessRequestReader) Read(reader io.Reader) (*VMessRequest, error) {
return nil, err
}
request.Version = buffer[0]
request := &VMessRequest{
UserId: *userId,
Version: buffer[0],
}
if request.Version != Version {
log.Error("Unknown VMess version %d", request.Version)
return nil, ErrorInvalidVerion
@@ -181,8 +183,7 @@ type VMessRequestWriter struct {
}
func NewVMessRequestWriter() *VMessRequestWriter {
writer := new(VMessRequestWriter)
return writer
return &VMessRequestWriter{}
}
func (w *VMessRequestWriter) Write(writer io.Writer, request *VMessRequest) error {