Commit aab44e43 authored by bernd's avatar bernd
Browse files

A few small fixes

parent 70cc706d

linux/net.fs

+3 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ $00d8607f5 netlink-addr nl_groups l! 


: address? ( addr u -- flag )

    0= IF  drop false  EXIT  THEN

    nlmsg_type w@ RTM_NEWADDR [ RTM_DELADDR 1+ ]L within ;

    nlmsg_type w@ RTM_NEWLINK [ RTM_DELADDR 1+ ]L within ;



\ debugging stuff to see what kind of things are going on
@@ -138,7 +138,8 @@ event: ->netlink ( -- ) 
: create-netlink-task ( -- )

    ['] netlink-loop 1 net2o-task to netlink-task ;



:noname defers init-rest  create-netlink-task ; is init-rest

:noname defers init-rest

    [IFUNDEF] mslinux create-netlink-task [THEN] ; is init-rest



0 [IF]

Local Variables:

net2o-ip.fs

+4 −2
Original line number Diff line number Diff line
@@ -312,12 +312,14 @@ Defer !my-addr 
Variable net2o-host "net2o.de" net2o-host $!



: net2o-socket ( port -- ) dup >r

    ipv6( ipv4( create-udp-server46 )else( create-udp-server6 )

    ipv6( ipv4( [IFDEF] no-hybrid

    create-udp-server6 [ELSE] create-udp-server46 [THEN]

    )else( create-udp-server6 )

    )else( create-udp-server )

    [IFDEF] no-hybrid 0 [THEN] to net2o-sock

    r> ?dup-0=-IF  my-port  THEN to my-port#

    [IFDEF] no-hybrid

	net2o-sock drop my-port# create-udp-server to net2o-sock

	ipv4( net2o-sock drop my-port# create-udp-server to net2o-sock )

    [THEN]

    !my-addr ;

net2o-keys.fs

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ Variable cp-tmp 
	THEN o> ;] #map

    0 to key-sfd ;] save-file  ?key-sfd drop ;



: save-keys ( -- )

: save-keys ( -- )  ?.net2o/keys

    save-pubkeys save-seckeys ;



: +gen-keys ( nick u type -- )

net2o-msg.fs

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ Variable chat-keys 


: .ack ( o:ack -- o:ack )

    ." ack context:" cr

    ." rtdelay: " rtdelay 64@ 64. cr ;

    ." rtdelay: " rtdelay 64@ s64. cr ;



: .context ( o:context -- o:context )

    ." Connected with: " .con-id cr

net2o.fs

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ event: ->kill ( task -- ) 
    <event ->killed event> 0 (bye) ;

: send-kill ( -- ) <event up@ elit, ->kill event> ;



3.000.000.000 2constant kill-timeout# \ 3s

#3.000.000.000 2constant kill-timeout# \ 3s



: net2o-kills ( -- )

    net2o-tasks deque@ kills !  net2o-tasks $off