From Julian Onions

- some improvements to the NORM decoder, and the ability to
(optionally) heuristically detect NORM.
- some improvements to FEC block labelling.
- making the LCT header extension handler more generic and to decode more header extensions.

svn path=/trunk/; revision=16280

1 files changed, 29 insertions, 26 deletions

diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index ac92d4a8c7..573dbd1387 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -27,12 +27,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -75,7 +75,7 @@ void fec_info_column(struct _fec *fec, packet_info *pinfo)
 {
 	if (fec->sbn_present)
 		col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "SBN: %u", fec->sbn);
-	
+
 	if (fec->esi_present)
 		col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "ESI: 0x%X", fec->esi);
 }
@@ -88,11 +88,11 @@ void fec_decode_ext_fti(struct _ext *e, tvbuff_t *tvb, proto_tree *tree, gint et
 {
 	proto_item* ti = NULL;
 	proto_tree *ext_tree;
-	
+
 	if (tree)
 		ti = proto_tree_add_none_format(tree, f.hf->fti_header, tvb, e->offset, e->length,
 			"EXT_FTI, FEC Object Transmission Information (%u)", e->het);
-	
+
 	if (f.fec->encoding_id_present)
 	{
 		ext_tree = proto_item_add_subtree(ti, ett);
@@ -100,17 +100,17 @@ void fec_decode_ext_fti(struct _ext *e, tvbuff_t *tvb, proto_tree *tree, gint et
 
 		/* Decode 48-bit length field */
 		f.fec->transfer_length = tvb_get_ntoh64(tvb, e->offset) & G_GINT64_CONSTANT(0xFFFFFFFFFFFFU);
-		
+
 		if (f.fec->encoding_id >= 128)
 		{
 			/* Decode FEC Instance ID */
 			f.fec->instance_id_present = TRUE;
 			f.fec->instance_id = (guint8) tvb_get_ntohs(tvb, e->offset+8);
 		}
-		
+
 		if (tree)
 			proto_tree_add_uint64(ext_tree, f.hf->fti_transfer_length, tvb, e->offset+2, 6, f.fec->transfer_length);
-	
+
 		switch (f.fec->encoding_id)
 		{
 		case 0:
@@ -119,19 +119,19 @@ void fec_decode_ext_fti(struct _ext *e, tvbuff_t *tvb, proto_tree *tree, gint et
 		case 130:
 			f.fec->encoding_symbol_length = tvb_get_ntohs(tvb, e->offset+10);
 			f.fec->max_source_block_length = tvb_get_ntohl(tvb, e->offset+12);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(ext_tree, f.hf->fti_encoding_symbol_length, tvb, e->offset+10, 2, f.fec->encoding_symbol_length);
 				proto_tree_add_uint(ext_tree, f.hf->fti_max_source_block_length, tvb, e->offset+12, 4, f.fec->max_source_block_length);
 			}
 			break;
-			
+
 		case 129:
 			f.fec->encoding_symbol_length = tvb_get_ntohs(tvb, e->offset+10);
 			f.fec->max_source_block_length = tvb_get_ntohs(tvb, e->offset+12);
 			f.fec->max_number_encoding_symbols = tvb_get_ntohs(tvb, e->offset+14);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(ext_tree, f.hf->fti_encoding_symbol_length, tvb, e->offset+10, 2, f.fec->encoding_symbol_length);
@@ -139,12 +139,12 @@ void fec_decode_ext_fti(struct _ext *e, tvbuff_t *tvb, proto_tree *tree, gint et
 				proto_tree_add_uint(ext_tree, f.hf->fti_max_number_encoding_symbols, tvb, e->offset+14, 2, f.fec->max_number_encoding_symbols);
 			}
 			break;
-		
+
 		case 132:
 			f.fec->encoding_symbol_length = tvb_get_ntohs(tvb, e->offset+10);
 			f.fec->max_source_block_length = tvb_get_ntohl(tvb, e->offset+12);
 			f.fec->max_number_encoding_symbols = tvb_get_ntohl(tvb, e->offset+16);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(ext_tree, f.hf->fti_encoding_symbol_length, tvb, e->offset+10, 2, f.fec->encoding_symbol_length);
@@ -153,7 +153,7 @@ void fec_decode_ext_fti(struct _ext *e, tvbuff_t *tvb, proto_tree *tree, gint et
 			}
 			break;
 		}
-				
+
 	} else
 		if (tree)
 			rmt_ext_decode_default_subtree(e, tvb, ti, ett);
@@ -173,7 +173,8 @@ void fec_dissector(struct _fec_ptr f, tvbuff_t *tvb, proto_tree *tree, guint *of
 {
 	proto_item *ti;
 	proto_tree *fec_tree;
-	
+	guint offset_save = *offset;
+
 	/* Create the FEC subtree */
 	if (tree)
 	{
@@ -181,65 +182,65 @@ void fec_dissector(struct _fec_ptr f, tvbuff_t *tvb, proto_tree *tree, guint *of
 		fec_tree = proto_item_add_subtree(ti, f.ett->main);
 	} else
 		fec_tree = NULL;
-	
+
 	/* FEC Encoding ID and FEC Instance ID processing */
 	if (f.fec->encoding_id_present)
 	{
 		if (tree)
 		{
 			proto_tree_add_uint(fec_tree, f.hf->encoding_id, tvb, *offset, 0, f.fec->encoding_id);
-	
+
 			if (f.fec->encoding_id >= 128 && f.fec->instance_id_present)
 				proto_tree_add_uint(fec_tree, f.hf->instance_id, tvb, *offset, 0, f.fec->instance_id);
 		}
-		
+
 		switch (f.fec->encoding_id)
 		{
 		case 0:
 		case 130:
 			f.fec->sbn = tvb_get_ntohs(tvb, *offset);
 			f.fec->esi = tvb_get_ntohs(tvb, *offset+2);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(fec_tree, f.hf->sbn, tvb, *offset, 2, f.fec->sbn);
 				proto_tree_add_uint(fec_tree, f.hf->esi, tvb, *offset+2, 2, f.fec->esi);
 			}
-			
+
 			f.fec->sbn_present = TRUE;
 			f.fec->esi_present = TRUE;
 			*offset += 4;
 			break;
-			
+
 		case 2:
 		case 128:
 		case 132:
 			f.fec->sbn = tvb_get_ntohl(tvb, *offset);
 			f.fec->esi = tvb_get_ntohl(tvb, *offset+4);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(fec_tree, f.hf->sbn, tvb, *offset, 4, f.fec->sbn);
 				proto_tree_add_uint(fec_tree, f.hf->esi, tvb, *offset+4, 4, f.fec->esi);
 			}
-			
+
 			f.fec->sbn_present = TRUE;
 			f.fec->esi_present = TRUE;
 			*offset += 8;
 			break;
-		
+
 		case 129:
 			f.fec->sbn = tvb_get_ntohl(tvb, *offset);
 			f.fec->sbl = tvb_get_ntohs(tvb, *offset+4);
 			f.fec->esi = tvb_get_ntohs(tvb, *offset+6);
-			
+
 			if (tree)
 			{
 				proto_tree_add_uint(fec_tree, f.hf->sbn, tvb, *offset, 4, f.fec->sbn);
 				proto_tree_add_uint(fec_tree, f.hf->sbl, tvb, *offset+4, 2, f.fec->sbl);
 				proto_tree_add_uint(fec_tree, f.hf->esi, tvb, *offset+6, 2, f.fec->esi);
 			}
-			
+
 			f.fec->sbn_present = TRUE;
 			f.fec->sbl_present = TRUE;
 			f.fec->esi_present = TRUE;
@@ -247,6 +248,8 @@ void fec_dissector(struct _fec_ptr f, tvbuff_t *tvb, proto_tree *tree, guint *of
 			break;
 		}
 	}
+	if (tree)
+		proto_item_set_len(ti, *offset - offset_save);
 }
 
 void fec_dissector_free(struct _fec *fec _U_)