Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maint

* anders/diameter/release/R16B01/OTP-11120:
  vsn -> 1.4.2
  Update appup for R16B01
  Trailing whitespace and copyright fixes
  Minor macro simplification
  Move app/appsrc from src/base into src

6 files changed, 39 insertions, 12 deletions

diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index c0cf418f06..578bbaee2e 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -1,19 +1,19 @@
-# 
+#
 # %CopyrightBegin%
-# 
+#
 # Copyright Ericsson AB 2010-2013. All Rights Reserved.
-# 
+#
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 
 include $(ERL_TOP)/make/target.mk
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index 6c0e73de36..1d647b8c87 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -204,7 +204,7 @@ msg_header(Mod, 'answer-message' = MsgName, Header) ->
     #diameter_header{application_id = Aid,
                      cmd_code = Code}
         = Header,
-    {-1, Flags, ?DIAMETER_APP_ID_COMMON} = Mod:msg_header(MsgName),
+    {-1, Flags, ?APP_ID_COMMON} = Mod:msg_header(MsgName),
     {Code, Flags, Aid};
 
 msg_header(Mod, MsgName, _) ->
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 6f81ade30e..8b6f026b34 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -791,7 +791,7 @@ failed([MsgName | Values], FailedAvp, Dict) ->
 %% ... or record.
 failed(Rec, FailedAvp, Dict) ->
     try
-        RecName = element(1, Rec),  
+        RecName = element(1, Rec),
         Dict:'#info-'(RecName, {index, 'Failed-AVP'}),
         {'Failed-AVP', [FailedAvp]}
     catch
diff --git a/lib/diameter/src/base/diameter.app.src b/lib/diameter/src/diameter.app.src
index ceefb9b398..ceefb9b398 100644
--- a/lib/diameter/src/base/diameter.app.src
+++ b/lib/diameter/src/diameter.app.src
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 359f434941..62ace16faa 100644
--- a/lib/diameter/src/base/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -31,10 +31,36 @@
   {"1.4",   [{restart_application, diameter}]},  %% R16A
   {"1.4.1", [{load_module, diameter_reg},        %% R16B
              {load_module, diameter_stats},
+             {load_module, diameter_traffic},
              {load_module, diameter_service},
+             {load_module, diameter_config},
+             {load_module, diameter_peer},
+             {load_module, diameter_peer_fsm},
              {load_module, diameter_watchdog},
              {load_module, diameter_capx},
-             {load_module, diameter}]}
+             {load_module, diameter_codec},
+             {load_module, diameter_gen_base_rfc3588},
+             {load_module, diameter_gen_base_accounting},
+             {load_module, diameter_gen_base_rfc6733},
+             {load_module, diameter_gen_base_acct6733},
+             {load_module, diameter_tcp},
+             {load_module, diameter_lib},
+             {load_module, diameter}]},
+  {"1.4.1.1", [{load_module, diameter_traffic},
+               {load_module, diameter_service},
+               {load_module, diameter_config},
+               {load_module, diameter_peer},
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_watchdog},
+               {load_module, diameter_capx},
+               {load_module, diameter_codec},
+               {load_module, diameter_gen_base_rfc3588},
+               {load_module, diameter_gen_base_accounting},
+               {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter_gen_base_acct6733},
+               {load_module, diameter_tcp},
+               {load_module, diameter_lib},
+               {load_module, diameter}]}
  ],
  [
   {"0.9",   [{restart_application, diameter}]},
@@ -46,6 +72,7 @@
   {"1.3",   [{restart_application, diameter}]},
   {"1.3.1", [{restart_application, diameter}]},
   {"1.4",   [{restart_application, diameter}]},
-  {"1.4.1", [{restart_application, diameter}]}
+  {"1.4.1", [{restart_application, diameter}]},
+  {"1.4.1.1", [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/dict/base_rfc3588.dia b/lib/diameter/src/dict/base_rfc3588.dia
index acd7fffd00..43a417b8dc 100644
--- a/lib/diameter/src/dict/base_rfc3588.dia
+++ b/lib/diameter/src/dict/base_rfc3588.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The contents of this file are subject to the Erlang Public License,
 ;; Version 1.1, (the "License"); you may not use this file except in
@@ -421,7 +421,7 @@
    DIAMETER_INVALID_AVP_BIT_COMBO     5016
    DIAMETER_NO_COMMON_SECURITY        5017
 
-@grouped 
+@grouped
 
       Proxy-Info ::= < AVP Header: 284 >
                      { Proxy-Host }
@@ -440,7 +440,7 @@
                                      [ Auth-Application-Id ]
                                      [ Acct-Application-Id ]
 
-;; The E2E-Sequence AVP is defined in RFC 3588 as Grouped, but 
+;; The E2E-Sequence AVP is defined in RFC 3588 as Grouped, but
 ;; there is no definition of the group - only an informal text stating
 ;; that there should be a nonce (an OctetString) and a counter
 ;; (integer)