Add the posibillity to use a key for per-packet-data.

svn path=/trunk/; revision=49259

4 files changed, 12 insertions, 12 deletions

diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index cb78c1cb4e..03e78a8c8e 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -197,7 +197,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     struct rrc_info *rrcinf;
 
     top_tree = tree;
-    rrcinf = (struct rrc_info *)p_get_proto_data(pinfo->fd, proto_rrc);
+    rrcinf = (struct rrc_info *)p_get_proto_data(pinfo->fd, proto_rrc, 0);
 
     /* make entry in the Protocol column on summary display */
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC");
diff --git a/asn1/rrc/rrc.cnf b/asn1/rrc/rrc.cnf
index 80db1b10f4..f27bc426c2 100644
--- a/asn1/rrc/rrc.cnf
+++ b/asn1/rrc/rrc.cnf
@@ -404,7 +404,7 @@ fp_info       *fpinf ;
 
 %(DEFAULT_BODY)s
 
-  fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp);
+  fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp, 0);
   if(fpinf && ((c_inf = (rrc_ciphering_info *)g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER(fpinf->com_context_id))) != NULL) ){
     c_inf->setup_frame = actx->pinfo->fd->num;
   }
@@ -718,7 +718,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
         num_chans_per_flow[flowd]++;
 
         if(num_chans_per_flow[flowd] > 1 ){
-            rrcinf = (rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc);
+            rrcinf = (rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc, 0);
             if((rrcinf == NULL) || (rrcinf->hrnti[actx->pinfo->fd->subnum] == 0)){
                 expert_add_info_format(actx->pinfo, actx->created_item, PI_SEQUENCE, PI_NOTE, "Did not detect any H-RNTI");
             }
@@ -754,7 +754,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
 
 
         if(num_chans_per_flow[flowd] > 1 ){
-            rrcinf = (rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc);
+            rrcinf = (rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc, 0);
             if((rrcinf == NULL) || (rrcinf->hrnti[actx->pinfo->fd->subnum] == 0)){
                 expert_add_info_format(actx->pinfo, actx->created_item, PI_SEQUENCE, PI_NOTE, "Did not detect any H-RNTI");
             }
@@ -785,10 +785,10 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
 %(DEFAULT_BODY)s
 
 #.FN_FTR H-RNTI
-  rrcinf = (struct rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc);
+  rrcinf = (struct rrc_info *)p_get_proto_data(actx->pinfo->fd, proto_rrc, 0);
   if (!rrcinf) {
     rrcinf = se_new0(struct rrc_info);
-    p_add_proto_data(actx->pinfo->fd, proto_rrc, rrcinf);
+    p_add_proto_data(actx->pinfo->fd, proto_rrc, 0, rrcinf);
   }
   rrcinf->hrnti[actx->pinfo->fd->subnum] = tvb_get_ntohs(hrnti_tvb, 0);
 
@@ -802,7 +802,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
 %(DEFAULT_BODY)s
 
   /*We base this map on communication context from fp*/
-    fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp);
+    fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp, 0);
 
   /*If no info found, skip all this*/
   if(fpinf == NULL){
@@ -854,7 +854,7 @@ HNBName TYPE=FT_STRING DISPLAY=BASE_NONE
 
 
 
-  fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp);
+  fpinf = (fp_info *)p_get_proto_data(actx->pinfo->fd, proto_fp, 0);
 
 %(DEFAULT_BODY)s
 
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 357cd9f2f2..1afe18e48f 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -1273,7 +1273,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	 * It has to be per-frame as there can be more than one GSS-API
 	 * negotiation in a conversation.
 	 */
-	next_level_value = (gssapi_oid_value *)p_get_proto_data(pinfo->fd, proto_spnego);
+	next_level_value = (gssapi_oid_value *)p_get_proto_data(pinfo->fd, proto_spnego, 0);
 	if (!next_level_value && !pinfo->fd->flags.visited) {
 	    /*
 	     * No handle attached to this frame, but it's the first
@@ -1289,7 +1289,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 		next_level_value = (gssapi_oid_value *)conversation_get_proto_data(conversation,
 							       proto_spnego);
 		if (next_level_value)
-		    p_add_proto_data(pinfo->fd, proto_spnego, next_level_value);
+		    p_add_proto_data(pinfo->fd, proto_spnego, 0, next_level_value);
 	    }
 	}
 
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 87966844f5..24fbca9dfe 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -422,7 +422,7 @@ init_t38_info_conv(packet_info *pinfo)
 	p_t38_conv = NULL;
 
 	/* Use existing packet info if available */
-	 p_t38_packet_conv = (t38_conv *)p_get_proto_data(pinfo->fd, proto_t38);
+	 p_t38_packet_conv = (t38_conv *)p_get_proto_data(pinfo->fd, proto_t38, 0);
 
 
 	/* find the conversation used for Reassemble and Setup Info */
@@ -479,7 +479,7 @@ init_t38_info_conv(packet_info *pinfo)
 		memcpy(&(p_t38_packet_conv->src_t38_info), &(p_t38_conv->src_t38_info), sizeof(t38_conv_info));
 		memcpy(&(p_t38_packet_conv->dst_t38_info), &(p_t38_conv->dst_t38_info), sizeof(t38_conv_info));
 
-		p_add_proto_data(pinfo->fd, proto_t38, p_t38_packet_conv);
+		p_add_proto_data(pinfo->fd, proto_t38, 0, p_t38_packet_conv);
 	}
 
 	if (ADDRESSES_EQUAL(&p_conv->key_ptr->addr1, &pinfo->net_src)) {