pull/432/head
Darien Raymond 2017-02-08 10:01:22 +01:00
parent d2968e08ea
commit 5de7fb8bc2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
6 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,4 @@
// Package errors is a drop-in replacement for Golang lib 'errors'.
package errors package errors
import ( import (
@ -6,19 +7,23 @@ import (
"v2ray.com/core/common/serial" "v2ray.com/core/common/serial"
) )
type HasInnerError interface { type hasInnerError interface {
// Inner returns the underlying error of this one.
Inner() error Inner() error
} }
// Error is an error object with underlying error.
type Error struct { type Error struct {
message string message string
inner error inner error
} }
// Error implements error.Error().
func (v *Error) Error() string { func (v *Error) Error() string {
return v.message return v.message
} }
// Inner implements hasInnerError.Inner()
func (v *Error) Inner() error { func (v *Error) Inner() error {
if v.inner == nil { if v.inner == nil {
return nil return nil
@ -26,12 +31,14 @@ func (v *Error) Inner() error {
return v.inner return v.inner
} }
// New returns a new error object with message formed from given arguments.
func New(msg ...interface{}) error { func New(msg ...interface{}) error {
return &Error{ return &Error{
message: serial.Concat(msg...), message: serial.Concat(msg...),
} }
} }
// Base returns an ErrorBuilder based on the given error.
func Base(err error) ErrorBuilder { func Base(err error) ErrorBuilder {
return ErrorBuilder{ return ErrorBuilder{
error: err, error: err,
@ -48,7 +55,7 @@ func Cause(err error) error {
return nil return nil
} }
for { for {
inner, ok := err.(HasInnerError) inner, ok := err.(hasInnerError)
if !ok { if !ok {
break break
} }
@ -64,6 +71,7 @@ type ErrorBuilder struct {
error error
} }
// Message returns an error object with given message and base error.
func (v ErrorBuilder) Message(msg ...interface{}) error { func (v ErrorBuilder) Message(msg ...interface{}) error {
if v.error == nil { if v.error == nil {
return nil return nil
@ -75,6 +83,7 @@ func (v ErrorBuilder) Message(msg ...interface{}) error {
} }
} }
// Format returns an errors object with given message format and base error.
func (v ErrorBuilder) Format(format string, values ...interface{}) error { func (v ErrorBuilder) Format(format string, values ...interface{}) error {
if v.error == nil { if v.error == nil {
return nil return nil

View File

@ -6,6 +6,7 @@ option go_package = "net";
option java_package = "com.v2ray.core.common.net"; option java_package = "com.v2ray.core.common.net";
option java_multiple_files = true; option java_multiple_files = true;
// Address of a network host. It may be an IP address or a domain address.
message IPOrDomain { message IPOrDomain {
oneof address { oneof address {
// IP address. Must by either 4 or 16 bytes. // IP address. Must by either 4 or 16 bytes.
@ -14,4 +15,4 @@ message IPOrDomain {
// Domain address. // Domain address.
string domain = 2; string domain = 2;
} }
} }

View File

@ -18,7 +18,7 @@ func DestinationFromAddr(addr net.Addr) Destination {
case *net.UDPAddr: case *net.UDPAddr:
return UDPDestination(IPAddress(addr.IP), Port(addr.Port)) return UDPDestination(IPAddress(addr.IP), Port(addr.Port))
default: default:
panic("Unknown address type.") panic("Net: Unknown address type.")
} }
} }

View File

@ -9,6 +9,7 @@ option java_multiple_files = true;
import "v2ray.com/core/common/net/network.proto"; import "v2ray.com/core/common/net/network.proto";
import "v2ray.com/core/common/net/address.proto"; import "v2ray.com/core/common/net/address.proto";
// Endpoint of a network connection.
message Endpoint { message Endpoint {
Network network = 1; Network network = 1;
IPOrDomain address = 2; IPOrDomain address = 2;

View File

@ -9,12 +9,8 @@ option java_multiple_files = true;
enum Network { enum Network {
Unknown = 0; Unknown = 0;
// Native TCP provided by system.
RawTCP = 1 [deprecated=true]; RawTCP = 1 [deprecated=true];
// V2Ray specific TCP.
TCP = 2; TCP = 2;
UDP = 3; UDP = 3;
} }

View File

@ -8,6 +8,8 @@ option java_multiple_files = true;
// PortRange represents a range of ports. // PortRange represents a range of ports.
message PortRange { message PortRange {
// The port that this range starts from.
uint32 From = 1; uint32 From = 1;
// The port that this range ends with (inclusive).
uint32 To = 2; uint32 To = 2;
} }