Loading classes.fs +3 −0 Original line number Diff line number Diff line Loading @@ -260,6 +260,8 @@ cmd-class class field: resend0 field: data-resend field: pubkey \ other side official pubkey field: remote-host$ \ other side host name field: remote-ver$ \ other side version field: rqd-xts \ callbacks for request done (array) field: my-error-id field: beacon-hash Loading Loading @@ -465,6 +467,7 @@ object uclass io-mem cell uvar tmp-my-key cell uvar tmp-perm cell uvar $error-id cell uvar $remote-host end-class io-buffers \ reply structure Loading cmd.fs +2 −1 Original line number Diff line number Diff line Loading @@ -278,7 +278,8 @@ Defer >throw cmd( true )else( remote? @ 0= ) IF [: ." do-cmd-loop: " dup . .exe cr ;] $err dup DoError buf-state @ show-offset ! <err> cr net2o:see-me <default> show-offset on buf-state @ show-offset ! <warnings> cr net2o:see-me <default> show-offset on THEN un-cmd >throw ; : do-cmd-loop ( addr u -- ) 2dup buf-dump 2! Loading configure.ac +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_INIT([net2o], [0.9.7-20200116], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist]) AC_INIT([net2o], [0.9.7-20200123], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_USE_SYSTEM_EXTENSIONS Loading connect.fs +11 −1 Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ Forward >invitations in net2o Forward dispose-addrs in net2o Forward exchange-hostnames Forward mynick$ Forward invite-me Forward qr-invite-me Loading Loading @@ -230,7 +231,9 @@ Sema id-sema ELSE !!nokey!! THEN update-key all-ivs ; : reply-key ( -- ) crypt( ." Reply key: " tmpkey@ .nnb forth:cr ) reply-key, ( cookie+request ) time-offset! context ]tmpnest reply-key, ( cookie+request ) time-offset! context \ o IF net2o:exchange-hostnames THEN ]tmpnest push-cmd ; +net2o: gen-reply ( -- ) \g generate a key request reply Loading Loading @@ -283,7 +286,14 @@ Sema id-sema THEN ; +net2o: invite-result ( flag -- ) o IF to invite-result# THEN ; +net2o: set-host ( $:host -- ) $> o IF remote-host$ ELSE $remote-host THEN $! ; +net2o: get-host ( -- ) host$ $@ $, set-host ; ' invite-result is <invite-result> in net2o : exchange-hostnames ( -- ) host$ $@ $, set-host ; }scope setup-table $save Loading do +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ echo "This script builds net2o from scratch" GFORTH=gforth-0.7.9_20200109 GFORTH=gforth-0.7.9_20200123 if [ "$(uname -o)" = "Cygwin" ] then Loading Loading
classes.fs +3 −0 Original line number Diff line number Diff line Loading @@ -260,6 +260,8 @@ cmd-class class field: resend0 field: data-resend field: pubkey \ other side official pubkey field: remote-host$ \ other side host name field: remote-ver$ \ other side version field: rqd-xts \ callbacks for request done (array) field: my-error-id field: beacon-hash Loading Loading @@ -465,6 +467,7 @@ object uclass io-mem cell uvar tmp-my-key cell uvar tmp-perm cell uvar $error-id cell uvar $remote-host end-class io-buffers \ reply structure Loading
cmd.fs +2 −1 Original line number Diff line number Diff line Loading @@ -278,7 +278,8 @@ Defer >throw cmd( true )else( remote? @ 0= ) IF [: ." do-cmd-loop: " dup . .exe cr ;] $err dup DoError buf-state @ show-offset ! <err> cr net2o:see-me <default> show-offset on buf-state @ show-offset ! <warnings> cr net2o:see-me <default> show-offset on THEN un-cmd >throw ; : do-cmd-loop ( addr u -- ) 2dup buf-dump 2! Loading
configure.ac +1 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,7 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. AC_INIT([net2o], [0.9.7-20200116], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist]) AC_INIT([net2o], [0.9.7-20200123], [bernd@net2o.de], [net2o], [https://fossil.net2o.de/net2o/reportlist]) AC_PREREQ([2.59]) AC_CONFIG_MACRO_DIR([m4]) AC_USE_SYSTEM_EXTENSIONS Loading
connect.fs +11 −1 Original line number Diff line number Diff line Loading @@ -17,6 +17,7 @@ Forward >invitations in net2o Forward dispose-addrs in net2o Forward exchange-hostnames Forward mynick$ Forward invite-me Forward qr-invite-me Loading Loading @@ -230,7 +231,9 @@ Sema id-sema ELSE !!nokey!! THEN update-key all-ivs ; : reply-key ( -- ) crypt( ." Reply key: " tmpkey@ .nnb forth:cr ) reply-key, ( cookie+request ) time-offset! context ]tmpnest reply-key, ( cookie+request ) time-offset! context \ o IF net2o:exchange-hostnames THEN ]tmpnest push-cmd ; +net2o: gen-reply ( -- ) \g generate a key request reply Loading Loading @@ -283,7 +286,14 @@ Sema id-sema THEN ; +net2o: invite-result ( flag -- ) o IF to invite-result# THEN ; +net2o: set-host ( $:host -- ) $> o IF remote-host$ ELSE $remote-host THEN $! ; +net2o: get-host ( -- ) host$ $@ $, set-host ; ' invite-result is <invite-result> in net2o : exchange-hostnames ( -- ) host$ $@ $, set-host ; }scope setup-table $save Loading
do +1 −1 Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ echo "This script builds net2o from scratch" GFORTH=gforth-0.7.9_20200109 GFORTH=gforth-0.7.9_20200123 if [ "$(uname -o)" = "Cygwin" ] then Loading