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

18 files changed, 66 insertions, 39 deletions

diff --git a/lib/diameter/Makefile b/lib/diameter/Makefile
index 9961d627cf..aa1c9f7f20 100644
--- a/lib/diameter/Makefile
+++ b/lib/diameter/Makefile
@@ -1,7 +1,7 @@
-# 
+#
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2012. 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
@@ -22,11 +22,11 @@ include vsn.mk
 include subdirs.mk
 
 SUB_DIRECTORIES = $(SUB_DIRS) doc/src
-SPECIAL_TARGETS = 
+SPECIAL_TARGETS =
 
 include $(ERL_TOP)/make/otp_subdir.mk
 
-info: 
+info:
 	@echo "APP_VSN = $(APP_VSN)"
 
 .PHONY: info
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index 99a6680f12..bd2b6b103a 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # %CopyrightBegin%
 #
 # Copyright Ericsson AB 2010-2013. All Rights Reserved.
@@ -117,7 +117,7 @@ info:
 
 # ----------------------------------------------------
 # Release Target
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 161bcd33e6..3c9aebc6af 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -29,12 +29,12 @@ 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.
-    
+
 </legalnotice>
 
 <title>diameter(3)</title>
@@ -1650,7 +1650,7 @@ The <c>caps</c> entry identifies the capabilities sent by the local
 node and received from the peer during capabilities exchange.
 The <c>port</c> entry displays socket-level information about the
 transport connection.
-The <c>statistics</c> entry presents Diameter-level counters, 
+The <c>statistics</c> entry presents Diameter-level counters,
 an entry like <c>{{{0,280,1},recv},2}</c> saying that the client has
 received 2 DWR messages: <c>{0,280,1} = {Application_Id, Command_Code,
 R_Flag}</c>.</p>
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameter_compile.xml
index fc81e4efed..6630019e5c 100644
--- a/lib/diameter/doc/src/diameter_compile.xml
+++ b/lib/diameter/doc/src/diameter_compile.xml
@@ -16,9 +16,9 @@
 </copyright>
 <legalnotice>
 
-The program may be used and/or copied only with the written permission 
-from Ericsson AB, or in accordance with the terms and conditions 
-stipulated in the agreement/contract under which the program has been 
+The program may be used and/or copied only with the written permission
+from Ericsson AB, or in accordance with the terms and conditions
+stipulated in the agreement/contract under which the program has been
 supplied.
 
 </legalnotice>
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index 419dc143af..4fcde495b3 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -25,12 +25,12 @@ 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.
-    
+
 </legalnotice>
 
 <title>diameter_dict(4)</title>
diff --git a/lib/diameter/doc/src/diameter_intro.xml b/lib/diameter/doc/src/diameter_intro.xml
index fd578ccf45..288ebc0c7c 100644
--- a/lib/diameter/doc/src/diameter_intro.xml
+++ b/lib/diameter/doc/src/diameter_intro.xml
@@ -7,7 +7,7 @@
 <chapter>
 <header>
 <copyright>
-<year>2011</year><year>2012</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -17,12 +17,12 @@ 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.
-    
+
 </legalnotice>
 
 <title>Introduction</title>
diff --git a/lib/diameter/doc/src/diameter_using.xml b/lib/diameter/doc/src/diameter_using.xml
index 7d9c0cd492..c487d94a16 100644
--- a/lib/diameter/doc/src/diameter_using.xml
+++ b/lib/diameter/doc/src/diameter_using.xml
@@ -5,7 +5,7 @@
 
 <header>
 <copyright>
-<year>2011</year><year>2012</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -15,12 +15,12 @@ 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.
-    
+
 </legalnotice>
 
 <title>Usage</title>
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)
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 9719c67b32..aff1b18cf8 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # %CopyrightBegin%
 #
 # Copyright Ericsson AB 2010-2013. All Rights Reserved.
@@ -76,7 +76,7 @@ any: opt
 	$(MAKE) -i $(SUITES)
 
 clean:
-	rm -f $(TARGET_FILES) 
+	rm -f $(TARGET_FILES)
 	rm -f depend.mk coverspec
 
 realclean: clean
@@ -159,7 +159,7 @@ log:
 
 # ----------------------------------------------------
 # Release Targets
-# ---------------------------------------------------- 
+# ----------------------------------------------------
 
 /%: % force
 	sed -f release.sed $< > "$(RELSYSDIR)$@"
diff --git a/lib/diameter/test/diameter_codec_SUITE.erl b/lib/diameter/test/diameter_codec_SUITE.erl
index 2e219bbb10..cd8ca41f66 100644
--- a/lib/diameter/test/diameter_codec_SUITE.erl
+++ b/lib/diameter/test/diameter_codec_SUITE.erl
@@ -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
diff --git a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
index 49f2158b1a..cdf0cf55e1 100644
--- a/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
+++ b/lib/diameter/test/diameter_codec_SUITE_data/diameter_test_unknown.erl
@@ -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
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index 1954bc319b..75b542b679 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -149,7 +149,7 @@ to_erl(File, Opts) ->
         No ->
             throw({make, No})
     end.
-    
+
 to_beam(Name) ->
     case compile:file(Name ++ ".erl", [return]) of
         {ok, _, _} ->
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 757f29a32e..f7462c3916 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.4.1.1
+DIAMETER_VSN = 1.4.2
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)