errors.Format

This commit is contained in:
Darien Raymond
2016-12-15 11:05:32 +01:00
parent 49202930ff
commit 5bbbdc05de
6 changed files with 15 additions and 11 deletions
+1 -2
View File
@@ -1,7 +1,6 @@
package protocol
import (
"fmt"
"io"
"v2ray.com/core/common/buf"
@@ -228,7 +227,7 @@ func ReadRequest(reader io.Reader) (request *Socks5Request, err error) {
return
}
default:
err = fmt.Errorf("Socks: Unexpected address type %d", request.AddrType)
err = errors.Format("Socks: Unexpected address type %d", request.AddrType)
return
}
+1 -2
View File
@@ -1,7 +1,6 @@
package protocol
import (
"fmt"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/errors"
v2net "v2ray.com/core/common/net"
@@ -79,7 +78,7 @@ func ReadUDPRequest(packet []byte) (*Socks5UDPRequest, error) {
request.Address = v2net.ParseAddress(domain)
dataBegin = 5 + domainLength + 2
default:
return nil, fmt.Errorf("Socks|UDP: Unknown address type %d", addrType)
return nil, errors.Format("Socks|UDP: Unknown address type %d", addrType)
}
if len(packet) > dataBegin {