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

fixing extclient controller

Browse Source
This commit is contained in:
root
2021-05-20 02:09:48 +00:00
parent 47f5dc95dc
commit c5c38f0856
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/common.go
View File

@@ -68,7 +68,7 @@ func GetExtPeersList(networkName string, macaddress string) ([]models.ExtPeersRe
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
//Get all nodes in the relevant network which are NOT in pending state //Get all nodes in the relevant network which are NOT in pending state
filter := bson.M{"network": networkName, "gatewayid": macaddress} filter := bson.M{"network": networkName, "ingressgatewayid": macaddress}
cur, err := collection.Find(ctx, filter) cur, err := collection.Find(ctx, filter)
if err != nil { if err != nil {

6
controllers/extClientHttpController.go
View File

@@ -207,19 +207,19 @@ func getExtClientConf(w http.ResponseWriter, r *http.Request) {
config := fmt.Sprintf(`[Interface] config := fmt.Sprintf(`[Interface]
Address = %s Address = %s
PrivateKey = %s PrivateKey = %s
%s
[Peer] [Peer]
PublicKey = %s PublicKey = %s
AllowedIPs = %s AllowedIPs = %s
Endpoint = %s Endpoint = %s
%s
`, extclient.Address + "/32", `, extclient.Address + "/32",
extclient.PrivateKey, extclient.PrivateKey,
keepalive,
gwnode.PublicKey, gwnode.PublicKey,
network.AddressRange, network.AddressRange,
gwendpoint) gwendpoint,
keepalive)
if params["type"] == "qr" { if params["type"] == "qr" {
bytes, err := qrcode.Encode(config, qrcode.Medium, 220) bytes, err := qrcode.Encode(config, qrcode.Medium, 220)