mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-12-23 11:53:33 +02:00
Add more traffic info for future use
This commit is contained in:
parent
7f1d07e7f9
commit
3da6cefbca
1 changed files with 45 additions and 25 deletions
|
@ -101,6 +101,11 @@ type GetOutbound interface {
|
||||||
// It is used by XTLS to determine if switch to raw copy mode, It is used by Vision to calculate padding
|
// It is used by XTLS to determine if switch to raw copy mode, It is used by Vision to calculate padding
|
||||||
type TrafficState struct {
|
type TrafficState struct {
|
||||||
UserUUID []byte
|
UserUUID []byte
|
||||||
|
StartTime time.Time
|
||||||
|
ByteSent int64
|
||||||
|
ByteReceived int64
|
||||||
|
NumberOfPacketSent int
|
||||||
|
NumberOfPacketReceived int
|
||||||
NumberOfPacketToFilter int
|
NumberOfPacketToFilter int
|
||||||
EnableXtls bool
|
EnableXtls bool
|
||||||
IsTLS12orAbove bool
|
IsTLS12orAbove bool
|
||||||
|
@ -124,6 +129,11 @@ type TrafficState struct {
|
||||||
func NewTrafficState(userUUID []byte) *TrafficState {
|
func NewTrafficState(userUUID []byte) *TrafficState {
|
||||||
return &TrafficState{
|
return &TrafficState{
|
||||||
UserUUID: userUUID,
|
UserUUID: userUUID,
|
||||||
|
StartTime: time.Time{},
|
||||||
|
ByteSent: 0,
|
||||||
|
ByteReceived: 0,
|
||||||
|
NumberOfPacketSent: 0,
|
||||||
|
NumberOfPacketReceived: 0,
|
||||||
NumberOfPacketToFilter: 8,
|
NumberOfPacketToFilter: 8,
|
||||||
EnableXtls: false,
|
EnableXtls: false,
|
||||||
IsTLS12orAbove: false,
|
IsTLS12orAbove: false,
|
||||||
|
@ -160,6 +170,10 @@ func NewVisionReader(reader buf.Reader, state *TrafficState, context context.Con
|
||||||
func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
||||||
buffer, err := w.Reader.ReadMultiBuffer()
|
buffer, err := w.Reader.ReadMultiBuffer()
|
||||||
if !buffer.IsEmpty() {
|
if !buffer.IsEmpty() {
|
||||||
|
if w.trafficState.StartTime.IsZero() {
|
||||||
|
w.trafficState.StartTime = time.Now()
|
||||||
|
}
|
||||||
|
w.trafficState.ByteReceived += int64(buffer.Len())
|
||||||
if w.trafficState.WithinPaddingBuffers || w.trafficState.NumberOfPacketToFilter > 0 {
|
if w.trafficState.WithinPaddingBuffers || w.trafficState.NumberOfPacketToFilter > 0 {
|
||||||
mb2 := make(buf.MultiBuffer, 0, len(buffer))
|
mb2 := make(buf.MultiBuffer, 0, len(buffer))
|
||||||
for _, b := range buffer {
|
for _, b := range buffer {
|
||||||
|
@ -180,6 +194,7 @@ func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
||||||
errors.LogInfo(w.ctx, "XtlsRead unknown command ", w.trafficState.CurrentCommand, buffer.Len())
|
errors.LogInfo(w.ctx, "XtlsRead unknown command ", w.trafficState.CurrentCommand, buffer.Len())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
w.trafficState.NumberOfPacketReceived += len(buffer)
|
||||||
if w.trafficState.NumberOfPacketToFilter > 0 {
|
if w.trafficState.NumberOfPacketToFilter > 0 {
|
||||||
XtlsFilterTls(buffer, w.trafficState, w.ctx)
|
XtlsFilterTls(buffer, w.trafficState, w.ctx)
|
||||||
}
|
}
|
||||||
|
@ -208,14 +223,14 @@ func NewVisionWriter(writer buf.Writer, state *TrafficState, context context.Con
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *VisionWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
func (w *VisionWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
||||||
|
w.trafficState.NumberOfPacketSent += len(mb)
|
||||||
if w.trafficState.NumberOfPacketToFilter > 0 {
|
if w.trafficState.NumberOfPacketToFilter > 0 {
|
||||||
XtlsFilterTls(mb, w.trafficState, w.ctx)
|
XtlsFilterTls(mb, w.trafficState, w.ctx)
|
||||||
}
|
}
|
||||||
if w.trafficState.IsPadding {
|
if w.trafficState.IsPadding {
|
||||||
if len(mb) == 1 && mb[0] == nil {
|
if len(mb) == 1 && mb[0] == nil {
|
||||||
mb[0] = XtlsPadding(nil, CommandPaddingContinue, &w.writeOnceUserUUID, true, w.ctx) // we do a long padding to hide vless header
|
mb[0] = XtlsPadding(nil, CommandPaddingContinue, &w.writeOnceUserUUID, true, w.ctx) // we do a long padding to hide vless header
|
||||||
return w.Writer.WriteMultiBuffer(mb)
|
} else {
|
||||||
}
|
|
||||||
mb = ReshapeMultiBuffer(w.ctx, mb)
|
mb = ReshapeMultiBuffer(w.ctx, mb)
|
||||||
longPadding := w.trafficState.IsTLS
|
longPadding := w.trafficState.IsTLS
|
||||||
for i, b := range mb {
|
for i, b := range mb {
|
||||||
|
@ -249,6 +264,11 @@ func (w *VisionWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
|
||||||
mb[i] = XtlsPadding(b, command, &w.writeOnceUserUUID, longPadding, w.ctx)
|
mb[i] = XtlsPadding(b, command, &w.writeOnceUserUUID, longPadding, w.ctx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
w.trafficState.ByteSent += int64(mb.Len())
|
||||||
|
if w.trafficState.StartTime.IsZero() {
|
||||||
|
w.trafficState.StartTime = time.Now()
|
||||||
|
}
|
||||||
return w.Writer.WriteMultiBuffer(mb)
|
return w.Writer.WriteMultiBuffer(mb)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue