[snmp] Fixed problem with TimeTicks decode

The decoder had a problem with data of type TimeTicks.
Also, the handling of invalid values (value out of range)
was bad for both TimeTicks and Unsigned32.

OTP-10132

2 files changed, 106 insertions, 37 deletions

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).
 
 
 %%----------------------------------------------------------------------