urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 03:14:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

fine: work on bytes instead of bits

Browse Source
This commit is contained in:
fang 2022-01-24 21:01:09 +01:00
parent 92aa604be0
commit b606dea970
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pkg/arvo/sys/vane/fine.hoon
View File

@ -88,59 +88,58 @@
:: ::
++ request-body ++ request-body
|= [=path num=@ud] |= [=path num=@ud]
^- bits ^- byts
?> (lth num (bex 32)) ?> (lth num (bex 32))
=+ (spit path) =+ (spit path)
:- :(add 32 16 (mul 8 wid)) :- :(add 32 16 wid)
%+ can 0 %+ can 3
:~ 32^num :: fragment number :~ 4^num :: fragment number
16^wid :: path size 2^wid :: path size
(mul 8 wid)^`@`pat :: namespace path wid^`@`pat :: namespace path
== ==
:: ::
++ encode-request ++ encode-request
|= [=path num=@ud] |= [=path num=@ud]
^- hoot ^- hoot
=+ bod=(request-body path num) =+ bod=(request-body path num)
(can 0 512^(sign:keys d.bod) bod ~) (can 3 64^(sign:keys d.bod) bod ~)
:: ::
++ encode-response ++ encode-response
|= [=path data=(unit (cask))] |= [=path data=(unit (cask))]
^- song ^- song
:: prepend request descriptions to each response packet :: prepend request descriptions to each response packet
:: ::
=; pacs=(list bits) =; pacs=(list byts)
%- head %- head
%^ spin pacs 1 %^ spin pacs 1
|= [pac=bits num=@ud] |= [pac=byts num=@ud]
^- [purr _num] ^- [purr _num]
:_ +(num) :_ +(num)
^- @ux ^- @ux
::NOTE we stub out the receiver & origin details, ::NOTE we stub out the receiver & origin details,
:: runtime should replace them as appropriate. :: runtime should replace them as appropriate.
=/ req=bits (request-body path num) =/ req=byts (request-body path num)
=/ con=@ux (can 0 req pac ~) =/ con=@ux (can 3 req pac ~)
(encode-packet [our ~zod] (mod life:keys 16) 0b0 ~ con) (encode-packet [our ~zod] (mod life:keys 16) 0b0 ~ con)
:: prepend a signature and split the data into 1024-byte fragments :: prepend a signature and split the data into 1024-byte fragments
:: ::
=/ frag=(list @) =/ frag=(list @)
=/ sig=@ (full:keys path (fall data ~)) =/ sig=@ (full:keys path (fall data ~))
?~ data [sig]~ ?~ data [sig]~
%+ rip 3^1.024 ::TODO prints "rip: stub" %+ rip 13 ::NOTE 1024 bytes
(cat 3 sig (jam u.data)) ::REVIEW (cat 3 sig (jam u.data)) ::TODO should include life
=/ size=@ud
?~(data 0 (lent frag)) ::REVIEW
:: sign & packetize the fragments :: sign & packetize the fragments
:: ::
%+ turn frag %+ turn frag
|= dat=@ |= dat=@
^- byts
=/ wid=@ud (met 3 dat) =/ wid=@ud (met 3 dat)
:- :(add 512 32 16 (mul 8 wid)) :- :(add 64 4 2 wid)
%+ can 0 %+ can 3
:~ 512^(sign:keys dat) :: signature :~ 64^(sign:keys dat) :: signature ::TODO +pack:keys
32^size :: number of fragments 4^(lent frag) :: number of fragments
16^wid :: response data size in bytes ::REVIEW 2^wid :: response data fragment size in bytes
(mul 8 wid)^dat :: response data wid^dat :: response data fragment
== ==
:: ::
++ keys ++ keys
@ -174,14 +173,14 @@
++ decode-request ++ decode-request
|= =hoot |= =hoot
^- twit ^- twit
:- sig=(cut 0 [0 512] hoot) :- sig=(cut 3 [0 64] hoot)
-:(decode-request-info (rsh [0 512] hoot)) -:(decode-request-info (rsh 3^64 hoot))
:: ::
++ decode-request-info ++ decode-request-info
|= =hoot |= =hoot
^- [=peep =purr] ^- [=peep =purr]
=+ num=(cut 0 [0 32] hoot) =+ num=(cut 3 [0 4] hoot)
=+ len=(cut 0 [32 16] hoot) =+ len=(cut 3 [4 2] hoot)
=+ pat=(cut 3 [6 len] hoot) =+ pat=(cut 3 [6 len] hoot)
:- [(stab pat) num] :- [(stab pat) num]
:: if there is data remaining, it's the response :: if there is data remaining, it's the response
@ -192,10 +191,10 @@
=; =rawr =; =rawr
~? !=(wid.rawr (met 3 dat.rawr)) [%fine %unexpected-dat-size] ~? !=(wid.rawr (met 3 dat.rawr)) [%fine %unexpected-dat-size]
rawr rawr
:* sig=(cut 0 [0 512] purr) :* sig=(cut 3 [0 64] purr)
siz=(cut 0 [512 32] purr) siz=(cut 3 [64 4] purr)
wid=(cut 0 [544 16] purr) wid=(cut 3 [68 2] purr)
dat=(rsh 0^560 purr) dat=(rsh 3^70 purr)
== ==
:: ::
++ verify-response-packet ++ verify-response-packet
@ -206,12 +205,12 @@
|= partial ::TODO maybe take @ instead |= partial ::TODO maybe take @ instead
^- roar ^- roar
=/ mess=@ =/ mess=@
%+ can 3 %+ can 3 ::TODO just (rep 13 -)
%+ turn (gulf 1 num-fragments) %+ turn (gulf 1 num-fragments)
~(got by fragments) ~(got by fragments)
:- sig=(cut 0 [0 512] mess) :- sig=(cut 3 [0 64] mess)
~| [%fine %response-not-cask] ~| [%fine %response-not-cask]
;;((cask) (cue (rsh 0^512 mess))) ;;((cask) (cue (rsh 3^64 mess)))
:: ::
++ process-response ++ process-response
|= [=path data=(unit (cask))] |= [=path data=(unit (cask))]