make hash key session scoped

cleanup g_snprintf

svn path=/trunk/; revision=44565

1 files changed, 4 insertions, 15 deletions

diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index e46797d4e0..31923d8586 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -165,19 +165,10 @@ struct ansi_tcap_invokedata_t {
 static GHashTable *TransactionId_table=NULL;
 
 static void
-TransactionId_table_cleanup(gpointer key, gpointer value _U_, gpointer user_data _U_){
-
-        gchar *TransactionId_str = (gchar *)key;
-
-        g_free(TransactionId_str);
-}
-
-static void
 ansi_tcap_init_transaction_table(void){
 
         /* Destroy any existing memory chunks / hashes. */
         if (TransactionId_table){
-                g_hash_table_foreach(TransactionId_table, TransactionId_table_cleanup, NULL);
                 g_hash_table_destroy(TransactionId_table);
                 TransactionId_table = NULL;
         }
@@ -204,17 +195,15 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
 
           /* Only do this once XXX I hope its the right thing to do */
           /* The hash string needs to contain src and dest to distiguish differnt flows */
-          buf = ep_alloc(MAX_TID_STR_LEN);
-          buf[0] = '\0';
 		  switch(ansi_tcap_response_matching_type){
 				case 0:
-					g_snprintf(buf,MAX_TID_STR_LEN,"%s",ansi_tcap_private.TransactionID_str);
+					buf = ep_strdup(ansi_tcap_private.TransactionID_str);
 					break;
 				case 1:
-					g_snprintf(buf,MAX_TID_STR_LEN,"%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src));
+					buf = ep_strdup_printf("%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src));
 					break;
 				default:
-					g_snprintf(buf,MAX_TID_STR_LEN,"%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src),ep_address_to_str(dst));
+					buf = ep_strdup_printf("%s%s%s",ansi_tcap_private.TransactionID_str,ep_address_to_str(src),ep_address_to_str(dst));
 					break;
 			}
 
@@ -229,7 +218,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
           ansi_tcap_saved_invokedata->OperationCode_private = ansi_tcap_private.d.OperationCode_private;
 
           g_hash_table_insert(TransactionId_table,
-                        g_strdup(buf),
+                        se_strdup(buf),
                         ansi_tcap_saved_invokedata);
           /*
           g_warning("Tcap Invoke Hash string %s",buf);