Commit 6ca7f7e8 authored by bernd's avatar bernd
Browse files

rename p+ to pathc+

parent 34a77a2a

net2o-ip.fs

+2 −2
Original line number Original line Diff line number Diff line
@@ -299,13 +299,13 @@ Forward !my-addr ( -- ) 
    nat( ticks .ticks ."  ping: " 2dup .address cr )

    nat( ticks .ticks ."  ping: " 2dup .address cr )

    2>r net2o-sock ">" 0 2r> sendto drop ;

    2>r net2o-sock ">" 0 2r> sendto drop ;





: p+ ( addr u -- addr' u' )

: pathc+ ( addr u -- addr' u' )

    BEGIN  dup  WHILE  over c@ $80 < >r 1 /string r>  UNTIL  THEN ;

    BEGIN  dup  WHILE  over c@ $80 < >r 1 /string r>  UNTIL  THEN ;





: .addr-path ( addr -- )

: .addr-path ( addr -- )

    dup be@ routes #.key dup 0= IF  drop $10 xtype  ELSE

    dup be@ routes #.key dup 0= IF  drop $10 xtype  ELSE

	$@ .address

	$@ .address

	$10 p+ 0 -skip dup IF  '|' emit  THEN xtype  THEN ;

	$10 pathc+ 0 -skip dup IF  '|' emit  THEN xtype  THEN ;





\ Create udp socket

\ Create udp socket

net2o-socks.fs

+1 −1
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ Variable lastn2oaddr 
    path r> plen move ;

    path r> plen move ;

: skip-dest ( addr -- )

: skip-dest ( addr -- )

    $10 2dup 0 scan nip -

    $10 2dup 0 scan nip -

    2dup p+ { addr1 u1 addr2 u2 } \ better use locals here

    2dup pathc+ { addr1 u1 addr2 u2 } \ better use locals here

    addr2 addr1 u2 move

    addr2 addr1 u2 move

    addr1 u1 u2 /string erase ;

    addr1 u1 u2 /string erase ;