other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 04:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add remote addr to gRPC transport layer conn (#382) 

Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
This commit is contained in:
maskedeken 2021-03-18 01:55:51 +08:00 committed by GitHub
parent de54d4b08f
commit 36961ed882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
transport/internet/grpc/encoding/hunkconn.go
View File

@ -5,12 +5,15 @@ import (
"io" "io"
"net" "net"
"google.golang.org/grpc/peer"
"github.com/xtls/xray-core/common/buf" "github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net/cnc" "github.com/xtls/xray-core/common/net/cnc"
"github.com/xtls/xray-core/common/signal/done" "github.com/xtls/xray-core/common/signal/done"
) )
type HunkConn interface { type HunkConn interface {
Context() context.Context
Send(*Hunk) error Send(*Hunk) error
Recv() (*Hunk, error) Recv() (*Hunk, error)
SendMsg(m interface{}) error SendMsg(m interface{}) error
@ -35,11 +38,23 @@ func NewHunkReadWriter(hc HunkConn, cancel context.CancelFunc) *HunkReaderWriter
} }
func NewHunkConn(hc HunkConn, cancel context.CancelFunc) net.Conn { func NewHunkConn(hc HunkConn, cancel context.CancelFunc) net.Conn {
var rAddr net.Addr
pr, ok := peer.FromContext(hc.Context())
if ok {
rAddr = pr.Addr
} else {
rAddr = &net.TCPAddr{
IP: []byte{0, 0, 0, 0},
Port: 0,
}
}
wrc := NewHunkReadWriter(hc, cancel) wrc := NewHunkReadWriter(hc, cancel)
return cnc.NewConnection( return cnc.NewConnection(
cnc.ConnectionInput(wrc), cnc.ConnectionInput(wrc),
cnc.ConnectionOutput(wrc), cnc.ConnectionOutput(wrc),
cnc.ConnectionOnClose(wrc), cnc.ConnectionOnClose(wrc),
cnc.ConnectionRemoteAddr(rAddr),
) )
} }

15
transport/internet/grpc/encoding/multiconn.go
View File

@ -5,12 +5,15 @@ import (
"io" "io"
"net" "net"
"google.golang.org/grpc/peer"
"github.com/xtls/xray-core/common/buf" "github.com/xtls/xray-core/common/buf"
"github.com/xtls/xray-core/common/net/cnc" "github.com/xtls/xray-core/common/net/cnc"
"github.com/xtls/xray-core/common/signal/done" "github.com/xtls/xray-core/common/signal/done"
) )
type MultiHunkConn interface { type MultiHunkConn interface {
Context() context.Context
Send(*MultiHunk) error Send(*MultiHunk) error
Recv() (*MultiHunk, error) Recv() (*MultiHunk, error)
SendMsg(m interface{}) error SendMsg(m interface{}) error
@ -30,11 +33,23 @@ func NewMultiHunkReadWriter(hc MultiHunkConn, cancel context.CancelFunc) *MultiH
} }
func NewMultiHunkConn(hc MultiHunkConn, cancel context.CancelFunc) net.Conn { func NewMultiHunkConn(hc MultiHunkConn, cancel context.CancelFunc) net.Conn {
var rAddr net.Addr
pr, ok := peer.FromContext(hc.Context())
if ok {
rAddr = pr.Addr
} else {
rAddr = &net.TCPAddr{
IP: []byte{0, 0, 0, 0},
Port: 0,
}
}
wrc := NewMultiHunkReadWriter(hc, cancel) wrc := NewMultiHunkReadWriter(hc, cancel)
return cnc.NewConnection( return cnc.NewConnection(
cnc.ConnectionInputMulti(wrc), cnc.ConnectionInputMulti(wrc),
cnc.ConnectionOutputMulti(wrc), cnc.ConnectionOutputMulti(wrc),
cnc.ConnectionOnClose(wrc), cnc.ConnectionOnClose(wrc),
cnc.ConnectionRemoteAddr(rAddr),
) )
} }