A bit work on NAT debugging (b9eaf649) · Commits · Bernd Paysan / net2o

ip.fs

+5 −5

Original line number	Diff line number	Diff line
		@@ -319,12 +319,12 @@ Forward !my-addr ( -- )
		Variable net2o-host "net2o.de" net2o-host $!

		: net2o-socket ( port -- )
		BEGIN [: dup
		BEGIN dup
		ipv6( ipv4( [IFDEF] no-hybrid
		create-udp-server6 [ELSE] create-udp-server46 [THEN]
		)else( create-udp-server6 )
		)else( create-udp-server )
		;] catch WHILE 1+ REPEAT
		['] create-udp-server6 [ELSE] ['] create-udp-server46 [THEN]
		)else( ['] create-udp-server6 )
		)else( ['] create-udp-server )
		catch WHILE drop 1+ REPEAT
		[IFDEF] no-hybrid 0 [THEN] to net2o-sock
		?dup-0=-IF my-port THEN to my-port#
		[IFDEF] no-hybrid

+10 −9

Original line number	Diff line number	Diff line
		@@ -1014,20 +1014,21 @@ in net2o : punch ( addr u o:connection -- )
		punch-addr cell punch-addrs $+!
		ELSE 2drop THEN ;

		: ret-wrap ( xt -- )
		ret-addr $10 $make { w^ ret } catch
		ret $@ ret-addr swap move ret $free throw ;

		: pings ( o:connection -- )
		\G ping all addresses (why except the first one?)
		punch-addrs $@ cell safe/string bounds ?DO
		[: punch-addrs $@ ( cell safe/string ) bounds ?DO
		I @ ['] ping-addr1 addr>sock
		cell +LOOP ;
		cell +LOOP ;] ret-wrap ;

		: punchs ( addr u o:connection -- )
		\G send a reply to all addresses
		\ ret-addr $10 $make { w^ ret }
		punch-addrs $@ bounds ?DO
		[: punch-addrs $@ bounds ?DO
		I @ ['] send-punch addr>sock
		cell +LOOP 2drop
		\ ret $@ ret-addr swap move ret $free
		;
		cell +LOOP 2drop ;] ret-wrap ;

		\ send chunk

+6 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,12 @@ $00000000 Value droprate#
		: info>string ( info -- addr u )
		info@ ?>ipv6 ;

		: ping ( "addr:port" -- )
		net2o-sock ">" 0
		parse-name ':' $split s>unumber? 2drop
		SOCK_DGRAM >hints 0 hints ai_family l!
		get-info info@ sendto ?ior ;

		0 Value lastaddr#
		Variable lastn2oaddr