Check-in [1a894f33cb]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More fixes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1a894f33cb7945ff677ac850a0757f9e357f0a21
User & Date: bernd 2020-01-31 23:24:54.810
Context
2020-02-02
16:02
Fix xlat464 initialization problem check-in: 16ee7bd49e user: bernd tags: trunk
2020-01-31
23:24
More fixes check-in: 1a894f33cb user: bernd tags: trunk
21:58
Fix key import through chat check-in: 8f5ba435cf user: bernd tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to keys.fs.
138
139
140
141
142
143
144

145
146
147
148
149
150
151
    ke-nick $@ nick# #@ d0= IF
	optr cell ke-nick $@ nick# #! 0
    ELSE
	last# cell+ $@ bounds DO
	    ke-pk $@ I @ .ke-pk $@ str= IF
		I @ .ke-nick# @ ke-nick# !
		I @ .ke-offset 64@ ke-offset 64!

		I @ .ke-selfsig $@ drop 64@ ke-selfsig $@ drop 64@ 64u<
		IF  optr @ I !  THEN
		UNLOOP  EXIT
	    THEN
	cell +LOOP
	last# cell+ $@len cell/
	optr cell last# cell+ $+!







>







138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
    ke-nick $@ nick# #@ d0= IF
	optr cell ke-nick $@ nick# #! 0
    ELSE
	last# cell+ $@ bounds DO
	    ke-pk $@ I @ .ke-pk $@ str= IF
		I @ .ke-nick# @ ke-nick# !
		I @ .ke-offset 64@ ke-offset 64!
		I @ .ke-sk sec@ dup IF  ke-sk sec!  ELSE  2drop  THEN
		I @ .ke-selfsig $@ drop 64@ ke-selfsig $@ drop 64@ 64u<
		IF  optr @ I !  THEN
		UNLOOP  EXIT
	    THEN
	cell +LOOP
	last# cell+ $@len cell/
	optr cell last# cell+ $+!
Changes to msg.fs.
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211

: display-one-msg { d: msgt -- }
    msg-group-o >o
    msgt ['] msg:display catch IF  ." invalid entry"  cr  2drop  THEN
    o> ;

Forward silent-join
Forward fetch-pks

\ !!FIXME!! should use an asynchronous "do-when-connected" thing

: +unique-con ( -- ) o msg-group-o .msg:peers[] +unique$ ;

Forward +chat-control








<







197
198
199
200
201
202
203

204
205
206
207
208
209
210

: display-one-msg { d: msgt -- }
    msg-group-o >o
    msgt ['] msg:display catch IF  ." invalid entry"  cr  2drop  THEN
    o> ;

Forward silent-join


\ !!FIXME!! should use an asynchronous "do-when-connected" thing

: +unique-con ( -- ) o msg-group-o .msg:peers[] +unique$ ;

Forward +chat-control

1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
	    ELSE
		start off  1 requests +!  cookie+request
		requests @ $10 > IF  end-code|  0 to requests
		ELSE  [ also net2o-base ]   end-code|  THEN
	    THEN ;] #map
	start IF  [ also net2o-base ] cookie+request end-code|  THEN
	msg-group-o .msg:pks# free-obtained-pks
    THEN ;
: ?fetch-pks
    msg-group-o >o msg:peers[] $[]# 0 ?DO
	I msg:peers[] $[] @ .fetch-pks
    LOOP o> ;
: msg-tredisplay ( n -- )
    reset-time
    msg-group-o >o msg:?otr msg:-otr o> >r







|







1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
	    ELSE
		start off  1 requests +!  cookie+request
		requests @ $10 > IF  end-code|  0 to requests
		ELSE  [ also net2o-base ]   end-code|  THEN
	    THEN ;] #map
	start IF  [ also net2o-base ] cookie+request end-code|  THEN
	msg-group-o .msg:pks# free-obtained-pks
    THEN  save-keys ;
: ?fetch-pks
    msg-group-o >o msg:peers[] $[]# 0 ?DO
	I msg:peers[] $[] @ .fetch-pks
    LOOP o> ;
: msg-tredisplay ( n -- )
    reset-time
    msg-group-o >o msg:?otr msg:-otr o> >r