Merge branch 'hb/inet_types_and_specs/OTP-9260' into dev

* hb/inet_types_and_specs/OTP-9260:
  Improve types and specifications of the inet modules

5 files changed, 305 insertions, 221 deletions

diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 004f03f231..c9a849eca7 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -34,54 +34,84 @@
 -export([controlling_process/2]).
 
 -opaque assoc_id() :: term().
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
--type sctp_option() ::
-        {mode, list | binary} | list | binary
-      | {active, true | false | once}
-      | {buffer, non_neg_integer()}
-      | {tos, integer()}
-      | {priority, integer()}
-      | {dontroute, boolean()}
-      | {reuseaddr, boolean()}
-      | {linger, {boolean(), non_neg_integer()}}
-      | {sndbuf, non_neg_integer()}
-      | {recbuf, non_neg_integer()}
-      | {sctp_rtoinfo, #sctp_rtoinfo{}}
-      | {sctp_associnfo, #sctp_assocparams{}}
-      | {sctp_initmsg, #sctp_initmsg{}}
-      | {sctp_autoclose, timeout()}
-      | {sctp_nodelay, boolean()}
-      | {sctp_disable_fragments, boolean()}
-      | {sctp_i_want_mapped_v4_addr, boolean()}
-      | {sctp_maxseg, non_neg_integer()}
-      | {sctp_primary_addr, #sctp_prim{}}
-      | {sctp_set_peer_primary_addr, #sctp_setpeerprim{}}
-      | {sctp_adaptation_layer, #sctp_setadaptation{}}
-      | {sctp_peer_addr_params, #sctp_paddrparams{}}
-      | {sctp_default_send_param, #sctp_sndrcvinfo{}}
-      | {sctp_events, #sctp_event_subscribe{}}
-      | {sctp_delayed_ack_time, #sctp_assoc_value{}}
-      | {sctp_status, #sctp_status{}}
-      | {sctp_get_peer_addr_info, #sctp_paddrinfo{}}.
--opaque sctp_socket() :: port().
-
--spec open() -> {ok, Socket} | {error, posix()} when
+-type option() ::
+        {active, true | false | once} |
+        {buffer, non_neg_integer()} |
+        {dontroute, boolean()} |
+        {linger, {boolean(), non_neg_integer()}} |
+        {mode, list | binary} | list | binary |
+        {priority, non_neg_integer()} |
+        {recbuf, non_neg_integer()} |
+        {reuseaddr, boolean()} |
+        {sctp_adaptation_layer, #sctp_setadaptation{}} |
+        {sctp_associnfo, #sctp_assocparams{}} |
+        {sctp_autoclose, non_neg_integer()} |
+        {sctp_default_send_param, #sctp_sndrcvinfo{}} |
+        {sctp_delayed_ack_time, #sctp_assoc_value{}} |
+        {sctp_disable_fragments, boolean()} |
+        {sctp_events, #sctp_event_subscribe{}} |
+        {sctp_get_peer_addr_info, #sctp_paddrinfo{}} |
+        {sctp_i_want_mapped_v4_addr, boolean()} |
+        {sctp_initmsg, #sctp_initmsg{}} |
+        {sctp_maxseg, non_neg_integer()} |
+        {sctp_nodelay, boolean()} |
+        {sctp_peer_addr_params, #sctp_paddrparams{}} |
+        {sctp_primary_addr, #sctp_prim{}} |
+        {sctp_rtoinfo, #sctp_rtoinfo{}} |
+        {sctp_set_peer_primary_addr, #sctp_setpeerprim{}} |
+        {sctp_status, #sctp_status{}} |
+        {sndbuf, non_neg_integer()} |
+        {tos, non_neg_integer()}.
+-type option_name() ::
+        active |
+        buffer |
+        dontroute |
+        linger |
+        mode |
+        priority |
+        recbuf |
+        reuseaddr |
+        sctp_adaptation_layer |
+        sctp_associnfo |
+        sctp_autoclose |
+        sctp_default_send_param |
+        sctp_delayed_ack_time |
+        sctp_disable_fragments |
+        sctp_events |
+        sctp_get_peer_addr_info |
+        sctp_i_want_mapped_v4_addr |
+        sctp_initmsg |
+        sctp_maxseg |
+        sctp_nodelay |
+        sctp_peer_addr_params |
+        sctp_primary_addr |
+        sctp_rtoinfo |
+        sctp_set_peer_primary_addr |
+        sctp_status |
+        sndbuf |
+        tos.
+-type sctp_socket() :: port().
+
+-export_type([option/0, option_name/0]).
+
+-spec open() -> {ok, Socket} | {error, inet:posix()} when
       Socket :: sctp_socket().
 
 open() ->
     open([]).
 
--spec open(Port) -> {ok, Socket} | {error, posix()} when
-              Port :: port_number(),
+-spec open(Port) -> {ok, Socket} | {error, inet:posix()} when
+              Port :: inet:port_number(),
               Socket :: sctp_socket();
-          (Opts) -> {ok, Socket} | {error, posix()} when
+          (Opts) -> {ok, Socket} | {error, inet:posix()} when
               Opts :: [Opt],
-              Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
-              IP :: ip_address() | any | loopback,
-              Port :: port_number(),
+              Opt :: {ip,IP}
+                   | {ifaddr,IP}
+                   | inet:address_family()
+                   | {port,Port}
+                   | option(),
+              IP :: inet:ip_address() | any | loopback,
+              Port :: inet:port_number(),
               Socket :: sctp_socket().
 
 open(Opts) when is_list(Opts) ->
@@ -98,11 +128,15 @@ open(Port) when is_integer(Port) ->
 open(X) ->
     erlang:error(badarg, [X]).
 
--spec open(Port, Opts) -> {ok, Socket} | {error, posix()} when
+-spec open(Port, Opts) -> {ok, Socket} | {error, inet:posix()} when
       Opts :: [Opt],
-      Opt :: {ip,IP} | {ifaddr,IP} | {port,Port} | sctp_option(),
-      IP :: ip_address() | any | loopback,
-      Port :: port_number(),
+              Opt :: {ip,IP}
+                   | {ifaddr,IP}
+                   | inet:address_family()
+                   | {port,Port}
+                   | option(),
+      IP :: inet:ip_address() | any | loopback,
+      Port :: inet:port_number(),
       Socket :: sctp_socket().
 
 open(Port, Opts) when is_integer(Port), is_list(Opts) ->
@@ -110,7 +144,7 @@ open(Port, Opts) when is_integer(Port), is_list(Opts) ->
 open(Port, Opts) ->
     erlang:error(badarg, [Port,Opts]).
 
--spec close(Socket) -> ok | {error, posix()} when
+-spec close(Socket) -> ok | {error, inet:posix()} when
       Socket :: sctp_socket().
 
 close(S) when is_port(S) ->
@@ -138,22 +172,22 @@ listen(S, Flag) when is_port(S), is_boolean(Flag) ->
 listen(S, Flag) ->
     erlang:error(badarg, [S,Flag]).
 
--spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, posix()} when
+-spec connect(Socket, Addr, Port, Opts) -> {ok, Assoc} | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [Opt :: sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [Opt :: option()],
       Assoc :: #sctp_assoc_change{}.
 
 connect(S, Addr, Port, Opts) ->
     connect(S, Addr, Port, Opts, infinity).
 
 -spec connect(Socket, Addr, Port, Opts, Timeout) ->
-                     {ok, Assoc} | {error, posix()} when
+                     {ok, Assoc} | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [Opt :: sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [Opt :: option()],
       Timeout :: timeout(),
       Assoc :: #sctp_assoc_change{}.
 
@@ -166,21 +200,21 @@ connect(S, Addr, Port, Opts, Timeout) ->
     end.
 
 -spec connect_init(Socket, Addr, Port, Opts) ->
-                          ok | {error, posix()} when
+                          ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [sctp_option()].
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [option()].
 
 connect_init(S, Addr, Port, Opts) ->
     connect_init(S, Addr, Port, Opts, infinity).
 
 -spec connect_init(Socket, Addr, Port, Opts, Timeout) ->
-                          ok | {error, posix()} when
+                          ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
-      Addr :: ip_address() | hostname(),
-      Port :: port_number(),
-      Opts :: [sctp_option()],
+      Addr :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Opts :: [option()],
       Timeout :: timeout().
 
 connect_init(S, Addr, Port, Opts, Timeout) ->
@@ -232,7 +266,7 @@ eof(S, #sctp_assoc_change{assoc_id=AssocId}) when is_port(S) ->
 eof(S, Assoc) ->
     erlang:error(badarg, [S,Assoc]).
 
--spec abort(Socket, Assoc) -> ok | {error, posix()} when
+-spec abort(Socket, Assoc) -> ok | {error, inet:posix()} when
       Socket :: sctp_socket(),
       Assoc :: #sctp_assoc_change{}.
 
@@ -294,13 +328,13 @@ send(S, AssocChange, Stream, Data) ->
 -spec recv(Socket) -> {ok, {FromIP, FromPort, AncData, Data}}
                           | {error, Reason} when
       Socket :: sctp_socket(),
-      FromIP   :: ip_address(),
-      FromPort :: port_number(),
+      FromIP   :: inet:ip_address(),
+      FromPort :: inet:port_number(),
       AncData  :: [#sctp_sndrcvinfo{}],
       Data     :: binary() | string() | #sctp_sndrcvinfo{}
                 | #sctp_assoc_change{} | #sctp_paddr_change{}
                 | #sctp_adaptation_event{},
-      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+      Reason   :: inet:posix() | #sctp_send_failed{} | #sctp_paddr_change{}
                 | #sctp_pdapi_event{} | #sctp_remote_error{}
                 | #sctp_shutdown_event{}.
 
@@ -311,13 +345,13 @@ recv(S) ->
                                    | {error, Reason} when
       Socket :: sctp_socket(),
       Timeout :: timeout(),
-      FromIP   :: ip_address(),
-      FromPort :: port_number(),
+      FromIP   :: inet:ip_address(),
+      FromPort :: inet:port_number(),
       AncData  :: [#sctp_sndrcvinfo{}],
       Data     :: binary() | string() | #sctp_sndrcvinfo{}
                 | #sctp_assoc_change{} | #sctp_paddr_change{}
                 | #sctp_adaptation_event{},
-      Reason   :: posix() | #sctp_send_failed{} | #sctp_paddr_change{}
+      Reason   :: inet:posix() | #sctp_send_failed{} | #sctp_paddr_change{}
                 | #sctp_pdapi_event{} | #sctp_remote_error{}
                 | #sctp_shutdown_event{}.
 
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index bee61ca84a..df326b59d6 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -28,34 +28,108 @@
 
 -include("inet_int.hrl").
 
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
+-type option() ::
+        {active,          true | false | once} |
+        {bit8,            clear | set | on | off} |
+        {buffer,          non_neg_integer()} |
+        {delay_send,      boolean()} |
+        {deliver,         port | term} |
+        {dontroute,       boolean()} |
+        {exit_on_close,   boolean()} |
+        {header,          non_neg_integer()} |
+        {high_watermark,  non_neg_integer()} |
+        {keepalive,       boolean()} |
+        {linger,          {boolean(), non_neg_integer()}} |
+        {low_watermark,   non_neg_integer()} |
+        {mode,            list | binary} | list | binary |
+        {nodelay,         boolean()} |
+        {packet,
+         0 | 1 | 2 | 4 | raw | sunrm |  asn1 |
+         cdr | fcgi | line | tpkt | http | httph | http_bin | httph_bin } |
+        {packet_size,     non_neg_integer()} |
+        {priority,        non_neg_integer()} |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueBin :: binary()} |
+        {recbuf,          non_neg_integer()} |
+        {reuseaddr,       boolean()} |
+        {send_timeout,    non_neg_integer() | infinity} |
+        {send_timeout_close, boolean()} |
+        {sndbuf,          non_neg_integer()} |
+        {tos,             non_neg_integer()}.
+-type option_name() ::
+        active |
+        bit8 |
+        buffer |
+        delay_send |
+        deliver |
+        dontroute |
+        exit_on_close |
+        header |
+        high_watermark |
+        keepalive |
+        linger |
+        low_watermark |
+        mode |
+        nodelay |
+        packet |
+        packet_size |
+        priority |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueSpec :: (ValueSize :: non_neg_integer()) |
+                      (ValueBin :: binary())} |
+        recbuf |
+        reuseaddr |
+        send_timeout |
+        send_timeout_close |
+        sndbuf |
+        tos.
+-type connect_option() ::
+        {ip, inet:ip_address()} |
+        {fd, Fd :: non_neg_integer()} |
+        {ifaddr, inet:ip_address()} |
+        inet:address_family() |
+        {port, inet:port_number()} |
+        {tcp_module, module()} |
+        option().
+-type listen_option() ::
+        {ip, inet:ip_address()} |
+        {fd, Fd :: non_neg_integer()} |
+        {ifaddr, inet:ip_address()} |
+        inet:address_family() |
+        {port, inet:port_number()} |
+        {backlog, B :: non_neg_integer()} |
+        {tcp_module, module()} |
+        option().
 -type socket() :: port().
 
+-export_type([option/0, option_name/0, connect_option/0, listen_option/0]).
+
 %%
 %% Connect a socket
 %%
 
 -spec connect(Address, Port, Options) -> {ok, Socket} | {error, Reason} when
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Options :: [connect_option()],
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 connect(Address, Port, Opts) -> 
     connect(Address,Port,Opts,infinity).
 
 -spec connect(Address, Port, Options, Timeout) ->
                      {ok, Socket} | {error, Reason} when
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
+      Options :: [connect_option()],
       Timeout :: timeout(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 connect(Address, Port, Opts, Time) ->
     Timer = inet:start_timer(Time),
@@ -97,10 +171,10 @@ try_connect([], _Port, _Opts, _Timer, _Mod, Err) ->
 %%
 
 -spec listen(Port, Options) -> {ok, ListenSocket} | {error, Reason} when
-      Port :: port_number(),
-      Options :: [Opt :: term()],
+      Port :: inet:port_number(),
+      Options :: [listen_option()],
       ListenSocket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 listen(Port, Opts) ->
     Mod = mod(Opts, undefined),
@@ -119,7 +193,7 @@ listen(Port, Opts) ->
 -spec accept(ListenSocket) -> {ok, Socket} | {error, Reason} when
       ListenSocket :: socket(),
       Socket :: socket(),
-      Reason :: closed | timeout | posix().
+      Reason :: closed | timeout | inet:posix().
 
 accept(S) ->
     case inet_db:lookup_socket(S) of
@@ -133,7 +207,7 @@ accept(S) ->
       ListenSocket :: socket(),
       Timeout :: timeout(),
       Socket :: socket(),
-      Reason :: closed | timeout | posix().
+      Reason :: closed | timeout | inet:posix().
 
 accept(S, Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -150,7 +224,7 @@ accept(S, Time) when is_port(S) ->
 -spec shutdown(Socket, How) -> ok | {error, Reason} when
       Socket :: socket(),
       How :: read | write | read_write,
-      Reason :: posix().
+      Reason :: inet:posix().
 
 shutdown(S, How) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -177,7 +251,7 @@ close(S) ->
 -spec send(Socket, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
       Packet :: string() | binary(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 send(S, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -195,7 +269,7 @@ send(S, Packet) when is_port(S) ->
       Socket :: socket(),
       Length :: non_neg_integer(),
       Packet :: string() | binary() | HttpPacket,
-      Reason :: closed | posix(),
+      Reason :: closed | inet:posix(),
       HttpPacket :: term().
 
 recv(S, Length) when is_port(S) ->
@@ -211,7 +285,7 @@ recv(S, Length) when is_port(S) ->
       Length :: non_neg_integer(),
       Timeout :: timeout(),
       Packet :: string() | binary() | HttpPacket,
-      Reason :: closed | posix(),
+      Reason :: closed | inet:posix(),
       HttpPacket :: term().
 
 recv(S, Length, Time) when is_port(S) ->
@@ -237,7 +311,7 @@ unrecv(S, Data) when is_port(S) ->
 -spec controlling_process(Socket, Pid) -> ok | {error, Reason} when
       Socket :: socket(),
       Pid :: pid(),
-      Reason :: closed | not_owner | posix().
+      Reason :: closed | not_owner | inet:posix().
 
 controlling_process(S, NewOwner) ->
     case inet_db:lookup_socket(S) of
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index 7d14615c04..554f4ece4a 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -25,25 +25,74 @@
 
 -include("inet_int.hrl").
 
--type hostname() :: inet:hostname().
--type ip_address() :: inet:ip_address().
--type port_number() :: 0..65535.
--type posix() :: inet:posix().
+-type option() ::
+        {active,          true | false | once} |
+        {add_membership,  {inet:ip_address(), inet:ip_address()}} |
+        {broadcast,       boolean()} |
+        {buffer,          non_neg_integer()} |
+        {deliver,         port | term} |
+        {dontroute,       boolean()} |
+        {drop_membership, {inet:ip_address(), inet:ip_address()}} |
+        {header,          non_neg_integer()} |
+        {mode,            list | binary} | list | binary |
+        {multicast_if,    inet:ip_address()} |
+        {multicast_loop,  boolean()} |
+        {multicast_ttl,   non_neg_integer()} |
+        {priority,        non_neg_integer()} |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueBin :: binary()} |
+        {read_packets,    non_neg_integer()} |
+        {recbuf,          non_neg_integer()} |
+        {reuseaddr,       boolean()} |
+        {sndbuf,          non_neg_integer()} |
+        {tos,             non_neg_integer()}.
+-type option_name() ::
+        active |
+        broadcast |
+        buffer |
+        deliver |
+        dontroute |
+        header |
+        mode |
+        multicast_if |
+        multicast_loop |
+        multicast_ttl |
+        priority |
+        {raw,
+         Protocol :: non_neg_integer(),
+         OptionNum :: non_neg_integer(),
+         ValueSpec :: (ValueSize :: non_neg_integer()) |
+                      (ValueBin :: binary())} |
+        read_packets |
+        recbuf |
+        reuseaddr |
+        sndbuf |
+        tos.
 -type socket() :: port().
 
+-export_type([option/0, option_name/0]).
+
 -spec open(Port) -> {ok, Socket} | {error, Reason} when
-      Port :: port_number(),
+      Port :: inet:port_number(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 open(Port) -> 
     open(Port, []).
 
 -spec open(Port, Opts) -> {ok, Socket} | {error, Reason} when
-      Port :: port_number(),
-      Opts :: [Opt :: term()],
+      Port :: inet:port_number(),
+      Opts :: [Option],
+      Option :: {ip, inet:ip_address()}
+              | {fd, non_neg_integer()}
+              | {ifaddr, inet:ip_address()}
+              | inet:address_family()
+              | {port, inet:port_number()}
+              | option(),
       Socket :: socket(),
-      Reason :: posix().
+      Reason :: inet:posix().
 
 open(Port, Opts) ->
     Mod = mod(Opts, undefined),
@@ -58,10 +107,10 @@ close(S) ->
 
 -spec send(Socket, Address, Port, Packet) -> ok | {error, Reason} when
       Socket :: socket(),
-      Address :: ip_address() | hostname(),
-      Port :: port_number(),
+      Address :: inet:ip_address() | inet:hostname(),
+      Port :: inet:port_number(),
       Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Reason :: not_owner | inet:posix().
 
 send(S, Address, Port, Packet) when is_port(S) ->
     case inet_db:lookup_socket(S) of
@@ -92,10 +141,10 @@ send(S, Packet) when is_port(S) ->
                   {ok, {Address, Port, Packet}} | {error, Reason} when
       Socket :: socket(),
       Length :: non_neg_integer(),
-      Address :: ip_address(),
-      Port :: port_number(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number(),
       Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Reason :: not_owner | inet:posix().
 
 recv(S,Len) when is_port(S), is_integer(Len) ->
     case inet_db:lookup_socket(S) of
@@ -110,10 +159,10 @@ recv(S,Len) when is_port(S), is_integer(Len) ->
       Socket :: socket(),
       Length :: non_neg_integer(),
       Timeout :: timeout(),
-      Address :: ip_address(),
-      Port :: port_number(),
+      Address :: inet:ip_address(),
+      Port :: inet:port_number(),
       Packet :: string() | binary(),
-      Reason :: not_owner | posix().
+      Reason :: not_owner | inet:posix().
 
 recv(S,Len,Time) when is_port(S) ->
     case inet_db:lookup_socket(S) of
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 5649188c38..48a6f3db65 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -63,8 +63,9 @@
 %% timer interface
 -export([start_timer/1, timeout/1, timeout/2, stop_timer/1]).
 
--export_type([family_option/0, hostent/0, hostname/0, ip4_address/0,
-              ip6_address/0, ip_address/0, posix/0, socket/0]).
+-export_type([address_family/0, hostent/0, hostname/0, ip4_address/0,
+              ip6_address/0, ip_address/0, posix/0, socket/0,
+              port_number/0]).
 
 %% imports
 -import(lists, [append/1, duplicate/2, filter/2, foldl/3]).
@@ -87,98 +88,15 @@
 -type ip6_address() :: {0..65535,0..65535,0..65535,0..65535,
 			0..65535,0..65535,0..65535,0..65535}.
 -type ip_address() :: ip4_address() | ip6_address().
--type ip_port() :: 0..65535.
+-type port_number() :: 0..65535.
 -type posix() :: exbadport | exbadseq | file:posix().
 -type socket() :: port().
 
 -type socket_setopt() ::
-      {'raw', non_neg_integer(), non_neg_integer(), binary()} |
-      %% TCP/UDP options
-      {'reuseaddr',       boolean()} |
-      {'keepalive',       boolean()} |
-      {'dontroute',       boolean()} |
-      {'linger',          {boolean(), non_neg_integer()}} |
-      {'broadcast',       boolean()} |
-      {'sndbuf',          non_neg_integer()} |
-      {'recbuf',          non_neg_integer()} |
-      {'priority',        non_neg_integer()} |
-      {'tos',             non_neg_integer()} |
-      {'nodelay',         boolean()} |
-      {'multicast_ttl',   non_neg_integer()} |
-      {'multicast_loop',  boolean()} |
-      {'multicast_if',    ip_address()} |
-      {'add_membership',  {ip_address(), ip_address()}} |
-      {'drop_membership', {ip_address(), ip_address()}} |
-      {'header',          non_neg_integer()} |
-      {'buffer',          non_neg_integer()} |
-      {'active',          boolean() | 'once'} |
-      {'packet',        
-       0 | 1 | 2 | 4 | 'raw' | 'sunrm' |  'asn1' |
-       'cdr' | 'fcgi' | 'line' | 'tpkt' | 'http' | 'httph' | 'http_bin' | 'httph_bin' } |
-      {'mode',           'list' | 'binary'} |
-      {'port',           'port', 'term'} |
-      {'exit_on_close',   boolean()} |
-      {'low_watermark',   non_neg_integer()} |
-      {'high_watermark',  non_neg_integer()} |
-      {'bit8',            'clear' | 'set' | 'on' | 'off'} |
-      {'send_timeout',    non_neg_integer() | 'infinity'} |
-      {'send_timeout_close', boolean()} |
-      {'delay_send',      boolean()} |
-      {'packet_size',     non_neg_integer()} |
-      {'read_packets',    non_neg_integer()} |
-      %% SCTP options
-      {'sctp_rtoinfo',               #sctp_rtoinfo{}} |
-      {'sctp_associnfo',             #sctp_assocparams{}} |
-      {'sctp_initmsg',               #sctp_initmsg{}} |
-      {'sctp_nodelay',               boolean()} |
-      {'sctp_autoclose',             non_neg_integer()} |
-      {'sctp_disable_fragments',     boolean()} |
-      {'sctp_i_want_mapped_v4_addr', boolean()} |
-      {'sctp_maxseg',                non_neg_integer()} |
-      {'sctp_primary_addr',          #sctp_prim{}} |
-      {'sctp_set_peer_primary_addr', #sctp_setpeerprim{}} |
-      {'sctp_adaptation_layer',      #sctp_setadaptation{}} |
-      {'sctp_peer_addr_params',      #sctp_paddrparams{}} |
-      {'sctp_default_send_param',    #sctp_sndrcvinfo{}} |
-      {'sctp_events',                #sctp_event_subscribe{}} |
-      {'sctp_delayed_ack_time',      #sctp_assoc_value{}}.
+        gen_sctp:option() | gen_tcp:option() | gen_udp:option().
 
 -type socket_getopt() ::
-      {'raw',
-       non_neg_integer(), non_neg_integer(), binary()|non_neg_integer()} |
-      %% TCP/UDP options
-      'reuseaddr' | 'keepalive' | 'dontroute' | 'linger' |
-      'broadcast' | 'sndbuf' | 'recbuf' | 'priority' | 'tos' | 'nodelay' | 
-      'multicast_ttl' | 'multicast_loop' | 'multicast_if' | 
-      'add_membership' | 'drop_membership' | 
-      'header' | 'buffer' | 'active' | 'packet' | 'mode' | 'port' | 
-      'exit_on_close' | 'low_watermark' | 'high_watermark' | 'bit8' | 
-      'send_timeout' | 'send_timeout_close' |
-      'delay_send' | 'packet_size' | 'read_packets' | 
-      %% SCTP options
-      {'sctp_status',                #sctp_status{}} |
-      'sctp_get_peer_addr_info' |
-      {'sctp_get_peer_addr_info',    #sctp_status{}} |
-      'sctp_rtoinfo' |
-      {'sctp_rtoinfo',               #sctp_rtoinfo{}} |
-      'sctp_associnfo' |
-      {'sctp_associnfo',             #sctp_assocparams{}} |
-      'sctp_initmsg' |
-      {'sctp_initmsg',               #sctp_initmsg{}} |
-      'sctp_nodelay' | 'sctp_autoclose' | 'sctp_disable_fragments' |
-      'sctp_i_want_mapped_v4_addr' | 'sctp_maxseg' |
-      {'sctp_primary_addr',          #sctp_prim{}} |
-      {'sctp_set_peer_primary_addr', #sctp_setpeerprim{}} |
-      'sctp_adaptation_layer' |
-      {'sctp_adaptation_layer',      #sctp_setadaptation{}} |
-      {'sctp_peer_addr_params',      #sctp_paddrparams{}} |
-      'sctp_default_send_param' |
-      {'sctp_default_send_param',    #sctp_sndrcvinfo{}} |
-      'sctp_events' |
-      {'sctp_events',                #sctp_event_subscribe{}} |
-      'sctp_delayed_ack_time' |
-      {'sctp_delayed_ack_time',      #sctp_assoc_value{}}.
-
+        gen_sctp:option_name() | gen_tcp:option_name() | gen_udp:option_name().
 -type ether_address() :: [0..255].
 
 -type if_setopt() ::
@@ -196,7 +114,7 @@
       'addr' | 'broadaddr' | 'dstaddr' | 
       'mtu' | 'netmask' | 'flags' |'hwaddr'.
 
--type family_option() :: 'inet' | 'inet6'.
+-type address_family() :: 'inet' | 'inet6'.
 -type protocol_option() :: 'tcp' | 'udp' | 'sctp'.
 -type stat_option() :: 
 	'recv_cnt' | 'recv_max' | 'recv_avg' | 'recv_oct' | 'recv_dvi' |
@@ -229,7 +147,7 @@ close(Socket) ->
 peername(Socket) -> 
     prim_inet:peername(Socket).
 
--spec setpeername(Socket :: socket(), Address :: {ip_address(), ip_port()}) ->
+-spec setpeername(Socket :: socket(), Address :: {ip_address(), port_number()}) ->
 	'ok' | {'error', any()}.
 
 setpeername(Socket, {IP,Port}) ->
@@ -246,7 +164,7 @@ setpeername(Socket, undefined) ->
 sockname(Socket) -> 
     prim_inet:sockname(Socket).
 
--spec setsockname(Socket :: socket(), Address :: {ip_address(), ip_port()}) ->
+-spec setsockname(Socket :: socket(), Address :: {ip_address(), port_number()}) ->
 	'ok' | {'error', any()}.
 
 setsockname(Socket, {IP,Port}) -> 
@@ -254,7 +172,9 @@ setsockname(Socket, {IP,Port}) ->
 setsockname(Socket, undefined) ->
     prim_inet:setsockname(Socket, undefined).
 
--spec port(Socket :: socket()) -> {'ok', ip_port()} | {'error', any()}.
+-spec port(Socket) -> {'ok', Port} | {'error', any()} when
+      Socket :: socket(),
+      Port :: port_number().
 
 port(Socket) ->
     case prim_inet:sockname(Socket) of
@@ -268,16 +188,18 @@ port(Socket) ->
 send(Socket, Packet) -> 
     prim_inet:send(Socket, Packet).
     
--spec setopts(Socket :: socket(), Opts :: [socket_setopt()]) -> 
-	'ok' | {'error', posix()}.
+-spec setopts(Socket, Options) -> ok | {error, posix()} when
+      Socket :: socket(),
+      Options :: [socket_setopt()].
 
 setopts(Socket, Opts) -> 
     prim_inet:setopts(Socket, Opts).
 
 -spec getopts(Socket, Options) ->
-	{'ok', [socket_setopt()]} | {'error', posix()} when
+	{'ok', OptionValues} | {'error', posix()} when
       Socket :: socket(),
-      Options :: [socket_getopt()].
+      Options :: [socket_getopt()],
+      OptionValues :: [socket_setopt()].
 
 getopts(Socket, Opts) ->
     prim_inet:getopts(Socket, Opts).
@@ -419,14 +341,19 @@ gethostname() ->
 gethostname(Socket) ->
     prim_inet:gethostname(Socket).
 
--spec getstat(Socket :: socket()) ->
-	{'ok', [{stat_option(), integer()}]} | {'error', posix()}.
+-spec getstat(Socket) ->
+	{ok, OptionValues} | {error, posix()} when
+      Socket :: socket(),
+      OptionValues :: [{stat_option(), integer()}].
 
 getstat(Socket) ->
     prim_inet:getstat(Socket, stats()).
 
--spec getstat(Socket :: socket(), Statoptions :: [stat_option()]) ->
-	{'ok', [{stat_option(), integer()}]} | {'error', posix()}.
+-spec getstat(Socket, Options) ->
+	{ok, OptionValues} | {error, posix()} when
+      Socket :: socket(),
+      Options :: [stat_option()],
+      OptionValues :: [{stat_option(), integer()}].
 
 getstat(Socket,What) ->
     prim_inet:getstat(Socket, What).
@@ -441,14 +368,14 @@ gethostbyname(Name) ->
 -spec gethostbyname(Hostname, Family) ->
                            {ok, Hostent} | {error, posix()} when
       Hostname :: hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Hostent :: hostent().
 
 gethostbyname(Name,Family) -> 
     gethostbyname_tm(Name, Family, false).
 
 -spec gethostbyname(Name :: hostname(),
-	            Family :: family_option(),
+	            Family :: address_family(),
 	            Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', #hostent{}} | {'error', posix()}.
 	
@@ -527,14 +454,14 @@ getfd(Socket) ->
 
 -spec getaddr(Host, Family) -> {ok, Address} | {error, posix()} when
       Host :: ip_address() | hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Address :: ip_address().
 
 getaddr(Address, Family) ->
     getaddr(Address, Family, infinity).
 
 -spec getaddr(Host :: ip_address() | hostname(),
-	      Family :: family_option(),
+	      Family :: address_family(),
 	      Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', ip_address()} | {'error', posix()}.
 
@@ -553,14 +480,14 @@ getaddr_tm(Address, Family, Timer) ->
 -spec getaddrs(Host, Family) ->
 	{ok, Addresses} | {error, posix()} when
       Host :: ip_address() | hostname(),
-      Family :: family_option(),
+      Family :: address_family(),
       Addresses :: [ip_address()].
 
 getaddrs(Address, Family) -> 
     getaddrs(Address, Family, infinity).
 
 -spec getaddrs(Host :: ip_address() | string() | atom(),
-	       Family :: family_option(),
+	       Family :: address_family(),
 	       Timeout :: non_neg_integer() | 'infinity') ->
 	{'ok', [ip_address()]} | {'error', posix()}.
 
@@ -570,7 +497,7 @@ getaddrs(Address, Family, Timeout) ->
     stop_timer(Timer),
     Res.
 
--spec getservbyport(Port :: ip_port(), Protocol :: atom() | string()) ->
+-spec getservbyport(Port :: port_number(), Protocol :: atom() | string()) ->
 	{'ok', string()} | {'error', posix()}.
 
 getservbyport(Port, Proto) ->
@@ -584,7 +511,7 @@ getservbyport(Port, Proto) ->
 
 -spec getservbyname(Name :: atom() | string(),
 	            Protocol :: atom() | string()) ->
-	{'ok', ip_port()} | {'error', posix()}.
+	{'ok', port_number()} | {'error', posix()}.
 
 getservbyname(Name, Protocol) when is_atom(Name) ->
     case inet_udp:open(0, []) of
@@ -1067,7 +994,7 @@ gethostbyaddr_tm_native(Addr, Timer, Opts) ->
 
 -spec open(Fd :: integer(),
 	   Addr :: ip_address(),
-	   Port :: ip_port(),
+	   Port :: port_number(),
 	   Opts :: [socket_setopt()],
 	   Protocol :: protocol_option(),
 	   Family :: 'inet' | 'inet6',
@@ -1108,7 +1035,7 @@ open(Fd, _Addr, _Port, Opts, Protocol, Family, Module) ->
 -spec fdopen(Fd :: non_neg_integer(),
 	     Opts :: [socket_setopt()],
 	     Protocol :: protocol_option(),
-	     Family :: family_option(),
+	     Family :: address_family(),
 	     Module :: atom()) ->
 	{'ok', socket()} | {'error', posix()}.
 
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index d1f5644ff7..59ba408d7a 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -407,7 +407,7 @@ gethostbyname(Name) ->
 -spec gethostbyname(Name, Family) -> {ok, Hostent} | {error, Reason} when
       Name :: dns_name(),
       Hostent :: inet:hostent(),
-      Family :: inet:family_option(),
+      Family :: inet:address_family(),
       Reason :: inet:posix() | res_error().
 
 gethostbyname(Name,Family) ->
@@ -418,7 +418,7 @@ gethostbyname(Name,Family) ->
       Name :: dns_name(),
       Hostent :: inet:hostent(),
       Timeout :: timeout(),
-      Family :: inet:family_option(),
+      Family :: inet:address_family(),
       Reason :: inet:posix() | res_error().
 
 gethostbyname(Name,Family,Timeout) ->