github/v2ray-core
4
0 Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-14 06:46:11 +00:00
Code Issues Releases Wiki Activity

update error messages

Browse Source
This commit is contained in:
Darien Raymond committed 2017-04-07 22:56:27 +02:00
1 parent 9bb66b4de4
commit a034276eee
5 files changed
+29 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

transport/internet/dialer.go
+3 -3
View File
@@ -16,7 +16,7 @@ var (
func RegisterTransportDialer(protocol TransportProtocol, dialer Dialer) error {
if _, found := transportDialerCache[protocol]; found {
return errors.New("Internet|Dialer: ", protocol, " dialer already registered.")
return errors.New(protocol, " dialer already registered").AtError().Path("Transport", "Internet")
}
transportDialerCache[protocol] = dialer
return nil
@@ -40,14 +40,14 @@ func Dial(ctx context.Context, dest v2net.Destination) (Connection, error) {
}
dialer := transportDialerCache[protocol]
if dialer == nil {
return nil, errors.New("Internet|Dialer: ", protocol, " dialer not registered.")
return nil, errors.New(protocol, " dialer not registered").AtError().Path("Transport", "Internet")
}
return dialer(ctx, dest)
}
udpDialer := transportDialerCache[TransportProtocol_UDP]
if udpDialer == nil {
return nil, errors.New("Internet|Dialer: UDP dialer not registered.")
return nil, errors.New("UDP dialer not registered").AtError().Path("Transport", "Internet")
}
return udpDialer(ctx, dest)
}
transport/internet/kcp/connection.go
+5 -5
View File
@@ -198,7 +198,7 @@ type Connection struct {
// NewConnection create a new KCP connection between local and remote.
func NewConnection(conv uint16, sysConn SystemConnection, config *Config) *Connection {
log.Trace(errors.New("KCP|Connection: creating connection ", conv))
log.Trace(errors.New("creating connection ", conv).Path("Transport", "Internet", "mKCP", "Connection"))
conn := &Connection{
conv: conv,
@@ -335,7 +335,7 @@ func (v *Connection) SetState(state State) {
current := v.Elapsed()
atomic.StoreInt32((*int32)(&v.state), int32(state))
atomic.StoreUint32(&v.stateBeginTime, current)
log.Trace(errors.New("KCP|Connection: #", v.conv, " entering state ", state, " at ", current).AtDebug())
log.Trace(errors.New("#", v.conv, " entering state ", state, " at ", current).AtDebug().Path("Transport", "Internet", "mKCP", "Connection"))
switch state {
case StateReadyToClose:
@@ -372,7 +372,7 @@ func (v *Connection) Close() error {
if state.Is(StateReadyToClose, StateTerminating, StateTerminated) {
return ErrClosedConnection
}
log.Trace(errors.New("KCP|Connection: Closing connection to ", v.conn.RemoteAddr()))
log.Trace(errors.New("closing connection to ", v.conn.RemoteAddr()).Path("Transport", "Internet", "mKCP", "Connection"))
if state == StateActive {
v.SetState(StateReadyToClose)
@@ -441,7 +441,7 @@ func (v *Connection) Terminate() {
if v == nil {
return
}
log.Trace(errors.New("KCP|Connection: Terminating connection to ", v.RemoteAddr()))
log.Trace(errors.New("terminating connection to ", v.RemoteAddr()).Path("Transport", "Internet", "mKCP", "Connection"))
//v.SetState(StateTerminated)
v.OnDataInput()
@@ -531,7 +531,7 @@ func (v *Connection) flush() {
}
if v.State() == StateTerminating {
log.Trace(errors.New("KCP|Connection: #", v.conv, " sending terminating cmd.").AtDebug())
log.Trace(errors.New("#", v.conv, " sending terminating cmd.").AtDebug().Path("Transport", "Internet", "mKCP", "Connection"))
v.Ping(current, CommandTerminate)
if current-atomic.LoadUint32(&v.stateBeginTime) > 8000 {