diff options
Diffstat (limited to 'epan/dissectors/packet-cfm.c')
| -rw-r--r-- | epan/dissectors/packet-cfm.c | 428 |
1 files changed, 213 insertions, 215 deletions
diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 81179fb3a2..3ee097cbb5 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -385,34 +385,34 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_ccm_itu_tree; - ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_ccm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_RDI, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ccm_Reserved, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Interval, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_RDI, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ccm_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Interval, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_seq_number, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_seq_number, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_ma_ep_id, tvb, offset, 2, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_ma_ep_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* dissect CCM MAID */ - mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, FALSE); + mi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_maid, tvb, offset, 48, ENC_BIG_ENDIAN); cfm_ccm_maid_tree = proto_item_add_subtree(mi, ett_cfm_ccm_maid); maid_offset = offset; - proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_format, tvb, maid_offset, 1, FALSE); + proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_format, tvb, maid_offset, 1, ENC_BIG_ENDIAN); cfm_maid_md_name_format = tvb_get_guint8(tvb, maid_offset); maid_offset += 1; if (cfm_maid_md_name_format != 1) { guint8 cfm_maid_md_name_length; proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_length, - tvb, maid_offset, 1, FALSE); + tvb, maid_offset, 1, ENC_BIG_ENDIAN); cfm_maid_md_name_length = tvb_get_guint8(tvb, maid_offset); maid_offset += 1; if (cfm_maid_md_name_length) { @@ -422,34 +422,34 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* the MD name of type MAC should be 8 octets but if * it isn't we are going to try and process it anyways.*/ proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_hex, - tvb, maid_offset, cfm_maid_md_name_length, FALSE); + tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN); } else { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac, - tvb, maid_offset, 6, FALSE); + tvb, maid_offset, 6, ENC_BIG_ENDIAN); proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_mac_id, - tvb, maid_offset+6, 2, FALSE); + tvb, maid_offset+6, 2, ENC_BIG_ENDIAN); } } else { /* MD name format is regular string or DNS string */ proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_md_name_string, - tvb, maid_offset, cfm_maid_md_name_length, FALSE); + tvb, maid_offset, cfm_maid_md_name_length, ENC_BIG_ENDIAN); } maid_offset += cfm_maid_md_name_length; } } - proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_format, tvb, maid_offset, 1, FALSE); + proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_format, tvb, maid_offset, 1, ENC_BIG_ENDIAN); cfm_maid_ma_name_format = tvb_get_guint8(tvb, maid_offset); maid_offset += 1; - proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_length, tvb, maid_offset, 1, FALSE); + proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_length, tvb, maid_offset, 1, ENC_BIG_ENDIAN); cfm_maid_ma_name_length = tvb_get_guint8(tvb, maid_offset); maid_offset += 1; if ((cfm_maid_ma_name_format == 2) || (cfm_maid_ma_name_format == 32)) { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_string, - tvb, maid_offset, cfm_maid_ma_name_length, FALSE); + tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN); } else { proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_ma_name_hex, - tvb, maid_offset, cfm_maid_ma_name_length, FALSE); + tvb, maid_offset, cfm_maid_ma_name_length, ENC_BIG_ENDIAN); } maid_offset += cfm_maid_ma_name_length; offset += 48; @@ -457,20 +457,20 @@ static int dissect_cfm_ccm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr gint padding_length; padding_length = offset - maid_offset; proto_tree_add_item(cfm_ccm_maid_tree, hf_cfm_maid_padding, - tvb, maid_offset, padding_length, FALSE); + tvb, maid_offset, padding_length, ENC_BIG_ENDIAN); } /* Dissect 16 octets reserved for Y.1731, samples of the wrap-around frame counters */ - wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, FALSE); + wi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_ccm_itu_t_y1731, tvb, offset, 16, ENC_BIG_ENDIAN); cfm_ccm_itu_tree = proto_item_add_subtree(wi, ett_cfm_ccm_itu); itu_offset = offset; - proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, FALSE); + proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCf, tvb, itu_offset, 4, ENC_BIG_ENDIAN); itu_offset += 4; - proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, FALSE); + proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_RxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN); itu_offset += 4; - proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, FALSE); + proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_TxFCb, tvb, itu_offset, 4, ENC_BIG_ENDIAN); itu_offset += 4; - proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, FALSE); + proto_tree_add_item(cfm_ccm_itu_tree, hf_cfm_itu_reserved, tvb, itu_offset, 4, ENC_BIG_ENDIAN); itu_offset += 4; offset += 16; @@ -482,14 +482,14 @@ static int dissect_cfm_lbm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_item *ti; proto_tree *cfm_pdu_tree; - ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_lbm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -499,14 +499,14 @@ static int dissect_cfm_lbr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_item *ti; proto_tree *cfm_pdu_tree; - ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_lbr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lb_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; } @@ -518,24 +518,24 @@ static int dissect_cfm_ltm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_ltm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltm_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltm_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_orig_addr, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltm_targ_addr, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; return offset; } @@ -547,24 +547,24 @@ static int dissect_cfm_ltr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_ltr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_FwdYes, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_TerminalMEP, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltr_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_UseFDBonly, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_FwdYes, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_TerminalMEP, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ltr_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_transaction_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lt_ttl, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltr_relay_action, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_ltr_relay_action, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; } @@ -576,16 +576,16 @@ static int dissect_cfm_ais(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_ais_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; @@ -598,16 +598,16 @@ static int dissect_cfm_lck(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_lck_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_ais_lck_Period, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; return offset; @@ -620,18 +620,18 @@ static int dissect_cfm_tst(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_tst_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_tst_sequence_num, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_tst_sequence_num, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -645,15 +645,15 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_aps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The APS data field was not defined at the time of this code being written @@ -661,7 +661,7 @@ static int dissect_cfm_aps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr * the TLV offset and perform a hex dump */ cfm_tlv_offset = tvb_get_guint8(tvb, 3); if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_aps_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -677,30 +677,30 @@ static int dissect_cfm_raps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree *cfm_flag_tree; proto_tree *raps_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_raps_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_req_st, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_req_st, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ri = proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_flags, tvb, offset, 1, FALSE); + ri = proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_flags, tvb, offset, 1, ENC_BIG_ENDIAN); raps_flag_tree = proto_item_add_subtree(ri, ett_cfm_raps_flags); - proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_rb, tvb, offset, 1, FALSE); - proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_dnf, tvb, offset, 1, FALSE); + proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_rb, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(raps_flag_tree, hf_cfm_raps_flags_dnf, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_node_id, tvb, offset, 6, ENC_BIG_ENDIAN); offset += 6; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_raps_reserved, tvb, offset, 24, ENC_BIG_ENDIAN); offset += 24; return offset; @@ -714,20 +714,20 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_mcc_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The MCC data field was not defined at the time of this code being written @@ -737,7 +737,7 @@ static int dissect_cfm_mcc(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Remove OUI and subtype from the offset */ cfm_tlv_offset -= 4; if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_mcc_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -751,22 +751,22 @@ static int dissect_cfm_lmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_lmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -779,22 +779,22 @@ static int dissect_cfm_lmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_lmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_RxFCf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_lmm_lmr_TxFCb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -807,20 +807,20 @@ static int dissect_cfm_odm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_odm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -833,24 +833,24 @@ static int dissect_cfm_dmm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_dmm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -863,24 +863,24 @@ static int dissect_cfm_dmr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_dmr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_TxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_odm_dmm_dmr_RxTimestampf, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_TxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_dmm_dmr_RxTimestampb, tvb, offset, 8, ENC_BIG_ENDIAN); offset += 8; return offset; @@ -894,20 +894,20 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_exm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The EXM data field was not defined at the time of this code being written @@ -917,7 +917,7 @@ static int dissect_cfm_exm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Remove OUI and subtype from the offset */ cfm_tlv_offset -= 4; if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -932,20 +932,20 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_exr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The EXR data field was not defined at the time of this code being written @@ -955,7 +955,7 @@ static int dissect_cfm_exr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Remove OUI and subtype from the offset */ cfm_tlv_offset -= 4; if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_exm_exr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -970,20 +970,20 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_vsm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The VSM data field was not defined at the time of this code being written @@ -993,7 +993,7 @@ static int dissect_cfm_vsm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Remove OUI and subtype from the offset */ cfm_tlv_offset -= 4; if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -1008,20 +1008,20 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_vsr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_oui, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; - proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_tlv_org_spec_subtype, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; /* The VSR data field was not defined at the time of this code being written @@ -1031,7 +1031,7 @@ static int dissect_cfm_vsr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* Remove OUI and subtype from the offset */ cfm_tlv_offset -= 4; if (cfm_tlv_offset > 0) { - proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_vsm_vsr_data, tvb, offset, cfm_tlv_offset, ENC_BIG_ENDIAN); offset += cfm_tlv_offset; } @@ -1045,26 +1045,26 @@ static int dissect_cfm_slm(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_slm_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1077,26 +1077,26 @@ static int dissect_cfm_slr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr proto_tree *cfm_pdu_tree; proto_tree *cfm_flag_tree; - ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_slr_pdu, tvb, offset, -1, ENC_BIG_ENDIAN); cfm_pdu_tree = proto_item_add_subtree(ti, ett_cfm_pdu); - fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, FALSE); + fi = proto_tree_add_item(cfm_pdu_tree, hf_cfm_flags, tvb, offset, 1, ENC_BIG_ENDIAN); cfm_flag_tree = proto_item_add_subtree(fi, ett_cfm_flags); - proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_flag_tree, hf_cfm_flags_Reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_first_tlv_offset, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_src_mep, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_rsp_mep, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_testid, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slm_txfcf, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, FALSE); + proto_tree_add_item(cfm_pdu_tree, hf_cfm_slr_txfcb, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; return offset; @@ -1118,10 +1118,8 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* provide info column with CFM packet type (opcode)*/ cfm_pdu_type = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s", - val_to_str(cfm_pdu_type, opcodetypenames, "Unknown (0x%02x)")); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s", + val_to_str(cfm_pdu_type, opcodetypenames, "Unknown (0x%02x)")); if (tree) { /* we are being asked for details */ gint cfm_tlv_offset; @@ -1129,7 +1127,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *cfm_tree; /* isolate the payload of the packet */ - ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, FALSE); + ti = proto_tree_add_item(tree, proto_cfm, tvb, 0, -1, ENC_BIG_ENDIAN); /* report type of CFM packet to base of dissection tree */ @@ -1138,10 +1136,10 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* dissecting the common CFM header */ cfm_tree = proto_item_add_subtree(ti, ett_cfm); - proto_tree_add_item(cfm_tree, hf_cfm_md_level, tvb, offset, 1, FALSE); - proto_tree_add_item(cfm_tree, hf_cfm_version, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_tree, hf_cfm_md_level, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cfm_tree, hf_cfm_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - proto_tree_add_item(cfm_tree, hf_cfm_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(cfm_tree, hf_cfm_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; switch(cfm_pdu_type) { @@ -1222,7 +1220,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((cfm_tlv_offset == offset) && (cfm_tlv_offset > 3)) { proto_tree *cfm_all_tlvs_tree; guint8 cfm_tlv_type = 255; - ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, FALSE); + ti = proto_tree_add_item(tree, hf_cfm_all_tlvs, tvb, cfm_tlv_offset, -1, ENC_BIG_ENDIAN); cfm_all_tlvs_tree = proto_item_add_subtree(ti, ett_cfm_all_tlvs); while (cfm_tlv_type != END_TLV) @@ -1246,10 +1244,10 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cfm_tlv_type, cfm_tlv_length); cfm_tlv_tree = proto_item_add_subtree(fi, ett_cfm_tlv); - proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_type, tvb, cfm_tlv_offset, 1, FALSE); + proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_type, tvb, cfm_tlv_offset, 1, ENC_BIG_ENDIAN); cfm_tlv_offset += 1; if (cfm_tlv_type != END_TLV) { - proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_length, tvb, cfm_tlv_offset, 2, FALSE); + proto_tree_add_item(cfm_tlv_tree, hf_cfm_tlv_length, tvb, cfm_tlv_offset, 2, ENC_BIG_ENDIAN); cfm_tlv_offset += 2; if (cfm_tlv_length != 0) { @@ -1262,16 +1260,16 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(cfm_tlv_type) { case SENDER_ID_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id_length, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_chassis_id_length = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (tlv_chassis_id_length > 0) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id_subtype, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_chassis_id, - tvb, tlv_data_offset, tlv_chassis_id_length, FALSE); + tvb, tlv_data_offset, tlv_chassis_id_length, ENC_BIG_ENDIAN); tlv_data_offset += tlv_chassis_id_length; } @@ -1280,12 +1278,12 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cfm_tlv_length > (2 + tlv_chassis_id_length)) { guint8 tlv_ma_domain_length; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ma_domain_length, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_ma_domain_length = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (tlv_ma_domain_length > 0) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_ma_domain, - tvb, tlv_data_offset, tlv_ma_domain_length, FALSE); + tvb, tlv_data_offset, tlv_ma_domain_length, ENC_BIG_ENDIAN); tlv_data_offset += tlv_ma_domain_length; } @@ -1295,12 +1293,12 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cfm_tlv_length > (2 + tlv_chassis_id_length + 1 + tlv_ma_domain_length)) { guint8 tlv_management_addr_length; proto_tree_add_item(cfm_tlv_tree, hf_tlv_management_addr_length, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_management_addr_length = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (tlv_management_addr_length > 0) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_management_addr, - tvb, tlv_data_offset, tlv_management_addr_length, FALSE); + tvb, tlv_data_offset, tlv_management_addr_length, ENC_BIG_ENDIAN); tlv_data_offset += tlv_management_addr_length; } } @@ -1308,25 +1306,25 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case PORT_STAT_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_port_status_value, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; break; case DATA_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_data_value, - tvb, tlv_data_offset, cfm_tlv_length, FALSE); + tvb, tlv_data_offset, cfm_tlv_length, ENC_BIG_ENDIAN); tlv_data_offset += cfm_tlv_length; break; case INTERF_STAT_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_interface_status_value, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; break; case REPLY_ING_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ingress_action, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ingress_mac_address, - tvb, tlv_data_offset, 6, FALSE); + tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); tlv_data_offset += 6; /* For the IEEE standard if the TLV length is greater than 7 then we have @@ -1335,26 +1333,26 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cfm_tlv_length > 7) { guint8 tlv_reply_ingress_portid_length; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_length, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_reply_ingress_portid_length = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (tlv_reply_ingress_portid_length > 0) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_subtype, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid, - tvb, tlv_data_offset, tlv_reply_ingress_portid_length, FALSE); + tvb, tlv_data_offset, tlv_reply_ingress_portid_length, ENC_BIG_ENDIAN); tlv_data_offset += tlv_reply_ingress_portid_length; } } break; case REPLY_EGR_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_egress_action, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_egress_mac_address, - tvb, tlv_data_offset, 6, FALSE); + tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); tlv_data_offset += 6; /* For the IEEE standard if the TLV length is greater than 7 then we have @@ -1363,40 +1361,40 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (cfm_tlv_length > 7) { guint8 tlv_reply_egress_portid_length; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_length, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_reply_egress_portid_length = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (tlv_reply_egress_portid_length > 0) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid_subtype, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_reply_ing_egr_portid, - tvb, tlv_data_offset, tlv_reply_egress_portid_length, FALSE); + tvb, tlv_data_offset, tlv_reply_egress_portid_length, ENC_BIG_ENDIAN); tlv_data_offset += tlv_reply_egress_portid_length; } } break; case LTM_EGR_ID_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_unique_identifier, - tvb, tlv_data_offset, 2, FALSE); + tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltm_egress_id_mac, - tvb, tlv_data_offset, 6, FALSE); + tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); tlv_data_offset += 6; break; case LTR_EGR_ID_TLV: proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_unique_identifier, - tvb, tlv_data_offset, 2, FALSE); + tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_last_id_mac, - tvb, tlv_data_offset, 6, FALSE); + tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); tlv_data_offset += 6; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_unique_identifier, - tvb, tlv_data_offset, 2, FALSE); + tvb, tlv_data_offset, 2, ENC_BIG_ENDIAN); tlv_data_offset += 2; proto_tree_add_item(cfm_tlv_tree, hf_tlv_ltr_egress_next_id_mac, - tvb, tlv_data_offset, 6, FALSE); + tvb, tlv_data_offset, 6, ENC_BIG_ENDIAN); tlv_data_offset += 6; break; case ORG_SPEC_TLV: @@ -1405,13 +1403,13 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ if (cfm_tlv_length > 3) { proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_oui, - tvb, tlv_data_offset, 3, FALSE); + tvb, tlv_data_offset, 3, ENC_BIG_ENDIAN); tlv_data_offset += 3; proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_subtype, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_data_offset += 1; proto_tree_add_item(cfm_tlv_tree, hf_tlv_org_spec_value, - tvb, tlv_data_offset, cfm_tlv_length-4, FALSE); + tvb, tlv_data_offset, cfm_tlv_length-4, ENC_BIG_ENDIAN); tlv_data_offset -= 4; } tlv_data_offset += cfm_tlv_length; @@ -1423,7 +1421,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * length which corresponds with the typical format for TLV's * until the recommendation is more clear in this regard. */ proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern_type, - tvb, tlv_data_offset, 1, FALSE); + tvb, tlv_data_offset, 1, ENC_BIG_ENDIAN); tlv_tst_test_pattern_type = tvb_get_guint8(tvb,tlv_data_offset); tlv_data_offset += 1; if (cfm_tlv_length > 0) { @@ -1431,16 +1429,16 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case 0: case 2: proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern, - tvb, tlv_data_offset, cfm_tlv_length-1, FALSE); + tvb, tlv_data_offset, cfm_tlv_length-1, ENC_BIG_ENDIAN); tlv_data_offset += cfm_tlv_length; break; case 1: case 3: proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_test_pattern, - tvb, tlv_data_offset, cfm_tlv_length-5, FALSE); + tvb, tlv_data_offset, cfm_tlv_length-5, ENC_BIG_ENDIAN); tlv_data_offset += (cfm_tlv_length-5); proto_tree_add_item(cfm_tlv_tree, hf_tlv_tst_CRC32, - tvb, tlv_data_offset, 4, FALSE); + tvb, tlv_data_offset, 4, ENC_BIG_ENDIAN); tlv_data_offset += 4; break; } |