Propage changes done in generated dissectors to asn1/

svn path=/trunk/; revision=44845

2 files changed, 16 insertions, 14 deletions

diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index e7a948b54e..88c3398485 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -104,6 +104,8 @@ static const fragment_items rtse_frag_items = {
 	&hf_rtse_reassembled_in,
 	/* Reassembled length field */
 	&hf_rtse_reassembled_length,
+	/* Reassembled data field */
+	NULL,
 	/* Tag */
 	"RTSE fragments"
 };
@@ -155,7 +157,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
 		dissect_unknown_ber(pinfo, next_tvb, offset, next_tree);
 	}
 
-	/*XXX until we change the #.REGISTER signature for _PDU()s 
+	/*XXX until we change the #.REGISTER signature for _PDU()s
 	 * into new_dissector_t   we have to do this kludge with
 	 * manually step past the content in the ANY type.
 	 */
@@ -212,7 +214,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 		if(parent_tree){
 			proto_tree_add_text(parent_tree, tvb, offset, -1,
 				"Internal error:can't get application context from ACSE dissector.");
-		} 
+		}
 		return  ;
 	} else {
 		session  = ( (struct SESSION_DATA_STRUCTURE*)(pinfo->private_data) );
@@ -222,22 +224,22 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE");
   	col_clear(pinfo->cinfo, COL_INFO);
 
-	if (rtse_reassemble && 
+	if (rtse_reassemble &&
 	    ((session->spdu_type == SES_DATA_TRANSFER) ||
 	     (session->spdu_type == SES_MAJOR_SYNC_POINT))) {
 		/* Use conversation index as fragment id */
-		conversation  = find_conversation (pinfo->fd->num, 
-						   &pinfo->src, &pinfo->dst, pinfo->ptype, 
+		conversation  = find_conversation (pinfo->fd->num,
+						   &pinfo->src, &pinfo->dst, pinfo->ptype,
 						   pinfo->srcport, pinfo->destport, 0);
-		if (conversation != NULL) { 
+		if (conversation != NULL) {
 			rtse_id = conversation->index;
-		} 
+		}
 		session->rtse_reassemble = TRUE;
 	}
 	if (rtse_reassemble && session->spdu_type == SES_MAJOR_SYNC_POINT) {
 		frag_msg = fragment_end_seq_next (pinfo, rtse_id, rtse_segment_table,
 						  rtse_reassembled_table);
-		next_tvb = process_reassembled_data (tvb, offset, pinfo, "Reassembled RTSE", 
+		next_tvb = process_reassembled_data (tvb, offset, pinfo, "Reassembled RTSE",
 						     frag_msg, &rtse_frag_items, NULL, parent_tree);
 	}
 	if(parent_tree){
@@ -252,7 +254,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 			fragment_length = tvb_length_remaining (data_tvb, 0);
 			proto_item_append_text(asn1_ctx.created_item, " (%u byte%s)", fragment_length,
       	                              plurality(fragment_length, "", "s"));
-			frag_msg = fragment_add_seq_next (data_tvb, 0, pinfo, 
+			frag_msg = fragment_add_seq_next (data_tvb, 0, pinfo,
 							  rtse_id, rtse_segment_table,
 							  rtse_reassembled_table, fragment_length, TRUE);
 			if (frag_msg && pinfo->fd->num != frag_msg->reassembled_in) {
@@ -279,7 +281,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 		}
 		pinfo->fragmented = FALSE;
 		data_handled = TRUE;
-	} 
+	}
 
 	if (!data_handled) {
 		while (tvb_reported_length_remaining(tvb, offset) > 0){
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index b9561b3c4c..2bf6f8956d 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -20,7 +20,7 @@ RTABapdu
 			oid = find_oid_by_pres_ctx_id(actx->pinfo, session->pres_ctx_id);
 		break;
 	}
-	
+
 	if(!oid) /* XXX: problem here is we haven't decoded the applicationProtocol yet - so we make assumptions! */
 		oid = "applicationProtocol.12";
 
@@ -65,7 +65,7 @@ RTABapdu
 			oid = find_oid_by_pres_ctx_id(actx->pinfo, session->pres_ctx_id);
 		break;
 	}
-	
+
 	if(!oid) /* XXX: problem here is we haven't decoded the applicationProtocol yet - so we make assumptions! */
 		oid = "applicationProtocol.12";
 
@@ -146,7 +146,7 @@ RTABapdu
 
 #.FN_BODY RefuseReason
   int reason = -1;
- 
+
   %(DEFAULT_BODY)s
 
   if(reason != -1)
@@ -162,7 +162,7 @@ RTABapdu
 
 #.FN_BODY AbortReason
   int reason = -1;
- 
+
   %(DEFAULT_BODY)s
 
   if(reason != -1)