Merge branch 'bmk/snmp/bad_decode_TimeTicks/maint-r15/OTP-10132' into bmk/snmp/bad_decode_TimeTicks/maint/OTP-10132

9 files changed, 313 insertions, 83 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 2d045faa0f..097238af9a 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,54 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.22.1</title>
+    <p>Version 4.22.1 supports code replacement in runtime from/to
+    version 4.22, 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] Improve error handling while reading agent config files. 
+	  Some files contain mandatory information and is therefor themself
+	  mandatory. </p>
+	  <p>Own Id: OTP-9943</p>
+        </item>
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Incorrect TimeTicks decode. Also bad handling of 
+	  invalid encode (value outside of value range) for both
+	  TimeTicks and Unsigned32. </p>
+          <p>Own Id: OTP-10132</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.22.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.22</title>
     <p>Version 4.22 supports code replacement in runtime from/to
     version 4.21.7 4.21.6 4.21.5, 4.21.4, 4.21.3, 4.21.2, 4.21.1 and 4.21. </p>
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 340f2f1fa7..eec53162a1 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -963,7 +963,8 @@ Manager snmp config:
 7b. User name? hobbes
 7c. Security name? [hobbes] 
 7d. Authentication protocol (no/sha/md5)? [no] sha
-7e  Authentication [sha] key (length 0 or 20)? [""] [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]
+7e  Authentication [sha] key (length 0 or 20)? [""] [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16, \
+    17,18,19,20]
 7d. Priv protocol (no/des/aes)? [no] des
 7f  Priv [des] key (length 0 or 16)? [""] 10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25
 7. Configure an usm user handled by this manager (y/n)? [y] n
diff --git a/lib/snmp/doc/src/snmpa_network_interface_filter.xml b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
index 10419517dd..84953c5270 100644
--- a/lib/snmp/doc/src/snmpa_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="iso-8859-1" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -84,7 +84,9 @@
     <title>DATA TYPES</title>
     <code type="none">
 port() = integer() > 0
-pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 'set-request' | trap | 'get-bulk-request' | 'inform-request' | report
+pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 
+             'set-request' | trap | 'get-bulk-request' | 'inform-request' | 
+             report
     </code>
     <marker id="accept_recv"></marker>
   </section>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 9bbb6cdbdb..8ab3be8e18 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -173,16 +173,16 @@ sec_level() = noAuthNoPriv | authNoPriv | authPriv
       </type>
       <desc>
         <p>Register the manager entity (=user) responsible for specific 
-          agent(s). </p>
+	agent(s). </p>
 
         <p><c>Module</c> is the callback module (snmpm_user behaviour) which 
-          will be called whenever something happens (detected 
-          agent, incoming reply or incoming trap/notification).
-          Note that this could have already been done as a 
-          consequence of the node config. (see users.conf).</p>
+	will be called whenever something happens (detected 
+	agent, incoming reply or incoming trap/notification).
+	Note that this could have already been done as a 
+	consequence of the node config. (see users.conf).</p>
 
-        <p>The argument <c>DefaultAgentConfig</c> is used as default values when 
-          this user register agents.</p>
+        <p>The argument <c>DefaultAgentConfig</c> is used as default 
+	values when this user register agents.</p>
 
         <p>The type of <c>Val</c> depends on <c>Item</c>: </p>
 <code type="none"><![CDATA[
diff --git a/lib/snmp/doc/src/snmpm_network_interface_filter.xml b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
index 5f80cec94e..4dc133dd71 100644
--- a/lib/snmp/doc/src/snmpm_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
@@ -82,7 +82,9 @@
     <title>DATA TYPES</title>
     <code type="none">
 port() = integer() > 0
-pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 'set-request' | trap | 'get-bulk-request' | 'inform-request' | report | trappdu
+pdu_type() = 'get-request' | 'get-next-request' | 'get-response' | 
+             'set-request' | trap | 'get-bulk-request' | 'inform-request' | 
+             report | trappdu
     </code>
     <marker id="accept_recv"></marker>
   </section>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 8360d88c94..bfffd5810c 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,8 +22,15 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -50,6 +57,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -76,6 +85,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -107,6 +118,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -141,6 +154,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -175,6 +190,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -211,6 +228,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -248,6 +267,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -288,8 +309,16 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.22", 
+   [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.7", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -316,6 +345,8 @@
   }, 
   {"4.21.6",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -342,6 +373,8 @@
   },
   {"4.21.5",
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -373,6 +406,8 @@
   },
   {"4.21.4", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -407,6 +442,8 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -441,6 +478,8 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -477,6 +516,8 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
@@ -514,6 +555,8 @@
   }, 
   {"4.21", 
    [
+    {load_module, snmp_pdus, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_config, soft_purge, soft_purge, []}, 
     {load_module, snmp_conf, soft_purge, soft_purge, []}, 
     {load_module, snmp_community_mib, soft_purge, soft_purge, [snmp_conf]}, 
diff --git a/lib/snmp/src/misc/snmp_pdus.erl b/lib/snmp/src/misc/snmp_pdus.erl
index 0788d86b2d..e15be4a298 100644
--- a/lib/snmp/src/misc/snmp_pdus.erl
+++ b/lib/snmp/src/misc/snmp_pdus.erl
@@ -254,68 +254,87 @@ strip(0, _Tail) ->
 %%----------------------------------------------------------------------
 %% Returns:{Type, Value}
 %%----------------------------------------------------------------------
+
+%% OBJECT IDENTIFIER
 dec_value([6 | Bytes]) ->
     {Value, Rest} = dec_oid_notag(Bytes),
     {{'OBJECT IDENTIFIER', Value}, Rest};
 dec_value([5,0 | T]) ->
     {{'NULL', 'NULL'}, T};
+
+%% INTEGER
 dec_value([2 | Bytes]) ->
     {Value, Rest} = dec_integer_notag(Bytes),
     {{'INTEGER', Value}, Rest};
+
+%% OCTET STRING
 dec_value([4 | Bytes]) ->
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'OCTET STRING', Value}, Rest};
+
+%% IpAddress
 dec_value([64 | Bytes]) -> 
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'IpAddress', Value}, Rest};
+
+%% Counter32
 dec_value([65 | Bytes]) ->
     %% Counter32 is an unsigned 32 but is actually encoded as 
     %% a signed integer 32 (INTEGER).
     {Value, Rest} = dec_integer_notag(Bytes),
     Value2 = 
-	if
-	    (Value >= 0) andalso (Value =< 16#ffffffff) ->
-		%% We accept value above 16#7fffffff
-		%% in order to be backward bug-compatible
-		Value;
-	    (Value < 0) ->
-		16#ffffffff + Value + 1;
-	    true ->
-		exit({error, {bad_counter32, Value}})	
-	end,
+    	if
+    	    (Value >= 0) andalso (Value =< 16#ffffffff) ->
+    		%% We accept value above 16#7fffffff
+    		%% in order to be backward bug-compatible
+    		Value;
+    	    (Value < 0) ->
+    		16#ffffffff + Value + 1;
+    	    true ->
+    		exit({error, {bad_counter32, Value}})	
+    	end,
     {{'Counter32', Value2}, Rest};
+
+%% Unsigned32
 dec_value([66 | Bytes]) ->
     {Value, Rest} = dec_integer_notag(Bytes),
     if 
-	(Value >= 0) andalso (Value =< 4294967295) ->
-	    {{'Unsigned32', Value}, Rest};
-	true ->
-	    exit({error, {bad_unsigned32, Value}})
+	(Value >= 0) andalso (Value =< 16#ffffffff) ->
+    	    {{'Unsigned32', Value}, Rest};
+    	true ->
+    	    exit({error, {bad_unsigned32, Value}})
     end;
+
+%% TimeTicks
 dec_value([67 | Bytes]) ->
     {Value, Rest} = dec_integer_notag(Bytes),
-    if 
-	(Value >= 0) andalso (Value =< 4294967295) ->
+    if
+	(Value >= 0) andalso (Value =< 16#ffffffff) ->
 	    {{'TimeTicks', Value}, Rest};
 	true ->
 	    exit({error, {bad_timeticks, Value}})
     end;
+
+%% Opaque
 dec_value([68 | Bytes]) ->
     {Value, Rest} = dec_oct_str_notag(Bytes),
     {{'Opaque', Value}, Rest};
+
+%% Counter64
 dec_value([70 | Bytes]) ->
     %% Counter64 is an unsigned 64 but is actually encoded as 
     %% a signed integer 64.
     {Value, Rest} = dec_integer_notag(Bytes),
     Value2 = 
-	if
-	    (Value >= 0) andalso (Value < 16#8000000000000000) ->
-		Value;
-	    (Value < 0) ->
-		18446744073709551615 + Value + 1;
-	    true ->
-		exit({error, {bad_counter64, Value}})	end,
+    	if
+    	    (Value >= 0) andalso (Value < 16#8000000000000000) ->
+    		Value;
+    	    (Value < 0) ->
+    		16#ffffffffffffffff + Value + 1;
+    	    true ->
+    		exit({error, {bad_counter64, Value}})	end,
     {{'Counter64', Value2}, Rest};
+
 dec_value([128,0|T]) ->
     {{'NULL', noSuchObject}, T};
 dec_value([129,0|T]) ->
@@ -629,7 +648,7 @@ enc_VarBind_attributes(#varbind{oid = Oid, variabletype = Type,value = Val}) ->
     ValueBytes = enc_value(Type, Val),
     lists:append(OidBytes, ValueBytes).
 
-enc_value('INTEGER',Val) ->
+enc_value('INTEGER', Val) ->
     enc_integer_tag(Val);
 enc_value('OCTET STRING', Val) ->
     enc_oct_str_tag(Val);
@@ -637,7 +656,7 @@ enc_value('BITS', Val) ->
     enc_oct_str_tag(bits_to_str(Val));
 enc_value('OBJECT IDENTIFIER', Val) ->
     enc_oid_tag(Val);
-enc_value('IpAddress',Val) ->
+enc_value('IpAddress', Val) ->
     Bytes2 = enc_oct_str_notag(Val),
     Len2 = elength(length(Bytes2)),
     lists:append([64 | Len2],Bytes2);
@@ -668,6 +687,24 @@ enc_value('Counter32', Val) ->
     Bytes2 = enc_integer_notag(Val2),
     Len2 = elength(length(Bytes2)),
     lists:append([65 | Len2],Bytes2);
+enc_value('Unsigned32', Val) ->
+    if
+	(Val >= 0) andalso (Val =< 4294967295) ->
+	    Bytes2 = enc_integer_notag(Val),
+	    Len2 = elength(length(Bytes2)),
+	    lists:append([66 | Len2], Bytes2);
+	true ->
+	    exit({error, {bad_counter32, Val}}) 
+    end;
+enc_value('TimeTicks', Val) ->
+    if
+	(Val >= 0) andalso (Val =< 4294967295) ->
+	    Bytes2 = enc_integer_notag(Val),
+	    Len2 = elength(length(Bytes2)),
+	    lists:append([67 | Len2], Bytes2);
+	true ->
+	    exit({error, {bad_timeticks, Val}}) 
+    end;
 enc_value('Counter64', Val) ->
     Val2 = 
 	if
@@ -682,18 +719,7 @@ enc_value('Counter64', Val) ->
 	end,
     Bytes2 = enc_integer_notag(Val2),
     Len2 = elength(length(Bytes2)),
-    lists:append([70 | Len2],Bytes2);
-enc_value(Type, Val) ->
-    Bytes2 = enc_integer_notag(Val),
-    Len2 = elength(length(Bytes2)),
-    lists:append([enc_val_tag(Type,Val) | Len2],Bytes2).
-
-enc_val_tag('Counter32',Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    65;
-enc_val_tag('Unsigned32', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    66;
-enc_val_tag('TimeTicks', Val) when (Val >= 0) andalso (Val =< 4294967295) ->
-    67.
+    lists:append([70 | Len2],Bytes2).
 
 
 %%----------------------------------------------------------------------
diff --git a/lib/snmp/test/snmp_pdus_test.erl b/lib/snmp/test/snmp_pdus_test.erl
index 07b6d6b657..0d78749bcb 100644
--- a/lib/snmp/test/snmp_pdus_test.erl
+++ b/lib/snmp/test/snmp_pdus_test.erl
@@ -39,6 +39,7 @@
 	 otp7575/1,
 	 otp8563/1, 
 	 otp9022/1, 
+	 otp10132/1, 
 
          init_per_testcase/2, end_per_testcase/2
 	]).
@@ -74,16 +75,16 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %% Test case definitions
 %%======================================================================
 all() -> 
-[{group, tickets}].
+    [{group, tickets}].
 
 groups() -> 
-    [{tickets, [], [otp7575, otp8563, otp9022]}].
+    [{tickets, [], [otp7575, otp8563, otp9022, otp10132]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
@@ -94,7 +95,7 @@ end_per_group(_GroupName, Config) ->
 %%======================================================================
 
 otp7575(suite) -> [];
-otp7575(doc) -> ["OTP-7575"];
+otp7575(doc) -> ["OTP-7575 - Message version"];
 otp7575(Config) when is_list(Config) ->
     io:format("attempt to decode message with valid version~n", []),
     MsgWithOkVersion = <<48,39,2,1,0,4,6,112,117,98,108,105,99,160,26,2,2,1,49,2,1,0,2,1,0,48,14,48,12,6,8,43,6,1,2,1,1,5,0,5,0>>,
@@ -127,48 +128,55 @@ otp7575(Config) when is_list(Config) ->
 
 
 otp8563(suite) -> [];
-otp8563(doc) -> ["OTP-8563"];
+otp8563(doc) -> ["OTP-8563 - Counter64"];
 otp8563(Config) when is_list(Config) ->
     Val1 = 16#7fffffffffffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter64', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter64', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter64', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter64', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
     Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    io:format("try encode and decode valule 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter64', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter64', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
     Val4 = 16#fffffffffffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter64', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter64', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter64', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter64', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
     Val6 = 16#ffffffffffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
+    io:format("try and fail to encode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
     case (catch snmp_pdus:enc_value('Counter64', Val6)) of
 	{'EXIT', {error, {bad_counter64, Val6}}} ->
 	    ok;
 	Unexpected6 ->
+	    io:format("  => ~w~n", [Unexpected6]),
 	    exit({unexpected_encode_result, Unexpected6, Val6})
     end,
 
     Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
+    io:format("try and fail to encode value 7: ~w~n", [Val7]),
     case (catch snmp_pdus:enc_value('Counter64', Val7)) of
 	{'EXIT', {error, {bad_counter64, Val7}}} ->
 	    ok;
 	Unexpected7 ->
+	    io:format("  => ~w~n", [Unexpected7]),
 	    exit({unexpected_encode_result, Unexpected7, Val7})
     end,
 
@@ -176,51 +184,151 @@ otp8563(Config) when is_list(Config) ->
 
 
 otp9022(suite) -> [];
-otp9022(doc) -> ["OTP-9022"];
+otp9022(doc) -> ["OTP-9022 - Counter32"];
 otp9022(Config) when is_list(Config) ->
-    Val1 = 16#7fffffff,
-    io:format("try encode and decode ~w~n", [Val1]),
+    Val0 = 2908389204, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('Counter32', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'Counter32', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
     Enc1 = snmp_pdus:enc_value('Counter32', Val1), 
+    io:format("  => ~w~n", [Enc1]),
     {{'Counter32', Val1}, []} = snmp_pdus:dec_value(Enc1), 
 
     Val2 = Val1 + 1,
-    io:format("try encode and decode ~w~n", [Val2]),
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
     Enc2 = snmp_pdus:enc_value('Counter32', Val2), 
+    io:format("  => ~w~n", [Enc2]),
     {{'Counter32', Val2}, []} = snmp_pdus:dec_value(Enc2), 
 
-    Val3 = Val2 + 1,
-    io:format("try encode and decode ~w~n", [Val3]),
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
     Enc3 = snmp_pdus:enc_value('Counter32', Val3), 
+    io:format("  => ~w~n", [Enc3]),
     {{'Counter32', Val3}, []} = snmp_pdus:dec_value(Enc3), 
 
-    Val4 = 16#fffffffe,
-    io:format("try encode and decode ~w~n", [Val4]),
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
     Enc4 = snmp_pdus:enc_value('Counter32', Val4), 
+    io:format("  => ~w~n", [Enc4]),
     {{'Counter32', Val4}, []} = snmp_pdus:dec_value(Enc4), 
 
     Val5 = Val4 + 1,
-    io:format("try encode and decode ~w~n", [Val5]),
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
     Enc5 = snmp_pdus:enc_value('Counter32', Val5), 
+    io:format("  => ~w~n", [Enc5]),
     {{'Counter32', Val5}, []} = snmp_pdus:dec_value(Enc5), 
 
-    Val6 = 16#ffffffff + 1, 
-    io:format("try and fail to encode ~w~n", [Val6]),
-    case (catch snmp_pdus:enc_value('Counter32', Val6)) of
-	{'EXIT', {error, {bad_counter32, Val6}}} ->
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('Counter32', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'Counter32', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('Counter32', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'Counter32', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = 16#ffffffff + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('Counter32', Val8)) of
+	{'EXIT', {error, {bad_counter32, Val8}}} ->
 	    ok;
-	Unexpected6 ->
-	    exit({unexpected_encode_result, Unexpected6, Val6})
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
-    Val7 = -1, 
-    io:format("try and fail to encode ~w~n", [Val7]),
-    case (catch snmp_pdus:enc_value('Counter32', Val7)) of
-	{'EXIT', {error, {bad_counter32, Val7}}} ->
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('Counter32', Val9)) of
+	{'EXIT', {error, {bad_counter32, Val9}}} ->
 	    ok;
-	Unexpected7 ->
-	    exit({unexpected_encode_result, Unexpected7, Val7})
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    ok.
+
+
+otp10132(suite) -> [];
+otp10132(doc) -> ["OTP-10132 - TimeTicks"];
+otp10132(Config) when is_list(Config) ->
+    Val0 = 2159001034, 
+    io:format("try encode and decode value 0: ~w (0x~.16b)~n", [Val0, Val0]),
+    Enc0 = snmp_pdus:enc_value('TimeTicks', Val0), 
+    io:format("  => ~w~n", [Enc0]),
+    {{'TimeTicks', Val0}, []} = snmp_pdus:dec_value(Enc0), 
+
+    Val1 = 0, 
+    io:format("try encode and decode value 1: ~w (0x~.16b)~n", [Val1, Val1]),
+    Enc1 = snmp_pdus:enc_value('TimeTicks', Val1), 
+    io:format("  => ~w~n", [Enc1]),
+    {{'TimeTicks', Val1}, []} = snmp_pdus:dec_value(Enc1), 
+
+    Val2 = Val1 + 1, 
+    io:format("try encode and decode value 2: ~w (0x~.16b)~n", [Val2, Val2]),
+    Enc2 = snmp_pdus:enc_value('TimeTicks', Val2), 
+    io:format("  => ~w~n", [Enc2]),
+    {{'TimeTicks', Val2}, []} = snmp_pdus:dec_value(Enc2), 
+
+    Val3 = 16#7ffffffe,
+    io:format("try encode and decode value 3: ~w (0x~.16b)~n", [Val3, Val3]),
+    Enc3 = snmp_pdus:enc_value('TimeTicks', Val3), 
+    io:format("  => ~w~n", [Enc3]),
+    {{'TimeTicks', Val3}, []} = snmp_pdus:dec_value(Enc3), 
+
+    Val4 = Val3 + 1,
+    io:format("try encode and decode value 4: ~w (0x~.16b)~n", [Val4, Val4]),
+    Enc4 = snmp_pdus:enc_value('TimeTicks', Val4), 
+    io:format("  => ~w~n", [Enc4]),
+    {{'TimeTicks', Val4}, []} = snmp_pdus:dec_value(Enc4), 
+
+    Val5 = Val4 + 1,
+    io:format("try encode and decode value 5: ~w (0x~.16b)~n", [Val5, Val5]),
+    Enc5 = snmp_pdus:enc_value('TimeTicks', Val5), 
+    io:format("  => ~w~n", [Enc5]),
+    {{'TimeTicks', Val5}, []} = snmp_pdus:dec_value(Enc5), 
+
+    Val6 = 16#fffffffe,
+    io:format("try encode and decode value 6: ~w (0x~.16b)~n", [Val6, Val6]),
+    Enc6 = snmp_pdus:enc_value('TimeTicks', Val6), 
+    io:format("  => ~w~n", [Enc6]),
+    {{'TimeTicks', Val6}, []} = snmp_pdus:dec_value(Enc6), 
+
+    Val7 = Val6 + 1,
+    io:format("try encode and decode value 7: ~w (0x~.16b)~n", [Val7, Val7]),
+    Enc7 = snmp_pdus:enc_value('TimeTicks', Val7), 
+    io:format("  => ~w~n", [Enc7]),
+    {{'TimeTicks', Val7}, []} = snmp_pdus:dec_value(Enc7), 
+
+    Val8 = Val7 + 1, 
+    io:format("try and fail to encode value 8: ~w (0x~.16b)~n", [Val8, Val8]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val8)) of
+	{'EXIT', {error, {bad_timeticks, Val8}}} ->
+	    ok;
+	Unexpected8 ->
+	    io:format("  => ~w~n", [Unexpected8]),
+	    exit({unexpected_encode_result, Unexpected8, Val8})
     end,
 
+    Val9 = -1, 
+    io:format("try and fail to encode value 9: ~w~n", [Val9]),
+    case (catch snmp_pdus:enc_value('TimeTicks', Val9)) of
+	{'EXIT', {error, {bad_timeticks, Val9}}} ->
+	    ok;
+	Unexpected9 ->
+	    io:format("  => ~w~n", [Unexpected9]),
+	    exit({unexpected_encode_result, Unexpected9, Val9})
+    end,
+
+    io:format("done~n", []),
     ok.
 
 
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 36b9764bc8..b90dbe4eef 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.22
+SNMP_VSN    = 4.22.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"