Browse Source

set egress field

Abhishek Kondur 2 năm trước cách đây
mục cha
commit
964b4de77d
4 tập tin đã thay đổi với 10 bổ sung11 xóa
  1. 5 5
      Dockerfile
  2. 1 1
      go.mod
  3. 2 0
      go.sum
  4. 2 5
      logic/peers.go

+ 5 - 5
Dockerfile

@@ -4,12 +4,12 @@ ARG version
 ARG tags 
 WORKDIR /app
 COPY . .
-# RUN mkdir -p /Users/abhishekk/go/src/github.com/gravitl
-# ADD ../netclient /Users/abhishekk/go/src/github.com/gravitl
 ENV GO111MODULE=auto
 
-# RUN apk add git
-# RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
+RUN apk add git
+#RUN apk add build-essential 
+RUN apk add libpcap-dev
+RUN GOOS=linux CGO_ENABLED=1 go build -tags ${tags} -ldflags="-s -X 'main.version=${version}'" .
 # RUN go build -tags=ee . -o netmaker main.go
 FROM alpine:3.16.2
 
@@ -18,7 +18,7 @@ RUN apk add gcompat iptables wireguard-tools
 # set the working directory
 WORKDIR /root/
 RUN mkdir -p /etc/netclient/config
-COPY --from=builder /app/bin/netmaker .
+COPY --from=builder /app/netmaker .
 COPY --from=builder /app/config config
 EXPOSE 8081
 ENTRYPOINT ["./netmaker"]

+ 1 - 1
go.mod

@@ -51,7 +51,7 @@ require (
 )
 
 require (
-	github.com/gravitl/netclient v0.0.0-20221212172659-bdf676e4250a
+	github.com/gravitl/netclient v0.0.0-20221213182626-f178377104e9
 	github.com/matryer/is v1.4.0
 )
 

+ 2 - 0
go.sum

@@ -306,6 +306,8 @@ github.com/gravitl/netclient v0.0.0-20221212162818-256d5ec70bfa h1:KOEaK6EqC7f+g
 github.com/gravitl/netclient v0.0.0-20221212162818-256d5ec70bfa/go.mod h1:FzorTqDHIx2RZSij15VDPc1lafn/3R6ppYcOK0n7szk=
 github.com/gravitl/netclient v0.0.0-20221212172659-bdf676e4250a h1:1c8zoEJS7BeQ3STbeiQ+cEP2uytb1G6FevXORiZCxNc=
 github.com/gravitl/netclient v0.0.0-20221212172659-bdf676e4250a/go.mod h1:FzorTqDHIx2RZSij15VDPc1lafn/3R6ppYcOK0n7szk=
+github.com/gravitl/netclient v0.0.0-20221213182626-f178377104e9 h1:JYjXQexEdrNn6oaRdc4DfhOy/r/p5q4b3E+qbevXRb8=
+github.com/gravitl/netclient v0.0.0-20221213182626-f178377104e9/go.mod h1:rppdzV1EvNZ+rA00nX3AFMv08YWsuksr9RS4JalxnZM=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/guumaster/hostctl v1.1.3 h1:b/yR3svkYsbr5VBdvfdyLXUl2xaKopSzgE/Xi7+1WRo=
 github.com/guumaster/hostctl v1.1.3/go.mod h1:h5rDx5Z8Hj2bYZfDt/eX4BNS2RSq7iRcGVQqfROJyH8=

+ 2 - 5
logic/peers.go

@@ -153,11 +153,12 @@ func GetPeersForProxy(node *models.Node, onlyPeers bool) (manager.ProxyManagerPa
 		}
 	}
 
-	proxyPayload.IsIngress = node.IsIngressGateway == "yes"
 	addr := node.Address
 	if addr == "" {
 		addr = node.Address6
 	}
+	proxyPayload.IsIngress = node.IsIngressGateway == "yes"
+	proxyPayload.IsEgress = node.IsEgressGateway == "yes"
 	proxyPayload.WgAddr = addr
 	proxyPayload.Peers = peers
 	proxyPayload.PeerMap = peerConfMap
@@ -485,10 +486,6 @@ func getExtPeersForProxy(node *models.Node, proxyPeerConf map[string]proxy_model
 		if extPeer.IngressGatewayID == node.ID {
 			extConf.IsAttachedExtClient = true
 		}
-		ingGatewayUdpAddr, err := net.ResolveUDPAddr("udp", extPeer.IngressGatewayEndpoint)
-		if err == nil {
-			extConf.IngressGatewayEndPoint = ingGatewayUdpAddr
-		}
 
 		proxyPeerConf[peer.PublicKey.String()] = extConf