From 0392c3ea73e1bbb3e54b5de36e3f372ac2d81868 Mon Sep 17 00:00:00 2001 From: qo-op Date: Sat, 15 May 2021 21:05:28 +0200 Subject: [PATCH] stop propagating all swam peers address, only friends --- zen/tools/add_externIP_to_ipfstryme.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/zen/tools/add_externIP_to_ipfstryme.sh b/zen/tools/add_externIP_to_ipfstryme.sh index 0152f34..4d1d393 100755 --- a/zen/tools/add_externIP_to_ipfstryme.sh +++ b/zen/tools/add_externIP_to_ipfstryme.sh @@ -24,6 +24,13 @@ mkdir -p ~/.zen/ipfs/.${IPFSNODEID} rm -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr touch ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + +######################################################################## +## If my address is published by my friends, sending it only. +# ME=$(cat ~/.zen/ipfs/.*/FRIENDS/*/tryme.addr | grep $IPFSNODEID | sort | uniq) +# [[ $ME ]] && cat ~/.zen/ipfs/.*/FRIENDS/*/tryme.addr | grep $IPFSNODEID | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && exit 0 +######################################################################## + for tryme in $(ipfs id | jq -r .Addresses[]); do isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") @@ -33,8 +40,10 @@ done # Now adding "ipfs swarm peers" to ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr for tryme in $(ipfs swarm peers); do + ipfsnodeid=$(echo $tryme | rev | cut -d '/' -f 1 | rev) + isMySWARM=$(cat ~/.zen/astrXbian/A_my_swarm.txt | grep $ipfsnodeid ) isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") - [[ ! $isLAN ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && echo "$tryme" + [[ ! $isLAN ]] && [[ $isMySWARM ]] && echo "$tryme" >> ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr && echo "$tryme" || ipfs swarm disconnect /ipfs/$ipfsnodeid done # REMOVE ipv6 address for in LAN node