Ethereal-dev: [Ethereal-dev] Patch to packet-mdshdr.c

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Dinesh G Dutt <ddutt@xxxxxxxxx>
Date: Sat, 25 Oct 2003 21:36:50 -0700
This adds displaying the FC CRC for frames encapsulated with MDSHDR. 

Dinesh
--
*** packet-mdshdr.c	7 Jun 2003 09:35:13 -0000	1.6
--- packet-mdshdr.c	26 Oct 2003 04:35:28 -0000
***************
*** 114,119 ****
--- 114,120 ----
  static int hf_mdshdr_vsan = -1;
  static int hf_mdshdr_eof = -1;
  static int hf_mdshdr_span = -1;
+ static int hf_mdshdr_fccrc = -1;
  
  /* Initialize the subtree pointers */
  static gint ett_mdshdr = -1;
***************
*** 187,193 ****
          trailer_start = MDSHDR_HEADER_SIZE + pktlen - MDSHDR_TRAILER_SIZE; 
      
          eof = tvb_get_guint8 (tvb, trailer_start);
-         
          tvb_set_reported_length (tvb, MDSHDR_HEADER_SIZE+pktlen);
      }
      else {
--- 188,193 ----
***************
*** 239,244 ****
--- 239,246 ----
          
              proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_eof, tvb,
                                   trailer_start, MDSHDR_SIZE_BYTE, 0);
+             proto_tree_add_item (mdshdr_tree_trlr, hf_mdshdr_fccrc, tvb,
+                                  trailer_start+2, MDSHDR_SIZE_INT32, 0);
          }
      }
      
***************
*** 273,279 ****
          { &hf_mdshdr_sof,
            {"SOF", "mdshdr.sof", FT_UINT8, BASE_DEC, VALS(sof_vals), 0x0, "", HFILL}},
          { &hf_mdshdr_pkt_len,
!           {"Packet Len", "mdshdr.plen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
          { &hf_mdshdr_dstidx,
            {"Dst Index", "mdshdr.dstidx", FT_UINT16, BASE_HEX, NULL, 0xFFC, "", HFILL}},
          { &hf_mdshdr_srcidx,
--- 275,281 ----
          { &hf_mdshdr_sof,
            {"SOF", "mdshdr.sof", FT_UINT8, BASE_DEC, VALS(sof_vals), 0x0, "", HFILL}},
          { &hf_mdshdr_pkt_len,
!           {"Packet Len", "mdshdr.plen", FT_UINT16, BASE_DEC, NULL, 0x1FFF, "", HFILL}},
          { &hf_mdshdr_dstidx,
            {"Dst Index", "mdshdr.dstidx", FT_UINT16, BASE_HEX, NULL, 0xFFC, "", HFILL}},
          { &hf_mdshdr_srcidx,
***************
*** 284,290 ****
            {"EOF", "mdshdr.eof", FT_UINT8, BASE_DEC, VALS(eof_vals), 0x0, "", HFILL}},
          { &hf_mdshdr_span,
            {"SPAN Frame", "mdshdr.span", FT_UINT8, BASE_DEC, NULL, 0x0,
!            "", HFILL}}, 
      };
  
  /* Setup protocol subtree array */
--- 286,294 ----
            {"EOF", "mdshdr.eof", FT_UINT8, BASE_DEC, VALS(eof_vals), 0x0, "", HFILL}},
          { &hf_mdshdr_span,
            {"SPAN Frame", "mdshdr.span", FT_UINT8, BASE_DEC, NULL, 0x0,
!            "", HFILL}},
!         { &hf_mdshdr_fccrc,
!           {"CRC", "mdshdr.crc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
      };
  
  /* Setup protocol subtree array */
-- 
I am not young enough to know everything. - Oscar Wilde