From 296de656c6a56142b6fd801d0391024e81a02fbd Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Wed, 21 Jun 2023 10:04:56 +0200
Subject: [PATCH] Fix: Update IP before start to make the start successful

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 PKGBUILD  | 10 ++++------
 he-tunnel | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 6b7f875..5d2e4ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=he-tunnel
-pkgver=0.1.0
+pkgver=0.1.1
 pkgrel=1
 pkgdesc="Tunnel setup script and service"
 arch=(any)
@@ -11,11 +11,9 @@ source=(
   he-tunnel
   he-tunnel.service
 )
-sha512sums=(
-  '49b4970ca50bd6858111edaa756f31b860e02cbbe336691b28f69dd0cdd74b818d43c4a16a3c272834c4f056bcbb65eb78bfbc3bdac236684f1311918a8114f6'
-  '78e3c2fbedba6b106eb682d0e493a7169787fba4c4b03f3d9e6fe32d14e25348cc5bb6c3cf95da7f551802b25f819c524daeea9e9f696fe3256d9b38585c75b8'
-  '11073404bc2f62ea0f104e03858777793079edad657571c9ab8893a50acfbbe64648d126d8625592cef464f25b9304bd04e2d381f630e320a01cccd61b3c039b'
-)
+sha512sums=('49b4970ca50bd6858111edaa756f31b860e02cbbe336691b28f69dd0cdd74b818d43c4a16a3c272834c4f056bcbb65eb78bfbc3bdac236684f1311918a8114f6'
+            '731da391fac056b108e7db0191fb227785d46616866f08111a028914df3faef23433dd4dc881efad7ccc9beb0d04fdbca2c73fae70932213661c6baf735cf1af'
+            '11073404bc2f62ea0f104e03858777793079edad657571c9ab8893a50acfbbe64648d126d8625592cef464f25b9304bd04e2d381f630e320a01cccd61b3c039b')
 
 package() {
   install -Dm 0600 config.default "${pkgdir}/etc/default/he-tunnel"
diff --git a/he-tunnel b/he-tunnel
index 0c0f18f..6e412b1 100755
--- a/he-tunnel
+++ b/he-tunnel
@@ -14,8 +14,18 @@ function log() {
 
 source ${DEFAULT_CFG}
 
+function update_ip() {
+  log "Updating remote IP with tunnel broker..."
+  curl -4 -sSf \
+    -o /dev/null \
+    "https://${UPDATE_USER}:${UPDATE_KEY}@ipv4.tunnelbroker.net/nic/update?hostname=${TUNNEL_ID}"
+  log "IP updated."
+}
+
 case $1 in
 start)
+  update_ip
+
   log "Configuring tunnel interface..."
   /usr/bin/ip tunnel add he-ipv6 mode sit remote ${TUNNEL_REMOTE} local ${TUNNEL_LOCAL} ttl 255
   /usr/bin/ip link set he-ipv6 up mtu 1480
@@ -32,11 +42,5 @@ stop)
   log "Tunnel interface removed."
   ;;
 
-update-ip)
-  log "Updating remote IP with tunnel broker..."
-  curl -4 -sSf \
-    -o /dev/null \
-    "https://${UPDATE_USER}:${UPDATE_KEY}@ipv4.tunnelbroker.net/nic/update?hostname=${TUNNEL_ID}"
-  log "IP updated."
-  ;;
+update-ip) update_ip ;;
 esac