[snmp] Corrected (agent) ATL logging of outgoing messages

For some outgoing messages (not response) the following
error(s) has been corrected:
* encrypted: logged incorrectly, should have written the v3-header
  and the scoped pdu, but was actually logged as-is (encrypted),
  making conversion impossible.
* un-encrypted: messages was not logged at all.

OTP-15287 (ERIERL-206)

1 files changed, 47 insertions, 62 deletions

diff --git a/lib/snmp/src/agent/snmpa_net_if.erl b/lib/snmp/src/agent/snmpa_net_if.erl
index ecf9498ca9..807491bfcb 100644
--- a/lib/snmp/src/agent/snmpa_net_if.erl
+++ b/lib/snmp/src/agent/snmpa_net_if.erl
@@ -137,11 +137,10 @@ init(Prio, NoteStore, MasterAgent, Parent, Opts) ->
 	    proc_lib:init_ack({ok, self()}),
 	    try loop(State)
 	    catch
-		C:E when C =/= exit, E =/= shutdown ->
+		C:E:S when C =/= exit, E =/= shutdown ->
 		    Fmt =
 			"loop/1 EXCEPTION ~w:~w~n"
 			"   ~p",
-		    S = erlang:get_stacktrace(),
 		    case C of
 			exit ->
 			    %% Externally killed, root cause is elsewhere
@@ -647,10 +646,10 @@ maybe_handle_recv(
     case
 	try FilterMod:accept_recv(From_1, From_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_recv(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [From_1,From_2,Class,Exception,erlang:get_stacktrace()]),
+		  [From_1, From_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -753,12 +752,11 @@ maybe_handle_recv_pdu(
     case
 	try FilterMod:accept_recv_pdu(From_1, From_2, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_recv_pdu(~p, ~p, ~p) crashed: ~w:~w~n"
 		  "    ~p",
-		  [From_1,From_2,Type,Class,Exception,
-		   erlang:get_stacktrace()]),
+		  [From_1, From_2, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -834,11 +832,10 @@ maybe_handle_reply_pdu(
 	try
 	    FilterMod:accept_send_pdu(Addresses, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send_pdu(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [Addresses, Type, Class, Exception,
-		   erlang:get_stacktrace()]),
+		  [Addresses, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -872,7 +869,7 @@ handle_reply_pdu(
 						ACMData, LogF)) of
 	{ok, Packet} ->
 	    ?vinfo("time in agent: ~w mysec", [time_in_agent()]),
-	    try maybe_udp_send(S, Transport, To, Packet)
+	    try maybe_udp_send_wo_log(S, Transport, To, Packet)
 	    catch
 		{Reason, Sz} ->
 		    error_msg("Cannot send message "
@@ -917,11 +914,10 @@ maybe_handle_send_pdu(
     case
 	try FilterMod:accept_send_pdu(AddressesToFilter, Type)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send_pdu(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [AddressesToFilter,Type,
-		   Class,Exception,erlang:get_stacktrace()]),
+		  [AddressesToFilter, Type, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1049,46 +1045,36 @@ do_handle_send_pdu(S, Type, Pdu, Addresses) ->
 	      [Sz, Reason, Pdu])
     end.
 
-do_handle_send_pdu1(
-  #state{transports = Transports} = S,
-  Type, Addresses) ->
+do_handle_send_pdu1(S, Type, Addresses) ->
     lists:foreach(
-      fun ({Domain, Address, Packet}) when is_binary(Packet) ->
-	      ?vdebug(
-		 "[~w] sending packet:~n"
-		 "   size: ~p~n"
-		 "   to:   ~p", [Domain, sz(Packet), Address]),
-	      To = {Domain, Address},
-	      case select_transport_from_domain(Domain, Transports) of
-		  false ->
-		      error_msg(
-			"Can not find transport~n"
-			"   size:   ~p~n"
-			"   to:     ~s",
-			[sz(Packet), format_address(To)]);
-		  Transport ->
-		      maybe_udp_send(S, Transport, To, Packet)
-	      end;
-	  ({Domain, Address, {Packet, LogData}}) when is_binary(Packet) ->
-	      ?vdebug(
-		 "[~w] sending encrypted packet:~n"
-		 "   size: ~p~n"
-		 "   to:   ~p", [Domain, sz(Packet), Address]),
-	      To = {Domain, Address},
-	      case select_transport_from_domain(Domain, Transports) of
-		  false ->
-		      error_msg(
-			"Can not find transport~n"
-			"   size:   ~p~n"
-			"   to:     ~s",
-			[sz(Packet), format_address(To)]);
-		  Transport ->
-		      maybe_udp_send(S, Transport, To, Packet, Type, LogData)
-	      end
+      fun ({Domain, Address, Pkg}) when is_binary(Pkg) ->
+	      do_handle_send_pdu2(S, Type, Domain, Address,
+                                  Pkg, Pkg, "");
+	  ({Domain, Address, {Pkg, LogPkg}}) when is_binary(Pkg) ->
+	      do_handle_send_pdu2(S, Type, Domain, Address,
+                                  Pkg, LogPkg, " encrypted")
       end,
       Addresses).
 
-maybe_udp_send(
+do_handle_send_pdu2(#state{transports = Transports} = S,
+                    Type, Domain, Address, Pkg, LogPkg, EncrStr) ->
+    ?vdebug("[~w] sending~s packet:"
+            "~n   size: ~p"
+            "~n   to:   ~p", [Domain, EncrStr, sz(Pkg), Address]),
+    To = {Domain, Address},
+    case select_transport_from_domain(Domain, Transports) of
+	false ->
+	    error_msg("Can not find transport: "
+                      "~n   size: ~p"
+                      "~n   to:   ~s",
+                      [sz(Pkg), format_address(To)]);
+	Transport ->
+	    maybe_udp_send_w_log(S, Transport, To, Pkg, LogPkg, Type)
+    end.
+
+
+%% This function is used when logging has already been done!
+maybe_udp_send_wo_log(
   #state{filter = FilterMod, transports = Transports},
   #transport{socket = Socket},
   To, Packet) ->
@@ -1096,10 +1082,10 @@ maybe_udp_send(
     case
 	try FilterMod:accept_send(To_1, To_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send(~p, ~p) crashed: ~w:~w~n    ~p",
-		  [To_1,To_2,Class,Exception,erlang:get_stacktrace()]),
+		  [To_1, To_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1118,18 +1104,18 @@ maybe_udp_send(
 	    udp_send(Socket, To, Packet)
     end.
 
-maybe_udp_send(
+maybe_udp_send_w_log(
   #state{log = Log, filter = FilterMod, transports = Transports},
   #transport{socket = Socket},
-  To, Packet, Type, _LogData) ->
+  To, Pkg, LogPkg, Type) ->
     {To_1, To_2} = fix_filter_address(Transports, To),
     case
 	try FilterMod:accept_send(To_1, To_2)
 	catch
-	    Class:Exception ->
+	    Class:Exception:StackTrace ->
 		error_msg(
 		  "FilterMod:accept_send(~p, ~p) crashed for: ~w:~w~n    ~p",
-		  [To_1, To_2, Class, Exception, erlang:get_stacktrace()]),
+		  [To_1, To_2, Class, Exception, StackTrace]),
 		true
 	end
     of
@@ -1143,10 +1129,10 @@ maybe_udp_send(
 		_ ->
 		    error_msg(
 		      "FilterMod:accept_send(~p, ~p) returned: ~p",
-		      [To_1,To_2,Other])
+		      [To_1, To_2, Other])
 	    end,
-	    log(Log, Type, Packet, To),
-	    udp_send(Socket, To, Packet)
+	    log(Log, Type, LogPkg, To),
+	    udp_send(Socket, To, Pkg)
     end.
 
 udp_send(Socket, To, B) ->
@@ -1168,11 +1154,10 @@ udp_send(Socket, To, B) ->
 	ok ->
 	    ok
     catch
-	error:ExitReason ->
+	error:ExitReason:StackTrace ->
 	    error_msg("[exit] cannot send message "
 		      "(destination: ~p:~p, size: ~p, reason: ~p, at: ~p)",
-		      [IpAddr, IpPort, sz(B), ExitReason,
-		       erlang:get_stacktrace()])
+		      [IpAddr, IpPort, sz(B), ExitReason, StackTrace])
     end.
 
 sz(L) when is_list(L) -> length(L);