! See http://factorcode.org/license.txt for BSD license.
USING: accessors alien.c-types alien.data alien.strings arrays
byte-arrays classes classes.struct combinators
-combinators.short-circuit continuations destructors fry
-grouping init io.backend io.binary io.encodings.ascii
+combinators.short-circuit continuations destructors endian fry
+grouping init io.backend io.encodings.ascii
io.encodings.binary io.pathnames io.ports io.streams.duplex
kernel locals math math.parser memoize namespaces present
sequences sequences.private splitting strings summary system
-vocabs vocabs.parser ;
+vocabs vocabs.parser ip-parser ip-parser.private random ;
IN: io.sockets
<< {
{ [ os unix? ] [ "unix.ffi" ] }
} cond use-vocab >>
-GENERIC# with-port 1 ( addrspec port -- addrspec )
+GENERIC#: with-port 1 ( addrspec port -- addrspec )
! Addressing
<PRIVATE
GENERIC: make-sockaddr ( addrspec -- sockaddr )
+GENERIC: make-sockaddr-outgoing ( addrspec -- sockaddr )
+
GENERIC: empty-sockaddr ( addrspec -- sockaddr )
GENERIC: address-size ( addrspec -- n )
GENERIC: inet-pton ( str addrspec -- data )
+: make-sockaddr/size-outgoing ( addrspec -- sockaddr size )
+ [ make-sockaddr-outgoing ] [ sockaddr-size ] bi ;
+
: make-sockaddr/size ( addrspec -- sockaddr size )
[ make-sockaddr ] [ sockaddr-size ] bi ;
: empty-sockaddr/size ( addrspec -- sockaddr size )
[ empty-sockaddr ] [ sockaddr-size ] bi ;
+M: object make-sockaddr-outgoing make-sockaddr ;
+
GENERIC: parse-sockaddr ( sockaddr addrspec -- newaddrspec )
M: f parse-sockaddr nip ;
<PRIVATE
-ERROR: invalid-ipv4 string reason ;
+ERROR: invalid-ipv4 host reason ;
M: invalid-ipv4 summary drop "Invalid IPv4 address" ;
-ERROR: malformed-ipv4 sequence ;
-
-ERROR: bad-ipv4-component string ;
-
-: parse-ipv4 ( string -- seq )
- [ f ] [
- "." split dup length 4 = [ malformed-ipv4 ] unless
- [ dup string>number [ ] [ bad-ipv4-component ] ?if ] B{ } map-as
- ] if-empty ;
+: ?parse-ipv4 ( string -- seq/f )
+ [ f ] [ parse-ipv4 ] if-empty ;
-: check-ipv4 ( string -- )
- [ parse-ipv4 drop ] [ invalid-ipv4 ] recover ;
+: check-ipv4 ( host -- )
+ [ ?parse-ipv4 drop ] [ invalid-ipv4 ] recover ;
PRIVATE>
: <ipv4> ( host -- ipv4 ) dup check-ipv4 ipv4 boa ;
-M: ipv4 inet-ntop ( data addrspec -- str )
- drop 4 memory>byte-array [ number>string ] { } map-as "." join ;
+M: ipv4 inet-ntop
+ drop 4 memory>byte-array join-ipv4 ;
-M: ipv4 inet-pton ( str addrspec -- data )
- drop [ parse-ipv4 ] [ invalid-ipv4 ] recover ;
+M: ipv4 inet-pton
+ drop [ ?parse-ipv4 ] [ invalid-ipv4 ] recover ;
M: ipv4 address-size drop 4 ;
M: ipv4 sockaddr-size drop sockaddr-in heap-size ;
-M: ipv4 empty-sockaddr drop sockaddr-in <struct> ;
+M: ipv4 empty-sockaddr drop sockaddr-in new ;
-M: ipv4 make-sockaddr ( inet -- sockaddr )
- sockaddr-in <struct>
+: make-sockaddr-part ( inet -- sockaddr )
+ sockaddr-in new
AF_INET >>family
swap
- [ port>> htons >>port ]
- [ host>> "0.0.0.0" or ]
- [ inet-pton uint deref >>addr ] tri ;
+ port>> 0 or htons >>port ; inline
-M: ipv4 parse-sockaddr ( sockaddr-in addrspec -- newaddrspec )
+M: ipv4 make-sockaddr
+ [ make-sockaddr-part ]
+ [ host>> "0.0.0.0" or ]
+ [ inet-pton uint deref >>addr ] tri ;
+
+M: ipv4 make-sockaddr-outgoing
+ [ make-sockaddr-part ]
+ [ host>> dup { f "0.0.0.0" } member? [ drop "127.0.0.1" ] when ]
+ [ inet-pton uint deref >>addr ] tri ;
+
+M: ipv4 parse-sockaddr
[ addr>> uint <ref> ] dip inet-ntop <ipv4> ;
-TUPLE: inet4 < ipv4 { port integer read-only } ;
+TUPLE: inet4 < ipv4 { port maybe{ integer } read-only } ;
: <inet4> ( host port -- inet4 )
over check-ipv4 inet4 boa ;
-: <random-local-inet4> ( -- inet4 ) f 0 <inet4> ;
-
M: ipv4 with-port [ host>> ] dip <inet4> ;
-M: inet4 parse-sockaddr ( sockaddr-in addrspec -- newaddrspec )
+M: inet4 parse-sockaddr
[ call-next-method ] [ drop port>> ntohs ] 2bi with-port ;
M: inet4 present
M: invalid-ipv6 summary drop "Invalid IPv6 address" ;
-ERROR: bad-ipv6-component obj ;
-
-ERROR: bad-ipv4-embedded-prefix obj ;
-
-ERROR: more-than-8-components ;
-
-: parse-ipv6-component ( seq -- seq' )
- [ dup hex> [ nip ] [ bad-ipv6-component ] if* ] { } map-as ;
-
-: parse-ipv6 ( string -- seq )
- [ f ] [
- ":" split CHAR: . over last member? [
- unclip-last
- [ parse-ipv6-component ] [ parse-ipv4 ] bi* append
- ] [
- parse-ipv6-component
- ] if
- ] if-empty ;
-
-: check-ipv6 ( string -- )
- [ "::" split1 [ parse-ipv6 ] bi@ 2drop ] [ invalid-ipv6 ] recover ;
+: check-ipv6 ( host -- )
+ [ parse-ipv6 drop ] [ invalid-ipv6 ] recover ;
PRIVATE>
: <ipv6> ( host -- ipv6 ) dup check-ipv6 0 ipv6 boa ;
-M: ipv6 inet-ntop ( data addrspec -- str )
+M: ipv6 inet-ntop
drop 16 memory>byte-array 2 <groups> [ be> >hex ] map ":" join ;
<PRIVATE
-: pad-ipv6 ( string1 string2 -- seq )
- 2dup [ length ] bi@ + 8 swap -
- dup 0 < [ more-than-8-components ] when
- <byte-array> glue ;
-
: ipv6-bytes ( seq -- bytes )
[ 2 >be ] { } map-as B{ } concat-as ;
PRIVATE>
-M: ipv6 inet-pton ( str addrspec -- data )
- drop
- [ "::" split1 [ parse-ipv6 ] bi@ pad-ipv6 ipv6-bytes ]
- [ invalid-ipv6 ]
- recover ;
+M: ipv6 inet-pton
+ drop [ parse-ipv6 ipv6-bytes ] [ invalid-ipv6 ] recover ;
M: ipv6 address-size drop 16 ;
M: ipv6 sockaddr-size drop sockaddr-in6 heap-size ;
-M: ipv6 empty-sockaddr drop sockaddr-in6 <struct> ;
+M: ipv6 empty-sockaddr drop sockaddr-in6 new ;
-M: ipv6 make-sockaddr ( inet -- sockaddr )
- sockaddr-in6 <struct>
+: make-sockaddr-in6-part ( inet -- sockaddr )
+ sockaddr-in6 new
AF_INET6 >>family
swap
- [ port>> htons >>port ]
- [ [ host>> "::" or ] keep inet-pton >>addr ]
- [ scope-id>> >>scopeid ]
- tri ;
+ port>> 0 or htons >>port ; inline
+
+M: ipv6 make-sockaddr
+ [ make-sockaddr-in6-part ]
+ [ [ host>> "::" or ] keep inet-pton >>addr ]
+ [ scope-id>> >>scopeid ]
+ tri ;
+
+M: ipv6 make-sockaddr-outgoing
+ [ make-sockaddr-in6-part ]
+ [ [ host>> dup { f "::" } member? [ drop "::1" ] when ] keep inet-pton >>addr ]
+ [ scope-id>> >>scopeid ]
+ tri ;
M: ipv6 parse-sockaddr
[ [ addr>> ] dip inet-ntop ] [ drop scopeid>> ] 2bi
[ host>> ] [ scope-id>> ] bi
[ number>string "%" glue ] unless-zero ;
-TUPLE: inet6 < ipv6 { port integer read-only } ;
+TUPLE: inet6 < ipv6 { port maybe{ integer } read-only } ;
: <inet6> ( host port -- inet6 )
[ dup check-ipv6 0 ] dip inet6 boa ;
[ call-next-method ] [ drop port>> ntohs ] 2bi with-port ;
M: inet6 present
- [ call-next-method ] [ port>> number>string ] bi ":" glue ;
+ [ call-next-method "[" "]" surround ] [ port>> number>string ] bi ":" glue ;
M: inet6 protocol drop 0 ;
-ERROR: addrinfo-error n string ;
+ERROR: addrinfo-error n string host ;
<PRIVATE
GENERIC: establish-connection ( client-out remote -- )
-GENERIC: ((client)) ( remote -- handle )
+GENERIC: remote>handle ( remote -- handle )
GENERIC: (client) ( remote -- client-in client-out local )
M: array (client) [ (client) 3array ] attempt-all first3 ;
-M: object (client) ( remote -- client-in client-out local )
+M: object (client)
[
- [ ((client)) ] keep
+ [ remote>handle ] keep
[
[ <ports> [ |dispose ] bi@ dup ] dip
establish-connection
HOOK: addrinfo-error-string io-backend ( n -- string )
: prepare-addrinfo ( -- addrinfo )
- addrinfo <struct>
+ addrinfo new
PF_UNSPEC >>family
IPPROTO_TCP >>protocol ;
: send ( bytes addrspec datagram -- )
check-send (send) ; inline
-: <random-local-datagram> ( -- datagram )
- <random-local-inet4> <datagram> ;
-
-: <random-local-broadcast> ( -- datagram )
- <random-local-inet4> <broadcast> ;
-
-: with-random-local-datagram ( quot -- )
- [ <random-local-datagram> ] dip with-disposal ; inline
-
-: with-random-local-broadcast ( quot -- )
- [ <random-local-broadcast> ] dip with-disposal ; inline
-
-: send-once ( bytes addrspec -- )
- [ send ] with-random-local-datagram ;
-
-: broadcast-once ( bytes addrspec -- )
- [ send ] with-random-local-broadcast ;
-
MEMO: ipv6-supported? ( -- ? )
[ "::1" 0 <inet6> binary <server> dispose t ] [ drop f ] recover ;
-[ \ ipv6-supported? reset-memoized ]
-"io.sockets:ipv6-supported?" add-startup-hook
+STARTUP-HOOK: [ \ ipv6-supported? reset-memoized ]
GENERIC: resolve-host ( addrspec -- seq )
C: <inet> inet
-M: string resolve-host
- f prepare-addrinfo f void* <ref> [
+M:: string resolve-host ( host -- seq )
+ host f prepare-addrinfo f void* <ref> [
getaddrinfo [
- dup addrinfo-error-string addrinfo-error
+ dup addrinfo-error-string host addrinfo-error
] unless-zero
] keep void* deref addrinfo memory>struct
[ parse-addrinfo-list ] keep freeaddrinfo ;
: protocol-port ( protocol -- port )
[ f getservbyname [ port>> htons ] [ f ] if* ] [ f ] if* ;
+: port-protocol ( port -- protocol )
+ [ htons f getservbyport [ name>> ] [ f ] if* ] [ f ] if* ;
+
+: <any-port-local-inet4> ( -- inet4 ) f 0 <inet4> ;
+: <any-port-local-inet6> ( -- inet6 ) f 0 <inet6> ;
+
+GENERIC: <any-port-local-inet> ( inet -- inet4 )
+M: inet4 <any-port-local-inet> drop <any-port-local-inet4> ;
+M: inet6 <any-port-local-inet> drop f 0 <inet6> ;
+
+: <any-port-local-datagram> ( inet -- datagram )
+ <any-port-local-inet> <datagram> ;
+
+: <any-port-local-broadcast> ( inet -- datagram )
+ <any-port-local-inet> <broadcast> ;
+
+: with-any-port-local-datagram ( quot -- )
+ [ dup <any-port-local-datagram> ] dip with-disposal ; inline
+
+: with-any-port-local-broadcast ( quot -- )
+ [ dup <any-port-local-broadcast> ] dip with-disposal ; inline
+
+: send-once ( bytes addrspec -- )
+ [ send ] with-any-port-local-datagram ;
+
+: broadcast-once ( bytes addrspec -- )
+ [ send ] with-any-port-local-broadcast ;
+
{
{ [ os unix? ] [ "io.sockets.unix" require ] }
{ [ os windows? ] [ "io.sockets.windows" require ] }
projects / factor.git / blobdiff