Skip to content

Commit

Permalink
Add remote address to grpc transport layer conn (#783)
Browse files Browse the repository at this point in the history
* Add remote address to grpc transport layer conn

* go fmt
  • Loading branch information
maskedeken committed Mar 15, 2021
1 parent 933861a commit fb9a5a1
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 150 deletions.
2 changes: 1 addition & 1 deletion transport/internet/grpc/dial.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func dialgRPC(ctx context.Context, dest net.Destination, streamSettings *interne
if err != nil {
return nil, newError("Cannot dial grpc").Base(err)
}
return encoding.NewClientConn(gunService), nil
return encoding.NewGunConn(gunService, nil), nil
}

func getGrpcClient(dest net.Destination, dialOption grpc.DialOption) (*grpc.ClientConn, error) {
Expand Down
70 changes: 0 additions & 70 deletions transport/internet/grpc/encoding/clientConn.go

This file was deleted.

113 changes: 113 additions & 0 deletions transport/internet/grpc/encoding/conn.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
// +build !confonly

package encoding

import (
"bytes"
"context"
"io"
"net"
"time"

"google.golang.org/grpc/peer"
)

// GunService is the abstract interface of GunService_TunClient and GunService_TunServer
type GunService interface {
Context() context.Context
Send(*Hunk) error
Recv() (*Hunk, error)
}

// GunConn implements net.Conn for gun tunnel
type GunConn struct {
service GunService
reader io.Reader
over context.CancelFunc
local net.Addr
remote net.Addr
}

// Read implements net.Conn.Read()
func (c *GunConn) Read(b []byte) (n int, err error) {
if c.reader == nil {
h, err := c.service.Recv()
if err != nil {
return 0, newError("unable to read from gun tunnel").Base(err)
}
c.reader = bytes.NewReader(h.Data)
}
n, err = c.reader.Read(b)
if err == io.EOF {
c.reader = nil
return n, nil
}
return n, err
}

// Write implements net.Conn.Write()
func (c *GunConn) Write(b []byte) (n int, err error) {
err = c.service.Send(&Hunk{Data: b})
if err != nil {
return 0, newError("Unable to send data over gun").Base(err)
}
return len(b), nil
}

// Close implements net.Conn.Close()
func (c *GunConn) Close() error {
if c.over != nil {
c.over()
}
return nil
}

// LocalAddr implements net.Conn.LocalAddr()
func (c *GunConn) LocalAddr() net.Addr {
return c.local
}

// RemoteAddr implements net.Conn.RemoteAddr()
func (c *GunConn) RemoteAddr() net.Addr {
return c.remote
}

// SetDeadline implements net.Conn.SetDeadline()
func (*GunConn) SetDeadline(time.Time) error {
return nil
}

// SetReadDeadline implements net.Conn.SetReadDeadline()
func (*GunConn) SetReadDeadline(time.Time) error {
return nil
}

// SetWriteDeadline implements net.Conn.SetWriteDeadline()
func (*GunConn) SetWriteDeadline(time.Time) error {
return nil
}

// NewGunConn creates GunConn which handles gun tunnel
func NewGunConn(service GunService, over context.CancelFunc) *GunConn {
conn := &GunConn{
service: service,
reader: nil,
over: over,
}

conn.local = &net.TCPAddr{
IP: []byte{0, 0, 0, 0},
Port: 0,
}
pr, ok := peer.FromContext(service.Context())
if ok {
conn.remote = pr.Addr
} else {
conn.remote = &net.TCPAddr{
IP: []byte{0, 0, 0, 0},
Port: 0,
}
}

return conn
}
78 changes: 0 additions & 78 deletions transport/internet/grpc/encoding/serverconn.go

This file was deleted.

2 changes: 1 addition & 1 deletion transport/internet/grpc/hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type Listener struct {

func (l Listener) Tun(server encoding.GunService_TunServer) error {
tunCtx, cancel := context.WithCancel(l.ctx)
l.handler(encoding.NewServerConn(server, cancel))
l.handler(encoding.NewGunConn(server, cancel))
<-tunCtx.Done()
return nil
}
Expand Down

0 comments on commit fb9a5a1

Please sign in to comment.