zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 09:22:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

restructure proxy code

Browse Source
This commit is contained in:
Abhishek Kondur
2022-10-27 17:20:06 +05:30
parent 953b5eae0a
commit f4783f87d0
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netclient/functions/daemon.go
View File

@@ -19,8 +19,8 @@ import (
"github.com/gravitl/netmaker/netclient/global_settings" "github.com/gravitl/netmaker/netclient/global_settings"
"github.com/gravitl/netmaker/netclient/local" "github.com/gravitl/netmaker/netclient/local"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
netclientproxy "github.com/gravitl/netmaker/netclient/netclient-proxy"
"github.com/gravitl/netmaker/netclient/wireguard" "github.com/gravitl/netmaker/netclient/wireguard"
nmproxy "github.com/gravitl/netmaker/nm-proxy"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )
@@ -115,7 +115,7 @@ func startGoRoutines(wg *sync.WaitGroup) context.CancelFunc {
} }
wg.Add(1) wg.Add(1)
go Checkin(ctx, wg) go Checkin(ctx, wg)
go netclientproxy.Start() go nmproxy.Start()
return cancel return cancel
} }

0
netclient/netclient-proxy/bin/proxy.linux → nm-proxy/bin/proxy.linux
View File

2
netclient/netclient-proxy/common/common.go → nm-proxy/common/common.go
View File

@@ -18,7 +18,7 @@ import (
"github.com/gravitl/netmaker/netclient/config" "github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/netclient-proxy/wg" "github.com/gravitl/netmaker/nm-proxy/wg"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )

12
netclient/netclient-proxy/netclient-proxy.go → nm-proxy/nm-proxy.go
View File

@@ -1,4 +1,4 @@
package netclientproxy package nmproxy
import ( import (
"fmt" "fmt"
@@ -9,12 +9,12 @@ import (
"github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/netclient/config" "github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/ncutils" "github.com/gravitl/netmaker/netclient/ncutils"
"github.com/gravitl/netmaker/netclient/netclient-proxy/common"
peerpkg "github.com/gravitl/netmaker/netclient/netclient-proxy/peer"
"github.com/gravitl/netmaker/netclient/netclient-proxy/server"
"github.com/gravitl/netmaker/netclient/netclient-proxy/stun"
"github.com/gravitl/netmaker/netclient/netclient-proxy/wg"
"github.com/gravitl/netmaker/netclient/wireguard" "github.com/gravitl/netmaker/netclient/wireguard"
"github.com/gravitl/netmaker/nm-proxy/common"
peerpkg "github.com/gravitl/netmaker/nm-proxy/peer"
"github.com/gravitl/netmaker/nm-proxy/server"
"github.com/gravitl/netmaker/nm-proxy/stun"
"github.com/gravitl/netmaker/nm-proxy/wg"
) )
func Start() { func Start() {

0
netclient/netclient-proxy/packet/packet.go → nm-proxy/packet/packet.go
View File

8
netclient/netclient-proxy/peer/peer.go → nm-proxy/peer/peer.go
View File

@@ -10,10 +10,10 @@ import (
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config" "github.com/gravitl/netmaker/netclient/config"
"github.com/gravitl/netmaker/netclient/netclient-proxy/common" "github.com/gravitl/netmaker/nm-proxy/common"
"github.com/gravitl/netmaker/netclient/netclient-proxy/proxy" "github.com/gravitl/netmaker/nm-proxy/proxy"
"github.com/gravitl/netmaker/netclient/netclient-proxy/server" "github.com/gravitl/netmaker/nm-proxy/server"
"github.com/gravitl/netmaker/netclient/netclient-proxy/wg" "github.com/gravitl/netmaker/nm-proxy/wg"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )

4
netclient/netclient-proxy/proxy/proxy.go → nm-proxy/proxy/proxy.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"net" "net"
"github.com/gravitl/netmaker/netclient/netclient-proxy/server" "github.com/gravitl/netmaker/nm-proxy/server"
"github.com/gravitl/netmaker/netclient/netclient-proxy/wg" "github.com/gravitl/netmaker/nm-proxy/wg"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
) )

6
netclient/netclient-proxy/proxy/wireguard.go → nm-proxy/proxy/wireguard.go
View File

@@ -11,9 +11,9 @@ import (
"strconv" "strconv"
"github.com/c-robinson/iplib" "github.com/c-robinson/iplib"
"github.com/gravitl/netmaker/netclient/netclient-proxy/common" "github.com/gravitl/netmaker/nm-proxy/common"
"github.com/gravitl/netmaker/netclient/netclient-proxy/packet" "github.com/gravitl/netmaker/nm-proxy/packet"
"github.com/gravitl/netmaker/netclient/netclient-proxy/wg" "github.com/gravitl/netmaker/nm-proxy/wg"
) )
func NewProxy(config Config) *Proxy { func NewProxy(config Config) *Proxy {

4
netclient/netclient-proxy/server/server.go → nm-proxy/server/server.go
View File

@@ -6,8 +6,8 @@ import (
"net" "net"
"time" "time"
"github.com/gravitl/netmaker/netclient/netclient-proxy/common" "github.com/gravitl/netmaker/nm-proxy/common"
"github.com/gravitl/netmaker/netclient/netclient-proxy/packet" "github.com/gravitl/netmaker/nm-proxy/packet"
) )
const ( const (

0
netclient/netclient-proxy/stun/stun.go → nm-proxy/stun/stun.go
View File

0
netclient/netclient-proxy/wg/wg.go → nm-proxy/wg/wg.go
View File