From 9a7202e9e0f1d52679af22d82c682a420ae71678 Mon Sep 17 00:00:00 2001 From: qo-op Date: Mon, 25 May 2020 21:38:25 +0200 Subject: [PATCH] ipfstryme NOT isLAN FROM tail, v4, v6 --- zen/ssb_INIT.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh index 2983970..675d396 100755 --- a/zen/ssb_INIT.sh +++ b/zen/ssb_INIT.sh @@ -63,11 +63,18 @@ mkdir -p ~/.zen/ipfs/.$IPFSNODEID/G1SSB # This SSB messages are read by ./zen/ssb_IPFS_swarm.sh to build your IPFS #Swarm0 sbotc publish '{"type":"ipfsnodeid","text":"'"$(ipfs id -f='\n')"'"}' -# PUBLISH default "eth" IP addresses for ./zen/ssb_IPFS_swarm.sh +# PUBLISH default "eth" NOT isLAN IP addresses for ./zen/ssb_IPFS_swarm.sh +tryme=$(ipfs id | jq -r .Addresses[] | tail -n 1 ) +isLAN=$(echo $tryme | cut -f3 -d '/' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") +[[ ! $isLAN ]] && sbotc publish '{"type":"ipfstryme","text":"'"$tryme"'"}' + trymev4=$(ipfs id | jq -r .Addresses[] | grep $(hostname -I | cut -f 1 -d ' ')) +isLANv4=$(echo $trymev4 | cut -f3 -d '/' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") +[[ $isLAN && ! $isLANv4 ]] && sbotc publish '{"type":"ipfstryme","text":"'"$trymev4"'"}' + trymev6=$(ipfs id | jq -r .Addresses[] | grep $(hostname -I | cut -f 2 -d ' ')) -[[ $trymev4 ]] && sbotc publish '{"type":"ipfstryme","text":"'"$trymev4"'"}' -[[ $trymev6 ]] && sbotc publish '{"type":"ipfstrymev6","text":"'"$trymev6"'"}' +isLANv6=$(echo $trymev6 | cut -f3 -d '/' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") +[[ $isLAN && $isLANv4 && ! $isLANv6 ]] && sbotc publish '{"type":"ipfstryme","text":"'"$trymev6"'"}' ################################ # ADD Cesium+ informations