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

+3 -3
View File
@@ -13,9 +13,9 @@ type FreedomConnection struct {
}
func NewFreedomConnection(dest v2net.Address) *FreedomConnection {
conn := new(FreedomConnection)
conn.dest = dest
return conn
return &FreedomConnection{
dest: dest,
}
}
func (vconn *FreedomConnection) Start(ray core.OutboundRay) error {
+4 -4
View File
@@ -27,14 +27,14 @@ type SocksServer struct {
}
func NewSocksServer(vp *core.Point, rawConfig []byte) *SocksServer {
server := new(SocksServer)
server.vPoint = vp
config, err := loadConfig(rawConfig)
if err != nil {
panic(log.Error("Unable to load socks config: %v", err))
}
server.config = config
return server
return &SocksServer{
vPoint: vp,
config: config,
}
}
func (server *SocksServer) Listen(port uint16) error {
+4 -4
View File
@@ -20,10 +20,10 @@ type VMessInboundHandler struct {
}
func NewVMessInboundHandler(vp *core.Point, clients core.UserSet) *VMessInboundHandler {
handler := new(VMessInboundHandler)
handler.vPoint = vp
handler.clients = clients
return handler
return &VMessInboundHandler{
vPoint: vp,
clients: clients,
}
}
func (handler *VMessInboundHandler) Listen(port uint16) error {
+11 -10
View File
@@ -26,11 +26,11 @@ type VMessOutboundHandler struct {
}
func NewVMessOutboundHandler(vp *core.Point, vNextList []VNextServer, dest v2net.Address) *VMessOutboundHandler {
handler := new(VMessOutboundHandler)
handler.vPoint = vp
handler.dest = dest
handler.vNextList = vNextList
return handler
return &VMessOutboundHandler{
vPoint: vp,
dest: dest,
vNextList: vNextList,
}
}
func (handler *VMessOutboundHandler) pickVNext() (v2net.Address, core.User) {
@@ -52,14 +52,15 @@ func (handler *VMessOutboundHandler) pickVNext() (v2net.Address, core.User) {
func (handler *VMessOutboundHandler) Start(ray core.OutboundRay) error {
vNextAddress, vNextUser := handler.pickVNext()
request := new(vmessio.VMessRequest)
request.Version = vmessio.Version
request.UserId = vNextUser.Id
request := &vmessio.VMessRequest{
Version: vmessio.Version,
UserId: vNextUser.Id,
Command: byte(0x01),
Address: handler.dest,
}
rand.Read(request.RequestIV[:])
rand.Read(request.RequestKey[:])
rand.Read(request.ResponseHeader[:])
request.Command = byte(0x01)
request.Address = handler.dest
go startCommunicate(request, vNextAddress, ray)
return nil