Verified Commit 44f59216 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Solve IPv4 compare problem

parent d0a9dee0

ip.fs

+12 −0
Original line number Diff line number Diff line
@@ -168,6 +168,18 @@ Forward .addr$ 
: ?fake-ip4 ( -- addr u )

    sockaddr1 sin6_addr dup $C fake-ip4 over str= IF  12 + 4  ELSE  $10   THEN ;



: addr-v6= ( sockaddr -- sockaddr flag )

    dup fake-ip4? IF

	dup $C sin6_addr +  host:ipv4 4 tuck str=

	over sin6_port be-uw@  host:portv4 w@ = and

    ELSE

	dup sin6_addr host:ipv6 $10 tuck str=

	over sin6_port be-uw@  host:portv6 w@ = and

    THEN ;

: addr-v4= ( sockaddr -- sockaddr flag )

    dup sin_addr  host:ipv4 4 tuck str=

    over port be-uw@  host:portv4 w@ = and ;



29  Constant ESPIPE



: unavail? ( n -- flag )

net2o.fs

+13 −7
Original line number Diff line number Diff line
@@ -998,26 +998,32 @@ Forward sockaddr+return 
    send-a-packet ?msgsize ;



: addr-v6= ( sockaddr -- sockaddr flag )

    dup fake-ip4? IF

	dup $C sin6_addr +  host:ipv4 4 tuck str=

	over sin6_port be-uw@  host:portv4 w@ = and

    ELSE

	dup sin6_addr host:ipv6 $10 tuck str=

    over sin6_port be-uw@  host:portv6 w@ = and ;

	over sin6_port be-uw@  host:portv6 w@ = and

    THEN ;

: addr-v4= ( sockaddr -- sockaddr flag )

    dup sin_addr  host:ipv4 4 tuck str=

    over port be-uw@  host:portv4 w@ = and ;



: search-cmd0key ( -- )

    ret-addr { ra }

    ra be@ routes# #.key dup 0= IF  2drop  EXIT  THEN  $@ drop

    ret-addr { ra }  ra $10  pathc+ 0 -skip { d: ra$ }

    ra be@ routes# #.key dup 0= IF  2drop  EXIT  THEN  $@

    msg( ." search-cmd0key: " 2dup .address '|' emit ra$ xtype cr ) drop

    dest-addrs $@ bounds ?DO

	I @ >o

	dup w@ AF_INET6 =  IF  addr-v6=  ELSE  addr-v4=  THEN

	ra $10  pathc+ 0 -skip	host:route $@ str= and

	ra$ host:route $@ str= and

	IF

	    host:key sec@ o> dest-0key sec!

	    host:key sec@ o> dest-0key sec!  drop UNLOOP  EXIT

	ELSE

	    o>

	THEN

    cell +LOOP

    drop ;

    drop invalid( ." no cmd0key found" cr ) ;



: send-code-packet ( -- ) +sendX

    header( ." send code " outbuf .header )