Merge branch 'bmk/snmp/snmp425_integration' into maint

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src
	lib/snmp/src/misc/snmp_log.erl
	lib/snmp/vsn.mk

4 files changed, 279 insertions, 121 deletions

diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 945b8719fc..a222f842e5 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -233,16 +233,18 @@ config_agent_sys() ->
 		     fun verify_verbosity/1),
     DbDir     = ask("5. Database directory (absolute path)?", DefDir, 
 		    fun verify_dir/1),
-    MibStorageType = ask("6. Mib storage type (ets/dets/mnesia)?", "ets",
+    DbInitError = ask("6. How to handle DB init error?", 
+		      "terminate", fun verify_db_init_error/1),
+    MibStorageType = ask("7. Mib storage type (ets/dets/mnesia)?", "ets",
 			 fun verify_mib_storage_type/1),
     MibStorage = 
 	case MibStorageType of
 	    ets ->
 		[{module, snmpa_mib_storage_ets}];
 	    dets ->
-		DetsDir = ask("6b. Mib storage directory (absolute path)?",
+		DetsDir = ask("7b. Mib storage directory (absolute path)?",
 			      DbDir, fun verify_dir/1),
-		DetsAction = ask("6c. Mib storage [dets] database start "
+		DetsAction = ask("7c. Mib storage [dets] database start "
 				 "action "
 				 "(default/clear/keep)?", 
 				 "default", fun verify_mib_storage_action/1),
@@ -257,7 +259,7 @@ config_agent_sys() ->
 		end;
 	    mnesia ->
 		Nodes = [],
-		MnesiaAction = ask("6b. Mib storage [mnesia] database start "
+		MnesiaAction = ask("7b. Mib storage [mnesia] database start "
 				   "action "
 				   "(default/clear/keep)?", 
 				   "default", fun verify_mib_storage_action/1),
@@ -275,80 +277,80 @@ config_agent_sys() ->
     %% Here we should ask about mib-server data module, 
     %% but as we only have one at the moment...
 
-    TargetCacheVerb = ask("7. Target cache verbosity "
+    TargetCacheVerb = ask("8. Target cache verbosity "
 			  "(silence/info/log/debug/trace)?", "silence",
 			  fun verify_verbosity/1),
-    SymStoreVerb = ask("8. Symbolic store verbosity "
+    SymStoreVerb = ask("9. Symbolic store verbosity "
 		       "(silence/info/log/debug/trace)?", "silence",
 		       fun verify_verbosity/1),
-    LocalDbVerb = ask("9. Local DB verbosity "
+    LocalDbVerb = ask("10. Local DB verbosity "
 		       "(silence/info/log/debug/trace)?", "silence",
 		       fun verify_verbosity/1),
-    LocalDbRepair = ask("10. Local DB repair (true/false/force)?", "true",
+    LocalDbRepair = ask("11. Local DB repair (true/false/force)?", "true",
 			fun verify_dets_repair/1),
-    LocalDbAutoSave = ask("11. Local DB auto save (infinity/milli seconds)?", 
+    LocalDbAutoSave = ask("12. Local DB auto save (infinity/milli seconds)?", 
 			  "5000", fun verify_dets_auto_save/1),
-    ErrorMod = ask("12. Error report module?", "snmpa_error_logger", fun verify_module/1),
-    Type = ask("13. Agent type (master/sub)?", "master", 
+    ErrorMod = ask("13. Error report module?", "snmpa_error_logger", fun verify_module/1),
+    Type = ask("14. Agent type (master/sub)?", "master", 
 	       fun verify_agent_type/1),
     AgentConfig = 
 	case Type of 
 	    master ->
-		MasterAgentVerb = ask("14. Master-agent verbosity "
+		MasterAgentVerb = ask("15. Master-agent verbosity "
 				      "(silence/info/log/debug/trace)?", 
 				      "silence",
 				      fun verify_verbosity/1),
-		ForceLoad = ask("15. Shall the agent re-read the "
+		ForceLoad = ask("16. Shall the agent re-read the "
 				"configuration files during startup ~n"
 				"    (and ignore the configuration "
 				"database) (true/false)?", "true", 
 				fun verify_bool/1),
-		MultiThreaded = ask("16. Multi threaded agent (true/false)?", 
+		MultiThreaded = ask("17. Multi threaded agent (true/false)?", 
 				    "false",
 				    fun verify_bool/1),
-		MeOverride = ask("17. Check for duplicate mib entries when "
+		MeOverride = ask("18. Check for duplicate mib entries when "
 				 "installing a mib (true/false)?", "false",
 				 fun verify_bool/1),
-		TrapOverride = ask("18. Check for duplicate trap names when "
+		TrapOverride = ask("19. Check for duplicate trap names when "
 				   "installing a mib (true/false)?", "false",
 				   fun verify_bool/1),
-		MibServerVerb = ask("19. Mib server verbosity "
+		MibServerVerb = ask("20. Mib server verbosity "
 				    "(silence/info/log/debug/trace)?", 
 				    "silence",
 				    fun verify_verbosity/1),
-		MibServerCache = ask("20. Mib server cache "
+		MibServerCache = ask("21. Mib server cache "
 				    "(true/false)?", 
 				    "true",
 				    fun verify_bool/1),
-		NoteStoreVerb = ask("21. Note store verbosity "
+		NoteStoreVerb = ask("22. Note store verbosity "
 				    "(silence/info/log/debug/trace)?", 
 				    "silence",
 				    fun verify_verbosity/1),
-		NoteStoreTimeout = ask("22. Note store GC timeout?", "30000",
+		NoteStoreTimeout = ask("23. Note store GC timeout?", "30000",
 				       fun verify_timeout/1),
 		ATL = 
-		    case ask("23. Shall the agent use an audit trail log "
+		    case ask("24. Shall the agent use an audit trail log "
 			     "(y/n)?",
 			     "n", fun verify_yes_or_no/1) of
 			yes ->
-			    ATLType = ask("23b. Audit trail log type "
+			    ATLType = ask("24b. Audit trail log type "
 					  "(write/read_write)?",
 					  "read_write", fun verify_atl_type/1),
-			    ATLDir = ask("23c. Where to store the "
+			    ATLDir = ask("24c. Where to store the "
 					 "audit trail log?",
 					 DefDir, fun verify_dir/1),
-			    ATLMaxFiles = ask("23d. Max number of files?", 
+			    ATLMaxFiles = ask("24d. Max number of files?", 
 					      "10", 
 					      fun verify_pos_integer/1),
-			    ATLMaxBytes = ask("23e. Max size (in bytes) "
+			    ATLMaxBytes = ask("24e. Max size (in bytes) "
 					      "of each file?", 
 					      "10240", 
 					      fun verify_pos_integer/1),
 			    ATLSize = {ATLMaxBytes, ATLMaxFiles},
-			    ATLRepair = ask("23f. Audit trail log repair "
+			    ATLRepair = ask("24f. Audit trail log repair "
 					    "(true/false/truncate/snmp_repair)?", "true",
 					    fun verify_atl_repair/1),
-			    ATLSeqNo = ask("23g. Audit trail log "
+			    ATLSeqNo = ask("24g. Audit trail log "
 					   "sequence-numbering (true/false)?", 
 					   "false",
 					   fun verify_atl_seqno/1),
@@ -360,33 +362,33 @@ config_agent_sys() ->
 			no ->
 			    []
 		    end,
-		NetIfVerb = ask("24. Network interface verbosity "
+		NetIfVerb = ask("25. Network interface verbosity "
 				"(silence/info/log/debug/trace)?", 
 				"silence",
 				fun verify_verbosity/1),
-		NetIfMod = ask("25. Which network interface module shall be used?",
+		NetIfMod = ask("26. Which network interface module shall be used?",
 			       "snmpa_net_if", fun verify_module/1),
 		NetIfOpts = 
 		    case NetIfMod of
 			snmpa_net_if ->
 			    NetIfBindTo = 
-				ask("25a. Bind the agent IP address "
+				ask("26a. Bind the agent IP address "
 				    "(true/false)?",
 				    "false", fun verify_bool/1),
 			    NetIfNoReuse = 
-				ask("25b. Shall the agents "
+				ask("26b. Shall the agents "
 				    "IP address "
 				    "and port be not reusable "
 				    "(true/false)?",
 				    "false", fun verify_bool/1),
 			    NetIfReqLimit = 
-				ask("25c. Agent request limit "
+				ask("26c. Agent request limit "
 				    "(used for flow control) "
 				    "(infinity/pos integer)?", 
 				    "infinity",
 				    fun verify_netif_req_limit/1),
 			    NetIfRecbuf = 
-				case ask("25d. Receive buffer size of the "
+				case ask("26d. Receive buffer size of the "
 					 "agent (in bytes) "
 					 "(default/pos integer)?", 
 					 "default", 
@@ -397,7 +399,7 @@ config_agent_sys() ->
 					[{recbuf, RecBufSz}]
 				end,
 			    NetIfSndbuf = 
-				case ask("25e. Send buffer size of the agent "
+				case ask("26e. Send buffer size of the agent "
 					 "(in bytes) (default/pos integer)?", 
 					 "default", 
 					 fun verify_netif_sndbuf/1) of
@@ -407,7 +409,7 @@ config_agent_sys() ->
 					[{sndbuf, SndBufSz}]
 				end,
 			    NetIfFilter = 
-				case ask("25f. Do you wish to specify a "
+				case ask("26f. Do you wish to specify a "
 					 "network interface filter module "
 					 "(or use default)",
 					 "default", fun verify_module/1) of
@@ -426,18 +428,18 @@ config_agent_sys() ->
 		NetIf = [{module,    NetIfMod},
 			 {verbosity, NetIfVerb},
 			 {options,   NetIfOpts}],
-		TermDiscoEnable = ask("26a. Allow terminating discovery "
+		TermDiscoEnable = ask("27. Allow terminating discovery "
 				      "(true/false)?", "true",
 				      fun verify_bool/1),
 		TermDiscoConf = 
 		    case TermDiscoEnable of
 			true ->
 			    TermDiscoStage2 = 
-				ask("26b. Second stage behaviour "
+				ask("27a. Second stage behaviour "
 				    "(discovery/plain)?", "discovery",
 				    fun verify_term_disco_behaviour/1),
 			    TermDiscoTrigger = 
-				ask("26c. Trigger username "
+				ask("27b. Trigger username "
 				    "(default/a string)?", "default",
 				    fun verify_term_disco_trigger_username/1),
 			    [{enable, TermDiscoEnable},
@@ -448,7 +450,7 @@ config_agent_sys() ->
 			     {stage2, discovery},
 			     {trigger_username, ""}]
 		    end,
-		OrigDiscoEnable = ask("27a. Allow originating discovery "
+		OrigDiscoEnable = ask("28. Allow originating discovery "
 				      "(true/false)?", "true",
 				      fun verify_bool/1),
 		OrigDiscoConf = 
@@ -471,7 +473,7 @@ config_agent_sys() ->
 				    {verbosity, NoteStoreVerb}]},
 		 {net_if, NetIf}] ++ ATL;
 	    sub ->
-		SubAgentVerb = ask("14. Sub-agent verbosity "
+		SubAgentVerb = ask("15. Sub-agent verbosity "
 				   "(silence/info/log/debug/trace)?", 
 				   "silence",
 				   fun verify_verbosity/1),
@@ -480,11 +482,12 @@ config_agent_sys() ->
 		 {config,          [{dir, ConfigDir}]}]
 	end,
     SysConfig = 
-	[{priority,    Prio},
-	 {versions,    Vsns},
-	 {db_dir,      DbDir},
-	 {mib_storage, MibStorage},
-	 {target_cache, [{verbosity, TargetCacheVerb}]},
+	[{priority,       Prio},
+	 {versions,       Vsns},
+	 {db_dir,         DbDir},
+	 {db_init_error,  DbInitError},
+	 {mib_storage,    MibStorage},
+	 {target_cache,   [{verbosity, TargetCacheVerb}]},
 	 {symbolic_store, [{verbosity, SymStoreVerb}]},
 	 {local_db, [{repair,    LocalDbRepair},
 		     {auto_save, LocalDbAutoSave},
@@ -630,19 +633,21 @@ config_manager_sys() ->
 			fun verify_verbosity/1),
     ConfigDbDir = ask("5. Database directory (absolute path)?", 
 		      DefDir, fun verify_dir/1),
-    ConfigDbRepair = ask("6. Database repair "
+    ConfigDbInitError = ask("6. How to handle DB init error?", 
+			    "terminate", fun verify_db_init_error/1),
+    ConfigDbRepair = ask("7. Database repair "
 			 "(true/false/force)?", "true",
 			 fun verify_dets_repair/1),
-    ConfigDbAutoSave = ask("7. Database auto save "
+    ConfigDbAutoSave = ask("8. Database auto save "
 			   "(infinity/milli seconds)?", 
 			   "5000", fun verify_dets_auto_save/1),
     IRB = 
-	case ask("8. Inform request behaviour (auto/user)?", 
+	case ask("9. Inform request behaviour (auto/user)?", 
 		 "auto", fun verify_irb/1) of
 	    auto ->
 		auto;
 	    user ->
-		case ask("8b. Use default GC timeout"
+		case ask("9b. Use default GC timeout"
 			 "(default/seconds)?",
 			 "default", fun verify_irb_user/1) of
 		    default ->
@@ -651,31 +656,31 @@ config_manager_sys() ->
 			{user, IrbGcTo}
 		end
 	end,
-    ServerVerb = ask("9. Server verbosity "
+    ServerVerb = ask("10. Server verbosity "
 			"(silence/info/log/debug/trace)?", 
 			"silence",
 			fun verify_verbosity/1),
-    ServerTimeout = ask("10. Server GC timeout?", "30000",
+    ServerTimeout = ask("11. Server GC timeout?", "30000",
 			   fun verify_timeout/1),    
-    NoteStoreVerb = ask("11. Note store verbosity "
+    NoteStoreVerb = ask("12. Note store verbosity "
 			"(silence/info/log/debug/trace)?", 
 			"silence",
 			fun verify_verbosity/1),
-    NoteStoreTimeout = ask("12. Note store GC timeout?", "30000",
+    NoteStoreTimeout = ask("13. Note store GC timeout?", "30000",
 			   fun verify_timeout/1),    
-    NetIfMod = ask("13. Which network interface module shall be used?",
+    NetIfMod = ask("14. Which network interface module shall be used?",
 		   "snmpm_net_if", fun verify_module/1),
-    NetIfVerb = ask("14. Network interface verbosity "
+    NetIfVerb = ask("15. Network interface verbosity "
 		    "(silence/info/log/debug/trace)?", "silence",
 		    fun verify_verbosity/1),
-    NetIfBindTo = ask("15. Bind the manager IP address "
+    NetIfBindTo = ask("16. Bind the manager IP address "
 		      "(true/false)?",
 		      "false", fun verify_bool/1),
-    NetIfNoReuse = ask("16. Shall the manager IP address and port "
+    NetIfNoReuse = ask("17. Shall the manager IP address and port "
 		       "be not reusable (true/false)?",
 		       "false", fun verify_bool/1),
     NetIfRecbuf = 
-	case ask("17. Receive buffer size of the manager (in bytes) "
+	case ask("18. Receive buffer size of the manager (in bytes) "
 		 "(default/pos integer)?", "default", 
 		 fun verify_netif_recbuf/1) of
 	    default ->
@@ -684,7 +689,7 @@ config_manager_sys() ->
 		[{recbuf, RecBufSz}]
 	end,
     NetIfSndbuf = 
-	case ask("18. Send buffer size of the manager (in bytes) "
+	case ask("19. Send buffer size of the manager (in bytes) "
 		 "(default/pos integer)?", "default", 
 		 fun verify_netif_sndbuf/1) of
 	    default ->
@@ -700,28 +705,28 @@ config_manager_sys() ->
 	 {verbosity, NetIfVerb},
 	 {options,   NetIfOpts}], 
     ATL = 
-	case ask("19. Shall the manager use an audit trail log "
+	case ask("20. Shall the manager use an audit trail log "
 		 "(y/n)?",
 		 "n", fun verify_yes_or_no/1) of
 	    yes ->
-		ATLType = ask("19b. Audit trail log type "
+		ATLType = ask("20b. Audit trail log type "
 			      "(write/read_write)?",
 			      "read_write", fun verify_atl_type/1),
-		ATLDir = ask("19c. Where to store the "
+		ATLDir = ask("20c. Where to store the "
 			     "audit trail log?",
 			     DefDir, fun verify_dir/1),
-		ATLMaxFiles = ask("19d. Max number of files?", 
+		ATLMaxFiles = ask("20d. Max number of files?", 
 				  "10", 
 				  fun verify_pos_integer/1),
-		ATLMaxBytes = ask("19e. Max size (in bytes) "
+		ATLMaxBytes = ask("20e. Max size (in bytes) "
 				  "of each file?", 
 				  "10240", 
 				  fun verify_pos_integer/1),
 		ATLSize = {ATLMaxBytes, ATLMaxFiles},
-		ATLRepair = ask("19f. Audit trail log repair "
+		ATLRepair = ask("20f. Audit trail log repair "
 				"(true/false/truncate/snmp_repair)?", "true",
 				fun verify_atl_repair/1),
-		ATLSeqNo = ask("19g. Audit trail log sequence-numbering "
+		ATLSeqNo = ask("20g. Audit trail log sequence-numbering "
 			       "(true/false)?", "false",
 			       fun verify_atl_seqno/1),
 		[{audit_trail_log, [{type,   ATLType},
@@ -733,14 +738,14 @@ config_manager_sys() ->
 		[]
 	end,
     DefUser = 
-	case ask("20. Do you wish to assign a default user [yes] or use~n"
+	case ask("21. Do you wish to assign a default user [yes] or use~n"
 		 "    the default settings [no] (y/n)?", "n", 
 		 fun verify_yes_or_no/1) of
 	    yes ->
-		DefUserMod = ask("20b. Default user module?", 
+		DefUserMod = ask("21b. Default user module?", 
 				 "snmpm_user_default",
 				 fun verify_module/1),
-		DefUserData = ask("20c. Default user data?", "undefined",
+		DefUserData = ask("21c. Default user data?", "undefined",
 				  fun verify_user_data/1),
 		[{def_user_mod,  DefUserMod},
 		 {def_user_data, DefUserData}];
@@ -750,11 +755,12 @@ config_manager_sys() ->
     SysConfig = 
 	[{priority,   Prio},
 	 {versions,   Vsns},
-	 {config,     [{dir,       ConfigDir}, 
-		       {verbosity, ConfigVerb},
-		       {db_dir,    ConfigDbDir},
-		       {repair,    ConfigDbRepair},
-		       {auto_save, ConfigDbAutoSave}]},
+	 {config,     [{dir,           ConfigDir},
+		       {db_dir,        ConfigDbDir}, 
+		       {db_init_error, ConfigDbInitError},
+		       {repair,        ConfigDbRepair},
+		       {auto_save,     ConfigDbAutoSave}, 
+		       {verbosity,     ConfigVerb}]},
 	 {inform_request_behaviour, IRB},
 	 {mibs,       []},
 	 {server,     [{timeout,   ServerTimeout},
@@ -1069,6 +1075,16 @@ verify_dir(Dir) ->
 	_E -> 
 	    {error, "invalid directory (not absolute): " ++ Dir}
     end.
+
+
+verify_db_init_error("terminate") ->
+    {ok, true};
+verify_db_init_error("create") ->
+    {ok, create};
+verify_db_init_error("create_db_and_dir") ->
+    {ok, create_db_and_dir};
+verify_db_init_error(R) ->
+    {error, "invalid DB init error: " ++ R}.
 	    
 
 verify_notif_type("trap")   -> {ok, trap};
@@ -1164,13 +1180,20 @@ verify_dets_auto_save(I0) ->
 
 
 %% I know that this is a little of the edge, but...
+verify_module(M) when is_atom(M) ->
+    {ok, M};
+verify_module(M0) when is_list(M0) ->
+    {ok, list_to_atom(M0)};
 verify_module(M0) ->
-    case (catch list_to_atom(M0)) of
-	M when is_atom(M) ->
-	    {ok, M};
-	_ ->
-	    {error, "invalid module: " ++ M0}
-    end.
+    {error, lists:flatten(io_lib:format("invalid module: ~p", [M0]))}.
+
+%% verify_module(M0) ->
+%%     case (catch list_to_atom(M0)) of
+%% 	M when is_atom(M) ->
+%% 	    {ok, M};
+%% 	_ ->
+%% 	    {error, "invalid module: " ++ M0}
+%%     end.
 	 
 
 verify_agent_type("master") ->
@@ -2168,6 +2191,8 @@ write_sys_config_file_agent_opt(Fid, {config, Opts}) ->
     ok = io:format(Fid, "}", []);
 write_sys_config_file_agent_opt(Fid, {db_dir, Dir}) ->
     ok = io:format(Fid, "     {db_dir, \"~s\"}", [Dir]);
+write_sys_config_file_agent_opt(Fid, {db_init_error, Action}) ->
+    ok = io:format(Fid, "     {db_init_error, ~w}", [Action]);
 write_sys_config_file_agent_opt(Fid, {mib_storage, ets}) ->
     ok = io:format(Fid, "     {mib_storage, ets}", []);
 write_sys_config_file_agent_opt(Fid, {mib_storage, {dets, Dir}}) ->
@@ -2344,6 +2369,8 @@ write_sys_config_file_manager_config_opt(Fid, {dir, Dir}) ->
     ok = io:format(Fid, "{dir, \"~s\"}", [Dir]);
 write_sys_config_file_manager_config_opt(Fid, {db_dir, Dir}) ->
     ok = io:format(Fid, "{db_dir, \"~s\"}", [Dir]);
+write_sys_config_file_manager_config_opt(Fid, {db_init_error, Action}) ->
+    ok = io:format(Fid, "{db_init_error, ~w}", [Action]);
 write_sys_config_file_manager_config_opt(Fid, {repair, Rep}) ->
     ok = io:format(Fid, "{repair, ~w}", [Rep]);
 write_sys_config_file_manager_config_opt(Fid, {auto_save, As}) ->
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index a8c5df0b64..ae28df37fa 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -24,8 +24,8 @@
 	 create/4, create/5, create/6, open/1, open/2, 
 	 change_size/2, close/1, sync/1, info/1, 
 	 log/4, 
-	 log_to_txt/5, log_to_txt/6, log_to_txt/7,
-	 log_to_io/4,  log_to_io/5,  log_to_io/6
+	 log_to_txt/6, log_to_txt/7, log_to_txt/8, 
+	 log_to_io/5,  log_to_io/6,  log_to_io/7
 	]).
 -export([
 	 upgrade/1, upgrade/2, 
@@ -34,7 +34,17 @@
 -export([
 	 validate/1, validate/2
 	]).
+%% <BACKWARD-COMPAT>
+-export([
+	 log_to_txt/5, 
+	 log_to_io/4 
+	]).
+%% </BACKWARD-COMPAT>
 
+-export_type([
+	      log/0, 
+	      log_time/0
+	     ]).
 
 -define(SNMP_USE_V3, true).
 -include("snmp_types.hrl").
@@ -42,12 +52,24 @@
 -define(VMODULE,"LOG").
 -include("snmp_verbosity.hrl").
 
--define(LOG_FORMAT, internal).
--define(LOG_TYPE,   wrap).
+-define(LOG_FORMAT,    internal).
+-define(LOG_TYPE,      wrap).
+-define(BLOCK_DEFAULT, true). 
 
 -record(snmp_log, {id, seqno}).
 
 
+%%-----------------------------------------------------------------
+%% Types
+%%-----------------------------------------------------------------
+
+-opaque log() :: #snmp_log{}.
+-type log_time() :: null | 
+                    calendar:datetime() | 
+                    {local_time,     calendar:datetime()} |
+                    {universal_time, calendar:datetime()}.
+
+
 %% --------------------------------------------------------------------
 %% Exported functions
 %% --------------------------------------------------------------------
@@ -322,7 +344,6 @@ validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
 %% log(Log, Packet, Addr, Port)
 %%-----------------------------------------------------------------
 
-
 log(#snmp_log{id = Log, seqno = SeqNo}, Packet, Addr, Port) ->
     ?vtrace("log -> entry with"
 	    "~n   Log:  ~p"
@@ -378,53 +399,86 @@ do_change_size(Log, NewSize) ->
 
 %% -- log_to_txt ---
 
+%% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile) ->
-    log_to_txt(Log, FileName, Dir, Mibs, TextFile, null, null).
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile).
+%% </BACKWARD-COMPAT>
 
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, null, null);
+%% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start) ->
-    log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, null).
-
-log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) 
-  when is_list(Mibs) andalso is_list(TextFile) ->
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, null).
+%% </BACKWARD-COMPAT>
+
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, null);
+%% <BACKWARD-COMPAT>
+log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) ->
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, Stop).
+%% </BACKWARD-COMPAT>
+
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop) 
+  when (((Block =:= true) orelse (Block =:= false)) andalso 
+	is_list(Mibs) andalso is_list(TextFile)) ->
     ?vtrace("log_to_txt -> entry with"
 	    "~n   Log:      ~p"
+	    "~n   Block:    ~p"
 	    "~n   FileName: ~p"
 	    "~n   Dir:      ~p"
 	    "~n   Mibs:     ~p"
 	    "~n   TextFile: ~p"
 	    "~n   Start:    ~p"
 	    "~n   Stop:     ~p", 
-	    [Log, FileName, Dir, Mibs, TextFile, Start, Stop]),
+	    [Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop]),
     File = filename:join(Dir, FileName),
     Converter = fun(L) ->
 			do_log_to_file(L, TextFile, Mibs, Start, Stop)
 		end,
-    log_convert(Log, File, Converter).
+    log_convert(Log, Block, File, Converter).
 
 
 %% -- log_to_io ---
 
+%% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs) ->
-    log_to_io(Log, FileName, Dir, Mibs, null, null).
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, null, null).
+%% </BACKWARD-COMPAT>
 
+log_to_io(Log, Block, FileName, Dir, Mibs) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_io(Log, Block, FileName, Dir, Mibs, null, null); 
+%% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs, Start) ->
-    log_to_io(Log, FileName, Dir, Mibs, Start, null).
-
-log_to_io(Log, FileName, Dir, Mibs, Start, Stop) 
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, null).
+%% </BACKWARD-COMPAT>
+
+log_to_io(Log, Block, FileName, Dir, Mibs, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_io(Log, Block, FileName, Dir, Mibs, Start, null); 
+%% <BACKWARD-COMPAT>
+log_to_io(Log, FileName, Dir, Mibs, Start, Stop) ->
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, Stop).
+%% </BACKWARD-COMPAT>
+
+log_to_io(Log, Block, FileName, Dir, Mibs, Start, Stop) 
   when is_list(Mibs) ->
     ?vtrace("log_to_io -> entry with"
 	    "~n   Log:      ~p"
+	    "~n   Block:    ~p"
 	    "~n   FileName: ~p"
 	    "~n   Dir:      ~p"
 	    "~n   Mibs:     ~p"
 	    "~n   Start:    ~p"
 	    "~n   Stop:     ~p", 
-	    [Log, FileName, Dir, Mibs, Start, Stop]),
+	    [Log, Block, FileName, Dir, Mibs, Start, Stop]),
     File = filename:join(Dir, FileName),
     Converter = fun(L) ->
 			do_log_to_io(L, Mibs, Start, Stop)
 		end,
-    log_convert(Log, File, Converter).
+    log_convert(Log, Block, File, Converter).
 
 
 %% --------------------------------------------------------------------
@@ -433,53 +487,121 @@ log_to_io(Log, FileName, Dir, Mibs, Start, Stop)
 
 %% -- log_convert ---
 
-log_convert(#snmp_log{id = Log}, File, Converter) ->
-    do_log_convert(Log, File, Converter);
-log_convert(Log, File, Converter) ->
-    do_log_convert(Log, File, Converter).
+log_convert(#snmp_log{id = Log}, Block, File, Converter) ->
+    do_log_convert(Log, Block, File, Converter);
+log_convert(Log, Block, File, Converter) ->
+    do_log_convert(Log, Block, File, Converter).
 
-do_log_convert(Log, File, Converter) ->
+do_log_convert(Log, Block, File, Converter) ->
     %% ?vtrace("do_log_converter -> entry with"
-    %% 	    "~n   Log:  ~p"
-    %% 	    "~n   File: ~p"
-    %% 	    "~n   disk_log:info(Log): ~p", [Log, File, disk_log:info(Log)]),
+    %% 	    "~n   Log:   ~p"
+    %% 	    "~n   Block: ~p"
+    %% 	    "~n   File:  ~p"
+    %% 	    [Log, Block, File]),
+    Verbosity  = get(verbosity), 
     {Pid, Ref} = 
 	erlang:spawn_monitor(
 	  fun() ->
-		  Result = do_log_convert2(Log, File, Converter),
+		  put(sname,     lc),
+		  put(verbosity, Verbosity), 
+		  ?vlog("begin converting", []),
+		  Result = do_log_convert2(Log, Block, File, Converter),
+		  ?vlog("convert result: ~p", [Result]),
 		  exit(Result)
 	  end),
     receive 
 	{'DOWN', Ref, process, Pid, Result} ->
 	    %% ?vtrace("do_log_converter -> received result"
-	    %% 	    "~n   Result: ~p"
-	    %% 	    "~n   disk_log:info(Log): ~p", 
-	    %% 	    [Result, disk_log:info(Log)]),
+	    %% 	    "~n   Result: ~p", [Result]),
 	    Result
     end.
     
-do_log_convert2(Log, File, Converter) ->
+do_log_convert2(Log, Block, File, Converter) ->
+
+    %% ?vtrace("do_log_converter2 -> entry with"
+    %% 	    "~n   Log:   ~p"
+    %% 	    "~n   Block: ~p"
+    %% 	    "~n   File:  ~p"
+    %% 	    "~n   disk_log:info(Log): ~p", 
+    %% 	    [Log, Block, File, disk_log:info(Log)]),
+
     %% First check if the caller process has already opened the
     %% log, because if we close an already open log we will cause
     %% a runtime error.
+
+    ?vtrace("do_log_convert2 -> entry - check if owner", []),
     case is_owner(Log) of
 	true ->
-	    Converter(Log);
+	    ?vtrace("do_log_converter2 -> convert an already owned log", []),
+	    maybe_block(Log, Block), 
+	    Res = Converter(Log),
+	    maybe_unblock(Log, Block), 
+	    Res;
 	false ->
 	    %% Not yet member of the ruling party, apply for membership...
+	    ?vtrace("do_log_converter2 -> convert log", []),
 	    case log_open(Log, File) of
 		{ok, _} ->
+		    ?vdebug("do_log_convert2 -> opened - now convert", []),
+		    maybe_block(Log, Block), 
 		    Res = Converter(Log),
+		    maybe_unblock(Log, Block), 
 		    disk_log:close(Log),
+		    ?vdebug("do_log_convert2 -> converted - done: "
+			    "~n   Result: ~p", [Res]),
 		    Res;
 		{error, {name_already_open, _}} ->
-                    Converter(Log);
+		    ?vdebug("do_log_convert2 -> "
+			    "already opened - now convert", []),
+		    maybe_block(Log, Block), 
+                    Res = Converter(Log), 
+		    maybe_unblock(Log, Block), 
+		    ?vdebug("do_log_convert2 -> converted - done: "
+			    "~n   Result: ~p", [Res]),
+		    Res;
                 {error, Reason} ->
+		    ?vinfo("do_log_converter2 -> "
+			   "failed converting log - open failed: "
+			   "~n   Reason: ~p", [Reason]),
                     {error, {Log, Reason}}
 	    end
     end.
 
 
+maybe_block(_Log, false = _Block) ->
+    %% ?vtrace("maybe_block(false) -> entry", []),
+    ok;
+maybe_block(Log, true = _Block) ->
+    %% ?vtrace("maybe_block(true) -> entry when"
+    %% 	    "~n   Log Status: ~p", [log_status(Log)]),
+    Res = disk_log:block(Log, true),
+    %% ?vtrace("maybe_block(true) -> "
+    %% 	    "~n   Log Status: ~p"
+    %% 	    "~n   Res:        ~p", [log_status(Log), Res]),
+    Res.
+
+maybe_unblock(_Log, false = _Block) ->
+    %% ?vtrace("maybe_unblock(false) -> entry", []),
+    ok;
+maybe_unblock(Log, true = _Block) ->
+    %% ?vtrace("maybe_unblock(true) -> entry when"
+    %% 	    "~n   Log Status: ~p", [log_status(Log)]),
+    Res = disk_log:unblock(Log),
+    %% ?vtrace("maybe_unblock(true) -> "
+    %% 	    "~n   Log Status: ~p"
+    %% 	    "~n   Res:        ~p", [log_status(Log), Res]),
+    Res.
+
+%% log_status(Log) ->
+%%     Info = disk_log:info(Log),
+%%     case lists:keysearch(status, 1, Info) of
+%% 	{value, {status, Status}} ->
+%% 	    Status;
+%% 	false ->
+%% 	    undefined
+%%     end.
+
+
 %% -- do_log_to_text ---
 
 do_log_to_file(Log, TextFile, Mibs, Start, Stop) ->
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 67e3476816..32198deb8b 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -16,6 +16,8 @@
 %%
 %% %CopyrightEnd%
 %% 
+%% AES: RFC 3826
+%% 
 
 -module(snmp_usm).
 
@@ -24,7 +26,7 @@
 -export([passwd2localized_key/3, localize_key/3]).
 -export([auth_in/4, auth_out/4, set_msg_auth_params/3]).
 -export([des_encrypt/3, des_decrypt/3]).
--export([aes_encrypt/3, aes_decrypt/5]).
+-export([aes_encrypt/5, aes_decrypt/5]).
 
 
 -define(SNMP_USE_V3, true).
@@ -42,6 +44,9 @@
 
 -define(i32(Int), (Int bsr 24) band 255, (Int bsr 16) band 255, (Int bsr 8) band 255, Int band 255).
 
+-define(BLOCK_CIPHER_AES, aes_cfb128).
+-define(BLOCK_CIPHER_DES, des_cbc).
+
 
 %%-----------------------------------------------------------------
 %% Func: passwd2localized_key/3
@@ -210,7 +215,8 @@ des_encrypt(PrivKey, Data, SaltFun) ->
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     TailLen = (8 - (length(Data) rem 8)) rem 8,
     Tail = mk_tail(TailLen),
-    EncData = crypto:block_encrypt(des_cbc, DesKey, IV, [Data,Tail]),
+    EncData = crypto:block_encrypt(?BLOCK_CIPHER_DES, 
+				   DesKey, IV, [Data,Tail]),
     {ok, binary_to_list(EncData), Salt}.
 
 des_decrypt(PrivKey, MsgPrivParams, EncData) 
@@ -224,7 +230,8 @@ des_decrypt(PrivKey, MsgPrivParams, EncData)
     Salt = MsgPrivParams,
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:block_decrypt(des_cbc, DesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(?BLOCK_CIPHER_DES, 
+					       DesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2};
 des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
@@ -236,13 +243,12 @@ des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
     throw({error, {bad_msgPrivParams, PrivKey, BadMsgPrivParams, EncData}}).
     
 
-aes_encrypt(PrivKey, Data, SaltFun) ->
+aes_encrypt(PrivKey, Data, SaltFun, EngineBoots, EngineTime) ->
     AesKey = PrivKey,
     Salt = SaltFun(),
-    EngineBoots = snmp_framework_mib:get_engine_boots(),
-    EngineTime = snmp_framework_mib:get_engine_time(),
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
-    EncData = crypto:block_encrypt(aes_cbf128, AesKey, IV, Data),
+    EncData = crypto:block_encrypt(?BLOCK_CIPHER_AES, 
+				   AesKey, IV, Data),
     {ok, binary_to_list(EncData), Salt}.
 
 aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
@@ -251,7 +257,8 @@ aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
     Salt = MsgPrivParams,
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:block_decrypt(aes_cbf128, AesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(?BLOCK_CIPHER_AES, 
+					       AesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2}.
 
diff --git a/lib/snmp/src/misc/snmp_verbosity.erl b/lib/snmp/src/misc/snmp_verbosity.erl
index df5986b7bc..f27c31db03 100644
--- a/lib/snmp/src/misc/snmp_verbosity.erl
+++ b/lib/snmp/src/misc/snmp_verbosity.erl
@@ -148,6 +148,8 @@ image_of_sname(mnifl)     -> "M-NET-IF-LOGGER";
 image_of_sname(mnifw)     -> io_lib:format("M-NET-IF-worker(~p)", [self()]);
 image_of_sname(mconf)     -> "M-CONF";
 
+image_of_sname(lc)        -> io_lib:format("LOG-CONVERTER(~p)", [self()]);
+
 image_of_sname(mgr)       -> "MGR";
 image_of_sname(mgr_misc)  -> "MGR_MISC";