From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 25 May 2020 15:33:19 +0000 (+0100)
Subject: Merge branch '1.0.0pre19.x'
X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/commitdiff_plain/ab6f1b0d12478b8fe266e3dacc3de7121df29066?hp=136f3f44e25317d5423b4bc0b075b297e6d00c93

Merge branch '1.0.0pre19.x'

* 1.0.0pre19.x:
  svc/connect.in: Squash newlines to spaces in `info' output.
  server/admin.c: Fix `=' vs `==' error in assertion.
  svc/tripe-ifup.in: Don't set remote IPv6 address until interface is up.
---

diff --git a/server/admin.c b/server/admin.c
index b653522c..b661e62e 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -890,7 +890,7 @@ static void a_jobdestroy(admin_svcop *svc)
   IF_TRACING(T_ADMIN, {
     trace(T_ADMIN, "admin: destroying job %s (%u)", a_jobidencode(svc), i);
   })
-  assert(j->v[i].u.op = svc);
+  assert(j->v[i].u.op == svc);
   j->v[i].u.next = j->free;
   j->v[i].seq++;
   j->free = i;
diff --git a/svc/connect.in b/svc/connect.in
index 99dbd8af..268ad5fc 100644
--- a/svc/connect.in
+++ b/svc/connect.in
@@ -842,7 +842,7 @@ def cmd_info(name):
   for i in items:
     try: v = d[i]
     except KeyError: v = peer.get(i)
-    T.svcinfo('%s=%s' % (i, v))
+    T.svcinfo('%s=%s' % (i, v.replace('\n', ' ')))
 
 def cmd_userpeer(user):
   """
diff --git a/svc/tripe-ifup.in b/svc/tripe-ifup.in
index e9e9cb92..63b5b2d6 100644
--- a/svc/tripe-ifup.in
+++ b/svc/tripe-ifup.in
@@ -124,9 +124,6 @@ case $have6,$# in
       try ip addr add "$a" dev "$ifname"
       haveaddr6=t
     done
-    case ${r6addr+set} in
-      set) try ip route add $r6addr proto static dev "$ifname" ;;
-    esac
     ;;
 esac
 
@@ -150,6 +147,18 @@ case $haveaddr4,$haveaddr6 in
 esac
 
 ###--------------------------------------------------------------------------
+### Set the peer IPv6 address if any.
+
+## IPv6 point-to-point links seem broken in Linux.  Attach the local and
+## remote addresses by hand.
+set -- $l6addr
+case $have6,$#,${r6addr+set} in
+  t,[1-9]*,set)
+    try ip route add $r6addr proto static dev "$ifname"
+    ;;
+esac
+
+###--------------------------------------------------------------------------
 ### Set up routing.
 
 ## Split the routes into v4 and v6 lists.