diff --git a/config/parsing/service.go b/config/parsing/service.go index 6bfb26c..3ccdf00 100644 --- a/config/parsing/service.go +++ b/config/parsing/service.go @@ -222,11 +222,12 @@ func ParseService(cfg *config.ServiceConfig) (service.Service, error) { s := xservice.NewService(cfg.Name, ln, h, xservice.AdmissionOption(admission.AdmissionGroup(admissions...)), - xservice.LoggerOption(serviceLogger), xservice.PreUpOption(preUp), xservice.PreDownOption(preDown), xservice.PostUpOption(postUp), xservice.PostDownOption(postDown), + xservice.RecordersOption(recorders...), + xservice.LoggerOption(serviceLogger), ) serviceLogger.Infof("listening on %s/%s", s.Addr().String(), s.Addr().Network()) diff --git a/dialer/grpc/dialer.go b/dialer/grpc/dialer.go index 6200ef4..ad7c464 100644 --- a/dialer/grpc/dialer.go +++ b/dialer/grpc/dialer.go @@ -49,10 +49,12 @@ func (d *grpcDialer) Multiplex() bool { } func (d *grpcDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (net.Conn, error) { - remoteAddr, err := net.ResolveTCPAddr("tcp", addr) - if err != nil { - return nil, err - } + /* + remoteAddr, err := net.ResolveTCPAddr("tcp", addr) + if err != nil { + return nil, err + } + */ d.clientMutex.Lock() defer d.clientMutex.Unlock() @@ -107,7 +109,7 @@ func (d *grpcDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialO return &conn{ c: cli, localAddr: &net.TCPAddr{}, - remoteAddr: remoteAddr, + remoteAddr: &net.TCPAddr{}, closed: make(chan struct{}), }, nil } diff --git a/go.mod b/go.mod index 67f96c2..0b01a06 100644 --- a/go.mod +++ b/go.mod @@ -37,8 +37,8 @@ require ( golang.org/x/sys v0.2.0 golang.org/x/time v0.2.0 golang.zx2c4.com/wireguard v0.0.0-20220703234212-c31a7b1ab478 - google.golang.org/grpc v1.49.0 - google.golang.org/protobuf v1.28.0 + google.golang.org/grpc v1.51.0 + google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index aeb66b2..f5cfe38 100644 --- a/go.sum +++ b/go.sum @@ -743,8 +743,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= -google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U= +google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -758,8 +758,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/service/service.go b/service/service.go index 70d5098..c632a91 100644 --- a/service/service.go +++ b/service/service.go @@ -142,14 +142,15 @@ func (s *defaultService) Serve() error { tempDelay = 0 for _, rec := range s.options.recorders { - host := conn.RemoteAddr().String() - if h, _, _ := net.SplitHostPort(host); h != "" { - host = h - } if rec.Record == recorder.RecorderServiceClientAddress { + host := conn.RemoteAddr().String() + if h, _, _ := net.SplitHostPort(host); h != "" { + host = h + } if err := rec.Recorder.Record(context.Background(), []byte(host)); err != nil { s.options.logger.Errorf("record %s: %v", rec.Record, err) } + break } } if s.options.admission != nil &&