diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 5e11eea5f..626aef1cf 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -14,6 +14,7 @@ import ( "v2ray.com/core/common" "v2ray.com/core/common/buf" "v2ray.com/core/common/net" + "v2ray.com/core/common/log" "v2ray.com/core/common/protocol" "v2ray.com/core/common/session" "v2ray.com/core/features/outbound" @@ -281,5 +282,11 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport. return } + accessMessage := log.AccessMessageFromContext(ctx) + if accessMessage != nil { + accessMessage.Detour = "[" + handler.Tag() + "]" + log.Record(accessMessage) + } + handler.Dispatch(ctx, link) } diff --git a/common/log/access.go b/common/log/access.go index 621f75b0a..66fafd360 100644 --- a/common/log/access.go +++ b/common/log/access.go @@ -2,10 +2,17 @@ package log import ( "strings" + "context" "v2ray.com/core/common/serial" ) +type logKey int + +const ( + accessMessageKey logKey = iota +) + type AccessStatus string const ( @@ -18,6 +25,7 @@ type AccessMessage struct { To interface{} Status AccessStatus Reason interface{} + Detour interface{} } func (m *AccessMessage) String() string { @@ -28,6 +36,19 @@ func (m *AccessMessage) String() string { builder.WriteByte(' ') builder.WriteString(serial.ToString(m.To)) builder.WriteByte(' ') + builder.WriteString(serial.ToString(m.Detour)) + builder.WriteByte(' ') builder.WriteString(serial.ToString(m.Reason)) return builder.String() } + +func ContextWithAccessMessage(ctx context.Context, accessMessage *AccessMessage) context.Context { + return context.WithValue(ctx, accessMessageKey, accessMessage) +} + +func AccessMessageFromContext(ctx context.Context) *AccessMessage { + if accessMessage, ok := ctx.Value(accessMessageKey).(*AccessMessage); ok { + return accessMessage + } + return nil +} diff --git a/proxy/http/server.go b/proxy/http/server.go index 3ab9d3114..c2bd9c1b7 100755 --- a/proxy/http/server.go +++ b/proxy/http/server.go @@ -131,10 +131,11 @@ Start: if err != nil { return newError("malformed proxy host: ", host).AtWarning().Base(err) } - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: conn.RemoteAddr(), To: request.URL, Status: log.AccessAccepted, + Reason: "", }) if strings.ToUpper(request.Method) == "CONNECT" { diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go index 14cee87a7..d9fb8d054 100644 --- a/proxy/shadowsocks/server.go +++ b/proxy/shadowsocks/server.go @@ -134,7 +134,7 @@ func (s *Server) handlerUDPPayload(ctx context.Context, conn internet.Connection dest := request.Destination() if inbound.Source.IsValid() { - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: inbound.Source, To: dest, Status: log.AccessAccepted, @@ -175,7 +175,7 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection, inbound.User = s.user dest := request.Destination() - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: conn.RemoteAddr(), To: dest, Status: log.AccessAccepted, diff --git a/proxy/socks/server.go b/proxy/socks/server.go index 1c4cb2b7b..aacb8a2a9 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -117,7 +117,7 @@ func (s *Server) processTCP(ctx context.Context, conn internet.Connection, dispa dest := request.Destination() newError("TCP Connect request to ", dest).WriteToLog(session.ExportIDToError(ctx)) if inbound != nil && inbound.Source.IsValid() { - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: inbound.Source, To: dest, Status: log.AccessAccepted, @@ -229,7 +229,7 @@ func (s *Server) handleUDPPayload(ctx context.Context, conn internet.Connection, newError("send packet to ", request.Destination(), " with ", payload.Len(), " bytes").AtDebug().WriteToLog(session.ExportIDToError(ctx)) if inbound := session.InboundFromContext(ctx); inbound != nil && inbound.Source.IsValid() { - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: inbound.Source, To: request.Destination(), Status: log.AccessAccepted, diff --git a/proxy/vmess/inbound/inbound.go b/proxy/vmess/inbound/inbound.go index 924157186..07487da05 100644 --- a/proxy/vmess/inbound/inbound.go +++ b/proxy/vmess/inbound/inbound.go @@ -250,7 +250,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i } if request.Command != protocol.RequestCommandMux { - log.Record(&log.AccessMessage{ + ctx = log.ContextWithAccessMessage(ctx, &log.AccessMessage{ From: connection.RemoteAddr(), To: request.Destination(), Status: log.AccessAccepted,