Commit d3d9583d authored by bernd's avatar bernd
Browse files

Removed old IP format

parent 170e8fbd

debugging.fs

+0 −2
Original line number Diff line number Diff line
@@ -69,10 +69,8 @@ debug: recvfrom( 
debug: sendto(

debug: avalanche( \ distribution tree

debug: adjust-timer( \ adjust timer

debug: new-addr( \ new address to try out

debug: reply( \ test replies



+db new-addr( \ )

-db profile( \ )



0 [IF]

net2o-addr.fs

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ previous 
\ sockaddr conversion



also net2o-base

: new.sockaddr ( addr alen -- sockaddr u )

: .sockaddr ( addr alen -- sockaddr u )

    \ convert socket into net2o address token

    [: { addr alen }

	case addr family w@
@@ -196,7 +196,7 @@ also net2o-base 
is sockaddr+return

previous

:noname ( -- addr len )

    return-address be@ routes #.key $@ new.sockaddr ; is new>sockaddr

    return-address be@ routes #.key $@ .sockaddr ; is >sockaddr



0 [IF]

Local Variables:

net2o-connect.fs

+1 −3
Original line number Diff line number Diff line
@@ -117,9 +117,7 @@ net2o-base 
: request, ( -- )  next-request #request, ;



: gen-punch ( -- )

    new-addr( my-addr$ [: -sig nat( ." punch: " 2dup .addr$ forth:cr ) $, punch ;]

    )else( my-ip$ [: nat( ." punch: " 2dup .ipaddr forth:cr )

      $, punch ;] ) $[]map ;

    my-addr$ [: -sig nat( ." punch: " 2dup .addr$ forth:cr ) $, punch ;] $[]map ;



: cookie+request ( -- ) request( ." gen cookie" forth:cr )

    nest[ cookie, request, ]nest ;

net2o-connected.fs

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ $20 net2o: disconnect ( -- ) \g close connection 
+net2o: set-ip ( $:string -- ) \g set address information

    $> setip-xt perform ;

+net2o: get-ip ( -- ) \g request address information

    new-addr( new>sockaddr )else( >sockaddr ) $, set-ip

    [: $, set-ip ;] new-addr( new-n2oaddrs )else( n2oaddrs ) ;

    >sockaddr $, set-ip [: $, set-ip ;] n2oaddrs ;



+net2o: set-blocksize ( n -- ) \g set blocksize to 2^n

    64>n 1 swap max-block# umin lshift blocksizes! ;

net2o-dht.fs

+6 −33
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ Variable dht-table 
: .tag ( addr u -- ) 2dup 2>r 

    >tag verify-tag >r sigpksize# - type r> 2r> .sigdates .check ;

: .host ( addr u -- ) over c@ '!' = IF  .revoke  EXIT  THEN

    2dup sigsize# - new-addr( .addr$ )else( .ipaddr )

    2dup sigsize# - .addr$

    2dup .sigdates >host verify-host .check 2drop ;

: host>$ ( addr u -- addr u' flag )

    >host verify-host >r sigsize# - r> ;
@@ -282,43 +282,16 @@ gen-table $freeze 


also net2o-base



: pub? ( addr u -- addr u flag )  skip-symname

    over c@ '2' = IF  dup $17 u<=  ELSE  false  THEN ;



false Value add-myip

Variable $addme



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

    \ add my name to host

    $addme $off

    [: .myname type ;] $addme $exec

    $addme $@ ;



: addme-end ( -- ) request( ." addme" forth:cr )

    add-myip IF

	my-ip$ [: gen-host $, dht-host+ ;] $[]map

    THEN

    endwith  do-expect-reply ( request, end-cmd ) ;

: addme ( addr u -- ) nat( ." addme: " 2dup .ipaddr forth:cr )

    pub? IF

	my-ip-merge IF  2drop  EXIT  THEN

	my-ip$ $ins[]  EXIT  THEN

    2dup my-ip? 0= IF  2dup my-ip$ $ins[]  THEN

    now>never

    what's expect-reply? ['] addme-end <> IF

	expect-reply pkc keysize2 $, dht-id

    THEN

    gen-host $, dht-host+

    ['] addme-end IS expect-reply? ;



\ new address formats



: new-addme-end ( -- ) request( ." addme" forth:cr )

: addme-end ( -- ) request( ." addme" forth:cr )

    add-myip IF

	my-addr$ [: $, dht-host+ ;] $[]map

    THEN

    endwith  do-expect-reply ;

: new-addme ( addr u -- )  new-addr { addr } now>never

: addme ( addr u -- )  new-addr { addr } now>never

    addr >o +my-id o>

    nat( ." addme: " addr .addr )

    addr .host-route $@len 0= IF
@@ -331,15 +304,15 @@ Variable $addme 
	addr o>addr gen-host my-addr$ $ins[]

	nat( ."  routed" ) THEN

    nat( forth:cr )

    what's expect-reply? ['] new-addme-end <> IF

    what's expect-reply? ['] addme-end <> IF

	expect-reply pkc keysize2 $, dht-id

    THEN

    addr o>addr gen-host $, dht-host+

    addr >o n2o:dispose-addr o>

    ['] new-addme-end IS expect-reply? ;

    ['] addme-end IS expect-reply? ;

previous



: +addme new-addr( ['] new-addme )else( ['] addme ) setip-xt ! ;

: +addme ['] addme setip-xt ! ;

: -setip ['] .iperr setip-xt ! ;



\ replace me stuff