From 2e848e9290c2c912df46a7f9b4cd93ce002e9ba9 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sat, 6 Apr 2013 15:59:13 +0200
Subject: Add transport interface 'connected' message with local address list

A transport module can return a local address list from its start/3
function in order to specify addresses to be used as Host-IP-Address
during capabilities exchange. Now allow addresses to be communicated in
a 'connected' message in the case of a connecting transport, so that
diameter_tcp (in particular) can make local address configuration
optional, communicating the gen_tcp default after connection
establishment instead.
---
 lib/diameter/src/base/diameter_peer.erl     |  8 ++++++--
 lib/diameter/src/base/diameter_peer_fsm.erl | 13 +++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'lib/diameter/src')

diff --git a/lib/diameter/src/base/diameter_peer.erl b/lib/diameter/src/base/diameter_peer.erl
index dfc76eb76e..0d2efd4d1f 100644
--- a/lib/diameter/src/base/diameter_peer.erl
+++ b/lib/diameter/src/base/diameter_peer.erl
@@ -24,7 +24,8 @@
 %% Interface towards transport modules ...
 -export([recv/2,
          up/1,
-         up/2]).
+         up/2,
+         up/3]).
 
 %% ... and the stack.
 -export([start/1,
@@ -180,7 +181,7 @@ start(Mod, Args) ->
     apply(Mod, start, Args).
 
 %%% ---------------------------------------------------------------------------
-%%% # up/[12]
+%%% # up/1-3
 %%% ---------------------------------------------------------------------------
 
 up(Pid) ->  %% accepting transport
@@ -189,6 +190,9 @@ up(Pid) ->  %% accepting transport
 up(Pid, Remote) ->  %% connecting transport
     ifc_send(Pid, {self(), connected, Remote}).
 
+up(Pid, Remote, LAddrs) -> %% connecting transport
+    ifc_send(Pid, {self(), connected, Remote, LAddrs}).
+
 %%% ---------------------------------------------------------------------------
 %%% # recv/2
 %%% ---------------------------------------------------------------------------
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index bee3e507fd..6be4259510 100644
--- a/lib/diameter/src/base/diameter_peer_fsm.erl
+++ b/lib/diameter/src/base/diameter_peer_fsm.erl
@@ -351,10 +351,17 @@ transition({diameter, {TPid, connected, Remote}},
                   mode = M}
            = S) ->
     {'Wait-Conn-Ack', _} = PS,  %% assert
-    connect = M,           %%
+    connect = M,                %%
     keep_transport(TPid),
     send_CER(S#state{mode = {M, Remote}});
 
+transition({diameter, {TPid, connected, Remote, LAddrs}},
+           #state{transport = TPid,
+                  service = Svc}
+           = S) ->
+    transition({diameter, {TPid, connected, Remote}},
+               S#state{service = readdr(Svc, LAddrs)});
+
 %% Connection from peer.
 transition({diameter, {TPid, connected}},
            #state{transport = TPid,
@@ -363,7 +370,7 @@ transition({diameter, {TPid, connected}},
                   parent = Pid}
            = S) ->
     {'Wait-Conn-Ack', Tmo} = PS,  %% assert
-    accept = M,            %%
+    accept = M,                   %%
     keep_transport(TPid),
     Pid ! {accepted, self()},
     start_timer(Tmo, S#state{state = recv_CER});
@@ -376,6 +383,8 @@ transition({diameter, {_, connected}}, _) ->
     {stop, connection_timeout};
 transition({diameter, {_, connected, _}}, _) ->
     {stop, connection_timeout};
+transition({diameter, {_, connected, _, _}}, _) ->
+    {stop, connection_timeout};
 
 %% Connection has timed out: start an alternate.
 transition({connection_timeout = T, TPid},
-- 
cgit v1.2.3