From LEGO via bug 3459:

Add a callback to UAT to be called after the table has being updated,
use it to renew the snmp_ue_cache.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32112 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 7 insertions, 4 deletions

diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index ae373d6431..9522ead85f 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3108,7 +3108,7 @@ static void snmp_users_update_cb(void* p _U_, const char** err) {
 	*err = NULL;
 
 	if (! ue->user.userName.len)
-		g_string_append_printf(es,"no userName\n",num_ueas);
+		g_string_append_printf(es,"no userName\n");
 
 	for (i=0; i<num_ueas-1; i++) {
 		snmp_ue_assoc_t* u = &(ueas[i]);
@@ -3120,7 +3120,7 @@ static void snmp_users_update_cb(void* p _U_, const char** err) {
 			if (u->engine.len > 0 && memcmp( u->engine.data,   ue->engine.data,  u->engine.len ) == 0) {
 				if ( memcmp( u->user.userName.data, ue->user.userName.data, ue->user.userName.len ) == 0 ) {
 					/* XXX: make a string for the engineId */
-					g_string_append_printf(es,"duplicate key (userName='%s' engineId='???')\n",ue->user.userName.data);
+					g_string_append_printf(es,"duplicate key (userName='%s')\n",ue->user.userName.data);
 				}
 			}
 			
@@ -3142,6 +3142,7 @@ static void snmp_users_update_cb(void* p _U_, const char** err) {
 	return;
 }
 
+
 UAT_LSTRING_CB_DEF(snmp_users,userName,snmp_ue_assoc_t,user.userName.data,user.userName.len)
 UAT_LSTRING_CB_DEF(snmp_users,authPassword,snmp_ue_assoc_t,user.authPassword.data,user.authPassword.len)
 UAT_LSTRING_CB_DEF(snmp_users,privPassword,snmp_ue_assoc_t,user.privPassword.data,user.privPassword.len)
@@ -3510,7 +3511,7 @@ void proto_register_snmp(void) {
         "snmp.T_operation", HFILL }},
 
 /*--- End of included file: packet-snmp-hfarr.c ---*/
-#line 2025 "packet-snmp-template.c"
+#line 2026 "packet-snmp-template.c"
   };
 
   /* List of subtrees */
@@ -3550,7 +3551,7 @@ void proto_register_snmp(void) {
     &ett_snmp_RReqPDU_U,
 
 /*--- End of included file: packet-snmp-ettarr.c ---*/
-#line 2041 "packet-snmp-template.c"
+#line 2042 "packet-snmp-template.c"
   };
   module_t *snmp_module;
 
@@ -3575,6 +3576,7 @@ void proto_register_snmp(void) {
 					   snmp_users_copy_cb,
 					   snmp_users_update_cb,
 					   snmp_users_free_cb,
+                       renew_ue_cache,
 					   users_fields);
 
   static uat_field_t specific_traps_flds[] = {
@@ -3595,6 +3597,7 @@ void proto_register_snmp(void) {
                                       snmp_specific_trap_copy_cb,
                                       NULL,
                                       snmp_specific_trap_free_cb,
+									  NULL,
                                       specific_traps_flds);
 
   /* Register protocol */