Commit 784935c0 authored by Bernd Paysan's avatar Bernd Paysan

Test otrify, works

parent c9f1e3b2
......@@ -129,13 +129,15 @@ User dest-0key< \ pointer to obtained dest-0key
host:ipv4 be-ul@ sockaddr1 ipv4!
host:route $@ !temp-addr ;
: addr>sock6 { xt -- }
ipv6( host:ipv6 ip6? IF addr>6sock o o> >r xt execute r> >o THEN ) ;
: addr>sock4 { xt -- }
ipv4( host:ipv4 be-ul@ IF addr>4sock o o> >r xt execute r> >o THEN ) ;
: addr>sock ( o xt -- ) { xt } >o
ipv64( xt addr>sock6 xt addr>sock4 )else( xt addr>sock4 xt addr>sock6 ) o> ;
ipv64(
ipv6( host:ipv6 ip6? IF addr>6sock o o> >r xt execute r> >o THEN )
ipv4( host:ipv4 be-ul@ IF addr>4sock o o> >r xt execute r> >o THEN )
)else(
ipv4( host:ipv4 be-ul@ IF addr>4sock o o> >r xt execute r> >o THEN )
ipv6( host:ipv6 ip6? IF addr>6sock o o> >r xt execute r> >o THEN )
)
o> ;
: +my-id ( -- )
config:prio# @ host:pri# !
......
......@@ -529,7 +529,6 @@ msg-class is msg:object
: replace-sig { addrsig usig addrmsg umsg -- }
addrsig usig addrmsg umsg usig - [: type type ;] $tmp
2dup dump
2dup msg-dec?-sig? !!sig!! 2drop addrmsg umsg smove ;
: new-otrsig ( addr u flag -- addrsig usig )
>r 2dup startdate@ old>otr
......@@ -537,7 +536,7 @@ msg-class is msg:object
[: sktmp pkmod sk@ drop >modkey .encsign-rest ;]
['] .sig r@ select $tmp
2dup + 2 - r> swap orc!
2dup dump 1 64s /string ;
( 2dup dump ) 1 64s /string ;
:noname { sig u' addr u -- }
u' 64'+ u = u sigsize# = and IF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment