v0.5.0-rc.2

scripts/cjdns/install

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC1091
 
-TAG_CJDNS=d2e55d58548d83940482fe1bbbe1fd36f7f1b4ef
+TAG_CJDNS=2daf59e2ca6a41aa36a629f03301c9f6d02f5a4a
 
 # Set BASE_DIR
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

scripts/firewall/rules.v6

@@ -24,6 +24,8 @@
 # Redirect to named tables
 -A INPUT -i tun0 -d fc00::/8 -j CJDNS
 -A INPUT -i ygg0 -d 200::/8 -j YGGDRASIL
+# Allow BABELD
+-A INPUT -j ACCEPT -p udp --dport 6696
 -A INPUT -j REJECT --reject-with icmp6-port-unreachable
 # Allow clients to have outbound requests and receive their response
 -A FORWARD -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT

scripts/ipfs/install

@@ -3,7 +3,7 @@
 
 set -e
 
-GO_IPFS_VERSION="v0.17.0"
+GO_IPFS_VERSION="v0.23.0"
 
 ARCH="$(uname -m)" 
 case "$ARCH" in
@@ -58,6 +58,7 @@ fi
 
 # Enable gossipsub routing
 ipfs config Pubsub.Router gossipsub
+ipfs config Routing.AcceleratedDHTClient true --json
 
 # Enable Filestore for --nocopy capability
 ipfs config --bool Experimental.FilestoreEnabled true
@@ -70,7 +71,11 @@ ipfs config --json Swarm.ConnMgr.HighWater 200
 ipfs config Swarm.ConnMgr.GracePeriod 60s
 
 # Enable QUIC for better connections when possible
-ipfs config --bool Experimental.QUIC true
+ipfs config --bool QUIC true
+
+# Grow udp size for QUIC
+sysctl -w net.core.rmem_max=2500000
+sysctl -w net.core.wmem_max=2500000
 
 # Configure HTTP reverse proxy to IPFS gateway
 sudo cp "$BASE_DIR/ipfs-http-gateway.conf" /etc/nginx/site-path-enabled/ipfs-http-gateway.conf
@@ -96,8 +101,10 @@ sudo cp "$BASE_DIR/ipfs-swarm.sh" /usr/local/bin/
 sudo chmod +x /usr/local/bin/ipfs-swarm.sh
 
 # Configure systemd to start ipfs.service on system boot
-sudo cp "$BASE_DIR/ipfs.service" /etc/systemd/system/ipfs.service
-sudo sed -i "s|__USER_HOME__|${HOME}|" /etc/systemd/system/ipfs.service
+sudo cp "$BASE_DIR/ipfs.service" /tmp/ipfs.service
+sudo sed -i "s|__USER_HOME__|${HOME}|" /tmp/ipfs.service
+sudo mv /tmp/ipfs.service /etc/systemd/system/ipfs.service
+
 sudo systemctl daemon-reload
 sudo systemctl enable ipfs.service
 sudo systemctl start ipfs.service

scripts/mesh-adhoc/install

@@ -9,9 +9,9 @@ MESH_NAME=$(confget -f /etc/mesh.conf -s general "mesh-name")
 sudo apt-get install -y iw 
 
 # Install bring-up script for the Mesh Ad-hoc interface to /usr/bin
-cp "$BASE_DIR/mesh-adhoc" "$BASE_DIR/mesh-adhoc2"
-sed -i "s/MESH_NAME/$MESH_NAME/g" "$BASE_DIR/mesh-adhoc2"
-sudo mv "$BASE_DIR/mesh-adhoc2" /usr/bin/mesh-adhoc
+cp "$BASE_DIR/mesh-adhoc" "/tmp/mesh-adhoc"
+sed -i "s/MESH_NAME/$MESH_NAME/g" "/tmp/mesh-adhoc"
+sudo mv "/tmp/mesh-adhoc" "/usr/bin/mesh-adhoc"
 
 # Configure systemd to start mesh-adhoc.service on system boot
 sudo cp "$BASE_DIR/mesh-adhoc.service" /etc/systemd/system/mesh-adhoc.service

scripts/shared/node.js/install

@@ -2,8 +2,8 @@
 
 set -e
 
-NODEJS_PREFIX=10
-NODEJS_VERSION="$NODEJS_PREFIX.15.3"
+NODEJS_PREFIX=14
+NODEJS_VERSION="$NODEJS_PREFIX.17.5"
 
 # Check whether it has the newest version - 32-bit OSes need an older one
 if [[ ("$(node --version)" != "v$NODEJS_VERSION") || ("$(uname -m)" =~ ^(i386|i586|i686)$ && "$(node --version)" != "v8.11.0") ]]; then

scripts/shared/nodeinfo/install

@@ -11,14 +11,15 @@ sudo apt-get install -y jq
 
 sudo mkdir -p /opt/tomesh/nodeinfo.d
 
-sudo cp "$BASE_DIR/nodeinfo.json" /opt/tomesh/nodeinfo.json
+sudo cp "$BASE_DIR/nodeinfo.json" /tmp/nodeinfo.json
 sudo cp "$BASE_DIR/nodeinfo-update.sh" /usr/local/bin/nodeinfo-update.sh
 
-sudo sed -i -e "s/__REPO__/$(git remote get-url origin | awk -F / '{print $5}'| cut -d '.' -f1)/g" /opt/tomesh/nodeinfo.json
-sudo sed -i -e "s/__BRANCH__/$(git rev-parse --abbrev-ref HEAD)/g" /opt/tomesh/nodeinfo.json
-sudo sed -i -e "s/__COMMIT__/$(git rev-parse HEAD)/g" /opt/tomesh/nodeinfo.json
-sudo sed -i -e "s/__INSTALLED__/$(date)/g" /opt/tomesh/nodeinfo.json
-sudo sed -i -e "s/__ORG__/$MESH_NAME/g" /opt/tomesh/nodeinfo.json
+sudo sed -i -e "s/__REPO__/$(git remote get-url origin | awk -F / '{print $5}'| cut -d '.' -f1)/g" /tmp/nodeinfo.json
+sudo sed -i -e "s/__BRANCH__/$(git rev-parse --abbrev-ref HEAD)/g" /tmp/nodeinfo.json
+sudo sed -i -e "s/__COMMIT__/$(git rev-parse HEAD)/g" /tmp/nodeinfo.json
+sudo sed -i -e "s/__INSTALLED__/$(date)/g" /tmp/nodeinfo.json
+sudo sed -i -e "s/__ORG__/$MESH_NAME/g" /tmp/nodeinfo.json
+sudo mv /tmp/nodeinfo.json /opt/tomesh/nodeinfo.json
 
 ##TODO## Fix rc.local issue
 sudo sed -i 's#^exit 0#/usr/local/bin/nodeinfo-update.sh\nexit 0#' /etc/rc.local || true

scripts/ssb-web-pi/install

@@ -29,8 +29,10 @@ ssbPath="$HOME/.ssb"
 currentUser=$USER
 sudo cp "$BASE_DIR/ssb-web-pi-broadcast-service.sh" "/usr/local/bin/ssb-web-pi-broadcast-service.sh"
 sudo chmod a+x "/usr/local/bin/ssb-web-pi-broadcast-service.sh"
-sudo cp "$BASE_DIR/ssb-web-pi-broadcast.service" /etc/systemd/system/ssb-web-pi-broadcast.service
-sudo sed -i "s|__USER__|${currentUser}|g" /etc/systemd/system/ssb-web-pi-broadcast.service
+
+sudo cp "$BASE_DIR/ssb-web-pi-broadcast.service" /tmp/ssb-web-pi-broadcast.service
+sudo sed -i "s|__USER__|${currentUser}|g" /tmp/ssb-web-pi-broadcast.service
+sudo mv /tmp/ssb-web-pi-broadcast.service /etc/systemd/system/ssb-web-pi-broadcast.service
 
 sudo systemctl daemon-reload
 sudo systemctl enable ssb-web-pi-broadcast.service

scripts/yggdrasil-iptunnel/yggdrasil-setup

@@ -6,6 +6,9 @@ echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
 
 # Give yggdrasil enough time to create an ygg0 interface before we start adding routes
 sleep 3
+
+LOCAL_YGG=$(sudo yggdrasilctl getSelf | grep IPv6\ a | awk '{print $3}')
+
 if [ -f /etc/yggdrasil.iptunnel.conf ]; then
     touch /etc/yggdrasil.iptunnel.conf
 fi
@@ -14,6 +17,7 @@ if [[ -z "$IPv6NAT" ]]; then
     IPv6NAT=true
     confset "iptunnel" "IPv6nat" "$IPv6NAT" /etc/yggdrasil.iptunnel.conf
 fi
+EXITNODE=$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "iptunnel" EXIT)
 
 YGGINT="$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "general" yggdrasil-interface)"
 if [[ -z "${YGGINT}" ]]; then
@@ -25,91 +29,73 @@ if [[ -z "${IPv6SUBNETINT}" ]]; then
     IPv6SUBNETINT="wlan-ap"
 fi
 
-if [ -e /etc/yggdrasil.iptunnel.server ]; then
-    SUBNET4=$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "iptunnel" subnet)
+if [ -e /etc/yggdrasil.iptunnel ]; then
+   SUBNET4=$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "iptunnel" subnet)
     if [[ -z "${SUBNET4}" ]]; then
         SUBNET4="10.10.0.0/24"
     fi
     SUBNET6=$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "ipv6tunnel" subnet)
-    if [[ -z "${SUBNET6}" ]]; then
-        SUBNET6="fd00::/64"
-        ip -6 route add ${SUBNET6} dev "${YGGINT}"
-    fi
+#    if [[ -z "${SUBNET6}" ]]; then
+#        SUBNET6="fd00::/64"
+#        ip -6 route add ${SUBNET6} dev "${YGGINT}"
+#    fi
     EXITINT="$(confget -f "/etc/yggdrasil.iptunnel.conf" -s "general" exit-interface)"
     if [[ -z "${EXITINT}" ]]; then
         EXITINT="eth0"
     fi
 
-    while read -r PUBLIC_KEY IP_ADDR IP6_ADDR IP6_SUBNET; do
-        if [[ "${PUBLIC_KEY}" =~ ^[0-z]{64} ]]; then
-            yggdrasilctl addRemoteSubnet subnet="${IP_ADDR}/32" box_pub_key="${PUBLIC_KEY}"
+    INDEX=-1
+    while read -r REMOTE_YGG IP_ADDR IP6_ADDR; do
+            INDEX=$((INDEX+1))
+            GREINT="gre_ygg${INDEX}"
+            ifconfig ${GREINT} down
+            ip tunnel delete ${GREINT}
+            ip tunnel add ${GREINT} mode ip6gre remote ${REMOTE_YGG} local ${LOCAL_YGG} ttl 255
+	          ip link set ${GREINT} up
+            ip addr add $IP_ADDR/30 dev ${GREINT}
+#            ip route add $IP_ADDR/30 dev ${GREINT}
+
             if [[ ! -z "${IP6_ADDR}" ]]; then
-                yggdrasilctl addRemoteSubnet subnet="${IP6_ADDR}/128" box_pub_key="${PUBLIC_KEY}"
-                if [[ ! -z "${IP6_SUBNET}" ]]; then
-                    yggdrasilctl addRemoteSubnet subnet="${IP6_SUBNET}" box_pub_key="${PUBLIC_KEY}"
-                    ip -6 route add "${IP6_SUBNET}" dev "${YGGINT}" || true
-                fi
-                isIPv6=true
+                ip addr add $IP6_ADDR/126 dev ${GREINT}
+#                ip -6 route add "${IP6_ADDR}/126" dev ${GREINT} || true
             fi
-        fi
-    done < /etc/yggdrasil.iptunnel.server
+            isIPv6=true
+    done < /etc/yggdrasil.iptunnel
 
-    yggdrasilctl addLocalSubnet subnet="0.0.0.0/0"
-    ip route add "${SUBNET4}" dev "${YGGINT}" || true
+    if [ "$EXITNODE" == "true" ]; then
 
-    if [[ "${isIPv6}" == true ]]; then
-        yggdrasilctl addLocalSubnet subnet="::/0"
-        # Add route for ygg0 interface
-        ip -6 route add "${SUBNET6}" dev "${YGGINT}" || true
-    fi
-
-    # If no NAT (masquerading) being done, start doing it
-    if [ -z "$(iptables -L POSTROUTING -v -n -t nat  | grep MASQUERADE)" ]; then
-        iptables -t nat -A POSTROUTING -o "${EXITINT}" -j MASQUERADE
-    fi
-    # If no NAT (masquerading) being done, start doing it
-    if [ -z "$(ip6tables -L POSTROUTING -v -n -t nat  | grep MASQUERADE)" ]; then
-        if [[ ! "${IPv6NAT}" == false ]]; then
+        # If no NAT (masquerading) being done, start doing it
+        if [ -z "$(iptables -L POSTROUTING -v -n -t nat  | grep MASQUERADE)" ]; then
             iptables -t nat -A POSTROUTING -o "${EXITINT}" -j MASQUERADE
         fi
+        # If no NAT (masquerading) being done, start doing it
+        if [ -z "$(ip6tables -L POSTROUTING -v -n -t nat  | grep MASQUERADE)" ]; then
+            if [[ ! "${IPv6NAT}" == false ]]; then
+                iptables -t nat -A POSTROUTING -o "${EXITINT}" -j MASQUERADE
+            fi
+        fi
     fi
 # Configure as Yggdrasil IPTunnel client if client file is present 
 # this is a single line represeting a Yggdrasil public key in /etc/yggdrasil.iptunnel.client
 # along with IPAddresses configured on the exit node for this node
-elif [ -e /etc/yggdrasil.iptunnel.client ]; then
-    # Add each server to Yggdrasil IPTunnel connect-to's
-    while read -r PUBLIC_KEY IP_ADDR IP6_ADDR IP6_SUBNET; do
-        if [[ "${PUBLIC_KEY}" =~ ^[0-z]{64} ]]; then
-            if [[ ! -z "${IP6_ADDR}" ]]; then
-                ip addr add dev "${YGGINT}" "${IP6_ADDR}/128"
-                yggdrasilctl addRemoteSubnet subnet="::0/0" box_pub_key="${PUBLIC_KEY}"
-                yggdrasilctl addLocalSubnet subnet="${IP6_ADDR}/128"
-                if [[ ! -z "${IP6_SUBNET}" ]]; then
-                    yggdrasilctl addLocalSubnet subnet="${IP6_SUBNET}"
-                    ip -6 route add ${IP6_SUBNET} dev "${IPv6SUBNETINT}"
-                    ip addr add dev "${IPv6SUBNETINT}" "$(echo  ${IP6_SUBNET} | sed "s/\/64/1/")"
-                fi
-            fi
-            ip addr add dev "${YGGINT}" "${IP_ADDR}/32"
-            yggdrasilctl addRemoteSubnet subnet="0.0.0.0/0" box_pub_key="${PUBLIC_KEY}"
-            yggdrasilctl addLocalSubnet subnet="${IP_ADDR}/32"
-        fi
-    done < /etc/yggdrasil.iptunnel.client
-
+fi
     # Remove NAT from eth0 if it exists
-    iptables -t nat -D POSTROUTING -o eth0 -j MASQUERADE || true
-    ip6tables -t nat -D POSTROUTING -o eth0 -j MASQUERADE || true
+    iptables -t nat -D POSTROUTING -o ${GREINT} -j MASQUERADE || true
+    ip6tables -t nat -D POSTROUTING -o ${GREINT} -j MASQUERADE || true
 
-    # Route NAT traffic through to yggdrasil ygg0 interface to use iptunnel exit server
-    iptables -t nat -A POSTROUTING -o "${YGGINT}" -j MASQUERADE
-    if [[ ! "${IPv6NAT}" == false ]]; then
-        ip6tables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
-    fi
+    if [ "$EXITNODE" != "true" ]; then
 
-    # Special hack to change default route without removing original one
-    ip route add 0.0.0.0/1 dev "${YGGINT}"
-    ip route add 128.0.0.0/1 dev "${YGGINT}"
+        # Route NAT traffic through to yggdrasil ygg0 interface to use iptunnel exit server
+        iptables -t nat -A POSTROUTING -o ${GREINT} -j MASQUERADE
+        if [[ ! "${IPv6NAT}" == false ]]; then
+            ip6tables -t nat -A POSTROUTING -o ${GREINT} -j MASQUERADE
+        fi
 
-    ip -6 route add ::/1 dev "${YGGINT}"
-    ip -6 route add 8000::/1 dev "${YGGINT}" 
-fi
+        # Special hack to change default route without removing original one
+        ip route add 0.0.0.0/1 dev "${GREINT}"
+        ip route add 128.0.0.0/1 dev "${GREINT}"
+
+        ip -6 route add ::/1 dev "${GREINT}"
+        ip -6 route add 8000::/1 dev "${GREINT}" 
+   fi
+exit 0

scripts/yggdrasil/install

@@ -2,8 +2,7 @@
 
 set -e
 
-YGGDRASIL_VERSION=0.3.12
-YGGDRASIL_HOST=2375-115685026
+YGGDRASIL_VERSION=0.4.7
 
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
@@ -19,10 +18,10 @@ case "$ARCH" in
    ARCH_VERSION="armhf"
   ;;
   armv6l)
-    ARCH_VERSION="armhf"
+   ARCH_VERSION="armhf"
   ;;
   aarch64)
-    ARCH_VERSION="arm64"
+   ARCH_VERSION="arm64"
   ;;
   *)
     echo "Unknown Arch"
@@ -34,14 +33,15 @@ esac
 
 if [[ ! -f "/usr/bin/yggdrasil" ]]; then
     mkdir "$BASE_DIR/tmp"
-    wget "https://${YGGDRASIL_HOST}-gh.circle-artifacts.com/0/yggdrasil-${YGGDRASIL_VERSION}-${ARCH_VERSION}.deb" -O "$BASE_DIR/tmp/yggdrasil.deb"
+    wget https://github.com/yggdrasil-network/yggdrasil-go/releases/download/v${YGGDRASIL_VERSION}/yggdrasil-${YGGDRASIL_VERSION}-${ARCH_VERSION}.deb -O "$BASE_DIR/tmp/yggdrasil.deb"
+
     sudo dpkg -i "$BASE_DIR/tmp/yggdrasil.deb"
     rm -rf "$BASE_DIR/tmp"
 fi
 
-# Yggdrasil 0.3.12 service fix
-sudo sed -i "s/CapabilityBoundingSet=CAP_NET_ADMIN/CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW/" /etc/systemd/system/yggdrasil.service
-sudo systemctl daemon-reload
+## Yggdrasil 0.3.12 service fix
+#sudo sed -i "s/CapabilityBoundingSet=CAP_NET_ADMIN/CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW/" /etc/systemd/system/yggdrasil.service
+#sudo systemctl daemon-reload
 
 # Change configuration to have yggdrasil's tun interface called ygg0
 sudo sed -i "s/IfName: auto/IfName: ygg0/" /etc/yggdrasil.conf