because inet doesn't export all its types

4 files changed, 13 insertions, 11 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index a0f0c7f2..5c6bb08a 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -42,7 +42,8 @@
 -export_type([regexp/0, txn/0, thunk/1,maybe/1, info/0, info_key/0,
               msg_id/0, erlang_node/0, message/0, basic_message/0,
               delivery/0, content/0, decoded_content/0, undecoded_content/0,
-              unencoded_content/0, encoded_content/0, vhost/0, ctag/0]).
+              unencoded_content/0, encoded_content/0, vhost/0, ctag/0,
+              ip_port/0, hostname/0]).
 
 %%---------------------------------------------------------------------------
 %% Boot steps.
@@ -181,6 +182,7 @@
 
 -include("rabbit_framing.hrl").
 -include("rabbit.hrl").
+-include_lib("kernel/include/inet.hrl").
 
 -define(APPS, [os_mon, mnesia, rabbit]).
 
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 986b1825..1e05c61c 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -129,7 +129,7 @@
 -spec(makenode/1 :: ({string(), string()} | string()) -> rabbit:erlang_node()).
 -spec(nodeparts/1 :: (rabbit:erlang_node() | string()) -> {string(), string()}).
 -spec(cookie_hash/0 :: () -> string()).
--spec(tcp_name/3 :: (atom(), inet:ip_address(), inet:ip_port()) -> atom()).
+-spec(tcp_name/3 :: (atom(), inet:ip_address(), rabbit:ip_port()) -> atom()).
 -spec(intersperse/2 :: (A, [A]) -> [A]).
 -spec(upmap/2 :: (fun ((A) -> B), [A]) -> [B]).
 -spec(map_in_order/2 :: (fun ((A) -> B), [A]) -> [B]).
diff --git a/src/rabbit_net.erl b/src/rabbit_net.erl
index b098f37a..1232b457 100644
--- a/src/rabbit_net.erl
+++ b/src/rabbit_net.erl
@@ -46,7 +46,7 @@
 	'send_cnt' | 'send_max' | 'send_avg' | 'send_oct' | 'send_pend').
 -type(error() :: {'error', any()}).
 -type(ssl_socket() :: #ssl_socket{}).
--type(socket() :: inet:ip_port() | ssl_socket()).
+-type(socket() :: rabbit:ip_port() | ssl_socket()).
 
 -spec(async_recv/3 :: (socket(), integer(), timeout()) -> {'ok', any()}).
 -spec(close/1 :: (socket()) -> 'ok' | error()).
@@ -54,9 +54,9 @@
 -spec(port_command/2 :: (socket(), iolist()) -> 'true').
 -spec(send/2 :: (socket(), binary() | iolist()) -> 'ok' | error()).
 -spec(peername/1 :: (socket()) ->
-        {'ok', {inet:ip_address(), inet:ip_port()}} | error()).
+        {'ok', {inet:ip_address(), rabbit:ip_port()}} | error()).
 -spec(sockname/1 :: (socket()) ->
-        {'ok', {inet:ip_address(), inet:ip_port()}} | error()).
+        {'ok', {inet:ip_address(), rabbit:ip_port()}} | error()).
 -spec(getstat/2 :: (socket(), [stat_option()]) ->
         {'ok', [{stat_option(), integer()}]} | error()).
 
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 25ca5914..758741e8 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -68,14 +68,14 @@
 -type(listener() ::
       #listener{node     :: rabbit:erlang_node(),
                 protocol :: atom(),
-                host     :: inet:hostname(),
-                port     :: inet:ip_port()}).
+                host     :: rabbit:hostname(),
+                port     :: rabbit:ip_port()}).
 
 -spec(start/0 :: () -> 'ok').
--spec(start_tcp_listener/2 :: (inet:hostname(), inet:ip_port()) -> 'ok').
--spec(start_ssl_listener/3 :: (inet:hostname(), inet:ip_port(), [rabbit:info()])
+-spec(start_tcp_listener/2 :: (rabbit:hostname(), rabbit:ip_port()) -> 'ok').
+-spec(start_ssl_listener/3 :: (rabbit:hostname(), rabbit:ip_port(), [rabbit:info()])
                               -> 'ok').
--spec(stop_tcp_listener/2 :: (inet:hostname(), inet:ip_port()) -> 'ok').
+-spec(stop_tcp_listener/2 :: (rabbit:hostname(), rabbit:ip_port()) -> 'ok').
 -spec(active_listeners/0 :: () -> [listener()]).
 -spec(node_listeners/1 :: (rabbit:erlang_node()) -> [listener()]).
 -spec(connections/0 :: () -> [connection()]).
@@ -86,7 +86,7 @@
 -spec(connection_info_all/1 :: ([rabbit:info_key()]) -> [[rabbit:info()]]).
 -spec(close_connection/2 :: (pid(), string()) -> 'ok').
 -spec(on_node_down/1 :: (rabbit:erlang_node()) -> 'ok').
--spec(check_tcp_listener_address/3 :: (atom(), inet:hostname(), inet:ip_port()) ->
+-spec(check_tcp_listener_address/3 :: (atom(), rabbit:hostname(), rabbit:ip_port()) ->
              {inet:ip_address(), atom()}).
 
 -endif.