Matthew R Kasun 2 лет назад
Родитель
Сommit
5ec417cbae
2 измененных файлов с 0 добавлено и 8 удалено
  1. 0 4
      logic/peers.go
  2. 0 4
      logic/relay.go

+ 0 - 4
logic/peers.go

@@ -770,22 +770,18 @@ func getRelayAllowedIPs(peer *models.Client) []net.IPNet {
 	//logger.Log(0, "getRelayAllowedIPs called for non-relayed node", client.Host.Name, peer.Host.Name)
 	//return relayIPs
 	//}
-	fmt.Println("relayednodes", peer.Node.RelayedNodes)
 	for _, relayed := range peer.Node.RelayedNodes {
 		relayedNode, err := GetNodeByID(relayed)
-		fmt.Println("process relayed node", relayed, GetHostByNodeID(relayedNode.ID.String()).Name)
 		if err != nil {
 			logger.Log(0, "retrieve relayed node", err.Error())
 			continue
 		}
 		if relayedNode.Address.IP != nil {
 			relayedNode.Address.Mask = net.CIDRMask(32, 32)
-			fmt.Println("adding address", relayedNode.Address.String())
 			relayIPs = append(relayIPs, relayedNode.Address)
 		}
 		if relayedNode.Address6.IP != nil {
 			relayedNode.Address.Mask = net.CIDRMask(128, 128)
-			fmt.Println("adding address6", relayedNode.Address6.String())
 			relayIPs = append(relayIPs, relayedNode.Address6)
 		}
 		if relayedNode.IsRelay {

+ 0 - 4
logic/relay.go

@@ -149,7 +149,6 @@ func getRelayedAddresses(id string) []net.IPNet {
 // peerUpdateForRelayed - returns the peerConfig for a relayed node
 func peerUpdateForRelayed(client *models.Client, peers *[]models.Client) []wgtypes.PeerConfig {
 	peerConfig := []wgtypes.PeerConfig{}
-	fmt.Println(client.Node.IsRelayed, client.Node.RelayedBy)
 	if !client.Node.IsRelayed {
 		logger.Log(0, "GetPeerUpdateForRelayed called for non-relayed node ", client.Host.Name)
 		return []wgtypes.PeerConfig{}
@@ -163,13 +162,11 @@ func peerUpdateForRelayed(client *models.Client, peers *[]models.Client) []wgtyp
 		Host: *GetHostByNodeID(relayNode.ID.String()),
 		Node: relayNode,
 	}
-	fmt.Println(client.Host.Name, "is relayed by", relay.Host.Name)
 	for _, peer := range *peers {
 		if peer.Host.ID == client.Host.ID {
 			continue
 		}
 		if peer.Host.ID == relay.Host.ID { // add relay as a peer
-			fmt.Println("adding relay as a peer", relay.Host.Name)
 			update := peerUpdateForRelayedByRelay(client, &relay)
 			peerConfig = append(peerConfig, update)
 			continue
@@ -178,7 +175,6 @@ func peerUpdateForRelayed(client *models.Client, peers *[]models.Client) []wgtyp
 			PublicKey: peer.Host.PublicKey,
 			Remove:    true,
 		}
-		fmt.Println("removing peer", peer.Host.Name)
 		peerConfig = append(peerConfig, update)
 	}
 	return peerConfig