From 2adc2c2385e849c5f5b55240cbf7b0e66d364e5c Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 20 Apr 2016 11:04:26 +0200
Subject: Add diameter:peer_info/1

To return information about a single peer_ref(), to avoid having to
retrieve more than is needed with service_info/2.
---
 lib/diameter/src/base/diameter.erl         | 17 ++++++++++++++++-
 lib/diameter/src/base/diameter_service.erl | 24 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index de88f6befd..b04697513e 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
 
 %% Information.
 -export([services/0,
+         peer_info/1,
          service_info/2]).
 
 %% Start/stop the application. In a "real" application this should
@@ -53,6 +54,7 @@
               service_name/0,
               capability/0,
               peer_filter/0,
+              peer_ref/0,
               service_opt/0,
               application_opt/0,
               app_module/0,
@@ -146,6 +148,16 @@ services() ->
 service_info(SvcName, Option) ->
     diameter_service:info(SvcName, Option).
 
+%% ---------------------------------------------------------------------------
+%% peer_info/2
+%% ---------------------------------------------------------------------------
+
+-spec peer_info(peer_ref())
+   -> [tuple()].
+
+peer_info(PeerRef) ->
+    diameter_service:peer_info(PeerRef).
+
 %% ---------------------------------------------------------------------------
 %% add_transport/3
 %% ---------------------------------------------------------------------------
@@ -280,6 +292,9 @@ call(SvcName, App, Message) ->
     | {all, [peer_filter()]}
     | {any, [peer_filter()]}.
 
+-opaque peer_ref()
+   :: pid().
+
 -type evaluable()
    :: {module(), atom(), list()}
     | fun()
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 87ef2e522d..de373b158f 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -32,6 +32,7 @@
 -export([subscribe/1,
          unsubscribe/1,
          services/0,
+         peer_info/1,
          info/2]).
 
 %% towards diameter_config
@@ -217,6 +218,29 @@ lookup_state(SvcName) ->
             []
     end.
 
+%% ---------------------------------------------------------------------------
+%% # peer_info/2
+%% ---------------------------------------------------------------------------
+
+%% An extended version of info_peer/1 for peer_info/1.
+peer_info(Pid) ->
+    try
+        {_, PD} = process_info(Pid, dictionary),
+        {_, T} = lists:keyfind({diameter_peer_fsm, start}, 1, PD),
+        {TPid, {{Type, Ref}, TMod, Cfg}} = T,
+        {_, TD} = process_info(TPid, dictionary),
+        {_, Data} = lists:keyfind({TMod, info}, 1, TD),
+        [{ref, Ref},
+         {type, Type},
+         {owner, TPid},
+         {module, TMod},
+         {config, Cfg}
+         | try TMod:info(Data) catch _:_ -> [] end]
+    catch
+        error:_ ->
+            []
+    end.
+
 %% ---------------------------------------------------------------------------
 %% # subscribe/1
 %% # unsubscribe/1
-- 
cgit v1.2.3