From 29f078bb14d9a42797c7cabde3f12745973243a5 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Tue, 10 Dec 2019 16:20:12 -0800
Subject: [PATCH] ames: don't forward up the sponsorship chain

This is *actually* why the galaxies are under so much load.  They're in
a forwarding loop with their stars, and this breaks the loop.
---
 pkg/arvo/sys/vane/ames.hoon | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/arvo/sys/vane/ames.hoon b/pkg/arvo/sys/vane/ames.hoon
index afebdae12..7221292a5 100644
--- a/pkg/arvo/sys/vane/ames.hoon
+++ b/pkg/arvo/sys/vane/ames.hoon
@@ -1220,7 +1220,7 @@
     ::
     =?  origin.packet  ?=(~ origin.packet)  `lane
     =/  =blob  (encode-packet packet)
-    (send-blob rcvr.packet blob)
+    (send-blob & rcvr.packet blob)
   ::  +on-hear-open: handle receipt of plaintext comet self-attestation
   ::
   ++  on-hear-open
@@ -1577,7 +1577,7 @@
         ::  if we're a comet, send self-attestation packet first
         ::
         =?  event-core  =(%pawn (clan:title our))
-          (send-blob ship (attestation-packet ship life.point))
+          (send-blob | ship (attestation-packet ship life.point))
         ::  save current duct
         ::
         =/  original-duct  duct
@@ -1598,7 +1598,7 @@
         =.  event-core
           %+  roll  ~(tap in packets.todos)
           |=  [=blob core=_event-core]
-          (send-blob:core ship blob)
+          (send-blob:core | ship blob)
         ::
         event-core(duct original-duct)
       --
@@ -1710,7 +1710,7 @@
   ::    request the information from Jael if we haven't already.
   ::
   ++  send-blob
-    |=  [=ship =blob]
+    |=  [for=? =ship =blob]
     ::
     %-  (trace rot.veb |.("send-blob: to {<ship>}"))
     |-
@@ -1726,6 +1726,10 @@
         =/  =peer-state  +.u.ship-state
         ::
         ?:  =(our ship)
+          ::  if forwarding, don't send to sponsor to avoid loops
+          ::
+          ?:  for
+            event-core
           (try-next-sponsor sponsor.peer-state)
         ::
         ?~  route=route.peer-state
@@ -1967,7 +1971,7 @@
           ?&  ?=(%pawn (clan:title our))
               =(1 current:(~(got by snd.peer-state) bone))
           ==
-        (send-blob her.channel (attestation-packet [her her-life]:channel))
+        (send-blob | her.channel (attestation-packet [her her-life]:channel))
       ::  maybe resend some timed out packets
       ::
       (run-message-pump bone %wake ~)
@@ -1984,7 +1988,7 @@
       =/  =packet  [[our her.channel] encrypted=%.y origin=~ content]
       =/  =blob    (encode-packet packet)
       ::
-      =.  event-core  (send-blob her.channel blob)
+      =.  event-core  (send-blob | her.channel blob)
       peer-core
     ::  +got-duct: look up $duct by .bone, asserting already bound
     ::