Check-in [856357a817]
Not logged in

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

Overview
Comment:Fix problem with insert-address
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 856357a817834ff69350950490096562e89b2340
User & Date: bernd 2019-07-08 18:32:39
Context
2019-07-09
21:32
More on locked chat check-in: f5b4744608 user: bernd tags: trunk
2019-07-08
18:32
Fix problem with insert-address check-in: 856357a817 user: bernd tags: trunk
2019-07-07
20:57
Partial fix for the /renat problem check-in: e0382ae3c9 user: bernd tags: trunk
Changes
Hide Diffs Unified Diffs Show Whitespace Changes Patch

Changes to socks.fs.

132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152

153
154
155
156
157
158
159
    net2o-sock ">" 0
    parse-name ':' -$split s>unumber? 2drop >r
    over c@ '[' = negate /string 2dup + 1- c@ ']' = +
    r> SOCK_DGRAM >hints 0 hints ai_family l!
    get-info dup >r info@ sendto
    r> freeaddrinfo ?ior ;

0 Value lastaddr#
Variable lastn2oaddr

: insert-address ( addr u -- net2o-addr ) ?<ipv6
    address( ." Insert address " 2dup .address cr )
    lastaddr# IF  2dup lastaddr# $@ str=
	IF  2drop lastn2oaddr @ EXIT  THEN
    THEN
    2dup routes# #key dup -1 = IF
	drop s" " 2over routes# #!
	routes# #key  dup lastn2oaddr !
    ELSE
	nip nip
    THEN

    last# to lastaddr# ;

: dns>string ( addr u port hint -- info net2o-addr u )
    >r SOCK_DGRAM >hints r> hints ai_family l!
    get-info dup info>string ;

: insert-ip* ( addr u port hint -- net2o-addr )







|
|








|



>







132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
    net2o-sock ">" 0
    parse-name ':' -$split s>unumber? 2drop >r
    over c@ '[' = negate /string 2dup + 1- c@ ']' = +
    r> SOCK_DGRAM >hints 0 hints ai_family l!
    get-info dup >r info@ sendto
    r> freeaddrinfo ?ior ;

UValue lastaddr#
User lastn2oaddr

: insert-address ( addr u -- net2o-addr ) ?<ipv6
    address( ." Insert address " 2dup .address cr )
    lastaddr# IF  2dup lastaddr# $@ str=
	IF  2drop lastn2oaddr @ EXIT  THEN
    THEN
    2dup routes# #key dup -1 = IF
	drop s" " 2over routes# #!
	routes# #key
    ELSE
	nip nip
    THEN
    dup lastn2oaddr !
    last# to lastaddr# ;

: dns>string ( addr u port hint -- info net2o-addr u )
    >r SOCK_DGRAM >hints r> hints ai_family l!
    get-info dup info>string ;

: insert-ip* ( addr u port hint -- net2o-addr )