From 23cd65b80b395ad83e69618989ccc0bef13edd0a Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Fri, 20 Mar 2015 22:22:41 +0100
Subject: Set {string_decode, false} in examples

So as to do what's now recommended in diameter(1), in the grandparent
commit.
---
 lib/diameter/examples/code/relay.erl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/diameter/examples/code/relay.erl')

diff --git a/lib/diameter/examples/code/relay.erl b/lib/diameter/examples/code/relay.erl
index 0aa3cd06d3..e50d1a33f0 100644
--- a/lib/diameter/examples/code/relay.erl
+++ b/lib/diameter/examples/code/relay.erl
@@ -49,6 +49,7 @@
                         {'Vendor-Id', 193},
                         {'Product-Name', "RelayAgent"},
                         {'Auth-Application-Id', [16#FFFFFFFF]},
+                        {string_decode, false},
                         {application, [{alias, relay},
                                        {dictionary, diameter_relay},
                                        {module, relay_cb}]}]).
-- 
cgit v1.2.3


From 949cec3fdcf94310aa567921ac2ea37569beb970 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sat, 21 Mar 2015 19:10:19 +0100
Subject: Let examples override default service options

To make them a bit more flexible. Can now do things like this:

  server:start([{'Product-Name', "Bob"}]),
  server:listen({tcp, [{capx_timeout, 2000}]})

Beware that the latter is completely different from this:

  server:listen(tcp, [{capx_timeout, 2000}])
---
 lib/diameter/examples/code/relay.erl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib/diameter/examples/code/relay.erl')

diff --git a/lib/diameter/examples/code/relay.erl b/lib/diameter/examples/code/relay.erl
index e50d1a33f0..7bc46dc68d 100644
--- a/lib/diameter/examples/code/relay.erl
+++ b/lib/diameter/examples/code/relay.erl
@@ -32,6 +32,7 @@
 -module(relay).
 
 -export([start/1,
+         start/2,
          listen/2,
          connect/2,
          stop/1]).
@@ -58,11 +59,19 @@
 
 start(Name)
   when is_atom(Name) ->
-    node:start(Name, ?SERVICE(Name)).
+    start(Name, []).
+
+%% start/1
 
 start() ->
     start(?DEF_SVC_NAME).
 
+%% start/2
+
+start(Name, Opts) ->
+    node:start(Name, Opts ++ [T || {K,_} = T <- ?SERVICE(Name),
+                                   false == lists:keymember(K, 1, Opts)]).
+
 %% listen/2
 
 listen(Name, T) ->
-- 
cgit v1.2.3