ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 18:12:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

alef: fix .origin.packet and a printf

Browse Source
This commit is contained in:
Ted Blackman 2019-08-20 14:44:44 -07:00
parent 40328be29c
commit 137be0ffde
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/arvo/app/aqua-ames.hoon
View File

@ -75,7 +75,12 @@
^+ this ^+ this
=/ rcvr=ship (lane-to-ship lan) =/ rcvr=ship (lane-to-ship lan)
=/ hear-lane (ship-to-lane sndr) =/ hear-lane (ship-to-lane sndr)
::~> %slog.0^leaf/"aqua: {(scow %p sndr)} -> {(scow %p rcvr)}" => ?. ?| =(rcvr ~linnup-torsyx-linnup-torsyx)
=(sndr ~linnup-torsyx-linnup-torsyx)
==
.
~> %slog.0^leaf/"aqua: {(scow %p sndr)} -> {(scow %p rcvr)}"
.
%- emit-aqua-events %- emit-aqua-events
[%event rcvr //newt/0v1n.2m9vh %hear hear-lane pac]~ [%event rcvr //newt/0v1n.2m9vh %hear hear-lane pac]~
:: +lane-to-ship: decode a ship from an aqua lane :: +lane-to-ship: decode a ship from an aqua lane

10
pkg/arvo/sys/vane/alef.hoon
View File

@ -987,9 +987,11 @@
++ on-hear-forward ++ on-hear-forward
|= [=lane =packet ok=?] |= [=lane =packet ok=?]
^+ event-core ^+ event-core
:: set .origin.packet, re-encode, and send :: set .origin.packet if it doesn't already have one, re-encode, and send
:: ::
(send-blob rcvr.packet (encode-packet packet(origin `lane))) =? origin.packet ?=(~ origin.packet) `lane
=/ =blob (encode-packet packet)
(send-blob rcvr.packet blob)
:: +on-hear-open: handle receipt of plaintext comet self-attestation :: +on-hear-open: handle receipt of plaintext comet self-attestation
:: ::
++ on-hear-open ++ on-hear-open
@ -2376,8 +2378,8 @@
(give %send seq %& fragment-num) (give %send seq %& fragment-num)
:: whole message (n)ack :: whole message (n)ack
:: ::
=/ ok=? (~(has in nax.state) seq) =/ ok=? !(~(has in nax.state) seq)
~> %slog.0^leaf/"ames: send dupe message ack {<seq>}" ~> %slog.0^leaf/"ames: send dupe message ack {<seq>} ok={<ok>}"
(give %send seq %| ok lag=`@dr`0) (give %send seq %| ok lag=`@dr`0)
:: last-acked<seq<=last-heard; heard message, unprocessed :: last-acked<seq<=last-heard; heard message, unprocessed
:: ::