Merge branch 'maint'

* maint: (25 commits)
  Install example dictionaries
  Move example code to examples/code
  Move example dictionaries to examples/dict
  Set name/prefix at compilation, not in dictionaries
  Add RFC 4004 (MIP) dictionary
  Add RFC 4740 (SIP) dictionary
  Add RFC 4072 (EAP) dictionary
  Add RFC 4006 (CC) dictionary
  Add RFC 4005 (NAS) dictionary
  Add standards testcase to compiler suite
  Remove {init,end}_per_group workaround
  Use new syntax for specifying ct group properties
  Increase timetrap in compiler suite
  Minor capx suite tweaks
  Minor makefile tweak
  Remove trailing whitespace
  Update skip condition in gen_sctp suite
  Reintroduce gen_sctp suite
  Remove delay from connect in transport suite
  Add codec testcase for decode of unknown AVPs
  ...

1 files changed, 11 insertions, 9 deletions

diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 0893956f97..3dfdcee2b2 100644
--- a/lib/diameter/src/base/diameter_service.erl
+++ b/lib/diameter/src/base/diameter_service.erl
@@ -629,10 +629,6 @@ insert(Tbl, Rec) ->
     ets:insert(Tbl, Rec),
     Rec.
 
-monitor(Pid) ->
-    erlang:monitor(process, Pid),
-    Pid.
-
 %% Using the process dictionary for the callback state was initially
 %% just a way to make what was horrendous trace (big state record and
 %% much else everywhere) somewhat more readable. There's not as much
@@ -814,10 +810,10 @@ start(Ref, Type, Opts, #state{peerT = PeerT,
                               service = Svc})
   when Type == connect;
        Type == accept ->
-    Pid = monitor(s(Type, Ref, {ConnT,
-                                Opts,
-                                SvcName,
-                                merge_service(Opts, Svc)})),
+    Pid = s(Type, Ref, {ConnT,
+                        Opts,
+                        SvcName,
+                        merge_service(Opts, Svc)}),
     insert(PeerT, #peer{pid = Pid,
                         type = Type,
                         ref = Ref,
@@ -830,7 +826,13 @@ start(Ref, Type, Opts, #state{peerT = PeerT,
 %% callbacks.
 
 s(Type, Ref, T) ->
-    diameter_watchdog:start({Type, Ref}, T).
+    case diameter_watchdog:start({Type, Ref}, T) of
+        {_MRef, Pid} ->
+            Pid;
+        Pid when is_pid(Pid) ->  %% from old code
+            erlang:monitor(process, Pid),
+            Pid
+    end.
 
 %% merge_service/2