diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-06 14:46:34 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-06 14:46:34 +0000 |
| commit | 02065b0981f85eff9d84ca42546809ee6319bd20 (patch) | |
| tree | e8bfa03641fe838d3b61f29231158f7a81eb7ed9 | |
| parent | 3c551a7bce3b117edabd75a2c7e33ae2f70c5d8e (diff) | |
Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugin dissectors:
Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
the encoding parameter for proto_tree_add_item() calls which directly reference
an item in hf[] which has a type of:
FT_UINT8
FT_UINT16
FT_UINT24
FT_UINT32
FT_UINT64
FT_INT8
FT_INT16
FT_INT24
FT_INT32
FT_INT64
FT_FLOAT
FT_DOUBLE
svn path=/trunk/; revision=39292
97 files changed, 2126 insertions, 2126 deletions
diff --git a/plugins/docsis/packet-bintrngreq.c b/plugins/docsis/packet-bintrngreq.c index efa74f56af..df71f14f0b 100644 --- a/plugins/docsis/packet-bintrngreq.c +++ b/plugins/docsis/packet-bintrngreq.c @@ -64,20 +64,20 @@ dissect_bintrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Bonded Initial Ranging Request"); bintrngreq_tree = proto_item_add_subtree (bintrngreq_item, ett_docsis_bintrngreq); proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_capflags, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_frag, tvb, offset, 1, FALSE ); proto_tree_add_item( bintrngreq_tree, hf_docsis_bintrngreq_capflags_encrypt, tvb, offset, 1, FALSE ); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_mddsgid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_down_chid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item (bintrngreq_tree, hf_docsis_bintrngreq_up_chid, - tvb, offset, 1, FALSE); + tvb, offset, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-bpkmattr.c b/plugins/docsis/packet-bpkmattr.c index f11674e8c4..0cad0f1be6 100644 --- a/plugins/docsis/packet-bpkmattr.c +++ b/plugins/docsis/packet-bpkmattr.c @@ -213,14 +213,14 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_KEY_LIFETIME: if (length == 4) proto_tree_add_item (tree, hf_docsis_bpkmattr_key_life, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; case BPKM_KEY_SEQ_NUM: if (length == 1) proto_tree_add_item (tree, hf_docsis_bpkmattr_key_seq, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -234,7 +234,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_SAID: if (length == 2) proto_tree_add_item (tree, hf_docsis_bpkmattr_said, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -258,7 +258,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_ERROR_CODE: if (length == 1) proto_tree_add_item (tree, hf_docsis_bpkmattr_error_code, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -282,7 +282,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_CRYPTO_SUITE: if (length == 2) proto_tree_add_item (tree, hf_docsis_bpkmattr_crypto_suite, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -293,7 +293,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_BPI_VERSION: if (length == 1) proto_tree_add_item (tree, hf_docsis_bpkmattr_bpi_version, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -308,7 +308,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_SA_TYPE: if (length == 1) proto_tree_add_item (tree, hf_docsis_bpkmattr_sa_type, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; @@ -323,7 +323,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case BPKM_SA_QUERY_TYPE: if (length == 1) proto_tree_add_item (tree, hf_docsis_bpkmattr_sa_query_type, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else THROW (ReportedBoundsError); break; diff --git a/plugins/docsis/packet-bpkmreq.c b/plugins/docsis/packet-bpkmreq.c index 9416a4951e..6eda8a4ecc 100644 --- a/plugins/docsis/packet-bpkmreq.c +++ b/plugins/docsis/packet-bpkmreq.c @@ -83,11 +83,11 @@ dissect_bpkmreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "BPKM Request Message"); bpkmreq_tree = proto_item_add_subtree (it, ett_docsis_bpkmreq); proto_tree_add_item (bpkmreq_tree, hf_docsis_bpkmreq_code, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (bpkmreq_tree, hf_docsis_bpkmreq_ident, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (bpkmreq_tree, hf_docsis_bpkmreq_length, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Code to Call subdissector */ diff --git a/plugins/docsis/packet-bpkmrsp.c b/plugins/docsis/packet-bpkmrsp.c index 0826c9b2ea..3a3f882dce 100644 --- a/plugins/docsis/packet-bpkmrsp.c +++ b/plugins/docsis/packet-bpkmrsp.c @@ -84,11 +84,11 @@ dissect_bpkmrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "BPKM Response Message"); bpkmrsp_tree = proto_item_add_subtree (it, ett_docsis_bpkmrsp); proto_tree_add_item (bpkmrsp_tree, hf_docsis_bpkmrsp_code, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (bpkmrsp_tree, hf_docsis_bpkmrsp_ident, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (bpkmrsp_tree, hf_docsis_bpkmrsp_length, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Code to Call subdissector */ diff --git a/plugins/docsis/packet-cmctrlreq.c b/plugins/docsis/packet-cmctrlreq.c index 7ed5b2599a..ec9aa974d3 100644 --- a/plugins/docsis/packet-cmctrlreq.c +++ b/plugins/docsis/packet-cmctrlreq.c @@ -59,7 +59,7 @@ dissect_cmctrlreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "CM Control Request"); cmctrlreq_tree = proto_item_add_subtree (it, ett_docsis_cmctrlreq); proto_tree_add_item (cmctrlreq_tree, hf_docsis_cmctrlreq_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-cmctrlrsp.c b/plugins/docsis/packet-cmctrlrsp.c index cb255126e6..3bc4ac16e5 100644 --- a/plugins/docsis/packet-cmctrlrsp.c +++ b/plugins/docsis/packet-cmctrlrsp.c @@ -67,7 +67,7 @@ dissect_cmctrlrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "CM Control Response"); cmctrlrsp_tree = proto_item_add_subtree (it, ett_docsis_cmctrlrsp); proto_tree_add_item (cmctrlrsp_tree, hf_docsis_cmctrlrsp_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-cmstatus.c b/plugins/docsis/packet-cmstatus.c index e030975349..4f49416b5f 100644 --- a/plugins/docsis/packet-cmstatus.c +++ b/plugins/docsis/packet-cmstatus.c @@ -90,7 +90,7 @@ dissect_cmstatus_tlv (tvbuff_t * tvb, proto_tree * tree, guint8 start, guint16 l case EVENT_DS_CH_ID: if (length == 3) { - proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_ds_ch_id, tvb, pos + 1, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_ds_ch_id, tvb, pos + 1, 1, ENC_BIG_ENDIAN); } else { @@ -101,7 +101,7 @@ dissect_cmstatus_tlv (tvbuff_t * tvb, proto_tree * tree, guint8 start, guint16 l case EVENT_US_CH_ID: if (length == 3) { - proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_us_ch_id, tvb, pos + 1, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_us_ch_id, tvb, pos + 1, 1, ENC_BIG_ENDIAN); } else { @@ -112,7 +112,7 @@ dissect_cmstatus_tlv (tvbuff_t * tvb, proto_tree * tree, guint8 start, guint16 l case EVENT_DSID: if (length == 5) { - proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_dsid, tvb, pos + 1, 3, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_dsid, tvb, pos + 1, 3, ENC_BIG_ENDIAN); } else { @@ -153,48 +153,48 @@ dissect_cmstatus (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { it = proto_tree_add_protocol_format (tree, proto_docsis_cmstatus, tvb, 0, -1, "CM-STATUS Report"); cmstatus_tree = proto_item_add_subtree (it, ett_docsis_cmstatus); - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_tranid, tvb, 0, 2, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_tranid, tvb, 0, 2, ENC_BIG_ENDIAN); switch (event_type) { case SEC_CH_MDD_TIMEOUT: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_mdd_t, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_mdd_t, tvb, 2, 1, ENC_BIG_ENDIAN); break; case QAM_FEC_LOCK_FAILURE: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_qfl_f, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_qfl_f, tvb, 2, 1, ENC_BIG_ENDIAN); break; case SEQ_OUT_OF_RANGE: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_s_o, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_s_o, tvb, 2, 1, ENC_BIG_ENDIAN); break; case SEC_CH_MDD_RECOVERY: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_mdd_r, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_mdd_r, tvb, 2, 1, ENC_BIG_ENDIAN); break; case QAM_FEC_LOCK_RECOVERY: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_qfl_r, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_qfl_r, tvb, 2, 1, ENC_BIG_ENDIAN); break; case T4_TIMEOUT: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_t4_t, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_t4_t, tvb, 2, 1, ENC_BIG_ENDIAN); break; case T3_RETRIES_EXCEEDED: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_t3_e, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_t3_e, tvb, 2, 1, ENC_BIG_ENDIAN); break; case SUCCESS_RANGING_AFTER_T3_RETRIES_EXCEEDED: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_rng_s, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_rng_s, tvb, 2, 1, ENC_BIG_ENDIAN); break; case CM_ON_BATTERY: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_cm_b, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_cm_b, tvb, 2, 1, ENC_BIG_ENDIAN); break; case CM_ON_AC_POWER: - proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_cm_a, tvb, 2, 1, FALSE); + proto_tree_add_item (cmstatus_tree, hf_docsis_cmstatus_e_t_cm_a, tvb, 2, 1, ENC_BIG_ENDIAN); break; } /* switch */ diff --git a/plugins/docsis/packet-dbcack.c b/plugins/docsis/packet-dbcack.c index d8a50f7dde..8bcd22c165 100644 --- a/plugins/docsis/packet-dbcack.c +++ b/plugins/docsis/packet-dbcack.c @@ -59,7 +59,7 @@ dissect_dbcack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Dynamic Bonding Change Acknowledge"); dbcack_tree = proto_item_add_subtree (dbcack_item, ett_docsis_dbcack); proto_tree_add_item (dbcack_tree, hf_docsis_dbcack_tranid, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 2); diff --git a/plugins/docsis/packet-dbcreq.c b/plugins/docsis/packet-dbcreq.c index 6e90d996d3..3e5988a878 100644 --- a/plugins/docsis/packet-dbcreq.c +++ b/plugins/docsis/packet-dbcreq.c @@ -61,11 +61,11 @@ dissect_dbcreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Dynamic Bonding Change Request"); dbcreq_tree = proto_item_add_subtree (dbcreq_item, ett_docsis_dbcreq); proto_tree_add_item (dbcreq_tree, hf_docsis_dbcreq_tranid, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item( dbcreq_tree, hf_docsis_dbcreq_number_of_fragments, - tvb, 2, 1, FALSE ); + tvb, 2, 1, ENC_BIG_ENDIAN ); proto_tree_add_item( dbcreq_tree, hf_docsis_dbcreq_fragment_sequence_number , - tvb, 3, 1, FALSE ); + tvb, 3, 1, ENC_BIG_ENDIAN ); } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 4); diff --git a/plugins/docsis/packet-dbcrsp.c b/plugins/docsis/packet-dbcrsp.c index 305f98796e..7a899adf8c 100644 --- a/plugins/docsis/packet-dbcrsp.c +++ b/plugins/docsis/packet-dbcrsp.c @@ -65,9 +65,9 @@ dissect_dbcrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Dynamic Bonding Change Response"); dbcrsp_tree = proto_item_add_subtree (dbcrsp_item, ett_docsis_dbcrsp); proto_tree_add_item (dbcrsp_tree, hf_docsis_dbcrsp_tranid, - tvb, 0, 2, FALSE); + tvb, 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item( dbcrsp_tree, hf_docsis_dbcrsp_conf_code, - tvb, 2, 1, FALSE ); + tvb, 2, 1, ENC_BIG_ENDIAN ); } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 3); diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c index 1e9790a6fb..6335869618 100644 --- a/plugins/docsis/packet-dccack.c +++ b/plugins/docsis/packet-dccack.c @@ -64,7 +64,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvb_length_remaining (tvb, 0), "DCC-ACK Message"); dcc_tree = proto_item_add_subtree (dcc_item, ett_docsis_dccack); - proto_tree_add_item (dcc_tree, hf_docsis_dccack_tran_id, tvb, 0, 2, FALSE); + proto_tree_add_item (dcc_tree, hf_docsis_dccack_tran_id, tvb, 0, 2, ENC_BIG_ENDIAN); pos = 2; while (pos < len) @@ -77,7 +77,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccack_key_seq_num, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c index 2991f9bcc1..75f43b8aa8 100644 --- a/plugins/docsis/packet-dccreq.c +++ b/plugins/docsis/packet-dccreq.c @@ -132,7 +132,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 if (length == 4) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_freq, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -143,7 +143,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_mod_type, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -154,7 +154,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_sym_rate, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -165,9 +165,9 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 if (length == 2) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_intlv_depth_i, tvb, - pos, 1, FALSE); + pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_intlv_depth_j, tvb, - pos + 1, 1, FALSE); + pos + 1, 1, ENC_BIG_ENDIAN); } else { @@ -178,7 +178,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_chan_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -187,7 +187,7 @@ dissect_dccreq_ds_params (tvbuff_t * tvb, proto_tree * tree, int start, guint16 break; case DCCREQ_DS_SYNC_SUB: proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ds_sync_sub, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); break; } @@ -217,9 +217,9 @@ dissect_dccreq_sf_sub (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len if (length == 8) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_sf_sfid_cur, tvb, - pos, 4, FALSE); + pos, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dcc_tree, hf_docsis_dccreq_sf_sfid_new, tvb, - pos + 4, 4, FALSE); + pos + 4, 4, ENC_BIG_ENDIAN); } else { @@ -230,9 +230,9 @@ dissect_dccreq_sf_sub (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len if (length == 4) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_sf_sid_cur, tvb, - pos, 2, FALSE); + pos, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dcc_tree, hf_docsis_dccreq_sf_sid_new, tvb, - pos + 2, 2, FALSE); + pos + 2, 2, ENC_BIG_ENDIAN); } else { @@ -243,7 +243,7 @@ dissect_dccreq_sf_sub (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len if (length == 4) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_sf_unsol_grant_tref, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -274,7 +274,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvb_length_remaining (tvb, 0), "DCC-REQ Message"); dcc_tree = proto_item_add_subtree (dcc_item, ett_docsis_dccreq); - proto_tree_add_item (dcc_tree, hf_docsis_dccreq_tran_id, tvb, 0, 2, FALSE); + proto_tree_add_item (dcc_tree, hf_docsis_dccreq_tran_id, tvb, 0, 2, ENC_BIG_ENDIAN); pos = 2; while (pos < len) @@ -288,7 +288,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_up_chan_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -302,7 +302,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_init_tech, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -317,9 +317,9 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 4) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_said_sub_cur, tvb, - pos, 2, FALSE); + pos, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dcc_tree, hf_docsis_dccreq_said_sub_new, tvb, - pos + 2, 2, FALSE); + pos + 2, 2, ENC_BIG_ENDIAN); } else { @@ -344,7 +344,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccreq_key_seq_num, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c index f05e37713a..53bf8f879b 100644 --- a/plugins/docsis/packet-dccrsp.c +++ b/plugins/docsis/packet-dccrsp.c @@ -78,7 +78,7 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint if (length == 4) { proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_cm_jump_time_length, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -89,7 +89,7 @@ dissect_dccrsp_cm_jump_time (tvbuff_t * tvb, proto_tree * tree, int start, guint if (length == 8) { proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_cm_jump_time_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -120,8 +120,8 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvb_length_remaining (tvb, 0), "DCC-RSP Message"); dcc_tree = proto_item_add_subtree (dcc_item, ett_docsis_dccrsp); - proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_tran_id, tvb, 0, 2, FALSE); - proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_conf_code, tvb, 2, 1, FALSE); + proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_tran_id, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_conf_code, tvb, 2, 1, ENC_BIG_ENDIAN); pos = 3; while (pos < len) @@ -137,7 +137,7 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 1) { proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_key_seq_num, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c index b2aaa6f574..1b0d06eb60 100644 --- a/plugins/docsis/packet-dcd.c +++ b/plugins/docsis/packet-dcd.c @@ -147,7 +147,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 4) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_chan, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -158,7 +158,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg1, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -169,7 +169,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg2, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -180,7 +180,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg3, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -191,7 +191,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_tdsg4, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -274,7 +274,7 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_tcpudp_srcport_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -285,7 +285,7 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_tcpudp_srcport_end, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -296,7 +296,7 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_tcpudp_dstport_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -307,7 +307,7 @@ dissect_dcd_down_classifier_ip (tvbuff_t * tvb, proto_tree * tree, int start, gu if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_tcpudp_dstport_end, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -352,7 +352,7 @@ dissect_dcd_clid (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_clid_ca_sys_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -363,7 +363,7 @@ dissect_dcd_clid (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_clid_app_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -397,7 +397,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -408,7 +408,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_pri, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -437,7 +437,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_cfr_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -476,7 +476,7 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint if (length == 2) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -487,7 +487,7 @@ dissect_dcd_down_classifier (tvbuff_t * tvb, proto_tree * tree, int start, guint if (length == 1) { proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfr_rule_pri, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -522,9 +522,9 @@ dissect_dcd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvb_length_remaining (tvb, 0), "DCD Message"); dcd_tree = proto_item_add_subtree (dcd_item, ett_docsis_dcd); - proto_tree_add_item (dcd_tree, hf_docsis_dcd_config_ch_cnt, tvb, 0, 1, FALSE); - proto_tree_add_item (dcd_tree, hf_docsis_dcd_num_of_frag, tvb, 1, 1, FALSE); - proto_tree_add_item (dcd_tree, hf_docsis_dcd_frag_sequence_num, tvb, 2, 1, FALSE); + proto_tree_add_item (dcd_tree, hf_docsis_dcd_config_ch_cnt, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (dcd_tree, hf_docsis_dcd_num_of_frag, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (dcd_tree, hf_docsis_dcd_frag_sequence_num, tvb, 2, 1, ENC_BIG_ENDIAN); pos = 3; while (pos < len) diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 767e726f01..7e5796fd08 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -199,13 +199,13 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) len = (tvb_get_guint8 (tvb, pos) & 0x0F); if ((((type >> 4) & 0x0F)== 6) && (len == 2)) { - item = proto_tree_add_item(ehdr_tree, hf_docsis_eh_type, tvb, pos, 1, FALSE); + item = proto_tree_add_item(ehdr_tree, hf_docsis_eh_type, tvb, pos, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(item); proto_tree_add_text(ehdr_tree, tvb, pos, 1, "0110 .... = Unsolicited Grant Sync EHDR Sub-Element" ); } else - proto_tree_add_item (ehdr_tree, hf_docsis_eh_type, tvb, pos, 1, FALSE); - proto_tree_add_item (ehdr_tree, hf_docsis_eh_len, tvb, pos, 1, FALSE); + proto_tree_add_item (ehdr_tree, hf_docsis_eh_type, tvb, pos, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (ehdr_tree, hf_docsis_eh_len, tvb, pos, 1, ENC_BIG_ENDIAN); switch ((type >> 4) & 0x0F) { case EH_REQUEST: @@ -236,21 +236,21 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) } case EH_BP_UP: proto_tree_add_item (ehdr_tree, hf_docsis_key_seq, tvb, pos + 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ver, tvb, pos + 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_bpi_en, tvb, pos + 2, 1, FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_toggle_bit, tvb, pos + 2, 1, FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_sid, tvb, pos + 2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_mini_slots, tvb, pos + 4, - 1, FALSE); + 1, ENC_BIG_ENDIAN); if (isfrag) { proto_tree_add_item (ehdr_tree, hf_docsis_frag_rsvd, tvb, pos+5, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_frag_first, tvb, pos+5, 1, FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_frag_last, tvb, pos+5, @@ -261,34 +261,34 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag) break; case EH_BP_DOWN: proto_tree_add_item (ehdr_tree, hf_docsis_key_seq, tvb, pos + 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_ver, tvb, pos + 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_bpi_en, tvb, pos + 2, 1, FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_toggle_bit, tvb, pos + 2, 1, FALSE); proto_tree_add_item (ehdr_tree, hf_docsis_said, tvb, pos + 2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ehdr_tree, hf_docsis_reserved, tvb, pos + 4, 1, - FALSE); + ENC_BIG_ENDIAN); break; case EH_SFLOW_HDR_DOWN: case EH_SFLOW_HDR_UP: val = tvb_get_guint8 (tvb, pos+1); if (val == 0) { - item = proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_phsi, tvb, pos+1, 1, FALSE); + item = proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_phsi, tvb, pos+1, 1, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(item); proto_tree_add_text (ehdr_tree, tvb, pos+1, 1, "0000 0000 = No PHS on current packet" ); } else - proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_phsi, tvb, pos+1, 1, FALSE); + proto_tree_add_item(ehdr_tree, hf_docsis_ehdr_phsi, tvb, pos+1, 1, ENC_BIG_ENDIAN); if (len == 2) { proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_qind, tvb, pos+2, 1, FALSE); - proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_grants, tvb, pos+2, 1, FALSE); + proto_tree_add_item (ehdr_tree, hf_docsis_ehdr_grants, tvb, pos+2, 1, ENC_BIG_ENDIAN); } break; default: @@ -402,39 +402,39 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) docsis_tree = proto_item_add_subtree (ti, ett_docsis); /* add an item to the subtree, see section 1.6 for more information */ - proto_tree_add_item (docsis_tree, hf_docsis_fctype, tvb, 0, 1, FALSE); + proto_tree_add_item (docsis_tree, hf_docsis_fctype, tvb, 0, 1, ENC_BIG_ENDIAN); switch (fctype) { case FCTYPE_PACKET: case FCTYPE_ATMPDU: case FCTYPE_RESRVD: proto_tree_add_item (docsis_tree, hf_docsis_fcparm, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_ehdron, tvb, 0, 1, FALSE); if (ehdron == 0x01) { proto_tree_add_item (docsis_tree, hf_docsis_ehdrlen, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_lensid, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); dissect_ehdr (tvb, docsis_tree, isfrag); proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, - 4 + mac_parm, 2, FALSE); + 4 + mac_parm, 2, ENC_BIG_ENDIAN); } else { proto_tree_add_item (docsis_tree, hf_docsis_macparm, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_lensid, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, 4, 2, - FALSE); + ENC_BIG_ENDIAN); } break; case FCTYPE_MACSPC: proto_tree_add_item (docsis_tree, hf_docsis_machdr_fcparm, tvb, 0, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_ehdron, tvb, 0, 1, FALSE); /* Decode for a Request Frame. No extended header */ @@ -445,7 +445,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_uint (docsis_tree, hf_docsis_sid, tvb, 2, 2, len_sid); proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, 4, 2, - FALSE); + ENC_BIG_ENDIAN); break; } /* Check if this is a fragmentation header */ @@ -458,31 +458,31 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_item_append_text (ti, " (Concatenated Header)"); proto_tree_add_item (docsis_tree, hf_docsis_concat_cnt, tvb, 1, - 1, FALSE); + 1, ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_lensid, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, 4, 2, - FALSE); + ENC_BIG_ENDIAN); break; } /* If Extended header is present then decode it */ if (ehdron == 0x01) { proto_tree_add_item (docsis_tree, hf_docsis_ehdrlen, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_lensid, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); dissect_ehdr (tvb, docsis_tree, isfrag); proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, - 4 + mac_parm, 2, FALSE); + 4 + mac_parm, 2, ENC_BIG_ENDIAN); break; } /* default case for all other Mac Frame Types */ proto_tree_add_item (docsis_tree, hf_docsis_macparm, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (docsis_tree, hf_docsis_lensid, tvb, 2, 2, - FALSE); - proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, 4, 2, FALSE); + ENC_BIG_ENDIAN); + proto_tree_add_item (docsis_tree, hf_docsis_hcs, tvb, 4, 2, ENC_BIG_ENDIAN); break; } } diff --git a/plugins/docsis/packet-dpvreq.c b/plugins/docsis/packet-dpvreq.c index 565e3810ec..e851ad6ac7 100644 --- a/plugins/docsis/packet-dpvreq.c +++ b/plugins/docsis/packet-dpvreq.c @@ -68,23 +68,23 @@ dissect_dpvreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DPV Request"); dpvreq_tree = proto_item_add_subtree (it, ett_docsis_dpvreq); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_tranid, tvb, - 0, 2, FALSE); + 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_dschan, tvb, - 2, 1, FALSE); + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_flags, tvb, - 3, 1, FALSE); + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_us_sf, tvb, - 4, 4, FALSE); + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_n, tvb, - 8, 2, FALSE); + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_start, tvb, - 10, 1, FALSE); + 10, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_end, tvb, - 11, 1, FALSE); + 11, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_start, tvb, - 12, 4, FALSE); + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvreq_tree, hf_docsis_dpvreq_ts_end, tvb, - 16, 4, FALSE); + 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-dpvrsp.c b/plugins/docsis/packet-dpvrsp.c index df320a8458..49404195e1 100644 --- a/plugins/docsis/packet-dpvrsp.c +++ b/plugins/docsis/packet-dpvrsp.c @@ -68,23 +68,23 @@ dissect_dpvrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DPV Response"); dpvrsp_tree = proto_item_add_subtree (it, ett_docsis_dpvrsp); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_tranid, tvb, - 0, 2, FALSE); + 0, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_dschan, tvb, - 2, 1, FALSE); + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_flags, tvb, - 3, 1, FALSE); + 3, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_us_sf, tvb, - 4, 4, FALSE); + 4, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_n, tvb, - 8, 2, FALSE); + 8, 2, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_start, tvb, - 10, 1, FALSE); + 10, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_end, tvb, - 11, 1, FALSE); + 11, 1, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_start, tvb, - 12, 4, FALSE); + 12, 4, ENC_BIG_ENDIAN); proto_tree_add_item (dpvrsp_tree, hf_docsis_dpvrsp_ts_end, tvb, - 16, 4, FALSE); + 16, 4, ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-dsaack.c b/plugins/docsis/packet-dsaack.c index 98fdb9b7fe..d057cc99ca 100644 --- a/plugins/docsis/packet-dsaack.c +++ b/plugins/docsis/packet-dsaack.c @@ -66,9 +66,9 @@ dissect_dsaack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSA Acknowledge"); dsaack_tree = proto_item_add_subtree (it, ett_docsis_dsaack); proto_tree_add_item (dsaack_tree, hf_docsis_dsaack_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsaack_tree, hf_docsis_dsaack_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dsareq.c b/plugins/docsis/packet-dsareq.c index 5724ee5a77..6b0453090b 100644 --- a/plugins/docsis/packet-dsareq.c +++ b/plugins/docsis/packet-dsareq.c @@ -61,7 +61,7 @@ dissect_dsareq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSA Request"); dsareq_tree = proto_item_add_subtree (it, ett_docsis_dsareq); proto_tree_add_item (dsareq_tree, hf_docsis_dsareq_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dsarsp.c b/plugins/docsis/packet-dsarsp.c index ec9745bb55..4f02a2251c 100644 --- a/plugins/docsis/packet-dsarsp.c +++ b/plugins/docsis/packet-dsarsp.c @@ -66,9 +66,9 @@ dissect_dsarsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSA Response"); dsarsp_tree = proto_item_add_subtree (it, ett_docsis_dsarsp); proto_tree_add_item (dsarsp_tree, hf_docsis_dsarsp_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsarsp_tree, hf_docsis_dsarsp_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dscack.c b/plugins/docsis/packet-dscack.c index 75ec51fa2a..b84b106e63 100644 --- a/plugins/docsis/packet-dscack.c +++ b/plugins/docsis/packet-dscack.c @@ -66,9 +66,9 @@ dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSC Acknowledge"); dscack_tree = proto_item_add_subtree (it, ett_docsis_dscack); proto_tree_add_item (dscack_tree, hf_docsis_dscack_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dscack_tree, hf_docsis_dscack_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 3); diff --git a/plugins/docsis/packet-dscreq.c b/plugins/docsis/packet-dscreq.c index be580e258d..21ed0db9c0 100644 --- a/plugins/docsis/packet-dscreq.c +++ b/plugins/docsis/packet-dscreq.c @@ -62,7 +62,7 @@ dissect_dscreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSC Request"); dscreq_tree = proto_item_add_subtree (it, ett_docsis_dscreq); proto_tree_add_item (dscreq_tree, hf_docsis_dscreq_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Call dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dscrsp.c b/plugins/docsis/packet-dscrsp.c index 9a9affb7fa..b7f2e7cceb 100644 --- a/plugins/docsis/packet-dscrsp.c +++ b/plugins/docsis/packet-dscrsp.c @@ -67,9 +67,9 @@ dissect_dscrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSC Response"); dscrsp_tree = proto_item_add_subtree (it, ett_docsis_dscrsp); proto_tree_add_item (dscrsp_tree, hf_docsis_dscrsp_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dscrsp_tree, hf_docsis_dscrsp_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dsdreq.c b/plugins/docsis/packet-dsdreq.c index 2c060f4a0a..56908672be 100644 --- a/plugins/docsis/packet-dsdreq.c +++ b/plugins/docsis/packet-dsdreq.c @@ -63,11 +63,11 @@ dissect_dsdreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSD Request"); dsdreq_tree = proto_item_add_subtree (it, ett_docsis_dsdreq); proto_tree_add_item (dsdreq_tree, hf_docsis_dsdreq_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsdreq_tree, hf_docsis_dsdreq_rsvd, tvb, 2, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsdreq_tree, hf_docsis_dsdreq_sfid, tvb, 4, 4, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-dsdrsp.c b/plugins/docsis/packet-dsdrsp.c index a7df2931ab..9b4f90b535 100644 --- a/plugins/docsis/packet-dsdrsp.c +++ b/plugins/docsis/packet-dsdrsp.c @@ -64,11 +64,11 @@ dissect_dsdrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "DSD Response"); dsdrsp_tree = proto_item_add_subtree (it, ett_docsis_dsdrsp); proto_tree_add_item (dsdrsp_tree, hf_docsis_dsdrsp_tranid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsdrsp_tree, hf_docsis_dsdrsp_confcode, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (dsdrsp_tree, hf_docsis_dsdrsp_rsvd, tvb, 3, 1, - FALSE); + ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-intrngreq.c b/plugins/docsis/packet-intrngreq.c index 0042a138ba..94262e3466 100644 --- a/plugins/docsis/packet-intrngreq.c +++ b/plugins/docsis/packet-intrngreq.c @@ -61,11 +61,11 @@ dissect_intrngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Initial Ranging Request"); intrngreq_tree = proto_item_add_subtree (intrngreq_item, ett_docsis_intrngreq); proto_tree_add_item (intrngreq_tree, hf_docsis_intrngreq_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (intrngreq_tree, hf_docsis_intrngreq_down_chid, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (intrngreq_tree, hf_docsis_intrngreq_up_chid, tvb, 3, - 1, FALSE); + 1, ENC_BIG_ENDIAN); } diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index ca40eb45c8..2c5724a2ab 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -179,7 +179,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_src_addr, tvb, 6, 6, FALSE); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_msg_len, tvb, 12, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_dsap, tvb, 14, 1, FALSE); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_ssap, tvb, 15, 1, @@ -187,9 +187,9 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_control, tvb, 16, 1, FALSE); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_version, tvb, 17, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_type, tvb, 18, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (mgt_hdr_tree, hf_docsis_mgt_rsvd, tvb, 19, 1, FALSE); diff --git a/plugins/docsis/packet-map.c b/plugins/docsis/packet-map.c index 5eef44901b..6a4361efec 100644 --- a/plugins/docsis/packet-map.c +++ b/plugins/docsis/packet-map.c @@ -104,23 +104,23 @@ dissect_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) map_tree = proto_item_add_subtree (it, ett_docsis_map); proto_tree_add_item (map_tree, hf_docsis_map_upstream_chid, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_ucd_count, tvb, 1, 1, - FALSE); - proto_tree_add_item (map_tree, hf_docsis_map_numie, tvb, 2, 1, FALSE); + ENC_BIG_ENDIAN); + proto_tree_add_item (map_tree, hf_docsis_map_numie, tvb, 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_rsvd, tvb, 3, 1, FALSE); proto_tree_add_item (map_tree, hf_docsis_map_alloc_start, tvb, 4, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_ack_time, tvb, 8, 4, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_rng_start, tvb, 12, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_rng_end, tvb, 13, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_data_start, tvb, 14, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (map_tree, hf_docsis_map_data_end, tvb, 15, 1, - FALSE); + ENC_BIG_ENDIAN); pos = 16; for (i = 0; i < numie; i++) @@ -136,11 +136,11 @@ dissect_map (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) iuc = (guint8) (temp & 0x0F); mask = 0x3FFF; offset = (guint16) (ie & mask); - item = proto_tree_add_item(map_tree, hf_docsis_map_sid, tvb, pos, 4, FALSE); + item = proto_tree_add_item(map_tree, hf_docsis_map_sid, tvb, pos, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(item); - item = proto_tree_add_item(map_tree, hf_docsis_map_iuc, tvb, pos, 4, FALSE); + item = proto_tree_add_item(map_tree, hf_docsis_map_iuc, tvb, pos, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(item); - item = proto_tree_add_item(map_tree, hf_docsis_map_offset, tvb, pos, 4, FALSE); + item = proto_tree_add_item(map_tree, hf_docsis_map_offset, tvb, pos, 4, ENC_BIG_ENDIAN); PROTO_ITEM_SET_HIDDEN(item); if (sid == 0x3FFF) proto_tree_add_uint_format (map_tree, hf_docsis_map_ie, tvb, pos, 4, diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c index 3a542c3c5f..69917fa1ed 100644 --- a/plugins/docsis/packet-mdd.c +++ b/plugins/docsis/packet-mdd.c @@ -330,10 +330,10 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) it = proto_tree_add_protocol_format (tree, proto_docsis_mdd, tvb, 0, -1,"MDD Message"); mdd_tree = proto_item_add_subtree (it, ett_docsis_mdd); - proto_tree_add_item (mdd_tree, hf_docsis_mdd_ccc, tvb, 0, 1, FALSE); - proto_tree_add_item (mdd_tree, hf_docsis_mdd_number_of_fragments, tvb, 1, 1, FALSE); - proto_tree_add_item (mdd_tree, hf_docsis_mdd_fragment_sequence_number, tvb, 2, 1, FALSE); - proto_tree_add_item (mdd_tree, hf_docsis_mdd_current_channel_dcid, tvb, 3, 1, FALSE); + proto_tree_add_item (mdd_tree, hf_docsis_mdd_ccc, tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (mdd_tree, hf_docsis_mdd_number_of_fragments, tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (mdd_tree, hf_docsis_mdd_fragment_sequence_number, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (mdd_tree, hf_docsis_mdd_current_channel_dcid, tvb, 3, 1, ENC_BIG_ENDIAN); /*TLVs...*/ pos = 4; @@ -353,27 +353,27 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case DOWNSTREAM_ACTIVE_CHANNEL_LIST_CHANNEL_ID: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_channel_id, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_channel_id, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case DOWNSTREAM_ACTIVE_CHANNEL_LIST_FREQUENCY: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_frequency, tvb, subpos + 2 , 4, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_frequency, tvb, subpos + 2 , 4, ENC_BIG_ENDIAN); break; case DOWNSTREAM_ACTIVE_CHANNEL_LIST_MODULATION_ORDER_ANNEX: tlv_sub_item = proto_tree_add_text (tlv_tree, tvb, subpos + 2, 1, "Modulation Order/Annex"); tlv_sub_tree = proto_item_add_subtree (tlv_sub_item, ett_sub_tlv); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_downstream_active_channel_list_modulation_order, tvb, subpos + 2 , 1, FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_downstream_active_channel_list_annex, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_downstream_active_channel_list_modulation_order, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_downstream_active_channel_list_annex, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case DOWNSTREAM_ACTIVE_CHANNEL_LIST_PRIMARY_CAPABLE: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_primary_capable, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_active_channel_list_primary_capable, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case DOWNSTREAM_ACTIVE_CHANNEL_LIST_CM_STATUS_EVENT_ENABLE_BITMASK: tlv_sub_item = proto_tree_add_text (tlv_tree, tvb, subpos + 2, 2, "CM-STATUS Event Enable Bitmask"); tlv_sub_tree = proto_item_add_subtree (tlv_sub_item, ett_sub_tlv); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout, tvb, subpos + 2 , 2,FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure, tvb, subpos + 2 , 2, FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery, tvb, subpos + 2 , 2,FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery, tvb, subpos + 2 , 2, FALSE); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_timeout, tvb, subpos + 2 , 2,ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_failure, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_mdd_recovery, tvb, subpos + 2 , 2,ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_qam_fec_lock_recovery, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); break; } subpos += sublength + 2; @@ -386,11 +386,11 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case MAC_DOMAIN_DOWNSTREAM_SERVICE_GROUP_MD_DS_SG_IDENTIFIER: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_mac_domain_downstream_service_group_md_ds_sg_identifier, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_mac_domain_downstream_service_group_md_ds_sg_identifier, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case MAC_DOMAIN_DOWNSTREAM_SERVICE_GROUP_CHANNEL_IDS: for (i = 0; i < sublength; i++) { - proto_tree_add_item (tlv_tree, hf_docsis_mdd_mac_domain_downstream_service_group_channel_id, tvb, subpos + 2 + i , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_mac_domain_downstream_service_group_channel_id, tvb, subpos + 2 + i , 1, ENC_BIG_ENDIAN); } break; } @@ -400,7 +400,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case DOWNSTREAM_AMBIGUITY_RESOLUTION_FREQUENCY_LIST: subpos = pos + 2; for (i = 0; i < length; i+=4) { - proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_ambiguity_resolution_frequency, tvb, subpos + i , 4, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_downstream_ambiguity_resolution_frequency, tvb, subpos + i , 4, ENC_BIG_ENDIAN); } break; case RECEIVE_CHANNEL_PROFILE_REPORTING_CONTROL: @@ -410,10 +410,10 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case RCP_CENTER_FREQUENCY_SPACING: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_rpc_center_frequency_spacing, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_rpc_center_frequency_spacing, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case VERBOSE_RCP_REPORTING: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_verbose_rcp_reporting, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_verbose_rcp_reporting, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; } subpos += sublength + 2; @@ -426,10 +426,10 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case IP_PROVISIONING_MODE: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_ip_provisioning_mode, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_ip_provisioning_mode, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case PRE_REGISTRATION_DSID: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_pre_registration_dsid, tvb, subpos + 2 , 3, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_pre_registration_dsid, tvb, subpos + 2 , 3, ENC_BIG_ENDIAN); break; } subpos += sublength + 2; @@ -437,7 +437,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) break; case EARLY_AUTHENTICATION_AND_ENCRYPTION: subpos = pos + 2; - proto_tree_add_item (tlv_tree, hf_docsis_mdd_early_authentication_and_encryption, tvb, subpos, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_early_authentication_and_encryption, tvb, subpos, 1, ENC_BIG_ENDIAN); break; case UPSTREAM_ACTIVE_CHANNEL_LIST: subpos = pos + 2; @@ -446,14 +446,14 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case UPSTREAM_ACTIVE_CHANNEL_LIST_UPSTREAM_CHANNEL_ID: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_active_channel_list_upstream_channel_id, tvb, subpos + 2 , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_active_channel_list_upstream_channel_id, tvb, subpos + 2 , 1, ENC_BIG_ENDIAN); break; case UPSTREAM_ACTIVE_CHANNEL_LIST_CM_STATUS_EVENT_ENABLE_BITMASK: tlv_sub_item = proto_tree_add_text (tlv_tree, tvb, subpos + 2, 2, "CM-STATUS Event Enable Bitmask"); tlv_sub_tree = proto_item_add_subtree (tlv_sub_item, ett_sub_tlv); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout, tvb, subpos + 2 , 2, FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_t3_retries_exceeded, tvb, subpos + 2 , 2, FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_successful_ranging_after_t3_retries_exceeded, tvb, subpos + 2 , 2, FALSE); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_t4_timeout, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_t3_retries_exceeded, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_bitmask_successful_ranging_after_t3_retries_exceeded, tvb, subpos + 2 , 2, ENC_BIG_ENDIAN); break; } subpos += sublength + 2; @@ -462,16 +462,16 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) case UPSTREAM_AMBIGUITY_RESOLUTION_CHANNEL_LIST: sublength = tvb_get_guint8 (tvb, subpos + 1); for (i = 0; i < sublength; i++) { - proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_ambiguity_resolution_channel_list_channel_id, tvb, pos + 2 + i , 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_ambiguity_resolution_channel_list_channel_id, tvb, pos + 2 + i , 1, ENC_BIG_ENDIAN); } break; case UPSTREAM_FREQUENCY_RANGE: subpos = pos + 2; - proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_frequency_range, tvb, subpos, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_frequency_range, tvb, subpos, 1, ENC_BIG_ENDIAN); break; case SYMBOL_CLOCK_LOCKING_INDICATOR: subpos = pos + 2; - proto_tree_add_item (tlv_tree, hf_docsis_mdd_symbol_clock_locking_indicator, tvb, subpos, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_symbol_clock_locking_indicator, tvb, subpos, 1, ENC_BIG_ENDIAN); break; case CM_STATUS_EVENT_CONTROL: subpos = pos + 2; @@ -480,14 +480,14 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case EVENT_TYPE_CODE: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_event_type, tvb, subpos+2, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_event_type, tvb, subpos+2, 1, ENC_BIG_ENDIAN); break; case MAXIMUM_EVENT_HOLDOFF_TIMER: - text_item = proto_tree_add_item (tlv_tree, hf_docsis_mdd_maximum_event_holdoff_timer, tvb, subpos, 2, FALSE); + text_item = proto_tree_add_item (tlv_tree, hf_docsis_mdd_maximum_event_holdoff_timer, tvb, subpos, 2, ENC_BIG_ENDIAN); proto_item_append_text(text_item, " (%d ms)", (256*tvb_get_guint8 (tvb, subpos) + tvb_get_guint8 (tvb, subpos + 1)) * 20); break; case MAXIMUM_NUMBER_OF_REPORTS_PER_EVENT: - text_item = proto_tree_add_item (tlv_tree, hf_docsis_mdd_maximum_number_of_reports_per_event, tvb, subpos, 1, FALSE); + text_item = proto_tree_add_item (tlv_tree, hf_docsis_mdd_maximum_number_of_reports_per_event, tvb, subpos, 1, ENC_BIG_ENDIAN); if ( tvb_get_guint8 (tvb, subpos) == 0) { proto_item_append_text(text_item, " (Unlimited)"); } @@ -498,7 +498,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) break; case UPSTREAM_TRANSMIT_POWER_REPORTING: subpos = pos + 2; - proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_transmit_power_reporting, tvb, subpos, 1, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_upstream_transmit_power_reporting, tvb, subpos, 1, ENC_BIG_ENDIAN); break; case DSG_DA_TO_DSID_ASSOCIATION_ENTRY: subpos = pos + 2; @@ -507,10 +507,10 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sublength = tvb_get_guint8 (tvb, subpos + 1); switch(subtype) { case DSG_DA_TO_DSID_ASSOCIATION_DA: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_dsg_da_to_dsid_association_da, tvb, subpos, 6, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_dsg_da_to_dsid_association_da, tvb, subpos, 6, ENC_BIG_ENDIAN); break; case DSG_DA_TO_DSID_ASSOCIATION_DSID: - proto_tree_add_item (tlv_tree, hf_docsis_mdd_dsg_da_to_dsid_association_dsid, tvb, subpos, 3, FALSE); + proto_tree_add_item (tlv_tree, hf_docsis_mdd_dsg_da_to_dsid_association_dsid, tvb, subpos, 3, ENC_BIG_ENDIAN); break; } subpos += sublength + 2; @@ -520,9 +520,9 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) subpos = pos + 2; tlv_sub_item = proto_tree_add_text (tlv_tree, tvb, subpos, 2, "CM-STATUS Event Enable Bitmask for Non-Channel-Specific Events"); tlv_sub_tree = proto_item_add_subtree (tlv_sub_item, ett_sub_tlv); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_sequence_out_of_range, tvb, subpos, 2,FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_operating_on_battery_backup, tvb, subpos , 2,FALSE); - proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_returned_to_ac_power, tvb, subpos , 2,FALSE); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_sequence_out_of_range, tvb, subpos, 2,ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_operating_on_battery_backup, tvb, subpos , 2,ENC_BIG_ENDIAN); + proto_tree_add_item (tlv_sub_tree, hf_docsis_mdd_cm_status_event_enable_non_channel_specific_events_cm_returned_to_ac_power, tvb, subpos , 2,ENC_BIG_ENDIAN); break; } pos += length + 2; diff --git a/plugins/docsis/packet-regack.c b/plugins/docsis/packet-regack.c index 9544fecc3c..56625d0fa7 100644 --- a/plugins/docsis/packet-regack.c +++ b/plugins/docsis/packet-regack.c @@ -65,9 +65,9 @@ dissect_regack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Registration Acknowledge"); regack_tree = proto_item_add_subtree (it, ett_docsis_regack); proto_tree_add_item (regack_tree, hf_docsis_regack_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (regack_tree, hf_docsis_regack_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-regreq.c b/plugins/docsis/packet-regreq.c index 1a6cce5bc8..af33ec6b38 100644 --- a/plugins/docsis/packet-regreq.c +++ b/plugins/docsis/packet-regreq.c @@ -62,7 +62,7 @@ dissect_regreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Registration Request"); regreq_tree = proto_item_add_subtree (it, ett_docsis_regreq); proto_tree_add_item (regreq_tree, hf_docsis_regreq_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TlV's */ next_tvb = tvb_new_subset_remaining (tvb, 2); diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c index d2326ec90c..e1a7353368 100644 --- a/plugins/docsis/packet-regreqmp.c +++ b/plugins/docsis/packet-regreqmp.c @@ -61,9 +61,9 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) it = proto_tree_add_protocol_format (tree, proto_docsis_regreqmp, tvb, 0, -1,"REG-REQ-MP Message"); regreqmp_tree = proto_item_add_subtree (it, ett_docsis_regreqmp); - proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_sid, tvb, 0, 2, FALSE); - proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_number_of_fragments, tvb, 2, 1, FALSE); - proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_fragment_sequence_number, tvb, 3, 1, FALSE); + proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_number_of_fragments, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (regreqmp_tree, hf_docsis_regreqmp_fragment_sequence_number, tvb, 3, 1, ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-regrsp.c b/plugins/docsis/packet-regrsp.c index f868d22ff9..9cda995f25 100644 --- a/plugins/docsis/packet-regrsp.c +++ b/plugins/docsis/packet-regrsp.c @@ -67,9 +67,9 @@ dissect_regrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Registration Response"); regrsp_tree = proto_item_add_subtree (it, ett_docsis_regrsp); proto_tree_add_item (regrsp_tree, hf_docsis_regrsp_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (regrsp_tree, hf_docsis_regrsp_response, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ next_tvb = tvb_new_subset_remaining (tvb, 3); diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c index 272a033f37..f0442b7209 100644 --- a/plugins/docsis/packet-regrspmp.c +++ b/plugins/docsis/packet-regrspmp.c @@ -66,10 +66,10 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) it = proto_tree_add_protocol_format (tree, proto_docsis_regrspmp, tvb, 0, -1,"REG-RSP-MP Message"); regrspmp_tree = proto_item_add_subtree (it, ett_docsis_regrspmp); - proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_sid, tvb, 0, 2, FALSE); - proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_response, tvb, 2, 1, FALSE); - proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_number_of_fragments, tvb, 3, 1, FALSE); - proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_fragment_sequence_number, tvb, 4, 1, FALSE); + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_sid, tvb, 0, 2, ENC_BIG_ENDIAN); + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_response, tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_number_of_fragments, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item (regrspmp_tree, hf_docsis_regrspmp_fragment_sequence_number, tvb, 4, 1, ENC_BIG_ENDIAN); } /* Call Dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c index 1fbb5f25c5..a0f8998823 100644 --- a/plugins/docsis/packet-rngreq.c +++ b/plugins/docsis/packet-rngreq.c @@ -64,11 +64,11 @@ dissect_rngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Ranging Request"); rngreq_tree = proto_item_add_subtree (it, ett_docsis_rngreq); proto_tree_add_item (rngreq_tree, hf_docsis_rngreq_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (rngreq_tree, hf_docsis_rngreq_down_chid, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (rngreq_tree, hf_docsis_rngreq_pend_compl, tvb, 3, - 1, FALSE); + 1, ENC_BIG_ENDIAN); } diff --git a/plugins/docsis/packet-rngrsp.c b/plugins/docsis/packet-rngrsp.c index 0b4aca3261..38ae5b297e 100644 --- a/plugins/docsis/packet-rngrsp.c +++ b/plugins/docsis/packet-rngrsp.c @@ -93,9 +93,9 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "Ranging Response"); rngrsp_tree = proto_item_add_subtree (it, ett_docsis_rngrsp); proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_sid, tvb, 0, 2, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_upstream_chid, tvb, - 2, 1, FALSE); + 2, 1, ENC_BIG_ENDIAN); length = tvb_reported_length_remaining (tvb, 0); pos = 3; @@ -134,7 +134,7 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tlvlen == 2) { proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_freq_adj, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -149,7 +149,7 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tlvlen == 1) proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_ranging_status, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); else { THROW (ReportedBoundsError); @@ -159,7 +159,7 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tlvlen == 4) proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_down_freq_over, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); else { THROW (ReportedBoundsError); @@ -169,7 +169,7 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (tlvlen == 1) proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_upstream_ch_over, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); else { THROW (ReportedBoundsError); diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c index a21e54d30f..2b678f999b 100644 --- a/plugins/docsis/packet-sync.c +++ b/plugins/docsis/packet-sync.c @@ -52,7 +52,7 @@ dissect_sync (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) sync_tree = proto_item_add_subtree (it, ett_docsis_sync); proto_tree_add_item (sync_tree, hf_docsis_sync_cmts_timestamp, tvb, 0, 4, - FALSE); + ENC_BIG_ENDIAN); } /* if(tree) */ } diff --git a/plugins/docsis/packet-tlv-cmctrl.c b/plugins/docsis/packet-tlv-cmctrl.c index 5aa9346f05..ce9fc2e9f1 100644 --- a/plugins/docsis/packet-tlv-cmctrl.c +++ b/plugins/docsis/packet-tlv-cmctrl.c @@ -85,7 +85,7 @@ dissect_ds_event(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (event_tree, hf_ds_event_ch_id, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -130,7 +130,7 @@ dissect_us_event(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (event_tree, hf_us_event_ch_id, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -180,7 +180,7 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 1) { proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_mute, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -191,7 +191,7 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 4 || length == 1) /* response TLV always with len 1 */ { proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_mute_timeout, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -202,7 +202,7 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 1) { proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_reinit, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -213,7 +213,7 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 1) { proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_disable_fwd, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c index fcc9df1941..6f1c5535df 100644 --- a/plugins/docsis/packet-tlv.c +++ b/plugins/docsis/packet-tlv.c @@ -660,7 +660,7 @@ dissect_phs_err (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (err_tree, hf_docsis_tlv_phs_err_param, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -671,7 +671,7 @@ dissect_phs_err (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (err_tree, hf_docsis_tlv_phs_err_code, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -710,7 +710,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_class_ref, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -721,7 +721,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_class_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -732,7 +732,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_sflow_ref, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -743,7 +743,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 4) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_sflow_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -754,7 +754,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_dsc_action, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -771,7 +771,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_phsi, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -786,7 +786,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_phss, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -825,7 +825,7 @@ dissect_reqxmit_policy (tvbuff_t * tvb, proto_tree * tree, int start) value = tvb_get_ntohl (tvb, start); it = proto_tree_add_item (tree, hf_docsis_tlv_sflow_reqxmit_pol, tvb, start, 4, - FALSE); + ENC_BIG_ENDIAN); pol_tree = proto_item_add_subtree (it, ett_docsis_tlv_reqxmitpol); if (value & 0x01) @@ -880,7 +880,7 @@ dissect_sflow_err (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (err_tree, hf_docsis_tlv_sflow_err_param, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -891,7 +891,7 @@ dissect_sflow_err (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (err_tree, hf_docsis_tlv_sflow_err_code, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -925,7 +925,7 @@ dissect_downstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_max_down_latency, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -956,7 +956,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_max_concat_burst, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -968,7 +968,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, if (length == 1) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_sched_type, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -983,7 +983,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_nominal_polling, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -995,7 +995,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_tolerated_jitter, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1006,7 +1006,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, if (length == 2) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_ugs_size, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1018,7 +1018,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_nom_grant_intvl, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1030,7 +1030,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_tol_grant_jitter, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1042,7 +1042,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_grants_per_intvl, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1054,7 +1054,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_ip_tos_overwrite, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1066,7 +1066,7 @@ dissect_upstream_sflow (tvbuff_t * tvb, proto_tree * sflow_tree, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_ugs_timeref, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1110,7 +1110,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 2) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_ref, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1121,7 +1121,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 4) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1132,7 +1132,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 2) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_sid, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1150,7 +1150,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 1) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_qos_param, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1161,7 +1161,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 1) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_traf_pri, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1172,7 +1172,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 4) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_max_sus, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1183,7 +1183,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 4) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_max_burst, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1194,7 +1194,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, if (length == 4) { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_min_traf, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1206,7 +1206,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_ass_min_pkt_size, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1218,7 +1218,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_timeout_active, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1230,7 +1230,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len, { proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_timeout_admitted, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1278,7 +1278,7 @@ dissect_dot1q_clsfr (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (dot1qclsfr_tree, hf_docsis_tlv_dot1qclsfr_user_pri, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1290,7 +1290,7 @@ dissect_dot1q_clsfr (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (dot1qclsfr_tree, hf_docsis_tlv_dot1qclsfr_vlanid, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1354,7 +1354,7 @@ dissect_eth_clsfr (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ethclsfr_tree, hf_docsis_tlv_ethclsfr_ethertype, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1392,13 +1392,13 @@ dissect_clsfr_err (tvbuff_t * tvb, proto_tree * tree, int start, case CFR_ERR_PARAM: if (length == 1) proto_tree_add_item (err_tree, hf_docsis_tlv_clsfr_err_param, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else if (length == 2) { proto_tree_add_item (err_tree, hf_docsis_tlv_clsfr_err_param, - tvb, pos, 1, FALSE); + tvb, pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item (err_tree, hf_docsis_tlv_clsfr_err_param, - tvb, pos + 1, 1, FALSE); + tvb, pos + 1, 1, ENC_BIG_ENDIAN); } else { @@ -1409,7 +1409,7 @@ dissect_clsfr_err (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (err_tree, hf_docsis_tlv_clsfr_err_code, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1465,7 +1465,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ipclsfr_tree, hf_docsis_tlv_ipclsfr_ipproto, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1523,7 +1523,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ipclsfr_tree, hf_docsis_tlv_ipclsfr_sport_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1535,7 +1535,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ipclsfr_tree, hf_docsis_tlv_ipclsfr_sport_end, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1547,7 +1547,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ipclsfr_tree, hf_docsis_tlv_ipclsfr_dport_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1559,7 +1559,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (ipclsfr_tree, hf_docsis_tlv_ipclsfr_dport_end, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -1604,7 +1604,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_ref, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1615,7 +1615,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1626,7 +1626,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_sflow_ref, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1637,7 +1637,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 4) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_sflow_id, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1648,7 +1648,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_rule_pri, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1670,7 +1670,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_dsc_act, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1725,7 +1725,7 @@ dissect_doc10cos (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (doc10cos_tree, hf_docsis_tlv_cos_id, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1736,7 +1736,7 @@ dissect_doc10cos (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (doc10cos_tree, hf_docsis_tlv_cos_sid, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1784,7 +1784,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_docs_ver, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1861,9 +1861,9 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_8021P_filter, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_8021Q_filter, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1875,7 +1875,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_xmit_eq_taps_per_sym, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -1908,7 +1908,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_ip_filters, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1919,7 +1919,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_llc_filters, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1941,13 +1941,13 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 4) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_rnghoff_cm, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_rnghoff_erouter, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_rnghoff_emta, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_rnghoff_estb, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1970,7 +1970,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_freq_range, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -1981,17 +1981,17 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_160, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_320, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_640, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_1280, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_2560, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_us_srate_5120, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2024,7 +2024,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_mtc, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2035,7 +2035,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_512_msps_utc, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2046,7 +2046,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_256_msps_utc, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2057,7 +2057,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_total_sid_cluster, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2068,7 +2068,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_sid_per_sf, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2079,7 +2079,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_mrc, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2090,7 +2090,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_total_dsid, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2101,7 +2101,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_reseq_dsid, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2112,7 +2112,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_mc_dsid, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2123,7 +2123,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_mc_dsid_fwd, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2134,7 +2134,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_fctype_fwd, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2145,9 +2145,9 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_dpv_path, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_dpv_packet, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2158,7 +2158,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_ugs, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2180,7 +2180,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 2) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_udc, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2202,7 +2202,7 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start, if (length == 1) { proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_ext_us_trans_power, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2238,7 +2238,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2249,7 +2249,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 4) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_max_down, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2260,7 +2260,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 4) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_max_up, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2271,7 +2271,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 1) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_up_chnl_pri, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -2282,7 +2282,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 4) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_min_grntd_up, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -2293,7 +2293,7 @@ dissect_cos (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len) if (length == 2) { proto_tree_add_item (cos_tree, hf_docsis_tlv_cos_max_up_burst, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -2329,13 +2329,13 @@ dissect_svc_unavail(tvbuff_t * tvb, proto_tree * tree, int pos, guint16 length) svc_unavail_tree = proto_item_add_subtree(svc_unavail_it, ett_docsis_tlv_svc_unavail ); proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_classid, tvb, - pos, 1, FALSE); + pos, 1, ENC_BIG_ENDIAN); proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_type, tvb, - pos+1, 1, FALSE); + pos+1, 1, ENC_BIG_ENDIAN); proto_tree_add_item (svc_unavail_tree, hf_docsis_tlv_svc_unavail_code, tvb, - pos+2, 1, FALSE); + pos+2, 1, ENC_BIG_ENDIAN); } @@ -2395,7 +2395,7 @@ dissect_ds_ch_list_single (tvbuff_t * tvb, proto_tree * tree, if (length == 2) { proto_tree_add_item (single_tree, hf_docsis_tlv_single_ch_timeout, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2406,7 +2406,7 @@ dissect_ds_ch_list_single (tvbuff_t * tvb, proto_tree * tree, if (length == 4) { proto_tree_add_item (single_tree, hf_docsis_tlv_single_ch_freq, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2441,7 +2441,7 @@ dissect_ds_ch_list_range (tvbuff_t * tvb, proto_tree * tree, if (length == 2) { proto_tree_add_item (range_tree, hf_docsis_tlv_freq_rng_timeout, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2452,7 +2452,7 @@ dissect_ds_ch_list_range (tvbuff_t * tvb, proto_tree * tree, if (length == 4) { proto_tree_add_item (range_tree, hf_docsis_tlv_freq_rng_start, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2463,7 +2463,7 @@ dissect_ds_ch_list_range (tvbuff_t * tvb, proto_tree * tree, if (length == 4) { proto_tree_add_item (range_tree, hf_docsis_tlv_freq_rng_end, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2474,7 +2474,7 @@ dissect_ds_ch_list_range (tvbuff_t * tvb, proto_tree * tree, if (length == 4) { proto_tree_add_item (range_tree, hf_docsis_tlv_freq_rng_step, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); } else { @@ -2554,7 +2554,7 @@ dissect_ds_ch_list(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dschlst_tree, hf_docsis_tlv_ds_ch_list_default_timeout, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2594,7 +2594,7 @@ dissect_tcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (tccerr_tree, hf_docsis_tcc_err_code, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2634,7 +2634,7 @@ dissect_tcc_rng_parms(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rngparm_tree, hf_docsis_rng_parms_us_ch_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2670,7 +2670,7 @@ dissect_tcc_rng_parms(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rngparm_tree, hf_docsis_rng_parms_power_off, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2682,7 +2682,7 @@ dissect_tcc_rng_parms(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rngparm_tree, hf_docsis_rng_parms_freq_off, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2717,7 +2717,7 @@ dissect_sid_cl_so_crit(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (crit_tree, hf_docsis_sid_cl_so_max_req, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2729,7 +2729,7 @@ dissect_sid_cl_so_crit(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (crit_tree, hf_docsis_sid_cl_so_max_out_bytes, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2741,7 +2741,7 @@ dissect_sid_cl_so_crit(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (crit_tree, hf_docsis_sid_cl_so_max_req_bytes, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2753,7 +2753,7 @@ dissect_sid_cl_so_crit(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (crit_tree, hf_docsis_sid_cl_so_max_time, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2788,7 +2788,7 @@ dissect_sid_cl_enc_map(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (map_tree, hf_docsis_sid_cl_map_us_ch_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2800,7 +2800,7 @@ dissect_sid_cl_enc_map(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (map_tree, hf_docsis_sid_cl_map_sid, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2812,7 +2812,7 @@ dissect_sid_cl_enc_map(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (map_tree, hf_docsis_sid_cl_map_action, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2847,7 +2847,7 @@ dissect_sid_cl_enc(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (enc_tree, hf_docsis_sid_cl_enc_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2888,7 +2888,7 @@ dissect_sid_cl(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (sid_tree, hf_docsis_sid_cl_sf_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2932,7 +2932,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_refid, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2944,7 +2944,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_us_ch_action, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2956,7 +2956,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_us_ch_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2968,7 +2968,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_new_us_ch_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2984,7 +2984,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_rng_sid, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -2996,7 +2996,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_init_tech, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3011,7 +3011,7 @@ dissect_tcc(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (tcc_tree, hf_docsis_tlv_tcc_dyn_rng_win, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3049,7 +3049,7 @@ dissect_ch_bl_rng(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (chblrng_tree, hf_docsis_ch_bl_rng_min_ctr_freq, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3061,7 +3061,7 @@ dissect_ch_bl_rng(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (chblrng_tree, hf_docsis_ch_bl_rng_max_ctr_freq, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3096,7 +3096,7 @@ dissect_rcp_rcv_mod(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvmod_tree, hf_docsis_rcv_mod_enc_idx, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3161,7 +3161,7 @@ dissect_rcp_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcv_ch_idx, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3178,7 +3178,7 @@ dissect_rcp_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcv_ch_conn_off, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3190,7 +3190,7 @@ dissect_rcp_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcv_ch_prim_ds_ch_ind, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3253,7 +3253,7 @@ dissect_rcp(tvbuff_t * tvb, packet_info * pinfo _U_, { proto_tree_add_item (rcp_tree, hf_docsis_tlv_rcp_freq_spc, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3298,7 +3298,7 @@ dissect_rcc_rcv_mod(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvmod_tree, hf_docsis_rcc_rcv_mod_enc_idx, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3310,7 +3310,7 @@ dissect_rcc_rcv_mod(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvmod_tree, hf_docsis_rcc_rcv_mod_enc_ctr_freq_asgn, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3350,7 +3350,7 @@ dissect_rcc_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcc_rcv_ch_idx, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3367,7 +3367,7 @@ dissect_rcc_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcc_rcv_ch_ctr_freq_asgn, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3379,7 +3379,7 @@ dissect_rcc_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (rcvch_tree, hf_docsis_rcc_rcv_ch_prim_ds_ch_ind, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3414,7 +3414,7 @@ dissect_rcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (err_tree, hf_docsis_tlv_rcc_err_mod_or_ch, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3426,7 +3426,7 @@ dissect_rcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (err_tree, hf_docsis_tlv_rcc_err_idx, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3438,7 +3438,7 @@ dissect_rcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (err_tree, hf_docsis_tlv_rcc_err_param, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3450,7 +3450,7 @@ dissect_rcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (err_tree, hf_docsis_tlv_rcc_err_code, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3541,7 +3541,7 @@ dissect_dsid_ds_reseq(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_ds_reseq_dsid, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3558,7 +3558,7 @@ dissect_dsid_ds_reseq(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_ds_reseq_wait_time, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3570,7 +3570,7 @@ dissect_dsid_ds_reseq(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_ds_reseq_warn_thresh, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3582,7 +3582,7 @@ dissect_dsid_ds_reseq(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_ds_reseq_ho_timer, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3617,7 +3617,7 @@ dissect_dsid_mc_addr(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_mc_addr_action, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3703,7 +3703,7 @@ dissect_dsid(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_tlv_dsid_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3715,7 +3715,7 @@ dissect_dsid(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (dsid_tree, hf_docsis_tlv_dsid_action, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3756,7 +3756,7 @@ dissect_sec_assoc(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (sec_tree, hf_docsis_tlv_sec_assoc_action, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3803,7 +3803,7 @@ dissect_ch_asgn(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (asgn_tree, hf_docsis_ch_asgn_us_ch_id, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3815,7 +3815,7 @@ dissect_ch_asgn(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len) { proto_tree_add_item (asgn_tree, hf_docsis_ch_asgn_rx_freq, tvb, pos, - length, FALSE); + length, ENC_BIG_ENDIAN); } else { @@ -3906,10 +3906,10 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) * message type. */ if (length == 4) proto_tree_add_item (tlv_tree, hf_docsis_tlv_down_freq, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else if (length == 1) proto_tree_add_item (tlv_tree, hf_docsis_tlv_rng_tech, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); else dissect_doc10cos (tvb, tlv_tree, pos, length); break; @@ -3917,7 +3917,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 1) { proto_tree_add_item (tlv_tree, hf_docsis_tlv_upstream_chid, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -4040,7 +4040,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) { proto_tree_add_item (tlv_tree, hf_docsis_tlv_tftp_server_timestamp, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -4238,7 +4238,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 2) { proto_tree_add_item(tlv_tree, hf_docsis_tlv_init_ch_timeout, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -4252,7 +4252,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 1) { proto_tree_add_item(tlv_tree, hf_docsis_tlv_cm_init_reason, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { @@ -4297,7 +4297,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) if (length == 2) { proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ctrl_max_cpe_ipv6, - tvb, pos, length, FALSE); + tvb, pos, length, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-type29ucd.c b/plugins/docsis/packet-type29ucd.c index 046fd4615a..8b778cd70e 100644 --- a/plugins/docsis/packet-type29ucd.c +++ b/plugins/docsis/packet-type29ucd.c @@ -224,13 +224,13 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "type29ucd Message"); type29ucd_tree = proto_item_add_subtree (type29ucd_item, ett_docsis_type29ucd); proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_upstream_chid, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_config_ch_cnt, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_mini_slot_size, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_down_chid, tvb, 3, 1, - FALSE); + ENC_BIG_ENDIAN); pos = 4; while (pos < len) @@ -256,7 +256,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) if (length == 4) { proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_frequency, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); pos = pos + length; } else @@ -415,7 +415,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) length); burst_descr_tree = proto_item_add_subtree (it, ett_burst_descr); proto_tree_add_item (burst_descr_tree, hf_docsis_type29ucd_iuc, tvb, - pos++, 1, FALSE); + pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; while (pos < endtlvpos) { @@ -428,7 +428,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_mod_type, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -440,7 +440,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_diff_encoding, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -452,7 +452,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_preamble_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -464,7 +464,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_preamble_val_off, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -488,7 +488,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_fec_codeword, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -500,7 +500,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_scrambler_seed, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -512,7 +512,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_max_burst, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -524,7 +524,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_guard_time, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -536,7 +536,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_last_cw_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -548,7 +548,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -567,7 +567,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) length); burst_descr_tree = proto_item_add_subtree (it, ett_burst_descr); proto_tree_add_item (burst_descr_tree, hf_docsis_type29ucd_iuc, tvb, - pos++, 1, FALSE); + pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; while (pos < endtlvpos) { @@ -580,7 +580,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_mod_type, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -592,7 +592,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_diff_encoding, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -604,7 +604,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_preamble_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -616,7 +616,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_preamble_val_off, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -640,7 +640,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_fec_codeword, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -652,7 +652,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_scrambler_seed, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -664,7 +664,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_max_burst, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -676,7 +676,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_guard_time, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -688,7 +688,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_last_cw_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -700,7 +700,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_burst_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -721,7 +721,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_rs_int_depth, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -733,7 +733,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_rs_int_block, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -745,7 +745,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_preamble_type, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -757,7 +757,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_scdma_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -769,7 +769,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_scdma_codes_per_subframe, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -781,7 +781,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_scdma_framer_int_step_size, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -793,7 +793,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { proto_tree_add_item (burst_descr_tree, hf_docsis_tcm_enabled, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-uccreq.c b/plugins/docsis/packet-uccreq.c index c6bd21c676..8e9f4f2152 100644 --- a/plugins/docsis/packet-uccreq.c +++ b/plugins/docsis/packet-uccreq.c @@ -62,7 +62,7 @@ dissect_uccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "UCC Request"); uccreq_tree = proto_item_add_subtree (it, ett_docsis_uccreq); proto_tree_add_item (uccreq_tree, hf_docsis_uccreq_upchid, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); } /* call dissector for Appendix C TLV's */ diff --git a/plugins/docsis/packet-uccrsp.c b/plugins/docsis/packet-uccrsp.c index 0006ebe561..c2676439e3 100644 --- a/plugins/docsis/packet-uccrsp.c +++ b/plugins/docsis/packet-uccrsp.c @@ -60,7 +60,7 @@ dissect_uccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) "UCC Response"); uccrsp_tree = proto_item_add_subtree (it, ett_docsis_uccrsp); proto_tree_add_item (uccrsp_tree, hf_docsis_uccrsp_upchid, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); } } diff --git a/plugins/docsis/packet-ucd.c b/plugins/docsis/packet-ucd.c index 06e44185eb..e3949f4781 100644 --- a/plugins/docsis/packet-ucd.c +++ b/plugins/docsis/packet-ucd.c @@ -188,13 +188,13 @@ static void "UCD Message"); ucd_tree = proto_item_add_subtree (ucd_item, ett_docsis_ucd); proto_tree_add_item (ucd_tree, hf_docsis_ucd_upstream_chid, tvb, 0, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ucd_tree, hf_docsis_ucd_config_ch_cnt, tvb, 1, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ucd_tree, hf_docsis_ucd_mini_slot_size, tvb, 2, 1, - FALSE); + ENC_BIG_ENDIAN); proto_tree_add_item (ucd_tree, hf_docsis_ucd_down_chid, tvb, 3, 1, - FALSE); + ENC_BIG_ENDIAN); pos = 4; while (pos < len) @@ -232,7 +232,7 @@ static void if (length == 4) { proto_tree_add_item (tlv_tree, hf_docsis_ucd_frequency, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); pos = pos + length; } else @@ -247,7 +247,7 @@ static void break; case UCD_BURST_DESCR: proto_tree_add_item (tlv_tree, hf_docsis_ucd_iuc, tvb, - pos++, 1, FALSE); + pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; while (pos < endtlvpos) { @@ -260,7 +260,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_mod_type, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -272,7 +272,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_diff_encoding, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -284,7 +284,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_preamble_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -296,7 +296,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_preamble_val_off, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -320,7 +320,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_fec_codeword, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -332,7 +332,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_scrambler_seed, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -344,7 +344,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_max_burst, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -356,7 +356,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_guard_time, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -368,7 +368,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_last_cw_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -380,7 +380,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -394,7 +394,7 @@ static void case UCD_BURST_DESCR5: /* DOCSIS 2.0 Upstream Channel Descriptor */ proto_tree_add_item (tlv_tree, hf_docsis_ucd_iuc, tvb, - pos++, 1, FALSE); + pos++, 1, ENC_BIG_ENDIAN); endtlvpos = pos + length - 1; while (pos < endtlvpos) { @@ -407,7 +407,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_mod_type, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -419,7 +419,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_diff_encoding, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -431,7 +431,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_preamble_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -443,7 +443,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_preamble_val_off, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -467,7 +467,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_fec_codeword, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -479,7 +479,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_scrambler_seed, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -491,7 +491,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_max_burst, tvb, - pos, tlvlen, FALSE); + pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -503,7 +503,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_guard_time, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -515,7 +515,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_last_cw_len, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -527,7 +527,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_burst_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -548,7 +548,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_rs_int_depth, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -560,7 +560,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_rs_int_block, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -572,7 +572,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_preamble_type, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -584,7 +584,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_scdma_scrambler_onoff, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -596,7 +596,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_scdma_codes_per_subframe, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -608,7 +608,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_scdma_framer_int_step_size, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { @@ -620,7 +620,7 @@ static void { proto_tree_add_item (tlv_tree, hf_docsis_tcm_enabled, - tvb, pos, tlvlen, FALSE); + tvb, pos, tlvlen, ENC_BIG_ENDIAN); } else { diff --git a/plugins/docsis/packet-vendor.c b/plugins/docsis/packet-vendor.c index e53c25123f..635b0dce9b 100644 --- a/plugins/docsis/packet-vendor.c +++ b/plugins/docsis/packet-vendor.c @@ -120,7 +120,7 @@ dissect_vsif (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree) proto_tree_add_protocol_format (tree, proto_docsis_vsif, tvb, 0, -1, "VSIF Encodings"); vsif_tree = proto_item_add_subtree (it, ett_docsis_vsif); - proto_tree_add_item (vsif_tree, hf_docsis_vsif_vendorid, tvb, 2, 3, FALSE); + proto_tree_add_item (vsif_tree, hf_docsis_vsif_vendorid, tvb, 2, 3, ENC_BIG_ENDIAN); /* switch on the Vendor ID */ switch (value) @@ -169,7 +169,7 @@ dissect_cisco (tvbuff_t * tvb, proto_tree * tree, gint vsif_len) { case NUM_PHONES: proto_tree_add_item (tree, hf_docsis_vsif_cisco_numphones, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); break; case IP_PREC: ipprec_it = @@ -189,14 +189,14 @@ dissect_cisco (tvbuff_t * tvb, proto_tree * tree, gint vsif_len) THROW (ReportedBoundsError); proto_tree_add_item (ipprec_tree, hf_docsis_vsif_cisco_ipprec_val, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); break; case IP_PREC_BW: if (length != 4) THROW (ReportedBoundsError); proto_tree_add_item (ipprec_tree, hf_docsis_vsif_cisco_ipprec_bw, tvb, - pos, length, FALSE); + pos, length, ENC_BIG_ENDIAN); break; default: THROW (ReportedBoundsError); diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 962b5e2555..8173328e3c 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -412,21 +412,21 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_string(ams_tree, hf_ams_targetnetid, tvb, offset, AmsNetId_Len, szText); offset += AmsNetId_Len; - proto_tree_add_item(ams_tree, hf_ams_targetport, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_tree, hf_ams_targetport, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset += sizeof(guint16); NetIdFormater(tvb, offset, szText, nMax); proto_tree_add_string(ams_tree, hf_ams_sendernetid, tvb, offset, AmsNetId_Len, szText); offset += AmsNetId_Len; - proto_tree_add_item(ams_tree, hf_ams_senderport, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_tree, hf_ams_senderport, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset += sizeof(guint16); - proto_tree_add_item(ams_tree, hf_ams_cmdid, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_tree, hf_ams_cmdid, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); cmdId = tvb_get_letohs(tvb, offset); offset+=sizeof(guint16); - anItem = proto_tree_add_item(ams_tree, hf_ams_stateflags, tvb, offset, sizeof(guint16), TRUE); + anItem = proto_tree_add_item(ams_tree, hf_ams_stateflags, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); ams_statetree = proto_item_add_subtree(anItem, ett_ams_stateflags); proto_tree_add_item(ams_statetree, hf_ams_stateresponse,tvb, offset, sizeof(guint16), TRUE); proto_tree_add_item(ams_statetree, hf_ams_statenoreturn,tvb, offset, sizeof(guint16), TRUE); @@ -440,13 +440,13 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) stateflags = tvb_get_letohs(tvb, offset); offset+=sizeof(guint16); - proto_tree_add_item(ams_tree, hf_ams_cbdata, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_tree, hf_ams_cbdata, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_tree, hf_ams_errorcode, tvb, offset, sizeof(guint32),TRUE); + proto_tree_add_item(ams_tree, hf_ams_errorcode, tvb, offset, sizeof(guint32),ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_tree, hf_ams_invokeid, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_tree, hf_ams_invokeid, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); } else @@ -472,13 +472,13 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); } } @@ -494,13 +494,13 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsWriteReq_Len - sizeof(guint16) ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, 4, TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, 4, TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, 4, TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); @@ -518,16 +518,16 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadWriteReq_Len - sizeof(guint16)) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscbreadlength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscbreadlength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscbwritelength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscbwritelength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset+16, ams_length-offset, ENC_NA); @@ -545,7 +545,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadStateReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstaterequest); - proto_tree_add_item(ams_adstree, hf_ams_adsinvokeid, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsinvokeid, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -560,13 +560,13 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsWriteControlReq_Len - sizeof(guint16) ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, 2, TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); - proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, 2, TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); @@ -584,7 +584,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadDeviceInfoReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforequest); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -599,22 +599,22 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsAddDeviceNotificationReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexgroup, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsindexoffset, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adstransmode, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adstransmode, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsmaxdelay, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsmaxdelay, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscycletime, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscycletime, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); } } @@ -630,7 +630,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsDelDeviceNotificationReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -648,11 +648,11 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsDeviceNotificationReq_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdnrequest); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); /*cbLength = tvb_get_letohs(tvb, offset);*/ offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsnoteblocksstamps, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsnoteblocksstamps, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); /*nStamps = tvb_get_letohs(tvb, offset);*/ offset+=sizeof(guint32); @@ -678,10 +678,10 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadRes_Len - sizeof(guint16) ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); @@ -699,7 +699,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsWriteRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriteresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -714,10 +714,10 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadWriteRes_Len - sizeof(guint16) ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriteresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA); @@ -735,13 +735,13 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadStateRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstateresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsstate, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsdevicestate, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); } } } @@ -756,7 +756,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsWriteControlRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -771,12 +771,12 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsReadDeviceInfoRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforesponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsversionversion, tvb, offset++, sizeof(guint8), TRUE); - proto_tree_add_item(ams_adstree, hf_ams_adsversionrevision, tvb, offset++, sizeof(guint8), TRUE); - proto_tree_add_item(ams_adstree, hf_ams_adsversionbuild, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsversionversion, tvb, offset++, sizeof(guint8), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_adstree, hf_ams_adsversionrevision, tvb, offset++, sizeof(guint8), ENC_LITTLE_ENDIAN); + proto_tree_add_item(ams_adstree, hf_ams_adsversionbuild, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); proto_tree_add_item(ams_adstree, hf_ams_adsdevicename, tvb, offset, ams_length-offset, TRUE); @@ -794,10 +794,10 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsAddDeviceNotificationRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); offset+=sizeof(guint32); - proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsnotificationhandle, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } @@ -812,7 +812,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if( ams_length-offset >= TAdsDelDeviceNotificationRes_Len ) { ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnresponse); - proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), TRUE); + proto_tree_add_item(ams_adstree, hf_ams_adsresult, tvb, offset, sizeof(guint32), ENC_LITTLE_ENDIAN); } } } diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c index b0a5db99fa..48bf219f01 100644 --- a/plugins/ethercat/packet-ecatmb.c +++ b/plugins/ethercat/packet-ecatmb.c @@ -650,7 +650,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro switch ( sdo.anSdoHeaderUnion.Idq.Ccs ) { case SDO_CCS_INITIATE_DOWNLOAD: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsid, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsid, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoccs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoccs); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsid_sizeind, tvb, offset, 1, TRUE); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsid_expedited, tvb, offset, 1, TRUE); @@ -658,12 +658,12 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsid_size1, tvb, offset, 1, TRUE); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsid_complete, tvb, offset, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); if ( sdo.anSdoHeaderUnion.Idq.SizeInd && !sdo.anSdoHeaderUnion.Idq.Expedited ) { len = coe_length - ETHERCAT_COE_HEADER_LEN - ETHERCAT_SDO_HEADER_LEN; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, ENC_LITTLE_ENDIAN); offset+=ETHERCAT_SDO_HEADER_LEN; if ( len > 0 ) proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, len, ENC_NA); @@ -671,27 +671,27 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro else { if ( sdo.anSdoHeaderUnion.Idq.Size == 3 ) - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata1, tvb, offset+4, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata1, tvb, offset+4, 1, ENC_LITTLE_ENDIAN); else if ( sdo.anSdoHeaderUnion.Idq.Size == 2 ) - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata2, tvb, offset+4, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata2, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); else - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata, tvb, offset+4, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata, tvb, offset+4, 4, ENC_LITTLE_ENDIAN); } break; case SDO_CCS_INITIATE_UPLOAD: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsiu, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsiu, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoccs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoccs); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsid_complete, tvb, offset, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); break; case SDO_CCS_DOWNLOAD_SEGMENT: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsds, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsds, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoccs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoccs); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsds_lastseg, tvb, offset, 1, TRUE); - proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsds_size, tvb, offset, 1, TRUE); + proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsds_size, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsds_toggle, tvb, offset, 1, TRUE); offset+=1; @@ -702,12 +702,12 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } break; case SDO_CCS_UPLOAD_SEGMENT: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsus, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoccsus, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoccs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoccs); proto_tree_add_item(ecat_coe_sdoccs_tree, hf_ecat_mailbox_coe_sdoccsus_toggle, tvb, offset, 1, TRUE); break; case SDO_CCS_ABORT_TRANSFER: - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+4, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+4, 4, ENC_LITTLE_ENDIAN); break; } } @@ -737,11 +737,11 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro switch ( sdo.anSdoHeaderUnion.Ids.Scs ) { case SDO_SCS_INITIATE_DOWNLOAD: - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); break; case SDO_SCS_INITIATE_UPLOAD: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsiu, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsiu, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoscs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoscs); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsiu_sizeind, tvb, offset, 1, TRUE); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsiu_expedited, tvb, offset, 1, TRUE); @@ -749,33 +749,33 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsiu_size1, tvb, offset, 1, TRUE); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsiu_complete, tvb, offset, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoidx, tvb, offset+1, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdosub, tvb, offset+3, 1, ENC_LITTLE_ENDIAN); if ( sdo.anSdoHeaderUnion.Ius.SizeInd && !sdo.anSdoHeaderUnion.Ius.Expedited ) { len = coe_length - ETHERCAT_COE_HEADER_LEN - ETHERCAT_SDO_HEADER_LEN; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, ENC_LITTLE_ENDIAN); offset+=ETHERCAT_SDO_HEADER_LEN; if ( len > 0 ) proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, len, ENC_NA); } else if ( sdo.anSdoHeaderUnion.Ius.SizeInd && sdo.anSdoHeaderUnion.Ius.Expedited && sdo.anSdoHeaderUnion.Ius.Size == 3 ) - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata1, tvb, offset+4, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata1, tvb, offset+4, 1, ENC_LITTLE_ENDIAN); else if ( sdo.anSdoHeaderUnion.Ius.SizeInd && sdo.anSdoHeaderUnion.Ius.Expedited && sdo.anSdoHeaderUnion.Ius.Size == 2 ) - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata2, tvb, offset+4, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata2, tvb, offset+4, 2, ENC_LITTLE_ENDIAN); else - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata, tvb, offset+4, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdodata, tvb, offset+4, 4, ENC_LITTLE_ENDIAN); break; case SDO_SCS_DOWNLOAD_SEGMENT: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsds, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsds, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoscs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoscs); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsds_toggle, tvb, offset, 1, TRUE); break; case SDO_SCS_UPLOAD_SEGMENT: - anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsus, tvb, offset, 1, TRUE); + anItem = proto_tree_add_item(ecat_sdo_tree, hf_ecat_mailbox_coe_sdoscsus, tvb, offset, 1, ENC_LITTLE_ENDIAN); ecat_coe_sdoscs_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_coe_sdoscs); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsus_lastseg, tvb, offset, 1, TRUE); - proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsus_bytes, tvb, offset, 1, TRUE); + proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsus_bytes, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_coe_sdoscs_tree, hf_ecat_mailbox_coe_sdoscsus_toggle, tvb, offset, 1, TRUE); offset+=1; @@ -807,75 +807,75 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro if( tree ) { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoopcode, tvb, offset++, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoopcode, tvb, offset++, 1, ENC_LITTLE_ENDIAN); offset++; /*Reserved*/ - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfofrag, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfofrag, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; switch ( info.anSdoControlUnion.v.OpCode ) { case ECAT_COE_INFO_OPCODE_LIST_Q: { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolisttype, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolisttype, tvb, offset, 2, ENC_LITTLE_ENDIAN); } break; case ECAT_COE_INFO_OPCODE_LIST_S: { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolisttype, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolisttype, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolist, tvb, offset, coe_length-offset, ENC_NA); } break; case ECAT_COE_INFO_OPCODE_OBJ_Q: - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case ECAT_COE_INFO_OPCODE_OBJ_S: { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodatatype, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodatatype, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfomaxsub, tvb, offset++, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoobjcode, tvb, offset++, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfomaxsub, tvb, offset++, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoobjcode, tvb, offset++, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoname, tvb, offset, coe_length-offset, TRUE); } break; case ECAT_COE_INFO_OPCODE_ENTRY_Q: { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfosubindex, tvb, offset++, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfovalueinfo, tvb, offset, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfosubindex, tvb, offset++, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfovalueinfo, tvb, offset, 1, ENC_LITTLE_ENDIAN); } break; case ECAT_COE_INFO_OPCODE_ENTRY_S: { guint16 objlen; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoindex, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfosubindex, tvb, offset++, 1, TRUE); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfovalueinfo, tvb, offset++, 1, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfosubindex, tvb, offset++, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfovalueinfo, tvb, offset++, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodatatype, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodatatype, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfobitlen, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfobitlen, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoobjaccess, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoobjaccess, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; if ( (info.anSdoInfoUnion.Entry.ValueInfo & 0x08) != 0 ) { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfounittype, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfounittype, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; } if ( (info.anSdoInfoUnion.Entry.ValueInfo & 0x10) != 0 ) @@ -901,7 +901,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro break; case ECAT_COE_INFO_OPCODE_ERROR_S: { - proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoerrorcode, tvb, offset, 4, TRUE); + proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoerrorcode, tvb, offset, 4, ENC_LITTLE_ENDIAN); } break; } @@ -948,13 +948,13 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro proto_item_set_text(anItem, "%s", szText); ecat_soe_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_soe); - anItem = proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_header, tvb, offset , 2, TRUE); + anItem = proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_header, tvb, offset , 2, ENC_LITTLE_ENDIAN); ecat_soeflag_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_soeflag); - proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_opcode, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_opcode, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_incomplete, tvb, offset, 2, TRUE); proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_error, tvb, offset, 2, TRUE); - proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_driveno, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_driveno, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_datastate, tvb, offset, 2, TRUE); proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_name, tvb, offset, 2, TRUE); proto_tree_add_item(ecat_soeflag_tree, hf_ecat_mailbox_soe_header_attribute, tvb, offset, 2, TRUE); @@ -973,12 +973,12 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro { case ECAT_SOE_OPCODE_RRQ: case ECAT_SOE_OPCODE_WRS: - proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case ECAT_SOE_OPCODE_RRS: case ECAT_SOE_OPCODE_WRQ: case ECAT_SOE_OPCODE_NFC: - proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, ENC_NA); break; @@ -986,7 +986,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_frag, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_frag, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, ENC_NA); @@ -994,8 +994,8 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro } else { - proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, TRUE); - proto_tree_add_item(tree, hf_ecat_mailbox_soe_error, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_ecat_mailbox_soe_error, tvb, offset, 2, ENC_LITTLE_ENDIAN); } } } @@ -1089,12 +1089,12 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro if ( eoe.anEoeHeaderInfoUnion.v.TimeStampAppended ) { - proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_timestamp, tvb, eoe_length-ETHERCAT_EOE_TIMESTAMP_LEN, ETHERCAT_EOE_TIMESTAMP_LEN, TRUE); + proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_timestamp, tvb, eoe_length-ETHERCAT_EOE_TIMESTAMP_LEN, ETHERCAT_EOE_TIMESTAMP_LEN, ENC_LITTLE_ENDIAN); } break; case EOE_TYPE_TIMESTAMP_RES: - proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_timestamp, tvb, offset+ETHERCAT_EOE_HEADER_LEN, ETHERCAT_EOE_TIMESTAMP_LEN, TRUE); + proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_timestamp, tvb, offset+ETHERCAT_EOE_HEADER_LEN, ETHERCAT_EOE_TIMESTAMP_LEN, ENC_LITTLE_ENDIAN); break; case EOE_TYPE_INIT_REQ: @@ -1144,8 +1144,8 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro proto_tree *ecat_eoe_macfilter_filtermask_tree; ecat_eoe_macfilter_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_macfilter); - proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_macfiltercount, tvb, offset, 4, TRUE); - proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_maskcount, tvb, offset, 4, TRUE); + proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_macfiltercount, tvb, offset, 4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_maskcount, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_nobroadcasts, tvb, offset, 4, TRUE); options.Options = tvb_get_letohs(tvb, offset); offset+=4; @@ -1212,14 +1212,14 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro init_foe_header(&foe, tvb, offset); ecat_foe_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_foe); - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_opmode, tvb, offset++, 1, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_opmode, tvb, offset++, 1, ENC_LITTLE_ENDIAN); offset++; /*Reserved1;*/ switch (foe.OpMode) { case ECAT_FOE_OPMODE_RRQ: case ECAT_FOE_OPMODE_WRQ: - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_filelength, tvb, offset, 4, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_filelength, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_filename, tvb, offset, foe_length-offset, TRUE); @@ -1227,7 +1227,7 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro case ECAT_FOE_OPMODE_DATA: { - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_packetno, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_packetno, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=4; /*+2 for Reserved2*/ proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_data, tvb, offset, foe_length-offset, ENC_NA); @@ -1236,16 +1236,16 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro { anItem = proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_efw, tvb, offset, foe_length-offset, ENC_NA); ecat_foe_efw_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_foe_efw); - proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_cmd, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_cmd, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_size, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_size, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_addresslw, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_addresslw, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_addresshw, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_addresshw, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_data, tvb, offset, foe_length-offset, ENC_NA); @@ -1254,21 +1254,21 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro break; case ECAT_FOE_OPMODE_ACK: - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_packetno, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_packetno, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; case ECAT_FOE_OPMODE_ERR: - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_errcode, tvb, offset, 4, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_errcode, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset+=4; proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_errtext, tvb, offset, foe_length-offset, TRUE); break; case ECAT_FOE_OPMODE_BUSY: - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_busydone, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_busydone, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_busyentire, tvb, offset, 2, TRUE); + proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_busyentire, tvb, offset, 2, ENC_LITTLE_ENDIAN); break; } } @@ -1313,11 +1313,11 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ecat_mailbox_header_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_header); /* Add length information to the mailbox header */ - proto_tree_add_item(ecat_mailbox_header_tree, hf_ecat_mailboxlength, tvb, offset, sizeof(hdr.Length), TRUE); + proto_tree_add_item(ecat_mailbox_header_tree, hf_ecat_mailboxlength, tvb, offset, sizeof(hdr.Length), ENC_LITTLE_ENDIAN); offset+=sizeof(hdr.Length); /* Add address information to the mailbox header */ - proto_tree_add_item(ecat_mailbox_header_tree, hf_ecat_mailboxaddress, tvb, offset, sizeof(hdr.Address), TRUE); + proto_tree_add_item(ecat_mailbox_header_tree, hf_ecat_mailboxaddress, tvb, offset, sizeof(hdr.Address), ENC_LITTLE_ENDIAN); offset+=sizeof(hdr.Address); /* Add priority information to the mailbox header */ diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index 716d6575ee..1a0f97efcf 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -201,7 +201,7 @@ dissect_esl_header(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { proto_tree_add_item(esl_header_tree, hf_esl_alignerror, tvb, offset, 2, TRUE); offset+=2; - proto_tree_add_item(esl_header_tree, hf_esl_timestamp, tvb, offset, 8, TRUE); + proto_tree_add_item(esl_header_tree, hf_esl_timestamp, tvb, offset, 8, ENC_LITTLE_ENDIAN); } } } diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index 1a934782a4..970272d0eb 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -550,7 +550,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree ecat_header_tree = proto_item_add_subtree(aitem, ett_ecat_header); EcCmdFormatter(ecHdr.cmd, szText, nMax); - aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_cmd, tvb, suboffset, sizeof(ecHdr.cmd), TRUE); + aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_cmd, tvb, suboffset, sizeof(ecHdr.cmd), ENC_LITTLE_ENDIAN); proto_item_set_text(aitem, "%s", szText); if( subCount < 10 ){ aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_sub_cmd[subCount], tvb, suboffset, sizeof(ecHdr.cmd), TRUE); @@ -559,7 +559,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree suboffset+= sizeof(ecHdr.cmd); - proto_tree_add_item(ecat_header_tree, hf_ecat_idx, tvb, suboffset, sizeof(ecHdr.idx), TRUE); + proto_tree_add_item(ecat_header_tree, hf_ecat_idx, tvb, suboffset, sizeof(ecHdr.idx), ENC_LITTLE_ENDIAN); if( subCount < 10 ){ aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_sub_idx[subCount], tvb, suboffset, sizeof(ecHdr.idx), TRUE); PROTO_ITEM_SET_HIDDEN(aitem); @@ -571,7 +571,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree case 10: case 11: case 12: - proto_tree_add_item(ecat_header_tree, hf_ecat_lad, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp)+sizeof(ecHdr.anAddrUnion.a.ado), TRUE); + proto_tree_add_item(ecat_header_tree, hf_ecat_lad, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp)+sizeof(ecHdr.anAddrUnion.a.ado), ENC_LITTLE_ENDIAN); if( subCount < 10 ){ aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_sub_lad[subCount], tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp)+sizeof(ecHdr.anAddrUnion.a.ado), TRUE); PROTO_ITEM_SET_HIDDEN(aitem); @@ -580,14 +580,14 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree suboffset += (sizeof(ecHdr.anAddrUnion.a.adp)+sizeof(ecHdr.anAddrUnion.a.ado)); break; default: - proto_tree_add_item(ecat_header_tree, hf_ecat_adp, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp), TRUE); + proto_tree_add_item(ecat_header_tree, hf_ecat_adp, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp), ENC_LITTLE_ENDIAN); if( subCount < 10 ){ aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_sub_adp[subCount], tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.adp), TRUE); PROTO_ITEM_SET_HIDDEN(aitem); } suboffset+= sizeof(ecHdr.anAddrUnion.a.adp); - proto_tree_add_item(ecat_header_tree, hf_ecat_ado, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.ado), TRUE); + proto_tree_add_item(ecat_header_tree, hf_ecat_ado, tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.ado), ENC_LITTLE_ENDIAN); if( subCount < 10 ){ aitem = proto_tree_add_item(ecat_header_tree, hf_ecat_sub_ado[subCount], tvb, suboffset, sizeof(ecHdr.anAddrUnion.a.ado), TRUE); PROTO_ITEM_SET_HIDDEN(aitem); @@ -606,15 +606,15 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree len, len, ecHdr.len & 0x4000 ? "Roundtrip" : "No Roundtrip", ecHdr.len & 0x8000 ? "More Follows..." : "Last Sub Command"); length_sub_tree = proto_item_add_subtree(aitem, ett_ecat_length); - proto_tree_add_item(length_sub_tree, hf_ecat_length_len, tvb, suboffset, sizeof(ecHdr.len), TRUE); - proto_tree_add_item(length_sub_tree, hf_ecat_length_r, tvb, suboffset, sizeof(ecHdr.len), TRUE); - proto_tree_add_item(length_sub_tree, hf_ecat_length_c, tvb, suboffset, sizeof(ecHdr.len), TRUE); - proto_tree_add_item(length_sub_tree, hf_ecat_length_m, tvb, suboffset, sizeof(ecHdr.len), TRUE); + proto_tree_add_item(length_sub_tree, hf_ecat_length_len, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); + proto_tree_add_item(length_sub_tree, hf_ecat_length_r, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); + proto_tree_add_item(length_sub_tree, hf_ecat_length_c, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); + proto_tree_add_item(length_sub_tree, hf_ecat_length_m, tvb, suboffset, sizeof(ecHdr.len), ENC_LITTLE_ENDIAN); suboffset+= sizeof(ecHdr.len); } - proto_tree_add_item(ecat_header_tree, hf_ecat_int, tvb, suboffset, sizeof(ecHdr.intr), TRUE); + proto_tree_add_item(ecat_header_tree, hf_ecat_int, tvb, suboffset, sizeof(ecHdr.intr), ENC_LITTLE_ENDIAN); suboffset+= sizeof(ecHdr.intr); } else @@ -634,25 +634,25 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree ecat_fmmu_tree = proto_item_add_subtree(aitem, ett_ecat_fmmu); - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lstart, tvb, suboffset, 4, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lstart, tvb, suboffset, 4, ENC_LITTLE_ENDIAN); suboffset += 4; - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_llen, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_llen, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset += 2; - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lstartbit, tvb, suboffset, 1, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lstartbit, tvb, suboffset, 1, ENC_LITTLE_ENDIAN); suboffset += 1; - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lendbit, tvb, suboffset, 1, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_lendbit, tvb, suboffset, 1, ENC_LITTLE_ENDIAN); suboffset += 1; - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_pstart, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_pstart, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset += 2; - proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_pstartbit, tvb, suboffset, 1, TRUE); + proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_pstartbit, tvb, suboffset, 1, ENC_LITTLE_ENDIAN); suboffset += 1; - aitem = proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_type, tvb, suboffset, 1, TRUE); + aitem = proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_type, tvb, suboffset, 1, ENC_LITTLE_ENDIAN); ecat_fmmu_type_tree = proto_item_add_subtree(aitem, ett_ecat_fmmu_type); proto_tree_add_item(ecat_fmmu_type_tree, hf_ecat_fmmu_typeread, tvb, suboffset, 1, TRUE); proto_tree_add_item(ecat_fmmu_type_tree, hf_ecat_fmmu_typewrite, tvb, suboffset, 1, TRUE); suboffset += 1; - aitem = proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_active, tvb, suboffset, 1, TRUE); + aitem = proto_tree_add_item(ecat_fmmu_tree, hf_ecat_fmmu_active, tvb, suboffset, 1, ENC_LITTLE_ENDIAN); ecat_fmmu_active_tree = proto_item_add_subtree(aitem, ett_ecat_fmmu_active); proto_tree_add_item(ecat_fmmu_active_tree, hf_ecat_fmmu_active0, tvb, suboffset, 1, TRUE); @@ -667,12 +667,12 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_item_set_text(aitem, "SyncManager"); ecat_syncman_tree = proto_item_add_subtree(aitem, ett_ecat_syncman); - proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_start, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_start, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset+=2; - proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_len, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_len, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset+=2; - aitem = proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_flags, tvb, suboffset, 4, TRUE); + aitem = proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_flags, tvb, suboffset, 4, ENC_LITTLE_ENDIAN); ecat_syncflag_tree = proto_item_add_subtree(aitem, ett_ecat_syncflag); proto_tree_add_item(ecat_syncflag_tree, hf_ecat_syncman_flag0, tvb, suboffset, 4, TRUE); proto_tree_add_item(ecat_syncflag_tree, hf_ecat_syncman_flag1, tvb, suboffset, 4, TRUE); @@ -702,12 +702,12 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree proto_item_set_text(aitem, "SyncManager"); ecat_syncman_tree = proto_item_add_subtree(aitem, ett_ecat_syncman); - proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_start, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_start, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset+=2; - proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_len, tvb, suboffset, 2, TRUE); + proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_len, tvb, suboffset, 2, ENC_LITTLE_ENDIAN); suboffset+=2; - aitem = proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_flags, tvb, suboffset, 4, TRUE); + aitem = proto_tree_add_item(ecat_syncman_tree, hf_ecat_syncman_flags, tvb, suboffset, 4, ENC_LITTLE_ENDIAN); ecat_syncflag_tree = proto_item_add_subtree(aitem, ett_ecat_syncflag); proto_tree_add_item(ecat_syncflag_tree, hf_ecat_syncman_flag0, tvb, suboffset, 4, TRUE); proto_tree_add_item(ecat_syncflag_tree, hf_ecat_syncman_flag1, tvb, suboffset, 4, TRUE); diff --git a/plugins/ethercat/packet-ethercat-frame.c b/plugins/ethercat/packet-ethercat-frame.c index ba0669e394..5db87a90ff 100644 --- a/plugins/ethercat/packet-ethercat-frame.c +++ b/plugins/ethercat/packet-ethercat-frame.c @@ -83,9 +83,9 @@ static void dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree ti = proto_tree_add_item(tree, proto_ethercat_frame, tvb, offset, EtherCATFrameParserHDR_Len, TRUE); ethercat_frame_tree = proto_item_add_subtree(ti, ett_ethercat_frame); - proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_length, tvb, offset, EtherCATFrameParserHDR_Len, TRUE); - proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_reserved, tvb, offset, EtherCATFrameParserHDR_Len, TRUE); - proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_type, tvb, offset, EtherCATFrameParserHDR_Len, TRUE); + proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_length, tvb, offset, EtherCATFrameParserHDR_Len, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_reserved, tvb, offset, EtherCATFrameParserHDR_Len, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ethercat_frame_tree, hf_ethercat_frame_type, tvb, offset, EtherCATFrameParserHDR_Len, ENC_LITTLE_ENDIAN); } hdr.hdr = tvb_get_letohs(tvb, offset); offset = EtherCATFrameParserHDR_Len; diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 5f8581439c..7490b7e7a8 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -126,11 +126,11 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_set_text(ti, "%s", szText); offset+=(sizeof(guint8)*6); - proto_tree_add_item(nv_header_tree, hf_nv_count, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_header_tree, hf_nv_count, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); nv_count = tvb_get_letohs(tvb, offset); offset+=sizeof(guint16); - proto_tree_add_item(nv_header_tree, hf_nv_cycleindex, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_header_tree, hf_nv_cycleindex, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset = NvParserHDR_Len; for ( i=0; i < nv_count; i++ ) @@ -145,16 +145,16 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(nv_var_tree, hf_nv_varheader, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len, ENC_NA); nv_varheader_tree = proto_item_add_subtree(ti, ett_nv_varheader); - proto_tree_add_item(nv_varheader_tree, hf_nv_id, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_varheader_tree, hf_nv_id, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); - proto_tree_add_item(nv_varheader_tree, hf_nv_hash, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_varheader_tree, hf_nv_hash, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); - proto_tree_add_item(nv_varheader_tree, hf_nv_length, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_varheader_tree, hf_nv_length, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); - proto_tree_add_item(nv_varheader_tree, hf_nv_quality, tvb, offset, sizeof(guint16), TRUE); + proto_tree_add_item(nv_varheader_tree, hf_nv_quality, tvb, offset, sizeof(guint16), ENC_LITTLE_ENDIAN); offset+=sizeof(guint16); proto_tree_add_item(nv_var_tree, hf_nv_data, tvb, offset, var_length, ENC_NA); diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index 91b4dc5de6..8615e5be43 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -198,7 +198,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ti = proto_tree_add_item(tree, hf_control, tvb, 0, clen + 1, ENC_NA); ctrl_tree = proto_item_add_subtree(ti, ett_ircomm_ctrl); - proto_tree_add_item(ctrl_tree, hf_control_len, tvb, offset, 1, FALSE); + proto_tree_add_item(ctrl_tree, hf_control_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; { tvbuff_t *cvalue = tvb_new_subset(tvb, offset, clen, clen); diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 6198508200..569baff1a0 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -434,11 +434,11 @@ unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset) guint8 len = tvb_get_guint8(tvb, offset + 1); if (tree) - proto_tree_add_item(tree, hf_param_pi, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_param_pi, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (tree) - proto_tree_add_item(tree, hf_param_pl, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_param_pl, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (len > 0) @@ -616,11 +616,11 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r proto_tree* ctl_tree; - ti = proto_tree_add_item(tree, hf_iap_ctl, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_iap_ctl, tvb, offset, 1, ENC_BIG_ENDIAN); ctl_tree = proto_item_add_subtree(ti, ett_iap_ctl); proto_tree_add_item(ctl_tree, hf_iap_ctl_lst, tvb, offset, 1, FALSE); proto_tree_add_item(ctl_tree, hf_iap_ctl_ack, tvb, offset, 1, FALSE); - proto_tree_add_item(ctl_tree, hf_iap_ctl_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(ctl_tree, hf_iap_ctl_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (op) @@ -764,14 +764,14 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro proto_tree* entry_tree; - ti = proto_tree_add_item(tree, hf_iap_ctl, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_iap_ctl, tvb, offset, 1, ENC_BIG_ENDIAN); ctl_tree = proto_item_add_subtree(ti, ett_iap_ctl); proto_tree_add_item(ctl_tree, hf_iap_ctl_lst, tvb, offset, 1, FALSE); proto_tree_add_item(ctl_tree, hf_iap_ctl_ack, tvb, offset, 1, FALSE); - proto_tree_add_item(ctl_tree, hf_iap_ctl_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(ctl_tree, hf_iap_ctl_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_iap_return, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_iap_return, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (op) @@ -781,7 +781,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro { list_len = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(tree, hf_iap_list_len, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_iap_list_len, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; while ((offset < len) && (n < list_len)) @@ -809,10 +809,10 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro proto_item_append_text(ti, "%d", n + 1); entry_tree = proto_item_add_subtree(ti, ett_iap_entry[n]); - proto_tree_add_item(entry_tree, hf_iap_obj_id, tvb, offset, 2, FALSE); + proto_tree_add_item(entry_tree, hf_iap_obj_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(entry_tree, hf_iap_attr_type, tvb, offset, 1, FALSE); + proto_tree_add_item(entry_tree, hf_iap_attr_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (type) @@ -821,11 +821,11 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro if (!iap_conv || !iap_conv->pattr_dissector || !iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree, n, type)) - proto_tree_add_item(entry_tree, hf_iap_int, tvb, offset, 4, FALSE); + proto_tree_add_item(entry_tree, hf_iap_int, tvb, offset, 4, ENC_BIG_ENDIAN); break; case IAS_OCT_SEQ: - proto_tree_add_item(entry_tree, hf_iap_seq_len, tvb, offset, 2, FALSE); + proto_tree_add_item(entry_tree, hf_iap_seq_len, tvb, offset, 2, ENC_BIG_ENDIAN); if (!iap_conv || !iap_conv->pattr_dissector || !iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree, n, type)) @@ -834,7 +834,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro break; case IAS_STRING: - proto_tree_add_item(entry_tree, hf_iap_char_set, tvb, offset, 1, FALSE); + proto_tree_add_item(entry_tree, hf_iap_char_set, tvb, offset, 1, ENC_BIG_ENDIAN); if (!iap_conv || !iap_conv->pattr_dissector || !iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree, n, type)) @@ -1077,21 +1077,21 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) proto_tree* src_tree; - ti = proto_tree_add_item(tree, hf_lmp_dst, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_lmp_dst, tvb, offset, 1, ENC_BIG_ENDIAN); dst_tree = proto_item_add_subtree(ti, ett_lmp_dst); proto_tree_add_item(dst_tree, hf_lmp_dst_control, tvb, offset, 1, FALSE); proto_tree_add_item(dst_tree, hf_lmp_dst_lsap, tvb, offset, 1, FALSE); offset++; - ti = proto_tree_add_item(tree, hf_lmp_src, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_lmp_src, tvb, offset, 1, ENC_BIG_ENDIAN); src_tree = proto_item_add_subtree(ti, ett_lmp_src); - proto_tree_add_item(src_tree, hf_lmp_src_r, tvb, offset, 1, FALSE); + proto_tree_add_item(src_tree, hf_lmp_src_r, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(src_tree, hf_lmp_src_lsap, tvb, offset, 1, FALSE); offset++; if (cbit != 0) { - proto_tree_add_item(tree, hf_lmp_opcode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_opcode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (opcode) @@ -1100,29 +1100,29 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) case CONNECT_CNF: if (offset < tvb_length(tvb)) { - proto_tree_add_item(tree, hf_lmp_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; } break; case DISCONNECT: - proto_tree_add_item(tree, hf_lmp_reason, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_reason, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case ACCESSMODE_CMD: - proto_tree_add_item(tree, hf_lmp_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_lmp_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; case ACCESSMODE_CNF: - proto_tree_add_item( tree, hf_lmp_status, tvb, offset, 1, FALSE); + proto_tree_add_item( tree, hf_lmp_status, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(tree, hf_lmp_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_lmp_mode, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; break; } @@ -1476,7 +1476,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro ti = proto_tree_add_item(lap_tree, hf_lap_i, tvb, offset, -1, ENC_NA); i_tree = proto_item_add_subtree(ti, ett_lap_i); - proto_tree_add_item(i_tree, hf_xid_ident, tvb, offset, 1, FALSE); + proto_tree_add_item(i_tree, hf_xid_ident, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; @@ -1494,9 +1494,9 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro if (lap_tree) { - ti = proto_tree_add_item(i_tree, hf_xid_flags, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(i_tree, hf_xid_flags, tvb, offset, 1, ENC_BIG_ENDIAN); flags_tree = proto_item_add_subtree(ti, ett_xid_flags); - proto_tree_add_item(flags_tree, hf_xid_s, tvb, offset, 1, FALSE); + proto_tree_add_item(flags_tree, hf_xid_s, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(flags_tree, hf_xid_conflict, tvb, offset, 1, FALSE); } offset++; @@ -1518,7 +1518,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro offset++; if (lap_tree) - proto_tree_add_item(i_tree, hf_xid_version, tvb, offset, 1, FALSE); + proto_tree_add_item(i_tree, hf_xid_version, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (lap_tree) @@ -1731,7 +1731,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) tree = proto_item_add_subtree(ti, ett_irlap); /* create subtree for the address field */ - ti = proto_tree_add_item(tree, hf_lap_a, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tree, hf_lap_a, tvb, offset, 1, ENC_BIG_ENDIAN); a_tree = proto_item_add_subtree(ti, ett_lap_a); proto_tree_add_item(a_tree, hf_lap_a_cr, tvb, offset, 1, FALSE); addr_item = proto_tree_add_item(a_tree, hf_lap_a_address, tvb, offset, 1, FALSE); diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c index 39f04f9ecc..c23819ca0e 100644 --- a/plugins/irda/packet-sir.c +++ b/plugins/irda/packet-sir.c @@ -160,12 +160,12 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) proto_tree_add_item(tree, hf_sir_preamble, tvb, offset, preamble_len, ENC_NA); proto_tree_add_item(tree, hf_sir_bof, tvb, - bof_offset, 1, FALSE); + bof_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_uint(tree, hf_sir_length, next_tvb, 0, data_len, data_len); next_tvb = checksum_data(next_tvb, tree); proto_tree_add_item(tree, hf_sir_eof, tvb, - eof_offset, 1, FALSE); + eof_offset, 1, ENC_BIG_ENDIAN); } else { next_tvb = checksum_data(next_tvb, NULL); } diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 48caf30cac..98feea3147 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -200,10 +200,10 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ proto_item_append_text(m2m_item, " (%u bytes)", length); /* display the sequence number */ - proto_tree_add_item(m2m_tree, hf_m2m_sequence_number, tvb, offset, 2, FALSE); + proto_tree_add_item(m2m_tree, hf_m2m_sequence_number, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* display the TLV count */ - proto_tree_add_item(m2m_tree, hf_m2m_tlv_count, tvb, offset, 2, FALSE); + proto_tree_add_item(m2m_tree, hf_m2m_tlv_count, tvb, offset, 2, ENC_BIG_ENDIAN); tlv_count = tvb_get_ntohs(tvb, offset); offset += 2; /* parses the TLVs within current packet */ @@ -290,7 +290,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* get the frame number */ frame_number = tvb_get_ntoh24( tvb, offset ); /* add the description */ - proto_tree_add_item(tlv_tree, hf_m2m_frame_number, tvb, offset, 3, FALSE); + proto_tree_add_item(tlv_tree, hf_m2m_frame_number, tvb, offset, 3, ENC_BIG_ENDIAN); proto_item_append_text(ti, ": %d", frame_number); break; @@ -532,22 +532,22 @@ void proto_tree_add_tlv(tlv_info_t *this, tvbuff_t *tvb, guint offset, packet_in } tlv_offset = offset; /* display TLV type */ - proto_tree_add_item(tree, hf_m2m_type, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tree, hf_m2m_type, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); tlv_offset++; /* check the TLV length type */ if( this->length_type ) { /* multiple bytes TLV length */ /* display the length of the TLV length with MSB */ - proto_tree_add_item(tree, hf_m2m_len_size, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tree, hf_m2m_len_size, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); tlv_offset++; if(this->size_of_length) /* display the multiple byte TLV length */ - proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, this->size_of_length, FALSE); + proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, this->size_of_length, ENC_BIG_ENDIAN); else return; } else /* display the single byte TLV length */ - proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); tlv_type = get_tlv_type(this); /* Display Frame Number as special case for filter */ diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c index 5d08b633d0..803a027ffa 100644 --- a/plugins/opcua/opcua_application_layer.c +++ b/plugins/opcua/opcua_application_layer.c @@ -79,28 +79,28 @@ int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) guint32 Numeric = 0; EncodingMask = tvb_get_guint8(tvb, iOffset); - proto_tree_add_item(tree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE); + proto_tree_add_item(tree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset++; switch(EncodingMask) { case 0x00: /* two byte node id */ Numeric = tvb_get_guint8(tvb, iOffset); - proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 1, TRUE); + proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; break; case 0x01: /* four byte node id */ - proto_tree_add_item(tree, hf_opcua_app_nsid, tvb, iOffset, 1, TRUE); + proto_tree_add_item(tree, hf_opcua_app_nsid, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; Numeric = tvb_get_letohs(tvb, iOffset); - proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 2, TRUE); + proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; break; case 0x02: /* numeric, that does not fit into four bytes */ - proto_tree_add_item(tree, hf_opcua_app_nsid, tvb, iOffset, 4, TRUE); + proto_tree_add_item(tree, hf_opcua_app_nsid, tvb, iOffset, 4, ENC_LITTLE_ENDIAN); iOffset+=4; Numeric = tvb_get_letohl(tvb, iOffset); - proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 4, TRUE); + proto_tree_add_item(tree, hf_opcua_app_numeric, tvb, iOffset, 4, ENC_LITTLE_ENDIAN); iOffset+=4; break; case 0x03: /* string */ diff --git a/plugins/opcua/opcua_enumparser.c b/plugins/opcua/opcua_enumparser.c index 1597629a87..6af58029e0 100644 --- a/plugins/opcua/opcua_enumparser.c +++ b/plugins/opcua/opcua_enumparser.c @@ -45,7 +45,7 @@ static int hf_opcua_NodeIdType = -1; void parseNodeIdType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_NodeIdType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_NodeIdType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** DialogConditionChoice enum table */ static const value_string g_DialogConditionChoiceTable[] = { @@ -61,7 +61,7 @@ static int hf_opcua_DialogConditionChoice = -1; void parseDialogConditionChoice(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_DialogConditionChoice, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_DialogConditionChoice, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** IdType enum table */ static const value_string g_IdTypeTable[] = { @@ -75,7 +75,7 @@ static int hf_opcua_IdType = -1; void parseIdType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_IdType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_IdType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** NodeClass enum table */ static const value_string g_NodeClassTable[] = { @@ -94,7 +94,7 @@ static int hf_opcua_NodeClass = -1; void parseNodeClass(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_NodeClass, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_NodeClass, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** MessageSecurityMode enum table */ static const value_string g_MessageSecurityModeTable[] = { @@ -108,7 +108,7 @@ static int hf_opcua_MessageSecurityMode = -1; void parseMessageSecurityMode(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_MessageSecurityMode, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_MessageSecurityMode, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** UserTokenType enum table */ static const value_string g_UserTokenTypeTable[] = { @@ -122,7 +122,7 @@ static int hf_opcua_UserTokenType = -1; void parseUserTokenType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_UserTokenType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_UserTokenType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** ApplicationType enum table */ static const value_string g_ApplicationTypeTable[] = { @@ -136,7 +136,7 @@ static int hf_opcua_ApplicationType = -1; void parseApplicationType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_ApplicationType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_ApplicationType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** SecurityTokenRequestType enum table */ static const value_string g_SecurityTokenRequestTypeTable[] = { @@ -148,7 +148,7 @@ static int hf_opcua_SecurityTokenRequestType = -1; void parseSecurityTokenRequestType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_SecurityTokenRequestType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_SecurityTokenRequestType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** ComplianceLevel enum table */ static const value_string g_ComplianceLevelTable[] = { @@ -162,7 +162,7 @@ static int hf_opcua_ComplianceLevel = -1; void parseComplianceLevel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_ComplianceLevel, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_ComplianceLevel, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** AttributeWriteMask enum table */ static const value_string g_AttributeWriteMaskTable[] = { @@ -195,7 +195,7 @@ static int hf_opcua_AttributeWriteMask = -1; void parseAttributeWriteMask(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_AttributeWriteMask, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_AttributeWriteMask, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** NodeAttributesMask enum table */ static const value_string g_NodeAttributesMaskTable[] = { @@ -234,7 +234,7 @@ static int hf_opcua_NodeAttributesMask = -1; void parseNodeAttributesMask(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_NodeAttributesMask, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_NodeAttributesMask, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** EnumeratedTestType enum table */ static const value_string g_EnumeratedTestTypeTable[] = { @@ -247,7 +247,7 @@ static int hf_opcua_EnumeratedTestType = -1; void parseEnumeratedTestType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_EnumeratedTestType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_EnumeratedTestType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** BrowseDirection enum table */ static const value_string g_BrowseDirectionTable[] = { @@ -260,7 +260,7 @@ static int hf_opcua_BrowseDirection = -1; void parseBrowseDirection(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_BrowseDirection, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_BrowseDirection, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** BrowseResultMask enum table */ static const value_string g_BrowseResultMaskTable[] = { @@ -280,7 +280,7 @@ static int hf_opcua_BrowseResultMask = -1; void parseBrowseResultMask(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_BrowseResultMask, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_BrowseResultMask, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** FilterOperator enum table */ static const value_string g_FilterOperatorTable[] = { @@ -308,7 +308,7 @@ static int hf_opcua_FilterOperator = -1; void parseFilterOperator(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_FilterOperator, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_FilterOperator, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** TimestampsToReturn enum table */ static const value_string g_TimestampsToReturnTable[] = { @@ -322,7 +322,7 @@ static int hf_opcua_TimestampsToReturn = -1; void parseTimestampsToReturn(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_TimestampsToReturn, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_TimestampsToReturn, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** HistoryUpdateMode enum table */ static const value_string g_HistoryUpdateModeTable[] = { @@ -335,7 +335,7 @@ static int hf_opcua_HistoryUpdateMode = -1; void parseHistoryUpdateMode(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_HistoryUpdateMode, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_HistoryUpdateMode, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** MonitoringMode enum table */ static const value_string g_MonitoringModeTable[] = { @@ -348,7 +348,7 @@ static int hf_opcua_MonitoringMode = -1; void parseMonitoringMode(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_MonitoringMode, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_MonitoringMode, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** DataChangeTrigger enum table */ static const value_string g_DataChangeTriggerTable[] = { @@ -361,7 +361,7 @@ static int hf_opcua_DataChangeTrigger = -1; void parseDataChangeTrigger(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_DataChangeTrigger, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_DataChangeTrigger, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** DeadbandType enum table */ static const value_string g_DeadbandTypeTable[] = { @@ -374,7 +374,7 @@ static int hf_opcua_DeadbandType = -1; void parseDeadbandType(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_DeadbandType, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_DeadbandType, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** RedundancySupport enum table */ static const value_string g_RedundancySupportTable[] = { @@ -389,7 +389,7 @@ static int hf_opcua_RedundancySupport = -1; void parseRedundancySupport(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_RedundancySupport, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_RedundancySupport, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** ServerState enum table */ static const value_string g_ServerStateTable[] = { @@ -407,7 +407,7 @@ static int hf_opcua_ServerState = -1; void parseServerState(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_ServerState, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_ServerState, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** ModelChangeStructureVerbMask enum table */ static const value_string g_ModelChangeStructureVerbMaskTable[] = { @@ -422,7 +422,7 @@ static int hf_opcua_ModelChangeStructureVerbMask = -1; void parseModelChangeStructureVerbMask(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_ModelChangeStructureVerbMask, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_ModelChangeStructureVerbMask, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** ExceptionDeviationFormat enum table */ static const value_string g_ExceptionDeviationFormatTable[] = { @@ -437,7 +437,7 @@ static int hf_opcua_ExceptionDeviationFormat = -1; void parseExceptionDeviationFormat(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_ExceptionDeviationFormat, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_ExceptionDeviationFormat, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } /** Register enum types. */ diff --git a/plugins/opcua/opcua_security_layer.c b/plugins/opcua/opcua_security_layer.c index 831b2a872a..453ed740cc 100644 --- a/plugins/opcua/opcua_security_layer.c +++ b/plugins/opcua/opcua_security_layer.c @@ -66,9 +66,9 @@ void registerSecurityLayerTypes(int proto) */ void parseSecurityLayer(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { - proto_tree_add_item(tree, hf_opcua_security_tokenid, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_security_seq, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_security_rqid, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_security_tokenid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_security_seq, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_security_rqid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; } diff --git a/plugins/opcua/opcua_simpletypes.c b/plugins/opcua/opcua_simpletypes.c index 78de29e559..1de0712a32 100644 --- a/plugins/opcua/opcua_simpletypes.c +++ b/plugins/opcua/opcua_simpletypes.c @@ -583,7 +583,7 @@ void parseVariant(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldN gint32 ArrayLength = 0; EncodingMask = tvb_get_guint8(tvb, iOffset); - proto_tree_add_item(subtree, hf_opcua_variant_encodingmask, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_variant_encodingmask, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset++; if (EncodingMask & VARIANT_ARRAYMASK) @@ -694,7 +694,7 @@ void parseArraySimple(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfInde /* read array length */ iLen = tvb_get_letohl(tvb, *pOffset); - proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); if (iLen > MAX_ARRAY_LEN) { @@ -725,7 +725,7 @@ void parseArrayEnum(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, fctEnumParse /* read array length */ iLen = tvb_get_letohl(tvb, *pOffset); - proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); if (iLen > MAX_ARRAY_LEN) { @@ -755,7 +755,7 @@ void parseArrayComplex(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szF /* read array length */ iLen = tvb_get_letohl(tvb, *pOffset); - proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_ArraySize, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); if (iLen > MAX_ARRAY_LEN) { @@ -782,39 +782,39 @@ void parseNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldNa guint8 EncodingMask; EncodingMask = tvb_get_guint8(tvb, iOffset); - proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset++; switch(EncodingMask) { case 0x00: /* two byte node id */ - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; break; case 0x01: /* four byte node id */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; break; case 0x02: /* numeric, that does not fit into four bytes */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, ENC_LITTLE_ENDIAN); iOffset+=4; break; case 0x03: /* string */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; parseString(subtree, tvb, &iOffset, hf_opcua_String); break; case 0x04: /* guid */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; parseGuid(subtree, tvb, &iOffset, hf_opcua_Guid); break; case 0x05: /* byte string */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 4, ENC_LITTLE_ENDIAN); iOffset+=4; parseByteString(subtree, tvb, &iOffset, hf_opcua_ByteString); break; @@ -864,39 +864,39 @@ void parseExpandedNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *s guint8 EncodingMask; EncodingMask = tvb_get_guint8(tvb, iOffset); - proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset++; switch(EncodingMask) { case 0x00: /* two byte node id */ - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; break; case 0x01: /* four byte node id */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 1, ENC_LITTLE_ENDIAN); iOffset+=1; - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; break; case 0x02: /* numeric, that does not fit into four bytes */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; - proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_numeric, tvb, iOffset, 4, ENC_LITTLE_ENDIAN); iOffset+=4; break; case 0x03: /* string */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; parseString(subtree, tvb, &iOffset, hf_opcua_String); break; case 0x04: /* guid */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; parseGuid(subtree, tvb, &iOffset, hf_opcua_Guid); break; case 0x05: /* byte string */ - proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, TRUE); + proto_tree_add_item(subtree, hf_opcua_nodeid_nsid, tvb, iOffset, 2, ENC_LITTLE_ENDIAN); iOffset+=2; parseByteString(subtree, tvb, &iOffset, hf_opcua_ByteString); break; diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c index 2340db6e28..fb72f6e6f9 100644 --- a/plugins/opcua/opcua_transport_layer.c +++ b/plugins/opcua/opcua_transport_layer.c @@ -129,12 +129,12 @@ int parseHello(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_ver, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_rbs, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_sbs, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_mms, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_mcc, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_ver, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_rbs, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_sbs, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_mms, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_mcc, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; parseString(tree, tvb, pOffset, hf_opcua_transport_endpoint); return -1; } @@ -143,12 +143,12 @@ int parseAcknowledge(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_ver, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_rbs, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_sbs, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_mms, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_mcc, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_ver, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_rbs, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_sbs, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_mms, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_mcc, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; return -1; } @@ -156,8 +156,8 @@ int parseError(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_error, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_error, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; parseString(tree, tvb, pOffset, hf_opcua_transport_reason); return -1; } @@ -171,8 +171,8 @@ int parseMessage(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; /* message data contains the security layer */ parseSecurityLayer(tree, tvb, pOffset); @@ -203,13 +203,13 @@ int parseOpenSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; parseString(tree, tvb, pOffset, hf_opcua_transport_spu); parseByteString(tree, tvb, pOffset, hf_opcua_transport_scert); parseByteString(tree, tvb, pOffset, hf_opcua_transport_rcthumb); - proto_tree_add_item(tree, hf_opcua_transport_seq, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_rqid, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_seq, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_rqid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; /* add encodeable object subtree */ ti = proto_tree_add_text(tree, tvb, 0, -1, "Message : Encodeable Object"); @@ -228,8 +228,8 @@ int parseCloseSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset) { proto_tree_add_item(tree, hf_opcua_transport_type, tvb, *pOffset, 3, TRUE); *pOffset+=3; proto_tree_add_item(tree, hf_opcua_transport_chunk, tvb, *pOffset, 1, TRUE); *pOffset+=1; - proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, TRUE); *pOffset+=4; - proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, TRUE); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_size, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; + proto_tree_add_item(tree, hf_opcua_transport_scid, tvb, *pOffset, 4, ENC_LITTLE_ENDIAN); *pOffset+=4; return -1; } diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 0ec9bb40d1..7ca3afa4a2 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -2940,19 +2940,19 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, /* add buffer header */ u8Version = tvb_get_guint8 (tvb, offset); if (conn_data_tree) { - proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_version, tvb, offset, 1, TRUE); + proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_version, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 1; u8Flags = tvb_get_guint8 (tvb, offset); if (conn_data_tree) { - proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_flags, tvb, offset, 1, TRUE); + proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_flags, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 1; u16Count = tvb_get_letohs (tvb, offset); if (conn_data_tree) { - proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_count, tvb, offset, 2, TRUE); + proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_count, tvb, offset, 2, ENC_LITTLE_ENDIAN); } offset += 2; u16CountFix = u16Count; @@ -3025,7 +3025,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, /* add item header fields */ if (sub_tree) { - proto_tree_add_item(sub_tree, hf_cba_acco_cb_item_length, tvb, offset, 2, TRUE); + proto_tree_add_item(sub_tree, hf_cba_acco_cb_item_length, tvb, offset, 2, ENC_LITTLE_ENDIAN); } offset += 2; u16HdrLen = 2; @@ -3035,7 +3035,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, { u32ID = tvb_get_letohl (tvb, offset); if (sub_tree) { - proto_tree_add_item(sub_tree, hf_cba_acco_conn_cons_id, tvb, offset, 4, TRUE); + proto_tree_add_item(sub_tree, hf_cba_acco_conn_cons_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); } offset += 4; u16HdrLen += 4; @@ -3045,7 +3045,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, u8QC = tvb_get_guint8 (tvb, offset); if (sub_tree) { - item = proto_tree_add_item(sub_tree, hf_cba_acco_qc, tvb, offset, 1, TRUE); + item = proto_tree_add_item(sub_tree, hf_cba_acco_qc, tvb, offset, 1, ENC_LITTLE_ENDIAN); } offset += 1; u16HdrLen += 1; diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 05d71811a7..f8158a1256 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -223,7 +223,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){ ti1=proto_tree_add_text(overall_unistim_tree,tvb,offset,5,"Reliable UDP"); rudpm_tree=proto_item_add_subtree(ti1,ett_unistim); - proto_tree_add_item(rudpm_tree,hf_unistim_seq_nu,tvb,offset,4,FALSE); + proto_tree_add_item(rudpm_tree,hf_unistim_seq_nu,tvb,offset,4,ENC_BIG_ENDIAN); /* Allocate new mem for queueing */ uinfo = (unistim_info_t *)se_alloc(sizeof(unistim_info_t)); @@ -246,7 +246,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){ uinfo->it_port = 0; offset+=4; - proto_tree_add_item(rudpm_tree,hf_unistim_packet_type,tvb,offset,1,FALSE); + proto_tree_add_item(rudpm_tree,hf_unistim_packet_type,tvb,offset,1,ENC_BIG_ENDIAN); uinfo->rudp_type = tvb_get_guint8(tvb,offset); switch(tvb_get_guint8(tvb,offset)) { @@ -286,7 +286,7 @@ dissect_payload(proto_tree *overall_unistim_tree,tvbuff_t *tvb, gint offset, pac uinfo->payload_type = payload_proto; ti=proto_tree_add_item(overall_unistim_tree,hf_unistim_payload, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; unistim_tree=proto_item_add_subtree(ti,ett_unistim); @@ -344,7 +344,7 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t command=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_uftp_command,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_uftp_command,tvb,offset,1,ENC_BIG_ENDIAN); offset += 1; @@ -358,10 +358,10 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t case 0x81: /* Connection Details */ /* Get datablock size */ - proto_tree_add_item(msg_tree,hf_uftp_datablock_size,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_uftp_datablock_size,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; /* Get datablock limit b4 flow control */ - proto_tree_add_item(msg_tree,hf_uftp_datablock_limit,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_uftp_datablock_limit,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; /* Get filename */ str_len = tvb_length_remaining(tvb, offset); @@ -411,19 +411,19 @@ dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tv addr=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_unistim_cmd_add,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_unistim_cmd_add,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len=tvb_get_guint8(tvb,offset); if (msg_len<=2) { - ti=proto_tree_add_item(msg_tree,hf_unistim_len,tvb,offset,1,FALSE); + ti=proto_tree_add_item(msg_tree,hf_unistim_len,tvb,offset,1,ENC_BIG_ENDIAN); expert_add_info_format(pinfo,ti,PI_MALFORMED,PI_ERROR,"Length too short"); return tvb_length(tvb); } else { proto_item_set_len(ti,msg_len); - proto_tree_add_item(msg_tree,hf_unistim_len,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_unistim_len,tvb,offset,1,ENC_BIG_ENDIAN); } offset+=1; @@ -519,7 +519,7 @@ dissect_basic_phone(proto_tree *msg_tree, basic_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_basic_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_basic_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(basic_cmd){ @@ -527,13 +527,13 @@ dissect_basic_phone(proto_tree *msg_tree, case 0x00: /*Basic Manager Attributes Info*/ proto_tree_add_item(msg_tree,hf_basic_phone_eeprom_stat_cksum, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_basic_phone_eeprom_dynam, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_basic_phone_eeprom_net_config_cksum, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x01: @@ -550,7 +550,7 @@ dissect_basic_phone(proto_tree *msg_tree, break; case 0x03: /*IT Type*/ - proto_tree_add_item(msg_tree,hf_basic_it_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_basic_it_type,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x07: @@ -602,7 +602,7 @@ dissect_basic_switch(proto_tree *msg_tree, tvbuff_t *tvb,gint offset,guint msg_len){ guint basic_cmd; basic_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_basic_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_basic_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(basic_cmd){ case 0x01: @@ -633,7 +633,7 @@ dissect_basic_switch(proto_tree *msg_tree, case 0x06: /*EEprom Write*/ proto_tree_add_item(msg_tree,hf_basic_switch_element_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_basic_switch_eeprom_data, tvb,offset,msg_len,ENC_NA); @@ -681,7 +681,7 @@ dissect_broadcast_switch(proto_tree *msg_tree, proto_tree *date_tree; proto_tree *time_tree; bcast_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_broadcast_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_broadcast_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(bcast_cmd){ case 0x00: @@ -692,9 +692,9 @@ dissect_broadcast_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_broadcast_icon_state, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x02: @@ -708,21 +708,21 @@ dissect_broadcast_switch(proto_tree *msg_tree, date_label=proto_tree_add_text(msg_tree,tvb,offset,3, "Date %i/%i/%i",month,day,year%100); date_tree=proto_item_add_subtree(date_label,ett_unistim); - proto_tree_add_item(date_tree,hf_broadcast_year,tvb,offset,1,FALSE); + proto_tree_add_item(date_tree,hf_broadcast_year,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(date_tree,hf_broadcast_month,tvb,offset,1,FALSE); + proto_tree_add_item(date_tree,hf_broadcast_month,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(date_tree,hf_broadcast_day,tvb,offset,1,FALSE); + proto_tree_add_item(date_tree,hf_broadcast_day,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; time_label=proto_tree_add_text(msg_tree,tvb,offset,3, "Time %i:%i:%i",hour,minute,second); time_tree=proto_item_add_subtree(time_label,ett_unistim); - proto_tree_add_item(time_tree,hf_broadcast_hour,tvb,offset,1,FALSE); + proto_tree_add_item(time_tree,hf_broadcast_hour,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(time_tree,hf_broadcast_minute,tvb,offset,1,FALSE); + proto_tree_add_item(time_tree,hf_broadcast_minute,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(time_tree,hf_broadcast_second,tvb,offset,1,FALSE); + proto_tree_add_item(time_tree,hf_broadcast_second,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x03: @@ -765,7 +765,7 @@ dissect_display_switch(proto_tree *msg_tree, proto_tree *address_tree; proto_item *tmp_ti; display_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_display_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(display_cmd){ @@ -774,7 +774,7 @@ dissect_display_switch(proto_tree *msg_tree, break; case 0x04: /*Arrow*/ - proto_tree_add_item(msg_tree,hf_display_arrow,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_arrow,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x05: @@ -807,7 +807,7 @@ dissect_display_switch(proto_tree *msg_tree, 1,FALSE); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_display_call_timer_id,tvb,offset, - 1,FALSE); + 1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0c: @@ -911,7 +911,7 @@ dissect_display_switch(proto_tree *msg_tree, } if((clear_mask&DISPLAY_CLEAR_SOFTKEY_LABEL)==DISPLAY_CLEAR_SOFTKEY_LABEL){ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_clear_sk_label_key_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_clear_sk_label_key_id,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_clear_all_slks,tvb,offset,1,FALSE); offset+=1;msg_len-=1; } @@ -920,7 +920,7 @@ dissect_display_switch(proto_tree *msg_tree, /*Cursor Control*/ movement_byte=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_move_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_move_cmd,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_cursor_blink,tvb,offset,1,FALSE); offset+=1;msg_len-=1; if(msg_len==0){ @@ -942,7 +942,7 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG) proto_tree_add_item(msg_tree, hf_display_write_address_softkey_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(msg_len==0){ /*turn cursor off*/ @@ -951,9 +951,9 @@ dissect_display_switch(proto_tree *msg_tree, } proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_write_address_char_pos, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_write_address_line_number, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x12: @@ -969,13 +969,13 @@ dissect_display_switch(proto_tree *msg_tree, case 0x14: /*Status Bar Icon Update*/ proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_icon_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_icon_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_broadcast_icon_state, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x15: @@ -992,10 +992,10 @@ dissect_display_switch(proto_tree *msg_tree, /*Time and Date Format*/ time_date_mask=tvb_get_guint8(tvb,offset); if((time_date_mask&DISPLAY_USE_TIME_FORMAT)==DISPLAY_USE_TIME_FORMAT){ - proto_tree_add_item(msg_tree,hf_display_time_format,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_time_format,tvb,offset,1,ENC_BIG_ENDIAN); } if((time_date_mask&DISPLAY_USE_DATE_FORMAT)==DISPLAY_USE_DATE_FORMAT){ - proto_tree_add_item(msg_tree,hf_display_date_format,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_date_format,tvb,offset,1,ENC_BIG_ENDIAN); } proto_tree_add_item(msg_tree,hf_display_use_time_format,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_use_date_format,tvb,offset,1,FALSE); @@ -1029,7 +1029,7 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_softkey_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); } offset+=1;msg_len-=1; if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)== @@ -1037,7 +1037,7 @@ dissect_display_switch(proto_tree *msg_tree, proto_tree_add_item(address_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(address_tree, hf_display_write_address_char_pos, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)!= DISPLAY_WRITE_ADDRESS_LINE_FLAG){ offset+=1;msg_len-=1; @@ -1047,7 +1047,7 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_LINE_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_line_number, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } if(msg_len>0){ @@ -1104,14 +1104,14 @@ dissect_display_switch(proto_tree *msg_tree, if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG){ proto_tree_add_item(address_tree,hf_display_write_address_softkey_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; } if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_char_pos, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)!= DISPLAY_WRITE_ADDRESS_LINE_FLAG) offset+=1;msg_len-=1; @@ -1120,7 +1120,7 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_LINE_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_line_number, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); @@ -1142,7 +1142,7 @@ dissect_display_switch(proto_tree *msg_tree, break; case 0x1c: /*address|no control|no tag|yes*/ - proto_tree_add_item(msg_tree,hf_display_write_tag,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_write_tag,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; @@ -1167,13 +1167,13 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG) proto_tree_add_item(address_tree, hf_display_write_address_softkey_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_char_pos, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)!= DISPLAY_WRITE_ADDRESS_LINE_FLAG) offset+=1;msg_len-=1; @@ -1181,7 +1181,7 @@ dissect_display_switch(proto_tree *msg_tree, if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)== DISPLAY_WRITE_ADDRESS_LINE_FLAG){ proto_tree_add_item(address_tree,hf_display_write_address_line_number, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } set_ascii_item(msg_tree,tvb,offset,msg_len); @@ -1206,7 +1206,7 @@ dissect_display_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA); offset+=msg_len; - proto_tree_add_item(msg_tree,hf_display_write_tag,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_write_tag,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; @@ -1230,7 +1230,7 @@ dissect_display_switch(proto_tree *msg_tree, if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_KEY_FLAG) proto_tree_add_item(address_tree,hf_display_write_address_softkey_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_string, tvb,offset,msg_len,FALSE); @@ -1238,7 +1238,7 @@ dissect_display_switch(proto_tree *msg_tree, if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)== DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG){ proto_tree_add_item(address_tree,hf_display_write_address_char_pos, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG)!= DISPLAY_WRITE_ADDRESS_SOFT_LABEL_FLAG) offset+=1;msg_len-=1; @@ -1247,7 +1247,7 @@ dissect_display_switch(proto_tree *msg_tree, DISPLAY_WRITE_ADDRESS_LINE_FLAG){ proto_tree_add_item(address_tree, hf_display_write_address_line_number, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); @@ -1265,7 +1265,7 @@ dissect_display_switch(proto_tree *msg_tree, tvb,offset,1,FALSE); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_display_write_tag, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; @@ -1273,8 +1273,8 @@ dissect_display_switch(proto_tree *msg_tree, case 0x20: /*Context Info Bar Format*/ while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_display_context_format,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_context_field,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_context_format,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_context_field,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; @@ -1285,7 +1285,7 @@ dissect_display_switch(proto_tree *msg_tree, break; case 0x22: /*Special Character Download*/ - proto_tree_add_item(msg_tree,hf_display_char_address,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_char_address,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA); offset+=msg_len; @@ -1297,16 +1297,16 @@ dissect_display_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_display_cursor_context ,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_line,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_softkey,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,FALSE); - offset+=1;msg_len-=1;proto_tree_add_item(msg_tree,hf_display_hlight_start,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,ENC_BIG_ENDIAN); + offset+=1;msg_len-=1;proto_tree_add_item(msg_tree,hf_display_hlight_start,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_hlight_end,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_hlight_end,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(msg_len==0) break; if((highlight_cmd&DISPLAY_CURSOR_LINE)==DISPLAY_CURSOR_LINE){ - proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA); @@ -1314,63 +1314,63 @@ dissect_display_switch(proto_tree *msg_tree, break; case 0x24: /*Contrast*/ - proto_tree_add_item(msg_tree,hf_display_contrast,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_contrast,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x25: /*Caller Log Download*/ - proto_tree_add_item(msg_tree,hf_broadcast_hour,tvb,offset,msg_len,FALSE); + proto_tree_add_item(msg_tree,hf_broadcast_hour,tvb,offset,msg_len,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_broadcast_minute,tvb,offset,msg_len,FALSE); + proto_tree_add_item(msg_tree,hf_broadcast_minute,tvb,offset,msg_len,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA); offset+=msg_len; break; case 0x30: /*Layered Softkey Text Download*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; break; case 0x31: /*Layered Softkey Clear*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_layer_all_skeys,tvb,offset,msg_len,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x32: /*Set Visible Softkey Layer*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_layer_all_skeys,tvb,offset,msg_len,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x33: /*Layered Softkey Cadence Download*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_display_once_or_cyclic,tvb,offset,msg_len,FALSE); offset+=1;msg_len-=1; while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_layer_duration,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_duration,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; case 0x34: /*Layered Softkey Cadencing On*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x35: /*Layered Softkey Cadencing Off*/ - proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_layer_skey_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0xff: @@ -1391,36 +1391,36 @@ dissect_display_phone(proto_tree *msg_tree, guint display_cmd; guint highlight_cmd; display_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_display_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(display_cmd){ case 0x00: /*Display Manager Attributes Info*/ - proto_tree_add_item(msg_tree,hf_display_line_width,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_lines,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_line_width,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_lines,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_softkey_width,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_softkeys,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_icon,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_softkey_width,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_softkeys,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_icon,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_softlabel_key_width,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_context_width,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_softlabel_key_width,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_context_width,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_numeric_width,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_time_width,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_date_width,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_numeric_width,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_time_width,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_date_width,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_char_dload,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_freeform_icon_dload,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_icon_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_char_dload,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_freeform_icon_dload,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_icon_type,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_charsets,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_charsets,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x01: /*Contrast Level Report*/ - proto_tree_add_item(msg_tree,hf_display_contrast,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_contrast,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x02: @@ -1429,10 +1429,10 @@ dissect_display_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_display_cursor_context ,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_line,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_softkey,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x03: @@ -1442,14 +1442,14 @@ dissect_display_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_display_cursor_context ,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_line,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_display_cursor_softkey,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,FALSE); - offset+=1;msg_len-=1;proto_tree_add_item(msg_tree,hf_display_hlight_start,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_softkey_id,tvb,offset,1,ENC_BIG_ENDIAN); + offset+=1;msg_len-=1;proto_tree_add_item(msg_tree,hf_display_hlight_start,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_display_hlight_end,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_hlight_end,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if((highlight_cmd&DISPLAY_CURSOR_LINE)==DISPLAY_CURSOR_LINE){ - proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_cursor_char_pos,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; @@ -1465,16 +1465,16 @@ dissect_display_phone(proto_tree *msg_tree, break; case 0x06: /*Timer And Date Format Report*/ - proto_tree_add_item(msg_tree,hf_display_time_format,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_display_date_format,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_display_time_format,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_display_date_format,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x07: /*Status Bar Icon State Report*/ - proto_tree_add_item(msg_tree,hf_icon_id,tvb,offset,msg_len,FALSE); + proto_tree_add_item(msg_tree,hf_icon_id,tvb,offset,msg_len,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_broadcast_icon_state,tvb,offset,msg_len,FALSE); - proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence,tvb,offset,msg_len,FALSE); + proto_tree_add_item(msg_tree,hf_broadcast_icon_state,tvb,offset,msg_len,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence,tvb,offset,msg_len,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0a: @@ -1497,14 +1497,14 @@ dissect_key_indicator_switch(proto_tree *msg_tree, tvbuff_t *tvb, gint offset,guint msg_len){ guint key_cmd; key_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_key_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(key_cmd){ case 0x00: /*LED Update*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_key_led_cadence,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_key_led_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_led_cadence,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_key_led_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x01: @@ -1533,62 +1533,62 @@ dissect_key_indicator_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_keys_enable_vol,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_conspic_prog_key,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_acd_super_control,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_keys_local_dial_feedback,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_local_dial_feedback,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x08: /*Logical Icon Mapping*/ - proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_keys_admin_command,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_keys_admin_command,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_keys_logical_icon_id,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_keys_logical_icon_id,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; break; case 0x09: /*Key Repeat Timer Download*/ - proto_tree_add_item(msg_tree,hf_keys_repeat_timer_one,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_repeat_timer_one,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_keys_repeat_timer_two,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_repeat_timer_two,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0a: /*Query LED State*/ - proto_tree_add_item(msg_tree,hf_keys_led_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_led_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0b: /*Query Phone Icon State*/ - proto_tree_add_item(msg_tree,hf_keys_phone_icon_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_phone_icon_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0c: /*Indicator Cadence Download*/ while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_keys_cadence_on_time,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_cadence_on_time,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_keys_cadence_off_time,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_cadence_off_time,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; case 0x0d: /*User Activity Timer Download*/ - proto_tree_add_item(msg_tree,hf_keys_user_activity_timeout,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_user_activity_timeout,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0e: /*Free Form Icon Download*/ - proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA); offset+=msg_len; break; case 0x0f: /*Phone Icon Update*/ - proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_broadcast_icon_state,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_broadcast_icon_state,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0xff: @@ -1610,7 +1610,7 @@ dissect_key_indicator_phone(proto_tree *msg_tree, tvbuff_t *tvb,gint offset, guint msg_len){ guint key_cmd; key_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_key_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(key_cmd){ case 0x00: @@ -1622,8 +1622,8 @@ dissect_key_indicator_phone(proto_tree *msg_tree, uinfo->key_val = (tvb_get_guint8(tvb,offset) & 0x3F); proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_key_code,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_key_command,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_code,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_key_command,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x01: @@ -1654,8 +1654,8 @@ dissect_key_indicator_phone(proto_tree *msg_tree, break; case 0x08: /*Key/Indicator Manager Attributes Info*/ - proto_tree_add_item(msg_tree,hf_key_programmable_keys,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_keys_soft_keys,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_key_programmable_keys,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_keys_soft_keys,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_keys_hd_key,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_mute_key,tvb,offset,1,FALSE); @@ -1663,8 +1663,8 @@ dissect_key_indicator_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_keys_copy_key,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_mwi_key,tvb,offset,1,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_keys_num_nav_keys,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_keys_num_conspic_keys,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_num_nav_keys,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_keys_num_conspic_keys,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; @@ -1674,7 +1674,7 @@ dissect_key_indicator_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_keys_enable_vol,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_conspic_prog_key,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_keys_acd_super_control,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_keys_local_dial_feedback,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_keys_local_dial_feedback,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0a: @@ -1702,7 +1702,7 @@ dissect_network_switch(proto_tree *msg_tree, guint string_len; network_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_network_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_network_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(network_cmd){ case 0x02: @@ -1741,33 +1741,33 @@ dissect_network_switch(proto_tree *msg_tree, break; case 0x0b: /*Download Server Information*/ - proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_net_server_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; - proto_tree_add_item(msg_tree,hf_net_server_action,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_action,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_net_server_retry_count,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_retry_count,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_net_server_failover_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_failover_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_net_server_ip_address,tvb,offset,4,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_ip_address,tvb,offset,4,ENC_BIG_ENDIAN); offset+=4; break; case 0x0c: /*Server Switch*/ - proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x0d: /*Query Network Configuration Element*/ proto_tree_add_item(msg_tree,hf_net_server_config_element, - tvb,offset-1,1,FALSE); + tvb,offset-1,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x0e: /*Download Software Upgrade*/ - proto_tree_add_item(msg_tree,hf_net_file_xfer_mode,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_file_xfer_mode,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_net_force_download,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_net_use_file_server_port,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_net_use_local_port,tvb,offset,1,FALSE); @@ -1780,9 +1780,9 @@ dissect_network_switch(proto_tree *msg_tree, string_len=tvb_strsize(tvb,offset); proto_tree_add_item(msg_tree,hf_net_file_identifier,tvb,offset,string_len,ENC_NA); offset+=string_len;msg_len-=string_len; - proto_tree_add_item(msg_tree,hf_net_file_server_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_net_file_server_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_net_local_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_net_local_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_net_file_server_address,tvb,offset,4,FALSE); offset+=4;msg_len-=4; @@ -1794,22 +1794,22 @@ dissect_network_switch(proto_tree *msg_tree, break; case 0x10: /*Set Primary Server*/ - proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_net_server_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x12: /*Reset Watchdog*/ proto_tree_add_item(msg_tree,hf_net_server_time_out, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; break; case 0x13: /*Set Recovery Procedure Time Interval*/ proto_tree_add_item(msg_tree,hf_net_server_recovery_time_low, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; proto_tree_add_item(msg_tree,hf_net_server_recovery_time_high, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2; break; case 0x14: @@ -1840,7 +1840,7 @@ dissect_expansion_switch(proto_tree *msg_tree, expansion_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_expansion_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_expansion_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; switch(expansion_cmd){ case 0x17: @@ -1852,7 +1852,7 @@ dissect_expansion_switch(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_expansion_softlabel_number,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; @@ -1863,15 +1863,15 @@ dissect_expansion_switch(proto_tree *msg_tree, offset+=1; msg_len-=1; proto_tree_add_item(msg_tree,hf_expansion_softlabel_number,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_broadcast_icon_state, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_broadcast_icon_cadence, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; break; @@ -1887,7 +1887,7 @@ dissect_expansion_phone(proto_tree *msg_tree, guint key_number; expansion_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_expansion_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_expansion_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; msg_len-=1; key_number=(tvb_get_guint8(tvb,offset))-64; @@ -1910,7 +1910,7 @@ dissect_network_phone(proto_tree *msg_tree, proto_item *server; guint i; network_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_network_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_network_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(network_cmd){ case 0x00: @@ -1966,7 +1966,7 @@ dissect_network_phone(proto_tree *msg_tree, case 0x0c: /*Server Information Report*/ proto_tree_add_item(msg_tree,hf_net_phone_primary_server_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; for (i=1; msg_len>8; i++){ /*if less than 9 not full report so punt*/ @@ -1980,19 +1980,19 @@ dissect_network_phone(proto_tree *msg_tree, server_tree=proto_item_add_subtree(server,ett_unistim); proto_tree_add_item(server_tree, hf_net_phone_server_port, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(server_tree, hf_net_phone_server_action, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(server_tree, hf_net_phone_server_retry_count, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(server_tree, hf_net_phone_server_failover_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(server_tree,hf_net_phone_server_ip, tvb,offset,4,FALSE); @@ -2020,7 +2020,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, guint apb_data_len; guint vocoder_param; audio_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_audio_switch_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_switch_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(audio_cmd){ case 0x00: @@ -2035,7 +2035,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, proto_tree_add_item(msg_tree,hf_audio_mgr_headset,tvb,offset,1,FALSE); offset+=1; proto_tree_add_item(msg_tree,hf_audio_default_rx_vol_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x01: @@ -2067,7 +2067,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, proto_tree_add_item(msg_tree,hf_audio_mgr_tx_rx,tvb,offset,1,FALSE); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; @@ -2075,7 +2075,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, /*Transducer Based Tone On*/ proto_tree_add_item(msg_tree, hf_audio_mgr_transducer_based_tone_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_mgr_attenuated, tvb,offset,1,FALSE); offset+=1; @@ -2083,44 +2083,44 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, case 0x11: /*Transducer Based Tone Off*/ proto_tree_add_item(msg_tree,hf_audio_mgr_transducer_based_tone_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x12: /*Alerting Tone Configuration*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_mgr_warbler_select, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_mgr_transducer_routing, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_mgr_tone_vol_range, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_mgr_cadence_select, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x13: /*Special Tone Configuration*/ proto_tree_add_item(msg_tree,hf_audio_mgr_transducer_routing, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_audio_mgr_tone_vol_range, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_audio_special_tone,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_special_tone,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x14: /*Paging Tone Configuration*/ proto_tree_add_item(msg_tree,hf_audio_mgr_transducer_routing, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; proto_tree_add_item(msg_tree,hf_audio_mgr_tone_vol_range, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_mgr_cadence_select, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x15: @@ -2141,8 +2141,8 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, tvb,offset,1,FALSE); proto_tree_add_item(msg_tree, hf_audio_mgr_transducer_based_tone_id, - tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_tone_level,tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_tone_level,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x1a: @@ -2155,26 +2155,26 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, /*Stream Based Tone On*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_stream_based_tone_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_stream_based_tone_rx_tx, tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_stream_based_tone_mute, tvb,offset,1,FALSE); offset+=1; - proto_tree_add_item(msg_tree,hf_audio_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; - proto_tree_add_item(msg_tree,hf_audio_stream_based_volume,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_stream_based_volume,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x1c: /*Stream Based Tone Off*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_stream_based_tone_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_stream_based_tone_rx_tx, tvb,offset,1,FALSE); offset+=1; - proto_tree_add_item(msg_tree,hf_audio_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1; break; case 0x1d: @@ -2190,7 +2190,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, case 0x20: /*Select Adjustable Rx Volume*/ proto_tree_add_item(msg_tree,hf_audio_default_rx_vol_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); break; case 0x21: /*Set APB's Rx Volume Level*/ @@ -2212,27 +2212,27 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, case 0x24: /*Adjust Default Rx Volume(quieter)*/ proto_tree_add_item(msg_tree,hf_audio_default_rx_vol_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); break; case 0x25: /*Adjust Default Rx Volume(louder)*/ proto_tree_add_item(msg_tree,hf_audio_default_rx_vol_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); break; case 0x28: /*APB Download*/ - proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; while(msg_len>0){ apb_op_code=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_op_code,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(apb_op_code>0x39){ /*should have a len + data*/ apb_data_len=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_param_len,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_apb_data,tvb, offset,apb_data_len,ENC_NA); @@ -2245,38 +2245,38 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, /* Set the tap info */ uinfo->stream_connect = 1; - proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_tx_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_tx_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_tx_vocoder_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_tx_vocoder_type,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_frames_per_packet,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_frames_per_packet,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_tos,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_precedence,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_tos,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_precedence,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_frf_11,tvb,offset,1,FALSE); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_rtcp_bucket_id, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_generic_data, tvb,offset,4,ENC_NA); offset+=4;msg_len-=4; proto_tree_add_item(msg_tree,hf_audio_lcl_rtp_port, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_lcl_rtcp_port, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_far_rtp_port, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_far_rtcp_port, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; /* Sometimes the open stream does not specify an endpoint */ @@ -2306,9 +2306,9 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, /* Set the tap info */ uinfo->stream_connect = 0; - proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_tx_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_tx_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x32: @@ -2317,18 +2317,18 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, uinfo->trans_connect = 1; proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_transducer_pair,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_transducer_pair,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_rx_enable,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_tx_enable,tvb,offset,1,FALSE); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_basic_bit_field, tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_sidetone_disable,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_destruct_additive,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_dont_force_active,tvb,offset,1,FALSE); offset+=1;msg_len-=1; while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,TRUE); + proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,ENC_LITTLE_ENDIAN); offset+=1;msg_len-=1; } break; @@ -2339,14 +2339,14 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, break; case 0x37: /*Query RTCP Statistics*/ - proto_tree_add_item(msg_tree,hf_audio_rtcp_bucket_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_rtcp_bucket_id,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_clear_bucket,tvb,offset,1,FALSE); offset+=1;msg_len-=1; break; case 0x38: /*Configure Vocoder Parameters*/ - proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,TRUE); + proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,ENC_LITTLE_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_vocoder_id,tvb,offset,1,FALSE), offset+=1;msg_len-=1; @@ -2357,9 +2357,9 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, proto_tree_add_item(param_tree,hf_basic_bit_field, tvb,offset,1,FALSE); proto_tree_add_item(param_tree,hf_audio_vocoder_param, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(param_tree,hf_audio_vocoder_entity, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if((vocoder_param&0x0a)==0x0a){ proto_tree_add_item(param_tree,hf_audio_vocoder_annexa, @@ -2370,63 +2370,63 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo, } else if((vocoder_param&0x0b)==0x0b){ proto_tree_add_item(param_tree,hf_audio_sample_rate, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } else if((vocoder_param&0x0c)==0x0c){ proto_tree_add_item(param_tree,hf_audio_rtp_type, - tvb,offset,1,FALSE); + tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } else if((vocoder_param&0x20)==0x20){ proto_tree_add_item(param_tree,hf_audio_bytes_per_frame, - tvb,offset,2,FALSE); + tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; } } break; case 0x39: /*Query RTCP Bucket's SDES Information*/ - proto_tree_add_item(msg_tree,hf_audio_source_descr,tvb,offset,msg_len,FALSE); - proto_tree_add_item(msg_tree,hf_audio_sdes_rtcp_bucket,tvb,offset,msg_len,FALSE); + proto_tree_add_item(msg_tree,hf_audio_source_descr,tvb,offset,msg_len,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_sdes_rtcp_bucket,tvb,offset,msg_len,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x3a: /*Jitter Buffer Parameters Configuration*/ - proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_rx_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_desired_jitter,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_desired_jitter,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_high_water_mark,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_high_water_mark,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_early_packet_resync_thresh,tvb, - offset,4,FALSE); + offset,4,ENC_BIG_ENDIAN); offset+=4;msg_len-=4; proto_tree_add_item(msg_tree,hf_audio_late_packet_resync_thresh,tvb, - offset,4,FALSE); + offset,4,ENC_BIG_ENDIAN); offset+=4;msg_len-=4; break; case 0x3b: /*Resolve Port Mapping*/ - proto_tree_add_item(msg_tree,hf_audio_resolve_phone_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_resolve_phone_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_audio_far_end_echo_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_far_end_echo_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_far_end_ip_address,tvb,offset,4,FALSE); offset+=4;msg_len-=4; break; case 0x3c: /*Port Mapping Discovery Ack*/ - proto_tree_add_item(msg_tree,hf_audio_nat_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_nat_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_nat_ip_address,tvb,offset,4,FALSE); offset+=4;msg_len-=4; break; case 0x3d: /*Query Audio Stream Status*/ - proto_tree_add_item(msg_tree,hf_audio_direction_code,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_direction_code,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0xff: @@ -2449,7 +2449,7 @@ dissect_audio_phone(proto_tree *msg_tree, guint stream_dir; guint stream_state; audio_cmd=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_audio_phone_cmd,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_phone_cmd,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; switch(audio_cmd){ case 0x00: @@ -2487,7 +2487,7 @@ dissect_audio_phone(proto_tree *msg_tree, proto_tree_add_item(msg_tree,hf_audio_hf_support,tvb,offset,1,FALSE); offset+=1;msg_len-=1; while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } break; @@ -2505,7 +2505,7 @@ dissect_audio_phone(proto_tree *msg_tree, case 0x09: /*Adjustable Rx Volume Report*/ proto_tree_add_item(msg_tree,hf_basic_bit_field,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_up,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_floor,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_ceiling,tvb,offset,1,FALSE); @@ -2513,34 +2513,34 @@ dissect_audio_phone(proto_tree *msg_tree, break; case 0x0a: /*Adjustable Rx Volume Information*/ - proto_tree_add_item(msg_tree,hf_audio_current_adj_vol_id,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_adj_vol_id,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_up,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_floor,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_ceiling,tvb,offset,1,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_current_rx_level,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_rx_level,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_current_rx_range,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_rx_range,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0b: /*APB's Default Rx Volume Value*/ - proto_tree_add_item(msg_tree,hf_audio_current_adj_vol_id,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_adj_vol_id,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_rx_vol_apb_rpt,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_up,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_floor,tvb,offset,1,FALSE); proto_tree_add_item(msg_tree,hf_audio_rx_vol_vol_ceiling,tvb,offset,1,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_current_rx_level,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_rx_level,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_current_rx_range,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_current_rx_range,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0c: /*Alerting Tone Select*/ - proto_tree_add_item(msg_tree,hf_audio_cadence_select,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_warbler_select,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_cadence_select,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_warbler_select,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x0e: @@ -2550,45 +2550,45 @@ dissect_audio_phone(proto_tree *msg_tree, break; case 0x0f: /*Open Audio Stream Report*/ - proto_tree_add_item(msg_tree,hf_audio_open_stream_rpt,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_open_stream_rpt,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x10: /*RTCP Bucket SDES Information Report*/ - proto_tree_add_item(msg_tree,hf_audio_sdes_rpt_source_desc,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_sdes_rpt_buk_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_sdes_rpt_source_desc,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_sdes_rpt_buk_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; set_ascii_item(msg_tree,tvb,offset,msg_len); offset+=msg_len; break; case 0x11: /*Port Mapping Discovery*/ - proto_tree_add_item(msg_tree,hf_audio_phone_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_phone_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_phone_ip,tvb,offset,4,FALSE); offset+=4;msg_len-=4; break; case 0x12: /*Resolve Port Mapping*/ - proto_tree_add_item(msg_tree,hf_audio_nat_listen_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_nat_listen_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_audio_nat_ip,tvb,offset,4,FALSE); + proto_tree_add_item(msg_tree,hf_audio_nat_ip,tvb,offset,4,ENC_BIG_ENDIAN); offset+=4;msg_len-=4; - proto_tree_add_item(msg_tree,hf_audio_nat_add_len,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_nat_add_len,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_phone_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_phone_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_phone_ip,tvb,offset,4,FALSE); offset+=4;msg_len-=4; - proto_tree_add_item(msg_tree,hf_audio_phone_add_len,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_phone_add_len,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; break; case 0x13: /*Audio Stream Status Report*/ stream_dir=tvb_get_guint8(tvb,offset); - proto_tree_add_item(msg_tree,hf_audio_stream_direction_code,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_stream_direction_code,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_mgr_stream_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; stream_state=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_stream_state,tvb,offset,1,FALSE); @@ -2596,50 +2596,50 @@ dissect_audio_phone(proto_tree *msg_tree, if((AUDIO_STREAM_STATE&stream_state)!=AUDIO_STREAM_STATE) break; if((AUDIO_STREAM_DIRECTION_RX&stream_dir)==AUDIO_STREAM_DIRECTION_RX) - proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_rx_vocoder_type,tvb,offset,1,ENC_BIG_ENDIAN); else if((AUDIO_STREAM_DIRECTION_TX&stream_dir)==AUDIO_STREAM_DIRECTION_TX) - proto_tree_add_item(msg_tree,hf_tx_vocoder_type,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_tx_vocoder_type,tvb,offset,1,ENC_BIG_ENDIAN); else proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,ENC_NA); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_frames_per_packet,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_frames_per_packet,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_tos,tvb,offset,1,FALSE); - proto_tree_add_item(msg_tree,hf_audio_precedence,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_tos,tvb,offset,1,ENC_BIG_ENDIAN); + proto_tree_add_item(msg_tree,hf_audio_precedence,tvb,offset,1,ENC_BIG_ENDIAN); proto_tree_add_item(msg_tree,hf_audio_frf_11,tvb,offset,1,FALSE); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_rtcp_bucket_id,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_rtcp_bucket_id,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; - proto_tree_add_item(msg_tree,hf_audio_lcl_rtp_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_lcl_rtp_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_audio_lcl_rtcp_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_lcl_rtcp_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_audio_far_rtp_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_far_rtp_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; - proto_tree_add_item(msg_tree,hf_audio_far_rtcp_port,tvb,offset,2,FALSE); + proto_tree_add_item(msg_tree,hf_audio_far_rtcp_port,tvb,offset,2,ENC_BIG_ENDIAN); offset+=2;msg_len-=2; proto_tree_add_item(msg_tree,hf_audio_far_ip_add,tvb,offset,4,FALSE); offset+=4;msg_len-=4; - proto_tree_add_item(msg_tree,hf_audio_transducer_list_length,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_transducer_list_length,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; while(msg_len>0){ - proto_tree_add_item(msg_tree,hf_audio_transducer_pair,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_transducer_pair,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; } case 0x14: /*Query APB Response*/ - proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,FALSE); + proto_tree_add_item(msg_tree,hf_audio_apb_number,tvb,offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; while(msg_len>0){ apb_op_code=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_op_code,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; if(apb_op_code>0x39){ /*should have a len + data*/ apb_data_len=tvb_get_guint8(tvb,offset); proto_tree_add_item(msg_tree,hf_audio_apb_param_len,tvb, - offset,1,FALSE); + offset,1,ENC_BIG_ENDIAN); offset+=1;msg_len-=1; proto_tree_add_item(msg_tree,hf_audio_apb_data,tvb, offset,apb_data_len,ENC_NA); diff --git a/plugins/wimax/mac_hd_generic_decoder.c b/plugins/wimax/mac_hd_generic_decoder.c index bb53d79db6..eb04e85689 100644 --- a/plugins/wimax/mac_hd_generic_decoder.c +++ b/plugins/wimax/mac_hd_generic_decoder.c @@ -654,9 +654,9 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, frag_len = ((tvb_get_ntohl(payload_tvb, payload_offset) & FRAG_LENGTH_MASK) >> 8); /* get the sequence number */ seq_number = (tvb_get_ntohs(payload_tvb, payload_offset) & SEQ_NUMBER_MASK_11) >> 3; - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc_ext, payload_tvb, payload_offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_bsn, payload_tvb, payload_offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len_ext, payload_tvb, payload_offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc_ext, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_bsn, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len_ext, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); /* update the length and offset */ payload_length -= 3; payload_offset += 3; @@ -669,9 +669,9 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, frag_len = ((tvb_get_ntohl(payload_tvb, payload_offset) & FRAG_LENGTH_MASK) >> 8); /* get the sequence number */ seq_number = (tvb_get_ntohs(payload_tvb, payload_offset) & SEQ_NUMBER_MASK_11) >> 3; - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc_ext, payload_tvb, payload_offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fsn_ext, payload_tvb, payload_offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len_ext, payload_tvb, payload_offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc_ext, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fsn_ext, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len_ext, payload_tvb, payload_offset, 3, ENC_BIG_ENDIAN); /* update the length and offset */ payload_length -= 3; payload_offset += 3; @@ -682,9 +682,9 @@ static guint decode_packing_subheader(tvbuff_t *payload_tvb, packet_info *pinfo, frag_len = (tvb_get_ntohs(payload_tvb, payload_offset) & PACKING_SUBHEADER_LENGTH_MASK); /* get the sequence number */ seq_number = (tvb_get_guint8(payload_tvb, payload_offset) & SEQ_NUMBER_MASK) >> 3; - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc, payload_tvb, payload_offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fsn, payload_tvb, payload_offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len, payload_tvb, payload_offset, 2, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fc, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_fsn, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_packing_subhd_len, payload_tvb, payload_offset, 2, ENC_BIG_ENDIAN); /* update the length and offset */ payload_length -= 2; payload_offset += 2; @@ -784,30 +784,30 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto /* get the CID */ mac_cid = tvb_get_ntohs(tvb, (offset+3)); /* display the Header Type (HT) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_ht, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_ht, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the Encryption Control (EC) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_ec, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_ec, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the sub-types (Type) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_5, tvb, offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_4, tvb, offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_3, tvb, offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_2, tvb, offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_1, tvb, offset, 3, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_type_0, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_5, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_4, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_3, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_2, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_1, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_type_0, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the Extended sub-header Field (ESF) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_esf, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_esf, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the CRC Indicator (CI) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_ci, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_ci, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the Encryption Key Sequence (EKS) */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_eks, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_eks, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the reserved field */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_rsv, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_rsv, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the length */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_len, tvb, offset, 3, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_len, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CID */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_cid, tvb, (offset+3), 2, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_cid, tvb, (offset+3), 2, ENC_BIG_ENDIAN); /* Decode and display the HCS */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_hcs, tvb, (offset+5), 1, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_hcs, tvb, (offset+5), 1, ENC_BIG_ENDIAN); /* get the frame length without MAC header */ length = mac_len - WIMAX_MAC_HEADER_SIZE; #ifdef DEBUG @@ -854,7 +854,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto /* add Mesh subheader subtree */ generic_tree = proto_item_add_subtree(generic_item, ett_mac_mesh_subheader_decoder); /* decode and display the Mesh subheader */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_mesh_subheader, tvb, offset, 2, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_mesh_subheader, tvb, offset, 2, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 2; offset += 2; @@ -872,8 +872,8 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto generic_item = proto_tree_add_protocol_format(tree, proto_mac_header_generic_decoder, tvb, offset, length, "Fast-feedback allocation (DL) subheader (%u bytes)", length); /* add Fast-feedback allocation subheader subtree */ generic_tree = proto_item_add_subtree(generic_item, ett_mac_fast_fb_subheader_decoder); - proto_tree_add_item(generic_tree, hf_mac_header_generic_fast_fb_subhd_alloc_offset, tvb, offset, 1, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_fast_fb_subhd_fb_type, tvb, offset, 1, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_fast_fb_subhd_alloc_offset, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_fast_fb_subhd_fb_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 1; offset += 1; @@ -904,25 +904,25 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto break; } /* Create tree for Scheduling Service Type (UGS) */ - child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ugs_tree, tvb, offset, 2, FALSE); + child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ugs_tree, tvb, offset, 2, ENC_BIG_ENDIAN); child_tree = proto_item_add_subtree(child_item, ett_mac_grant_mgmt_subheader_decoder); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_si, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_pm, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_fli, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_fl, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_si, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_pm, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_fli, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_fl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ugs_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* Create tree for Scheduling Service Type (Extended RTPS) */ - child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ext_rtps_tree, tvb, offset, 2, FALSE); + child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ext_rtps_tree, tvb, offset, 2, ENC_BIG_ENDIAN); child_tree = proto_item_add_subtree(child_item, ett_mac_grant_mgmt_subheader_decoder); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_pbr, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_fli, tvb, offset, 2, FALSE); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_fl, tvb, offset, 2, FALSE); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_pbr, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_fli, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_ext_fl, tvb, offset, 2, ENC_BIG_ENDIAN); /* Create tree for Scheduling Service Type (Piggyback Request) */ - child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ext_pbr_tree, tvb, offset, 2, FALSE); + child_item = proto_tree_add_item(generic_tree, hf_mac_header_generic_grant_mgmt_ext_pbr_tree, tvb, offset, 2, ENC_BIG_ENDIAN); child_tree = proto_item_add_subtree(child_item, ett_mac_grant_mgmt_subheader_decoder); - proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_pbr, tvb, offset, 2, FALSE); + proto_tree_add_item(child_tree, hf_mac_header_generic_grant_mgmt_subhd_pbr, tvb, offset, 2, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 2; @@ -945,9 +945,9 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto { /* get the sequence number */ seq_number = (tvb_get_ntohs(tvb, offset) & SEQ_NUMBER_MASK_11) >> 3; /* decode and display the header */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc_ext, tvb, offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_bsn, tvb, offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv_ext, tvb, offset, 2, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc_ext, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_bsn, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv_ext, tvb, offset, 2, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 2; offset += 2; @@ -958,9 +958,9 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto { /* get the sequence number */ seq_number = (tvb_get_ntohs(tvb, offset) & SEQ_NUMBER_MASK_11) >> 3; /* decode and display the header */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc_ext, tvb, offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fsn_ext, tvb, offset, 2, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv_ext, tvb, offset, 2, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc_ext, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fsn_ext, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv_ext, tvb, offset, 2, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 2; offset += 2; @@ -969,9 +969,9 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto { /* get the sequence number */ seq_number = (tvb_get_guint8(tvb, offset) & SEQ_NUMBER_MASK) >> 3; /* decode and display the header */ - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc, tvb, offset, 1, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fsn, tvb, offset, 1, FALSE); - proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv, tvb, offset, 1, FALSE); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fc, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_fsn, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(generic_tree, hf_mac_header_generic_frag_subhd_rsv, tvb, offset, 1, ENC_BIG_ENDIAN); /* update the length and offset */ length -= 1; offset += 1; @@ -1228,7 +1228,7 @@ check_crc: /* calculate the CRC */ calculated_crc = wimax_mac_calc_crc32(tvb_get_ptr(tvb, 0, mac_len - sizeof(mac_crc)), mac_len - sizeof(mac_crc)); /* display the CRC */ - generic_item = proto_tree_add_item(tree, hf_mac_header_generic_crc, tvb, mac_len - sizeof(mac_crc), sizeof(mac_crc), FALSE); + generic_item = proto_tree_add_item(tree, hf_mac_header_generic_crc, tvb, mac_len - sizeof(mac_crc), sizeof(mac_crc), ENC_BIG_ENDIAN); if (mac_crc != calculated_crc) { proto_item_append_text(generic_item, " - incorrect! (should be: 0x%x)", calculated_crc); @@ -1278,11 +1278,11 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ { /* Get the extended subheader type */ ubyte = (tvb_get_guint8(tvb, (offset+i)) & EXTENDED_SUB_HEADER_TYPE_MASK); /* decode and display the extended subheader type (MSB) */ - proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_rsv, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_rsv, tvb, (offset+i), 1, ENC_BIG_ENDIAN); /* for downlink */ if (is_down_link(pinfo)) /* for downlink */ { /* decode and display the extended subheader type */ - ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_type_dl, tvb, (offset+i), 1, FALSE); + ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_type_dl, tvb, (offset+i), 1, ENC_BIG_ENDIAN); /* add subtree */ ti_tree = proto_item_add_subtree(ti, ett_mac_ext_subheader_dl_decoder); i++; @@ -1290,43 +1290,43 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ { case SDU_SN: /* decode and display the extended sdu sn subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sdu_sn, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sdu_sn, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case DL_SLEEP_CONTROL: /* decode and display the extended dl sleep control subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_op, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv, tvb, (offset+i), 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_pscid, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_op, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_fswe, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_fswb, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_dl_sleep_control_rsv, tvb, (offset+i), 3, ENC_BIG_ENDIAN); i += 3; break; case FEEDBACK_REQ: /* decode and display the extended feedback request subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_uiuc, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_fb_type, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_slots, tvb, (offset+i), 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_frame_offset, tvb, (offset+i), 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_uiuc, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_fb_type, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_ofdma_symbol_offset, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_subchannel_offset, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_slots, tvb, (offset+i), 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_fb_req_frame_offset, tvb, (offset+i), 3, ENC_BIG_ENDIAN); i += 3; break; case SN_REQ: /* decode and display the extended SN request subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1, tvb, (offset+i), 1, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2, tvb, (offset+i), 1, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rsv, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rep_ind_1, tvb, (offset+i), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rep_ind_2, tvb, (offset+i), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_sn_req_rsv, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case PDU_SN_SHORT_DL: /* decode and display the extended pdu sn (short) subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_short, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_short, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case PDU_SN_LONG_DL: /* decode and display the extended pdu sn (long) subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_long, tvb, (offset+i), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_long, tvb, (offset+i), 2, ENC_BIG_ENDIAN); i += 2; break; default: /* reserved */ @@ -1335,7 +1335,7 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ } else /* for uplink */ { /* decode and display the extended subheader type */ - ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_type_ul, tvb, (offset+i), 1, FALSE); + ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_ext_subheader_type_ul, tvb, (offset+i), 1, ENC_BIG_ENDIAN); /* add subtree */ ti_tree = proto_item_add_subtree(ti, ett_mac_ext_subheader_ul_decoder); i++; @@ -1343,29 +1343,29 @@ static gint extended_subheader_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ { case MIMO_MODE_FEEDBACK: /* decode and display the extended MIMO Mode Feedback subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mimo_mode_fb_type, tvb, (offset+i), 1, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mimo_fb_content, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mimo_mode_fb_type, tvb, (offset+i), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mimo_fb_content, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case UL_TX_POWER_REPORT: /* decode and display the extended ul tx power report subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_ul_tx_pwr_rep, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case MINI_FEEDBACK: /* decode and display the extended MINI Feedback subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mini_fb_type, tvb, (offset+i), 2, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mini_fb_content, tvb, (offset+i), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mini_fb_type, tvb, (offset+i), 2, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_mini_fb_content, tvb, (offset+i), 2, ENC_BIG_ENDIAN); i += 2; break; case PDU_SN_SHORT_UL: /* decode and display the extended pdu sn (short) subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_short, tvb, (offset+i), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_short, tvb, (offset+i), 1, ENC_BIG_ENDIAN); i++; break; case PDU_SN_LONG_UL: /* decode and display the extended pdu sn (long) subheader */ - proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_long, tvb, (offset+i), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_generic_ext_subheader_pdu_sn_long, tvb, (offset+i), 2, ENC_BIG_ENDIAN); i += 2; break; default: /* reserved */ @@ -1412,7 +1412,7 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /* decode and display the ARQ Feedback IEs */ while (!last_ie) { /* decode and display CID */ - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_cid, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_cid, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next 16-bit word */ offset += 2; /* Get the 2nd 16-bit */ @@ -1424,13 +1424,13 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /* get the number of ACK maps */ num_maps = (word2 & ARQ_FB_IE_NUM_MAPS_MASK) + 1; /* decode and display the 2nd word */ - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_last, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_ack_type, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_bsn, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_last, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_ack_type, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_bsn, tvb, offset, 2, ENC_BIG_ENDIAN); /* decode and display the 3rd word */ if (ack_type != 1) { - sub_ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_num_maps, tvb, offset, 2, FALSE); + sub_ti = proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_num_maps, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next 16-bit word */ offset += 2; proto_item_append_text(sub_ti, " (%d map(s))", num_maps); @@ -1438,7 +1438,7 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot { if (ack_type != 3) { - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_sel_ack_map, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_sel_ack_map, tvb, offset, 2, ENC_BIG_ENDIAN); } else { /* Get the next 16-bit */ @@ -1446,20 +1446,20 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /* get the sequence format */ seq_format = (word3 & ARQ_FB_IE_SEQ_FORMAT_MASK); /* decode and display the sequence format */ - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_format, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_format, tvb, offset, 2, ENC_BIG_ENDIAN); if (!seq_format) { - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_ack_map_2, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq1_length_6, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq2_length_6, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_ack_map_2, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq1_length_6, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq2_length_6, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_ack_map, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq1_length, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq2_length, tvb, offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq3_length, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq_ack_map, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq1_length, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq2_length, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_mac_header_generic_arq_fb_ie_seq3_length, tvb, offset, 2, ENC_BIG_ENDIAN); } } /* move to next 16-bit word */ @@ -1469,7 +1469,7 @@ static gint arq_feedback_payload_decoder(tvbuff_t *tvb, packet_info *pinfo, prot else { /* Number of ACK Maps bits are reserved when ACK TYPE == 1 */ - proto_tree_add_item(sub_tree, hf_ack_type_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_ack_type_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next 16-bit word */ offset += 2; } diff --git a/plugins/wimax/mac_hd_type1_decoder.c b/plugins/wimax/mac_hd_type1_decoder.c index e592da80a9..18bcbedd28 100644 --- a/plugins/wimax/mac_hd_type1_decoder.c +++ b/plugins/wimax/mac_hd_type1_decoder.c @@ -238,9 +238,9 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ /* get the parent */ parent_item = proto_tree_get_parent(tree); /* Decode and display the first 3 bytes of the header */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_ht, tvb, offset, 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_1_ec, tvb, offset, 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_1_type, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_ht, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_ec, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_type, tvb, offset, 3, ENC_BIG_ENDIAN); /* Get the first byte */ first_byte = tvb_get_guint8(tvb, offset); /* get the sub Type */ @@ -267,67 +267,67 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ case BR_INCREMENTAL: case BR_AGGREGATE: /* Decode and display the Bandwidth Request */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_br, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_br, tvb, offset, 3, ENC_BIG_ENDIAN); break; case PHY_CHANNEL_REPORT: /* Decode and display the Preferred-DIUC */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_diuc, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_diuc, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the UL TX Power */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_ultxpwr, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_ultxpwr, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the UL Headroom */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_ulhdrm, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_ulhdrm, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the reserved filed */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_2, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_2, tvb, offset, 3, ENC_BIG_ENDIAN); break; case BR_WITH_UL_TX_POWER_REPORT: /* Decode and display the Bandwidth Request */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the UL TX Power */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_ultxpwr_3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_ultxpwr_3, tvb, offset, 3, ENC_BIG_ENDIAN); break; case BR_AND_CINR_REPORT: /* Decode and display the Bandwidth Request */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CINR */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_cinr, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_cinr, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the DCD Change Indication */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_dci, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_dci, tvb, offset, 3, ENC_BIG_ENDIAN); break; case BR_WITH_UL_SLEEP_CONTROL: /* Decode and display the Bandwidth Request */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_br_3, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the Power Saving Class ID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_pscid, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_pscid, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the Operation */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_op, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_op, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the reserved filed */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_5, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_5, tvb, offset, 3, ENC_BIG_ENDIAN); break; case SN_REPORT: /* Decode and display the Last field */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_last, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_last, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the SDU SN1 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn1, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn1, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the SDU SN2 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn2, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn2, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the SDU SN3 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_sdu_sn3, tvb, offset, 3, ENC_BIG_ENDIAN); break; case CQICH_ALLOCATION_REQUEST: /* Decode and display the Feedback Type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_fb_type, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_fb_type, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the FBSSI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_fbssi, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_fbssi, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the Prreferred-period */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_period, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_period, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the reserved filed */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_7, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_rsv_7, tvb, offset, 3, ENC_BIG_ENDIAN); break; } /* Decode and display the CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_cid, tvb, (offset+3), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_cid, tvb, (offset+3), 2, ENC_BIG_ENDIAN); /* Decode and display the HCS */ - proto_tree_add_item(ti_tree, hf_mac_header_type_1_hcs, tvb, (offset+5), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_1_hcs, tvb, (offset+5), 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/mac_hd_type2_decoder.c b/plugins/wimax/mac_hd_type2_decoder.c index 229ccc7564..d9eaf63858 100644 --- a/plugins/wimax/mac_hd_type2_decoder.c +++ b/plugins/wimax/mac_hd_type2_decoder.c @@ -414,15 +414,15 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ parent_item = proto_tree_get_parent(tree); /* Decode and display the first byte of the header */ /* header type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_ht, tvb, offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_ht, tvb, offset, 1, ENC_BIG_ENDIAN); /* encryption control */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_ec, tvb, offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_ec, tvb, offset, 1, ENC_BIG_ENDIAN); /* sub-type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* CID inclusion indication */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cii, tvb, offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cii, tvb, offset, 1, ENC_BIG_ENDIAN); /* feedback type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_fb_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_fb_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the first byte */ first_byte = tvb_get_guint8(tvb, offset); /* get the CII field */ @@ -455,333 +455,333 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ case CQI_MIMO_FB: /* Decode and display the CQI and MIMO feedback */ /* CQI feedback type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_fb_type, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_fb_type, tvb, offset, 2, ENC_BIG_ENDIAN); /* CQI payload */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_payload, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_payload, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cqi_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case DL_AVG_CINR: /* Decode and display the DL average CINR feedback */ /* DL average CINR payload */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_ave_cinr, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_ave_cinr, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_ave_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_ave_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case MIMO_COEF_FB: /* Decode and display the MIMO coefficients feedback */ /* number of index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_ni, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_ni, tvb, offset, 2, ENC_BIG_ENDIAN); /* occurrences of antenna index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_ai, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_ai, tvb, offset, 2, ENC_BIG_ENDIAN); /* MIMO coefficients */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_coef_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* Decode and display the CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case PREF_DL_CHAN_DIUC_FB: /* Decode and display the Preffed DL Channel DIUC feedback */ /* Preferred DIUC */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_diuc, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_diuc, tvb, offset, 2, ENC_BIG_ENDIAN); /* DCD Change Count */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_dcd, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_dcd, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_dl_chan_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case UL_TX_PWR: /* Decode and display the UL TX Power feedback */ /* UL TX Power */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_ul_tx_pwr, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_ul_tx_pwr, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_ul_tx_pwr_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_ul_tx_pwr_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case PHY_CHAN_FB: /* Decode and display the PHY Channel feedback */ /* Preffed DIUC */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_diuc, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_diuc, tvb, offset, 2, ENC_BIG_ENDIAN); /* UL TX Power */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_ul_tx_pwr, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_ul_tx_pwr, tvb, offset, 2, ENC_BIG_ENDIAN); /* UL Headroom */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_ul_hdrm, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_ul_hdrm, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_phy_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case AMC_BAND_BITMAP: /* Decode and display the AMC Band CQIs feedback */ /* AMC Band Indication Bitmap */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_bitmap, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_bitmap, tvb, offset, 2, ENC_BIG_ENDIAN); /* AMC CQI 1 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_1, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* AMC CQI 2 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_2, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_2, tvb, offset, 2, ENC_BIG_ENDIAN); /* AMC CQI 3 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_3, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_3, tvb, offset, 2, ENC_BIG_ENDIAN); /* AMC CQI 4 */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_4, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_amc_cqi_4, tvb, offset, 2, ENC_BIG_ENDIAN); #if 0 /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } #endif break; case SHORT_PRECODE_FB: /* Decode and display the Life Span of Short-term precoding feedback */ /* Life Span */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_life_span, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_life_span, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_life_span_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_life_span_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case MULTI_TYPES_FB: /* Decode and display the Multi types of feedback */ /* Number of feedback types */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_num_fb_types, tvb, offset, 4, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_num_fb_types, tvb, offset, 4, ENC_BIG_ENDIAN); /* Occurrences of feedback type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_occu_fb_type, tvb, offset, 4, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_occu_fb_type, tvb, offset, 4, ENC_BIG_ENDIAN); /* feedback contents */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_fb_contents, tvb, offset, 4, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mt_fb_contents, tvb, offset, 4, ENC_BIG_ENDIAN); #if 0 /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } #endif break; case LONG_PRECODE_FB: /* Decode and display the Long-term precoding feedback */ /* Feedback of index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_id_fb, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_id_fb, tvb, offset, 2, ENC_BIG_ENDIAN); /* rank of prrecoding codebook */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_rank, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_rank, tvb, offset, 2, ENC_BIG_ENDIAN); /* EFC and QAM feedback */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_fec_qam, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_fec_qam, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_lt_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case COMB_DL_AVG_CINR: /* Decode and display the Combined DL Average CINR feedback */ /* Combined DL average CINR of Active BSs */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_comb_dl_ave, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_comb_dl_ave, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_comb_dl_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_comb_dl_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case MIMO_CHAN_FB: /* Decode and display the second byte of the header */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_diuc, tvb, (offset+1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_pbwi, tvb, (offset+1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_diuc, tvb, (offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_pbwi, tvb, (offset+1), 1, ENC_BIG_ENDIAN); /* Decode and display the 3rd to 5th bytes of the header */ /* Decode and display the SLPB */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_slpb, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_slpb, tvb, offset, 3, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* Decode and display the BPRI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_bpri_cid, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_bpri_cid, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cid, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cid, tvb, offset, 3, ENC_BIG_ENDIAN); } else { /* without CID */ /* Decode and display the BPRI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_bpri, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_bpri, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CTI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cti, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cti, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the AI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_0, tvb, offset, 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_1, tvb, offset, 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_2, tvb, offset, 3, FALSE); - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_3, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_0, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_1, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_2, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ai_3, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the MI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_mi, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_mi, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CT */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ct, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_ct, tvb, offset, 3, ENC_BIG_ENDIAN); /* Decode and display the CQI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cqi, tvb, offset, 3, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_mimo_cqi, tvb, offset, 3, ENC_BIG_ENDIAN); } break; case CINR_FB: /* Decode and display the CINRC feedback */ /* CINR Mean */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cinr_mean, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cinr_mean, tvb, offset, 2, ENC_BIG_ENDIAN); /* CINR Standard Deviation */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cinr_devi, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cinr_devi, tvb, offset, 2, ENC_BIG_ENDIAN); /* check the CII field */ if(cii_bit) { /* with CID */ /* Decode and display the CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; case CL_MIMO_FB: /* Get the MIMO type */ mimo_type = ((tvb_get_guint8(tvb, offset) & 0xC0) >> 6); /* Decode and display the MIMO type */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_type, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_type, tvb, offset, 2, ENC_BIG_ENDIAN); if(mimo_type == 1) { /* Decode and display the umber of streams */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_streams, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_streams, tvb, offset, 2, ENC_BIG_ENDIAN); /* Decode and display the antenna selection option index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_ant_sel, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_ant_sel, tvb, offset, 2, ENC_BIG_ENDIAN); /* Decode and display the average CQI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi_1, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv_1, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv_1, tvb, offset, 2, ENC_BIG_ENDIAN); } else if(mimo_type == 2) { /* Decode and display the umber of streams */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_streams, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_streams, tvb, offset, 2, ENC_BIG_ENDIAN); /* Decode and display the antenna selection option index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_codebook_id, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_codebook_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* Decode and display the average CQI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi_2, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi_2, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv_2, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv_2, tvb, offset, 2, ENC_BIG_ENDIAN); } else { /* Decode and display the antenna grouping index */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_ant_id, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_ant_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* Decode and display the average CQI */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_cqi, tvb, offset, 2, ENC_BIG_ENDIAN); /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv, tvb, offset, 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cl_mimo_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); } /* check the CII field */ if(cii_bit) { /* with CID */ /* Decode and display the CID */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } else { /* without CID */ /* reserved */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_no_cid, tvb, (offset+2), 2, ENC_BIG_ENDIAN); } break; default: break; } /* Decode and display the HCS */ - proto_tree_add_item(ti_tree, hf_mac_header_type_2_hcs, tvb, (offset+4), 1, FALSE); + proto_tree_add_item(ti_tree, hf_mac_header_type_2_hcs, tvb, (offset+4), 1, ENC_BIG_ENDIAN); } else { diff --git a/plugins/wimax/msg_aas_beam.c b/plugins/wimax/msg_aas_beam.c index 41d60a016c..3d610b60dc 100644 --- a/plugins/wimax/msg_aas_beam.c +++ b/plugins/wimax/msg_aas_beam.c @@ -111,14 +111,14 @@ void dissect_mac_mgmt_msg_aas_beam_select_decoder(tvbuff_t *tvb, packet_info *pi /* add subtree */ aas_beam_tree = proto_item_add_subtree(aas_beam_item, ett_mac_mgmt_msg_aas_beam_select_decoder); /* Display the AAS-BEAM-SELECT message type */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* Decode and display the AAS-BEAM-SELECT message body */ /* display the AAS Beam Index */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_index, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_index, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the reserved fields */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } } @@ -144,26 +144,26 @@ static void dissect_mac_mgmt_msg_aas_beam_req_decoder(tvbuff_t *tvb, packet_info /* add subtree */ aas_beam_tree = proto_item_add_subtree(aas_beam_item, ett_mac_mgmt_msg_aas_beam_req_decoder); /* Display the AAS-BEAM-REQ message type */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* Decode and display the AAS-BEAM-REQ message body */ /* display the Frame Number */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_frame_number, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_frame_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Feedback Request Number */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_feedback_request_number, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_feedback_request_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Measurement Report Type */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_measurement_report_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_measurement_report_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Resolution Parameter */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_resolution_parameter, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_resolution_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Beam Bit mask */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_beam_bit_mask, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_beam_bit_mask, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the reserved fields */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } } @@ -189,28 +189,28 @@ static void dissect_mac_mgmt_msg_aas_beam_rsp_decoder(tvbuff_t *tvb, packet_info /* add subtree */ aas_beam_tree = proto_item_add_subtree(aas_beam_item, ett_mac_mgmt_msg_aas_beam_req_decoder); /* Display the AAS-BEAM-RSP message type */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* Decode and display the AAS-BEAM-RSP message body */ /* display the Frame Number */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_frame_number, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_frame_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* get the Measurement Report Type */ report_type = tvb_get_guint8(tvb, offset); /* display the Feedback Request Number */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_feedback_request_number, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_feedback_request_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Measurement Report Type */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_measurement_report_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_measurement_report_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Resolution Parameter */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_resolution_parameter, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_resolution_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Beam Bit mask */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_beam_bit_mask, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_beam_bit_mask, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the reserved fields */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_select_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* check the Measurement Report Type */ @@ -221,21 +221,21 @@ static void dissect_mac_mgmt_msg_aas_beam_rsp_decoder(tvbuff_t *tvb, packet_info /* display the frequency */ for(index = 0; index < number_of_frequencies; index++) { /* display the Frequency Value (real part) */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_freq_value_re, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_freq_value_re, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Frequency Value (imaginary part) */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_freq_value_im, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_freq_value_im, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; } } /* display the RSSI Mean Value */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_rssi_value, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_rssi_value, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the CINR Mean Value */ - proto_tree_add_item(aas_beam_tree, hf_aas_beam_cinr_value, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_beam_tree, hf_aas_beam_cinr_value, tvb, offset, 1, ENC_BIG_ENDIAN); } } #endif diff --git a/plugins/wimax/msg_aas_fbck.c b/plugins/wimax/msg_aas_fbck.c index f38e16546f..af6e621363 100644 --- a/plugins/wimax/msg_aas_fbck.c +++ b/plugins/wimax/msg_aas_fbck.c @@ -118,31 +118,31 @@ void dissect_mac_mgmt_msg_aas_fbck_req_decoder(tvbuff_t *tvb, packet_info *pinfo /* add subtree */ aas_fbck_tree = proto_item_add_subtree(aas_fbck_item, ett_mac_mgmt_msg_aas_fbck_req_decoder); /* Display the AAS-FBCK-REQ message type */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* Decode and display the AAS-FBCK-REQ message body */ /* display the Frame Number */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_frame_number, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_frame_number, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* get the data type */ data_type = tvb_get_guint8(tvb, offset); /* display the number of Frames */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_number_of_frames, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_number_of_frames, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Data Type */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_data_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_data_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Feedback Request Counter */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_counter, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_counter, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Frequency Measurement Resolution */ if(data_type & OFDMA_AAS_FBCK_REQ_DATA_TYPE_MASK) - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_resolution_1, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_resolution_1, tvb, offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_resolution_0, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_resolution_0, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the reserved fields */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } } @@ -167,42 +167,42 @@ void dissect_mac_mgmt_msg_aas_fbck_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo /* add subtree */ aas_fbck_tree = proto_item_add_subtree(aas_fbck_item, ett_mac_mgmt_msg_aas_fbck_req_decoder); /* Display the AAS-FBCK-RSP message type */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* get the data type */ data_type = tvb_get_guint8(tvb, offset); /* Decode and display the AAS-FBCK-RSP message body */ /* display the reserved fields */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Data Type */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_data_type, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_data_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Feedback Request Counter */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_counter, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_counter, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Frequency Measurement Resolution */ if(data_type & OFDMA_AAS_FBCK_RSP_DATA_TYPE_MASK) - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_resolution_1, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_resolution_1, tvb, offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_resolution_0, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rsp_resolution_0, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; for(; offset < (tvb_len - 2); ) { /* display the Frequency Value (real part) */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_freq_value_re, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_freq_value_re, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Frequency Value (imaginary part) */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_freq_value_im, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_freq_value_im, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; } /* display the RSSI Mean Value */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rssi_value, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_rssi_value, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the CINR Mean Value */ - proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_cinr_value, tvb, offset, 1, FALSE); + proto_tree_add_item(aas_fbck_tree, hf_aas_fbck_cinr_value, tvb, offset, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/msg_arq.c b/plugins/wimax/msg_arq.c index d83f9c8766..0b40b2c806 100644 --- a/plugins/wimax/msg_arq.c +++ b/plugins/wimax/msg_arq.c @@ -364,7 +364,7 @@ void dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info *pinfo /* add MAC ARQ Feedback subtree */ arq_feedback_tree = proto_item_add_subtree(arq_feedback_item, ett_mac_mgmt_msg_arq_decoder); /* display the Message Type */ - proto_tree_add_item(arq_feedback_tree, hf_arq_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(arq_feedback_tree, hf_arq_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; while(offset < tvb_len && !arq_last) @@ -384,12 +384,12 @@ void dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info *pinfo } /* add ARQ Feedback IE subtree */ arq_fb_tree = proto_item_add_subtree(arq_fb_item, ett_mac_mgmt_msg_arq_decoder); - proto_tree_add_item(arq_fb_tree, hf_arq_cid, tvb, offset, 2, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_cid, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(arq_fb_tree, hf_arq_last, tvb, offset + 2, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_ack_type, tvb, offset + 2, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_bsn, tvb, offset + 2, 2, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_ack_type, tvb, offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_bsn, tvb, offset + 2, 2, ENC_BIG_ENDIAN); if (arq_ack_type != ARQ_CUMULATIVE_ACK_ENTRY) { - ti = proto_tree_add_item(arq_fb_tree, hf_arq_num_ack_maps, tvb, offset + 3, 1, FALSE); + ti = proto_tree_add_item(arq_fb_tree, hf_arq_num_ack_maps, tvb, offset + 3, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " (%d map(s))", arq_num_ack_maps); offset += 2; @@ -397,26 +397,26 @@ void dissect_mac_mgmt_msg_arq_feedback_decoder(tvbuff_t *tvb, packet_info *pinfo /* Each ACK Map is 16 bits. */ offset += 2; if (arq_ack_type != 3) { - proto_tree_add_item(arq_fb_tree, hf_arq_selective_map, tvb, offset, 2, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_selective_map, tvb, offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(arq_fb_tree, hf_arq_seq_format, tvb, offset, 1, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_seq_format, tvb, offset, 1, ENC_BIG_ENDIAN); seq_format = (tvb_get_guint8(tvb, offset) & 0x80) >> 7; if (seq_format == 0) { - proto_tree_add_item(arq_fb_tree, hf_arq_0seq_ack_map, tvb, offset, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_0seq1_len, tvb, offset, 2, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_0seq2_len, tvb, offset, 2, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_reserved, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_0seq_ack_map, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_0seq1_len, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_0seq2_len, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_reserved, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(arq_fb_tree, hf_arq_1seq_ack_map, tvb, offset, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_1seq1_len, tvb, offset, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_1seq2_len, tvb, offset + 1, 1, FALSE); - proto_tree_add_item(arq_fb_tree, hf_arq_1seq3_len, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(arq_fb_tree, hf_arq_1seq_ack_map, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_1seq1_len, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_1seq2_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_fb_tree, hf_arq_1seq3_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN); } } } } else { /* Number of ACK Maps bits are reserved when ACK TYPE == 1 */ - proto_tree_add_item(arq_fb_tree, hf_ack_type_reserved, tvb, offset + 3, 1, FALSE); + proto_tree_add_item(arq_fb_tree, hf_ack_type_reserved, tvb, offset + 3, 1, ENC_BIG_ENDIAN); /* update the offset */ offset += 2; } @@ -451,11 +451,11 @@ void dissect_mac_mgmt_msg_arq_discard_decoder(tvbuff_t *tvb, packet_info *pinfo /* add MAC ARQ Discard subtree */ arq_discard_tree = proto_item_add_subtree(arq_discard_item, ett_mac_mgmt_msg_arq_decoder); /* display the Message Type */ - proto_tree_add_item(arq_discard_tree, hf_arq_message_type, tvb, 0, 1, FALSE); + proto_tree_add_item(arq_discard_tree, hf_arq_message_type, tvb, 0, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(arq_discard_tree, hf_arq_discard_cid, tvb, 1, 2, FALSE); - proto_tree_add_item(arq_discard_tree, hf_arq_discard_reserved, tvb, 3, 1, FALSE); - proto_tree_add_item(arq_discard_tree, hf_arq_discard_bsn, tvb, 3, 2, FALSE); + proto_tree_add_item(arq_discard_tree, hf_arq_discard_cid, tvb, 1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_discard_tree, hf_arq_discard_reserved, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_discard_tree, hf_arq_discard_bsn, tvb, 3, 2, ENC_BIG_ENDIAN); } } @@ -483,12 +483,12 @@ void dissect_mac_mgmt_msg_arq_reset_decoder(tvbuff_t *tvb, packet_info *pinfo _U /* add MAC ARQ Reset subtree */ arq_reset_tree = proto_item_add_subtree(arq_reset_item, ett_mac_mgmt_msg_arq_decoder); /* display the Message Type */ - proto_tree_add_item(arq_reset_tree, hf_arq_message_type, tvb, 0, 1, FALSE); + proto_tree_add_item(arq_reset_tree, hf_arq_message_type, tvb, 0, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(arq_reset_tree, hf_arq_reset_cid, tvb, 1, 2, FALSE); - proto_tree_add_item(arq_reset_tree, hf_arq_reset_type, tvb, 3, 1, FALSE); - proto_tree_add_item(arq_reset_tree, hf_arq_reset_direction, tvb, 3, 1, FALSE); - proto_tree_add_item(arq_reset_tree, hf_arq_reset_reserved, tvb, 3, 1, FALSE); + proto_tree_add_item(arq_reset_tree, hf_arq_reset_cid, tvb, 1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_reset_tree, hf_arq_reset_type, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_reset_tree, hf_arq_reset_direction, tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(arq_reset_tree, hf_arq_reset_reserved, tvb, 3, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/msg_clk_cmp.c b/plugins/wimax/msg_clk_cmp.c index a25d1b6c4a..d84dc05c2d 100644 --- a/plugins/wimax/msg_clk_cmp.c +++ b/plugins/wimax/msg_clk_cmp.c @@ -75,22 +75,22 @@ void dissect_mac_mgmt_msg_clk_cmp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, /* add MAC CLK_CMP subtree */ clk_cmp_tree = proto_item_add_subtree(clk_cmp_item, ett_mac_mgmt_msg_clk_cmp_decoder); /* display the Message Type */ - proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for clock count */ offset ++; /* get the clock count */ clock_count = tvb_get_guint8(tvb, offset); /* display the clock count */ - proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_count, tvb, offset, 1, FALSE); + proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_count, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for clock comparison */ offset++; for (i = 0; i < clock_count; i++ ) { /* display the Clock ID */ - proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_id, tvb, offset++, 1, FALSE); + proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_clock_id, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the sequence number */ - proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_seq_number, tvb, offset++, 1, FALSE); + proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_seq_number, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the comparison value */ - proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_comparison_value, tvb, offset++, 1, FALSE); + proto_tree_add_item(clk_cmp_tree, hf_clk_cmp_comparison_value, tvb, offset++, 1, ENC_BIG_ENDIAN); } } } diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index 110ee1e069..a32def8c21 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -364,15 +364,15 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t dcd_tree = proto_item_add_subtree(dcd_item, ett_mac_mgmt_msg_dcd_decoder); /* Decode and display the Downlink Channel Descriptor (DCD) */ /* display the Message Type */ - proto_tree_add_item(dcd_tree, hf_dcd_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dcd_tree, hf_dcd_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the Downlink Channel ID */ offset++; /* display the Downlink Channel ID */ - proto_tree_add_item(dcd_tree, hf_dcd_downlink_channel_id, tvb, offset, 1, FALSE); + proto_tree_add_item(dcd_tree, hf_dcd_downlink_channel_id, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the Configuration Change Count */ offset++; /* display the Configuration Change Count */ - proto_tree_add_item(dcd_tree, hf_dcd_config_change_count, tvb, offset, 1, FALSE); + proto_tree_add_item(dcd_tree, hf_dcd_config_change_count, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the DCD TLV Encoded information (table 358) */ @@ -408,8 +408,8 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, offset, tlv_len, "Downlink_Burst_Profile (DIUC=%u) (%u bytes)", (dl_burst_diuc+1), tlv_len); /* detail display */ - proto_tree_add_item(tlv_tree, hf_dcd_dl_burst_profile_rsv, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_dl_burst_profile_diuc, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_dl_burst_profile_rsv, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_dl_burst_profile_diuc, tvb, offset, 1, ENC_BIG_ENDIAN); /* process subTLVs */ for (tlv_offset = 1; tlv_offset < tlv_len; ) { /* get the TLV information */ @@ -433,32 +433,32 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_burst_freq, tvb, (offset+tlv_offset), 1, FALSE); - tlv_item = proto_tree_add_item(sub_tree, hf_dcd_burst_freq, tvb, (offset+tlv_offset), 1, FALSE); + tlv_item = proto_tree_add_item(sub_tree, hf_dcd_burst_freq, tvb, (offset+tlv_offset), 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " kHz"); break; } case DCD_BURST_FEC_CODE_TYPE: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_burst_fec, tvb, (offset+tlv_offset), 1, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_burst_fec, tvb, (offset+tlv_offset), 1, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_burst_fec, tvb, (offset+tlv_offset), 1, ENC_BIG_ENDIAN); break; } case DCD_BURST_DIUC_EXIT_THRESHOLD: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_burst_diuc_exit_threshold, tvb, (offset+tlv_offset), length, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_burst_diuc_exit_threshold, tvb, (offset+tlv_offset), length, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_burst_diuc_exit_threshold, tvb, (offset+tlv_offset), length, ENC_BIG_ENDIAN); break; } case DCD_BURST_DIUC_ENTRY_THRESHOLD: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_burst_diuc_entry_threshold, tvb, (offset+tlv_offset), length, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_burst_diuc_entry_threshold, tvb, (offset+tlv_offset), length, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_burst_diuc_entry_threshold, tvb, (offset+tlv_offset), length, ENC_BIG_ENDIAN); break; } case DCD_BURST_TCS_ENABLE: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_burst_tcs, tvb, (offset+tlv_offset), length, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_burst_tcs, tvb, (offset+tlv_offset), 1, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_burst_tcs, tvb, (offset+tlv_offset), 1, ENC_BIG_ENDIAN); break; } default: @@ -474,32 +474,32 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_bs_eirp, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_bs_eirp, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_bs_eirp, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " dBm"); break; } case DCD_FRAME_DURATION: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_frame_duration, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_frame_duration, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_frame_duration, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_PHY_TYPE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_phy_type, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_phy_type, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_phy_type, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_POWER_ADJUSTMENT: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_power_adjustment, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_power_adjustment, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_power_adjustment, tvb, offset, 1, ENC_BIG_ENDIAN); break; } case DCD_CHANNEL_NR: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_channel_nr, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_channel_nr, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_channel_nr, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TTG: @@ -507,7 +507,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_ttg, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_ttg, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_ttg, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " PS"); break; } @@ -516,7 +516,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_rtg, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_rtg, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_rtg, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " PS"); break; } @@ -544,7 +544,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case DCD_CHANNEL_SWITCH_FRAME_NR: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_channel_switch_frame_nr, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_channel_switch_frame_nr, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_channel_switch_frame_nr, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_FREQUENCY: @@ -552,7 +552,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_frequency, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_frequency, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_frequency, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " kHz"); break; } @@ -565,13 +565,13 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case DCD_FRAME_DURATION_CODE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_frame_duration_code, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_frame_duration_code, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_frame_duration_code, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_FRAME_NR: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_frame_nr, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_frame_nr, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_frame_nr, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } #ifdef WIMAX_16D_2004 @@ -587,34 +587,34 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_h_arq_ack_delay, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_h_arq_ack_delay, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_h_arq_ack_delay, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " frame offset"); break; } case DCD_MAC_VERSION: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_mac_version, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_mac_version, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_mac_version, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_19_PERMUTATION_TYPE_FOR_BROADCAST_REGION_IN_HARQ_ZONE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_19_permutation_type_for_broadcast_regions_in_harq_zone, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_20_MAXIMUM_RETRANSMISSION: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_20_maximum_retransmission, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_20_maximum_retransmission, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_20_maximum_retransmission, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_21_DEFAULT_RSSI_AND_CINR_AVERAGING_PARAMETER: { tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, offset, 1, "Default RSSI and CINR averaging parameter (%u byte(s))", tlv_len); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_physical_cinr_measurements, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_21_default_rssi_and_cinr_averaging_parameter_rssi_measurements, tvb, offset, 1, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP: @@ -628,15 +628,15 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, offset, tlv_len, "DL region definition (%u byte(s))", tlv_len); proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition, tvb, offset, tlv_len, ENC_NA); dl_num_regions = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_region, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_region, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); tlv_offset = offset; for(length = 0; length < dl_num_regions; length++) { - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_symbol_offset, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset, tvb, (tlv_offset+1), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_symbols, tvb, (tlv_offset+2), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_subchannels, tvb, (tlv_offset+3), 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_symbol_offset, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_subchannel_offset, tvb, (tlv_offset+1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_symbols, tvb, (tlv_offset+2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_34_dl_region_definition_num_subchannels, tvb, (tlv_offset+3), 1, ENC_BIG_ENDIAN); tlv_offset += 4; } break; @@ -644,11 +644,11 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case DCD_TLV_T_50_HO_TYPE_SUPPORT: { tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, offset, tlv_len, "HO type support (%u byte(s))", tlv_len); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_ho, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_mdho, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_fbss_ho, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_ho, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_mdho, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_fbss_ho, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_50_ho_type_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_31_H_ADD_THRESHOLD: @@ -656,7 +656,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_31_h_add_threshold, tvb, offset, 1, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_31_h_add_threshold, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_31_h_add_threshold, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " dB"); break; } @@ -665,7 +665,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_32_h_delete_threshold, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_32_h_delete_threshold, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_32_h_delete_threshold, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " dB"); break; } @@ -674,29 +674,29 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, offset, tlv_len, "ASR Slot Length (M) and Switching Period (L) (%u byte(s))", tlv_len); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr, tvb, offset, 1, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr_m, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr, tvb, offset, 1, ENC_BIG_ENDIAN); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr_m, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " frames"); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr_l, tvb, offset, 1, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_33_asr_l, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " frames"); break; } case DCD_TLV_T_35_PAGING_GROUP_ID: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_35_paging_group_id, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_35_paging_group_id, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_35_paging_group_id, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_36_TUSC1_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_36_tusc1_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_37_TUSC2_PERMUTATION_ACTIVE_SUBCHANNELS_BITMAP: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_37_tusc2_permutation_active_subchannels_bitmap, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_51_HYSTERSIS_MARGIN: @@ -704,7 +704,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_51_hysteresis_margin, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_51_hysteresis_margin, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_51_hysteresis_margin, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " dB"); break; } @@ -713,7 +713,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_item *tlv_item = NULL; tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_52_time_to_trigger_duration, tvb, offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_52_time_to_trigger_duration, tvb, offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_52_time_to_trigger_duration, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item, " ms"); break; } @@ -743,18 +743,18 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case DCD_TLV_T_541_TYPE_FUNCTION_ACTION: { /* table 358b */ sub_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, proto_mac_mgmt_msg_dcd_decoder, tvb, (offset + tlv_offset), length, "Trigger; Type/function/action description (%u byte(s))", tlv_len); - proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_function, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_action, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_function, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_dcd_tlv_t_541_action, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); } break; case DCD_TLV_T542_TRIGGER_VALUE: sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_tlv_t_542_trigger_value, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_tlv_t_542_trigger_value, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_tlv_t_542_trigger_value, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case DCD_TLV_T_543_TRIGGER_AVERAGING_DURATION: sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, tlv_tree, hf_dcd_tlv_t_543_trigger_averaging_duration, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(sub_tree, hf_dcd_tlv_t_543_trigger_averaging_duration, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(sub_tree, hf_dcd_tlv_t_543_trigger_averaging_duration, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; } tlv_offset += length; @@ -764,19 +764,19 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case DCD_TLV_T_60_NOISE_AND_INTERFERENCE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_60_noise_interference, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_60_noise_interference, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_60_noise_interference, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_153_DOWNLINK_BURST_PROFILE_FOR_MULTIPLE_FEC_TYPES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_153_downlink_burst_profile_for_mutiple_fec_types, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_RESTART_COUNT: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_restart_count, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_restart_count, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_restart_count, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case DCD_TLV_T_45_PAGING_INTERVAL_LENGTH: @@ -786,7 +786,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t proto_tree_add_text(tlv_tree, tvb, offset, tlv_len, "Reserved"); } else { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_45_paging_interval_length, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_45_paging_interval_length, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_45_paging_interval_length, tvb, offset, tlv_len, ENC_BIG_ENDIAN); } break; } diff --git a/plugins/wimax/msg_dlmap.c b/plugins/wimax/msg_dlmap.c index 967edc6601..5ab46c6c75 100644 --- a/plugins/wimax/msg_dlmap.c +++ b/plugins/wimax/msg_dlmap.c @@ -2081,24 +2081,24 @@ void dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, p dlmap_tree = proto_item_add_subtree(ti, ett_dlmap); /* Decode and display the DL-MAP */ - proto_tree_add_item(dlmap_tree, hf_dlmap_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dlmap_tree, hf_dlmap_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* PHY Synchronization Field 8.4.5.1 */ { ti = proto_tree_add_text(dlmap_tree, tvb, offset, 4, "Phy Synchronization Field"); phy_tree = proto_item_add_subtree(ti, ett_275_phy); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_ms, tvb, offset, 1, FALSE); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_per_sec, tvb, offset, 1, FALSE); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur, tvb, offset, 1, FALSE); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_ms, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_per_sec, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(phy_tree, hf_dlmap_phy_fnum, tvb, offset, 3, FALSE); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fnum, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; } - proto_tree_add_item(dlmap_tree, hf_dlmap_dcd, tvb, offset, 1, FALSE); + proto_tree_add_item(dlmap_tree, hf_dlmap_dcd, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; proto_tree_add_item(dlmap_tree, hf_dlmap_bsid, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(dlmap_tree, hf_dlmap_ofdma_sym, tvb, offset, 1, FALSE); + proto_tree_add_item(dlmap_tree, hf_dlmap_ofdma_sym, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* DL-MAP IEs */ @@ -2157,23 +2157,23 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre tree = proto_item_add_subtree(ti, ett_305); /* decode dlmap fields */ - proto_tree_add_item(tree, hf_dlmapc_compr, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dlmapc_ulmap, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dlmapc_rsv, tvb, offset, 2, FALSE); - proto_tree_add_item(tree, hf_dlmapc_len, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_dlmapc_compr, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmapc_ulmap, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmapc_rsv, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmapc_len, tvb, offset, 2, ENC_BIG_ENDIAN); /* PHY Synchronization Field 8.4.5.1 */ { ti_phy = proto_tree_add_text(tree, tvb, offset+2, 4, "Phy Synchronization Field"); phy_tree = proto_item_add_subtree(ti_phy, ett_275_phy); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_ms, tvb, offset+2, 1, FALSE); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_per_sec, tvb, offset+2, 1, FALSE); - proto_tree_add_item(phy_tree, hf_dlmap_phy_fnum, tvb, offset+3, 3, FALSE); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_ms, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fdur_per_sec, tvb, offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(phy_tree, hf_dlmap_phy_fnum, tvb, offset+3, 3, ENC_BIG_ENDIAN); } - proto_tree_add_item(tree, hf_dlmap_dcd, tvb, offset+6, 1, FALSE); - proto_tree_add_item(tree, hf_dlmapc_opid, tvb, offset+7, 1, FALSE); - proto_tree_add_item(tree, hf_dlmapc_secid, tvb, offset+8, 1, FALSE); - proto_tree_add_item(tree, hf_dlmap_ofdma_sym, tvb, offset+9, 1, FALSE); /* 2005 */ - proto_tree_add_item(tree, hf_dlmapc_count, tvb, offset+10,1, FALSE); + proto_tree_add_item(tree, hf_dlmap_dcd, tvb, offset+6, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmapc_opid, tvb, offset+7, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmapc_secid, tvb, offset+8, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_dlmap_ofdma_sym, tvb, offset+9, 1, ENC_BIG_ENDIAN); /* 2005 */ + proto_tree_add_item(tree, hf_dlmapc_count, tvb, offset+10,1, ENC_BIG_ENDIAN); dl_ie_count = tvb_get_guint8(tvb, offset + 10); offset += 11; nib = BYTE_TO_NIB(offset); @@ -2220,7 +2220,7 @@ gint wimax_decode_dlmapc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *base_tre /* calculate the CRC */ calculated_crc = wimax_mac_calc_crc32(tvb_get_ptr(tvb, 0, mac_len - sizeof(mac_crc)), mac_len - sizeof(mac_crc)); /* display the CRC */ - generic_item = proto_tree_add_item(base_tree, hf_mac_header_compress_dlmap_crc, tvb, mac_len - sizeof(mac_crc), sizeof(mac_crc), FALSE); + generic_item = proto_tree_add_item(base_tree, hf_mac_header_compress_dlmap_crc, tvb, mac_len - sizeof(mac_crc), sizeof(mac_crc), ENC_BIG_ENDIAN); if (mac_crc != calculated_crc) { proto_item_append_text(generic_item, " - incorrect! (should be: 0x%x)", calculated_crc); diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 5dd5256b8b..625ecd2856 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -150,31 +150,31 @@ static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb { switch (tlv_type) { case DREG_PAGING_INFO: - proto_tree_add_item(dreg_tree, hf_dreg_paging_cycle, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_paging_offset, tvb, tlv_offset + 2, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_paging_group_id, tvb, tlv_offset + 3, 2, FALSE); + proto_tree_add_item(dreg_tree, hf_dreg_paging_cycle, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_paging_offset, tvb, tlv_offset + 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_paging_group_id, tvb, tlv_offset + 3, 2, ENC_BIG_ENDIAN); break; case DREG_REQ_DURATION: - proto_tree_add_item(dreg_tree, hf_dreg_req_duration, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(dreg_tree, hf_dreg_req_duration, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case DREG_PAGING_CONTROLLER_ID: proto_tree_add_item(dreg_tree, hf_paging_controller_id, tvb, tlv_offset, 6, FALSE); break; case DREG_IDLE_MODE_RETAIN_INFO: - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_sbc, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_pkm, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_reg, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_network_address, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_tod, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_tftp, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_full_service, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(dreg_tree, hf_dreg_consider_paging_pref, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_sbc, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_pkm, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_reg, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_network_address, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_tod, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_tftp, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_retain_ms_service_full_service, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(dreg_tree, hf_dreg_consider_paging_pref, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case DREG_MAC_HASH_SKIP_THRESHOLD: - proto_tree_add_item(dreg_tree, hf_mac_hash_skip_threshold, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(dreg_tree, hf_mac_hash_skip_threshold, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case DREG_PAGING_CYCLE_REQUEST: - proto_tree_add_item(dreg_tree, hf_dreg_paging_cycle_request, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(dreg_tree, hf_dreg_paging_cycle_request, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; default: proto_tree_add_item(dreg_tree, hf_tlv_value, tvb, tlv_offset, tlv_len, ENC_NA); @@ -412,12 +412,12 @@ void dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pr /* add MAC DREG REQ subtree */ dreg_req_tree = proto_item_add_subtree(dreg_req_item, ett_mac_mgmt_msg_dreg_decoder); /* display the Message Type */ - proto_tree_add_item(dreg_req_tree, hf_dreg_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_req_tree, hf_dreg_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* display the Action Code */ - proto_tree_add_item(dreg_req_tree, hf_dreg_req_action, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_req_tree, hf_dreg_req_action, tvb, offset, 1, ENC_BIG_ENDIAN); /* show the Reserved bits */ - proto_tree_add_item(dreg_req_tree, hf_dreg_req_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_req_tree, hf_dreg_req_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; while(offset < tvb_len) @@ -495,15 +495,15 @@ void dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pr /* add MAC DREG CMD subtree */ dreg_cmd_tree = proto_item_add_subtree(dreg_cmd_item, ett_mac_mgmt_msg_dreg_decoder); /* display the Message Type */ - proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* display the Action Code */ if (include_cor2_changes) - proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_action_cor2, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_action_cor2, tvb, offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_action, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_action, tvb, offset, 1, ENC_BIG_ENDIAN); /* show the Reserved bits */ - proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(dreg_cmd_tree, hf_dreg_cmd_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; while(offset < tvb_len) diff --git a/plugins/wimax/msg_dsa.c b/plugins/wimax/msg_dsa.c index 9e3b20de32..1712598043 100644 --- a/plugins/wimax/msg_dsa.c +++ b/plugins/wimax/msg_dsa.c @@ -87,11 +87,11 @@ void dissect_mac_mgmt_msg_dsa_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_req_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsa_tree, hf_dsa_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* process DSA-REQ message TLV Encode Information */ @@ -122,15 +122,15 @@ void dissect_mac_mgmt_msg_dsa_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_rsp_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsa_tree, hf_dsa_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsa_tree, hf_dsa_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* process DSA RSP message TLV Encode Information */ @@ -161,15 +161,15 @@ void dissect_mac_mgmt_msg_dsa_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsa_tree = proto_item_add_subtree(dsa_item, ett_mac_mgmt_msg_dsa_ack_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsa_tree, hf_dsa_ack_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_ack_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsa_tree, hf_dsa_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsa_tree, hf_dsa_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* process DSA-REQ message TLV Encode Information */ diff --git a/plugins/wimax/msg_dsc.c b/plugins/wimax/msg_dsc.c index 87e518ea65..e66677945f 100644 --- a/plugins/wimax/msg_dsc.c +++ b/plugins/wimax/msg_dsc.c @@ -87,11 +87,11 @@ void dissect_mac_mgmt_msg_dsc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_req_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsc_tree, hf_dsc_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* process DSC REQ message TLV Encode Information */ @@ -122,15 +122,15 @@ void dissect_mac_mgmt_msg_dsc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_rsp_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsc_tree, hf_dsc_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* process DSC RSP message TLV Encode Information */ @@ -161,15 +161,15 @@ void dissect_mac_mgmt_msg_dsc_ack_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsc_tree = proto_item_add_subtree(dsc_item, ett_mac_mgmt_msg_dsc_ack_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(dsc_tree, hf_dsc_ack_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_ack_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsc_tree, hf_dsc_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* process DSC ACK message TLV Encode Information */ diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index 4bff39b237..29dbd1a507 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -95,15 +95,15 @@ void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro dsd_tree = proto_item_add_subtree(dsd_item, ett_mac_mgmt_msg_dsd_req_decoder); /* Decode and display the DSD message */ /* display the Message Type */ - proto_tree_add_item(dsd_tree, hf_dsd_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Service Flow ID */ - proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, ENC_BIG_ENDIAN); /* move to next field */ offset += 4; /* process DSD REQ message TLV Encode Information */ @@ -181,15 +181,15 @@ void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsd_tree, hf_dsd_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Service Flow ID */ - proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, FALSE); + proto_tree_add_item(dsd_tree, hf_dsd_service_flow_id, tvb, offset, 4, ENC_BIG_ENDIAN); /* move to next field */ offset += 4; /* process DSD RSP message TLV Encode Information */ diff --git a/plugins/wimax/msg_dsx_rvd.c b/plugins/wimax/msg_dsx_rvd.c index ee9fb03f93..449b26dc47 100644 --- a/plugins/wimax/msg_dsx_rvd.c +++ b/plugins/wimax/msg_dsx_rvd.c @@ -67,15 +67,15 @@ void dissect_mac_mgmt_msg_dsx_rvd_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, /* add MAC DSx subtree */ dsx_rvd_tree = proto_item_add_subtree(dsx_rvd_item, ett_mac_mgmt_msg_dsx_rvd_decoder); /* display the Message Type */ - proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* display the Transaction ID */ - proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_transaction_id, tvb, offset, 2, FALSE); + proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_transaction_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* move to next field */ offset += 2; /* display the Confirmation Code */ - proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_confirmation_code, tvb, offset, 1, FALSE); + proto_tree_add_item(dsx_rvd_tree, hf_dsx_rvd_confirmation_code, tvb, offset, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/msg_fpc.c b/plugins/wimax/msg_fpc.c index 8ff5506254..e535d74fd8 100644 --- a/plugins/wimax/msg_fpc.c +++ b/plugins/wimax/msg_fpc.c @@ -82,16 +82,16 @@ void dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, pro /* add MAC FPC subtree */ fpc_tree = proto_item_add_subtree(fpc_item, ett_mac_mgmt_msg_fpc_decoder); /* display the Message Type */ - proto_tree_add_item(fpc_tree, hf_fpc_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(fpc_tree, hf_fpc_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* display the Number of stations */ - proto_tree_add_item(fpc_tree, hf_fpc_number_of_stations, tvb, offset, 1, FALSE); + proto_tree_add_item(fpc_tree, hf_fpc_number_of_stations, tvb, offset, 1, ENC_BIG_ENDIAN); number_stations = tvb_get_guint8(tvb, offset); offset++; for (i = 0; i < number_stations; i++ ) { /* display the Basic CID*/ - proto_tree_add_item(fpc_tree, hf_fpc_basic_cid, tvb, offset, 2, FALSE); + proto_tree_add_item(fpc_tree, hf_fpc_basic_cid, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; /* display the Power adjust value */ @@ -103,7 +103,7 @@ void dissect_mac_mgmt_msg_fpc_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, pro offset++; /* display the Power measurement frame */ - proto_tree_add_item(fpc_tree, hf_fpc_power_measurement_frame, tvb, offset, 1, FALSE); + proto_tree_add_item(fpc_tree, hf_fpc_power_measurement_frame, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if ( offset >= tvb_len ) { diff --git a/plugins/wimax/msg_pkm.c b/plugins/wimax/msg_pkm.c index 5898720520..c439ef4258 100644 --- a/plugins/wimax/msg_pkm.c +++ b/plugins/wimax/msg_pkm.c @@ -110,15 +110,15 @@ void dissect_mac_mgmt_msg_pkm_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro pkm_tree = proto_item_add_subtree(pkm_item, ett_mac_mgmt_msg_pkm_req_decoder); /* Decode and display the Privacy Key Management Request Message (PKM-REQ) (table 24) */ /* display the Message Type */ - proto_tree_add_item(pkm_tree, hf_pkm_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the PKM Code */ offset++; /* display the PKM Code */ - proto_tree_add_item(pkm_tree, hf_pkm_msg_code, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the PKM ID */ offset++; /* display the PKM ID */ - proto_tree_add_item(pkm_tree, hf_pkm_msg_pkm_id, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_msg_pkm_id, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the PKM TLV Encoded Attributes */ @@ -151,15 +151,15 @@ void dissect_mac_mgmt_msg_pkm_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro pkm_tree = proto_item_add_subtree(pkm_item, ett_mac_mgmt_msg_pkm_rsp_decoder); /* Decode and display the Privacy Key Management Response (PKM-RSP) (table 25) */ /* display the Message Type */ - proto_tree_add_item(pkm_tree, hf_pkm_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the PKM Code */ offset++; /* display the PKM Code */ - proto_tree_add_item(pkm_tree, hf_pkm_msg_code, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_msg_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the PKM ID */ offset++; /* display the PKM ID */ - proto_tree_add_item(pkm_tree, hf_pkm_msg_pkm_id, tvb, offset, 1, FALSE); + proto_tree_add_item(pkm_tree, hf_pkm_msg_pkm_id, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the PKM TLV Encoded Attributes */ diff --git a/plugins/wimax/msg_pmc.c b/plugins/wimax/msg_pmc.c index a774d41747..a8099667d0 100644 --- a/plugins/wimax/msg_pmc.c +++ b/plugins/wimax/msg_pmc.c @@ -213,16 +213,16 @@ void dissect_mac_mgmt_msg_pmc_req_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, /* add MAC PMC REQ subtree */ pmc_req_tree = proto_item_add_subtree(pmc_req_item, ett_mac_mgmt_msg_pmc_decoder); /* display the Message Type */ - proto_tree_add_item(pmc_req_tree, hf_pmc_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pmc_req_tree, hf_pmc_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* display the Power Control Mode Change */ - proto_tree_add_item(pmc_req_tree, hf_pmc_req_pwr_control_mode_change, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_req_tree, hf_pmc_req_pwr_control_mode_change, tvb, offset, 2, ENC_BIG_ENDIAN); /* show the Transmit Power Level */ proto_tree_add_item(pmc_req_tree, hf_pmc_req_tx_power_level, tvb, offset, 2, FALSE); /* display the Confirmation/request */ - proto_tree_add_item(pmc_req_tree, hf_pmc_req_confirmation, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_req_tree, hf_pmc_req_confirmation, tvb, offset, 2, ENC_BIG_ENDIAN); /* show the Reserved bits */ - proto_tree_add_item(pmc_req_tree, hf_pmc_req_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_req_tree, hf_pmc_req_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); } } @@ -254,16 +254,16 @@ void dissect_mac_mgmt_msg_pmc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, /* add MAC PMC RSP subtree */ pmc_rsp_tree = proto_item_add_subtree(pmc_rsp_item, ett_mac_mgmt_msg_pmc_decoder); /* display the Message Type */ - proto_tree_add_item(pmc_rsp_tree, hf_pmc_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(pmc_rsp_tree, hf_pmc_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* display the Power Control Mode Change */ if (include_cor2_changes) - proto_tree_add_item(pmc_rsp_tree, hf_pmc_req_pwr_control_mode_change_cor2, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_rsp_tree, hf_pmc_req_pwr_control_mode_change_cor2, tvb, offset, 2, ENC_BIG_ENDIAN); else - proto_tree_add_item(pmc_rsp_tree, hf_pmc_req_pwr_control_mode_change, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_rsp_tree, hf_pmc_req_pwr_control_mode_change, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the Power Adjust start frame */ - proto_tree_add_item(pmc_rsp_tree, hf_pmc_rsp_start_frame, tvb, offset, 2, FALSE); + proto_tree_add_item(pmc_rsp_tree, hf_pmc_rsp_start_frame, tvb, offset, 2, ENC_BIG_ENDIAN); pwr_control_mode = 0xC0 & tvb_get_guint8(tvb, offset); offset++; diff --git a/plugins/wimax/msg_prc_lt_ctrl.c b/plugins/wimax/msg_prc_lt_ctrl.c index 8252a79cec..bd65c370fa 100644 --- a/plugins/wimax/msg_prc_lt_ctrl.c +++ b/plugins/wimax/msg_prc_lt_ctrl.c @@ -84,15 +84,15 @@ void dissect_mac_mgmt_msg_prc_lt_ctrl_decoder(tvbuff_t *tvb, packet_info *pinfo prc_lt_ctrl_tree = proto_item_add_subtree(prc_lt_ctrl_item, ett_mac_mgmt_msg_prc_lt_ctrl_decoder); /* display the Message Type */ - proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset ++; /* display whether to Setup or Tear-down the * long-term MIMO precoding delay */ - proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding, tvb, offset, 1, FALSE); + proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the Precoding Delay */ - proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding_delay, tvb, offset, 1, FALSE); + proto_tree_add_item(prc_lt_ctrl_tree, hf_prc_lt_ctrl_precoding_delay, tvb, offset, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index bb453b8f20..bf7fcfef28 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -248,11 +248,11 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb break; case REG_IP_VERSION: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_ip_version, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_ip_version, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_ip_version, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_UL_TRANSPORT_CIDS_SUPPORTED: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_ul_cids, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_ul_cids, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_ul_cids, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case REG_POWER_SAVING_CLASS_CAPABILITY: @@ -262,8 +262,8 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb proto_tree_add_item(tlv_tree, hf_reg_power_saving_class_type_ii, tvb, tlv_offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_reg_power_saving_class_type_iii, tvb, tlv_offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_reg_multi_active_power_saving_classes, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_total_power_saving_class_instances, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_power_saving_class_reserved, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_total_power_saving_class_instances, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_power_saving_class_reserved, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case REG_IP_PHS_SDU_ENCAP: /* add TLV subtree */ @@ -271,7 +271,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb #ifdef WIMAX_16E_2005 if (tlv_len == 2){ - proto_tree_add_item(tlv_tree, hf_reg_encap_atm_2, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_encap_atm_2, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_reg_encap_ipv4_2, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_ipv6_2, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_802_3_2, tvb, tlv_offset, tlv_len, FALSE); @@ -284,9 +284,9 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb proto_tree_add_item(tlv_tree, hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_2, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_packet_ip_rohc_header_compression_2, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_packet_ip_ecrtp_header_compression_2, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_encap_rsvd_2, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_encap_rsvd_2, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); } else if(tlv_len == 4){ - proto_tree_add_item(tlv_tree, hf_reg_encap_atm_4, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_encap_atm_4, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_reg_encap_ipv4_4, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_ipv6_4, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_802_3_4, tvb, tlv_offset, tlv_len, FALSE); @@ -299,17 +299,17 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb proto_tree_add_item(tlv_tree, hf_reg_encap_packet_8023_ethernet_and_ecrtp_header_compression_4, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_packet_ip_rohc_header_compression_4, tvb, tlv_offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_reg_encap_packet_ip_ecrtp_header_compression_4, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_encap_rsvd_4, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_encap_rsvd_4, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); } #endif break; case REG_MAX_CLASSIFIERS_SUPPORTED: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_max_classifiers, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_max_classifiers, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_max_classifiers, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case REG_PHS_SUPPORT: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_phs, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_phs, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_phs, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_ARQ_SUPPORT: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_arq, tvb, tlv_offset, tlv_len, FALSE); @@ -317,7 +317,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb break; case REG_DSX_FLOW_CONTROL: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_dsx_flow_control, tvb, tlv_offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_reg_dsx_flow_control, tvb, tlv_offset, 1, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_reg_dsx_flow_control, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); if (tvb_get_guint8(tvb, tlv_offset) == 0) { proto_item_append_text(tlv_item, " (no limit)"); } @@ -335,18 +335,18 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb break; case REG_MCA_FLOW_CONTROL: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_mca_flow_control, tvb, tlv_offset, tlv_len, FALSE); - tlv_item = proto_tree_add_item(tlv_tree, hf_reg_mca_flow_control, tvb, tlv_offset, 1, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_reg_mca_flow_control, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); if (tvb_get_guint8(tvb, tlv_offset) == 0) { proto_item_append_text(tlv_item, " (no limit)"); } break; case REG_MCAST_POLLING_CIDS: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_mcast_polling_cids, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_mcast_polling_cids, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_mcast_polling_cids, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_NUM_DL_TRANS_CID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_num_dl_trans_cid, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_num_dl_trans_cid, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_num_dl_trans_cid, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case REG_MAC_ADDRESS: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_mac_address, tvb, tlv_offset, tlv_len, FALSE); @@ -380,7 +380,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb { case REG_TLV_T_20_1_MAX_MAC_LEVEL_DATA_PER_DL_FRAME: sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, tlv_tree, hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame, tvb, tlv_offset, length, FALSE); - tlv_item = proto_tree_add_item(sub_tree, hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame, tvb, tlv_offset, 2, FALSE); + tlv_item = proto_tree_add_item(sub_tree, hf_reg_tlv_t_20_1_max_mac_level_data_per_dl_frame, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); if ( nblocks == 0 ) { proto_item_append_text(tlv_item, " (Unlimited bytes)"); @@ -390,7 +390,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb break; case REG_TLV_T_20_2_MAX_MAC_LEVEL_DATA_PER_UL_FRAME: sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, tlv_tree, hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame, tvb, tlv_offset, length, FALSE); - tlv_item = proto_tree_add_item(sub_tree, hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame, tvb, tlv_offset, 2, FALSE); + tlv_item = proto_tree_add_item(sub_tree, hf_reg_tlv_t_20_2_max_mac_level_data_per_ul_frame, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); if ( nblocks == 0 ) { proto_item_append_text(tlv_item, " (Unlimited bytes)"); @@ -417,7 +417,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb break; case REG_TLV_T_23_MAX_NUM_BURSTS_TRANSMITTED_CONCURRENTLY_TO_THE_MS: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_23_max_num_bursts_concurrently_to_the_ms, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_26_METHOD_FOR_ALLOCATING_IP_ADDR_SECONDARY_MGMNT_CONNECTION: /* add TLV subtree */ @@ -426,7 +426,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb proto_tree_add_item(tlv_tree, hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_mobile_ipv4, tvb, tlv_offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_dhcpv6, tvb, tlv_offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_ipv6, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_method_for_allocating_ip_addr_sec_mgmt_conn_rsvd, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_27_HANDOVER_SUPPORTED: /* add TLV subtree */ @@ -436,11 +436,11 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb proto_tree_add_item(tlv_tree, hf_reg_tlv_t_27_handover_mdho_dl_monitoring_single_map, tvb, tlv_offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_reg_tlv_t_27_handover_mdho_dl_monitoring_maps, tvb, tlv_offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_reg_tlv_t_27_handover_mdho_ul_multiple, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_27_handover_reserved, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_27_handover_reserved, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_29_HO_PROCESS_OPTIMIZATION_MS_TIMER: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_tlv_t_29_ho_process_opt_ms_timer, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_29_ho_process_opt_ms_timer, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_29_ho_process_opt_ms_timer, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_31_MOBILITY_FEATURES_SUPPORTED: /* add TLV subtree */ @@ -452,41 +452,41 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb case REG_TLV_T_40_ARQ_ACK_TYPE: /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, proto_registry, tvb, tlv_offset, tlv_len, "ARQ ACK Type 0x%02x", tvb_get_guint8(tvb, tlv_offset)); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_reserved, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_selective_ack_entry, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_entry, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_with_selective_ack_entry, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_cumulative_ack_with_block_sequence_ack, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_40_arq_ack_type_reserved, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_41_MS_HO_CONNECTIONS_PARAM_PROCESSING_TIME: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_tlv_t_41_ho_connections_param_processing_time, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_41_ho_connections_param_processing_time, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_41_ho_connections_param_processing_time, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_42_MS_HO_TEK_PROCESSING_TIME: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_tlv_t_42_ho_tek_processing_time, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_42_ho_tek_processing_time, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_42_ho_tek_processing_time, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_TLV_T_43_MAC_HEADER_AND_EXTENDED_SUBHEADER_SUPPORT: /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, proto_registry, tvb, tlv_offset, tlv_len, "MAC header and extended subheader support %d", tvb_get_ntoh24(tvb, tlv_offset)); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_cqich_allocation_request_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_phy_channel_report_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sn_report_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_feedback_header_support, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sdu_sn_parameter, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_dl_sleep_control_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_feedback_request_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_mini_feedback_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sn_request_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_pdu_sn_short_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_pdu_sn_long_extended_subheader, tvb, tlv_offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_reserved, tvb, tlv_offset, 3, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_ul_tx_power_report_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_cinr_report_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_cqich_allocation_request_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_phy_channel_report_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_bandwidth_request_ul_sleep_control_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sn_report_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_feedback_header_support, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sdu_sn_extended_subheader_support_and_parameter, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sdu_sn_parameter, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_dl_sleep_control_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_feedback_request_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_mimo_mode_feedback_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_ul_tx_power_report_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_mini_feedback_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_sn_request_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_pdu_sn_short_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_pdu_sn_long_extended_subheader, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_43_reserved, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); break; case REG_REQ_BS_SWITCHING_TIMER: /* add TLV subtree */ @@ -541,7 +541,7 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add MAC REG-REQ subtree */ reg_req_tree = proto_item_add_subtree(reg_req_item, ett_mac_mgmt_msg_reg_req_decoder); /* display the Message Type */ - proto_tree_add_item(reg_req_tree, hf_reg_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(reg_req_tree, hf_reg_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; while(offset < tvb_len) @@ -598,11 +598,11 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REG_REQ_SECONDARY_MGMT_CID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_req_secondary_mgmt_cid, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_req_secondary_mgmt_cid, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_req_secondary_mgmt_cid, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case REG_REQ_TLV_T_32_SLEEP_MODE_RECOVERY_TIME: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_req_tlv_t_32_sleep_mode_recovery_time, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_req_tlv_t_32_sleep_mode_recovery_time, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_req_tlv_t_32_sleep_mode_recovery_time, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case REG_REQ_TLV_T_33_MS_PREV_IP_ADDR: if ( tlv_len == 4 ) { @@ -615,15 +615,15 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REG_TLV_T_37_IDLE_MODE_TIMEOUT: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_idle_mode_timeout, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_idle_mode_timeout, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_idle_mode_timeout, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case REG_REQ_TLV_T_45_MS_PERIODIC_RANGING_TIMER_INFO: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_req_tlv_t_45_ms_periodic_ranging_timer, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_req_tlv_t_45_ms_periodic_ranging_timer, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_req_tlv_t_45_ms_periodic_ranging_timer, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case REG_HANDOVER_INDICATION_READINESS_TIMER: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_reg_tlv_t_46_handover_indication_readiness_timer, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_tlv_t_46_handover_indication_readiness_timer, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_tlv_t_46_handover_indication_readiness_timer, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case DSx_UPLINK_FLOW: diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index 45f02fb41b..75071fc2b1 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -116,8 +116,8 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add MAC REG-RSP subtree */ reg_rsp_tree = proto_item_add_subtree(reg_rsp_item, ett_mac_mgmt_msg_reg_rsp_decoder); /* display the Message Type */ - proto_tree_add_item(reg_rsp_tree, hf_reg_rsp_message_type, tvb, offset, 1, FALSE); - proto_tree_add_item(reg_rsp_tree, hf_reg_rsp_status, tvb, offset + 1, 1, FALSE); + proto_tree_add_item(reg_rsp_tree, hf_reg_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(reg_rsp_tree, hf_reg_rsp_status, tvb, offset + 1, 1, ENC_BIG_ENDIAN); offset += 2; while (offset < tvb_len) @@ -171,12 +171,12 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REG_RSP_SECONDARY_MGMT_CID: tlv_tree = add_tlv_subtree(&tlv_info, ett_reg_rsp_message_tree, reg_rsp_tree, hf_reg_rsp_secondary_mgmt_cid, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_rsp_secondary_mgmt_cid, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_rsp_secondary_mgmt_cid, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case REG_RSP_TLV_T_36_TOTAL_PROVISIONED_SERVICE_FLOW_DSAs: tlv_tree = add_tlv_subtree(&tlv_info, ett_reg_rsp_message_tree, reg_rsp_tree, hf_reg_total_provisioned_sf, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_total_provisioned_sf, tvb, tlv_offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_total_provisioned_sf, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); break; case REG_RSP_TLV_T_24_CID_UPDATE_ENCODINGS: @@ -203,11 +203,11 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro switch (sub_tlv_type) { case REG_RSP_TLV_T_24_1_CID_UPDATE_ENCODINGS_NEW_CID: tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_reg_rsp_message_tree, sub_tree, hf_reg_rsp_new_cid_after_ho, tvb, sub_tlv_offset, sub_tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_rsp_new_cid_after_ho, tvb, sub_tlv_offset, sub_tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_rsp_new_cid_after_ho, tvb, sub_tlv_offset, sub_tlv_len, ENC_BIG_ENDIAN); break; case REG_RSP_TLV_T_24_2_CID_UPDATE_ENCODINGS_SFID: tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_reg_rsp_message_tree, sub_tree, hf_reg_rsp_service_flow_id, tvb, sub_tlv_offset, sub_tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_reg_rsp_service_flow_id, tvb, sub_tlv_offset, sub_tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_reg_rsp_service_flow_id, tvb, sub_tlv_offset, sub_tlv_len, ENC_BIG_ENDIAN); break; case REG_RSP_TLV_T_24_3_CID_UPDATE_ENCODINGS_CONNECTION_INFO: tlv_tree = add_protocol_subtree(&sub_tlv_info, ett_reg_rsp_message_tree, sub_tree, proto_mac_mgmt_msg_reg_rsp_decoder, tvb, sub_tlv_offset, sub_tlv_len, "CID Update Encodings Connection Info (%u byte(s))", tlv_len); @@ -224,7 +224,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REG_RSP_TLV_T_28_HO_SYSTEM_RESOURCE_RETAIN_TIME: tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_reg_rsp_decoder, reg_rsp_tree, proto_mac_mgmt_msg_reg_rsp_decoder, tvb, tlv_offset, tlv_len, "System Resource Retain Time (%u byte(s))", tlv_len); - tlv_item = proto_tree_add_item(tlv_tree, hf_reg_rsp_system_resource_retain_time, tvb, tlv_offset, tlv_len, FALSE); + tlv_item = proto_tree_add_item(tlv_tree, hf_reg_rsp_system_resource_retain_time, tvb, tlv_offset, tlv_len, ENC_BIG_ENDIAN); if (include_cor2_changes) { proto_item_append_text(tlv_item, " (in units of 100 milliseconds)"); } else { diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 87db28020e..a755acc25a 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -285,7 +285,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro rep_tree = proto_item_add_subtree(rep_item, ett_mac_mgmt_msg_rep_req_decoder); /* Decode and display the Report Request message (REP-REQ) */ /* display the Message Type */ - proto_tree_add_item(rep_tree, hf_rep_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(rep_tree, hf_rep_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the REP-REQ TLVs */ @@ -341,7 +341,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit0, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit1, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit2, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit3_6, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit3_6, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); /* proto_item_append_text(ti, " dB");*/ proto_tree_add_item(ti_tree, hf_rep_req_rep_type_bit7, tvb, (offset + tlv_offset), length, FALSE); break; @@ -354,52 +354,52 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* decode and display the Channel Type */ ti_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, proto_mac_mgmt_msg_rep_decoder, tvb, (offset + tlv_offset), length, "Channel Type (%u byte(s))", length); proto_tree_add_item(ti_tree, hf_rep_req_channel_type_request, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_channel_type_reserved, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_channel_type_reserved, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_REQ_ZONE_SPEC_PHY_CINR_REQ: /* decode and display the zone specific physical cinr request */ ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_req_zone_spec_phy_cinr_request, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit0_2, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit0_2, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit3, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit4, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit5_6, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit7, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit8_13, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit14_17, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit18, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit19_23, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit5_6, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit7, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit8_13, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit14_17, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit18, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_phy_cinr_req_bit19_23, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_REQ_PREAMBLE_PHY_CINR_REQ: /* decode and display the preamble phy cinr request */ ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_req_preamble_phy_cinr_request, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit0_1, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit2_5, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit6, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit7, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit0_1, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit2_5, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit6, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_phy_cinr_req_bit7, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_REQ_ZONE_SPEC_EFF_CINR_REQ: /* decode and display the zone specific effective cinr request */ ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_req_zone_spec_effective_cinr_request, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit0_2, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit0_2, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit3, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit4, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit5_6, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit5_6, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); /* proto_item_append_text(ti, " dB");*/ - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit7, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit8_13, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit14_15, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit7, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit8_13, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_zone_spec_effective_cinr_req_bit14_15, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_REQ_PREAMBLE_EFF_CINR_REQ: /* decode and display the preamble effective cinr request */ ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_req_preamble_effective_cinr_request, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_effective_cinr_req_bit0_1, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_preamble_effective_cinr_req_bit2_7, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_effective_cinr_req_bit0_1, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_req_preamble_effective_cinr_req_bit2_7, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_REQ_CHANNEL_SELECTIVITY_REPORT: /* decode and display the channel selectivity report */ ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_req_channel_selectivity_report, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_req_channel_selectivity_rep_bit0, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_req_channel_selectivity_rep_bit1_7, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_req_channel_selectivity_rep_bit1_7, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; default: /* display the unknown tlv in hex */ @@ -453,7 +453,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro rep_tree = proto_item_add_subtree(rep_item, ett_mac_mgmt_msg_rep_rsp_decoder); /* Decode and display the Report Response message (REP-RSP) */ /* display the Message Type */ - proto_tree_add_item(rep_tree, hf_rep_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(rep_tree, hf_rep_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the REP-RSP TLVs */ @@ -502,15 +502,15 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro { case REP_RSP_REPORT_CHANNEL_NUMBER: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_channel_number, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_channel_number, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_channel_number, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_REPORT_START_FRAME: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_frame_number, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_frame_number, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_frame_number, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_REPORT_DURATION: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_duration, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_duration, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_duration, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_REPORT_BASIC_REPORT: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_basic_report, tvb, (offset + tlv_offset), length, FALSE); @@ -518,16 +518,16 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_basic_report_bit1, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_basic_report_bit2, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_basic_report_bit3, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_basic_report_reserved, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_basic_report_reserved, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_REPORT_CINR_REPORT: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_cinr_report, tvb, (offset + tlv_offset), length, FALSE); - ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_cinr_report_mean, tvb, (offset + tlv_offset), 1, FALSE); + ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_cinr_report_mean, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); db_val = tvb_get_guint8(tvb, offset + tlv_offset) - 20; if (db_val > 37) db_val = 37; proto_item_append_text(ti, " (%d dBm)", db_val); - ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_cinr_report_deviation, tvb, (offset + tlv_offset +1), 1, FALSE); + ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_cinr_report_deviation, tvb, (offset + tlv_offset +1), 1, ENC_BIG_ENDIAN); db_val = tvb_get_guint8(tvb, offset + tlv_offset + 1) - 20; if (db_val > 37) db_val = 37; @@ -535,12 +535,12 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REP_RSP_REPORT_RSSI_REPORT: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_report_type_rssi_report, tvb, (offset + tlv_offset), length, FALSE); - ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_mean, tvb, (offset + tlv_offset), 1, FALSE); + ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_mean, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); db_val = tvb_get_guint8(tvb, offset + tlv_offset) - 123; if (db_val > -40) db_val = -40; proto_item_append_text(ti, " (%d dBm)", db_val); - ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_deviation, tvb, (offset + tlv_offset +1), 1, FALSE); + ti = proto_tree_add_item(ti_tree, hf_rep_rsp_report_type_rssi_report_deviation, tvb, (offset + tlv_offset +1), 1, ENC_BIG_ENDIAN); db_val = tvb_get_guint8(tvb, offset + tlv_offset + 1) - 123; if (db_val > -40) db_val = -40; @@ -577,11 +577,11 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro { case REP_RSP_CHANNEL_TYPE_SUBCHANNEL: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_channel_type_subchannel, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_subchannel, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_subchannel, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_CHANNEL_TYPE_BAND_AMC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_channel_type_band_amc, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_band_amc, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_band_amc, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_CHANNEL_TYPE_SAFETY_CHANNEL: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_channel_type_safety_channel, tvb, (offset + tlv_offset), length, FALSE); @@ -593,7 +593,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case REP_RSP_CHANNEL_TYPE_SOUNDING: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_channel_type_sounding, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_sounding, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_sounding, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; default: /* display the unknown tlv in hex */ @@ -627,45 +627,45 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro case REP_RSP_ZONE_SPECIFIC_PHY_CINR_PUSC_SC0: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc0, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_mean, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); if (length == 2) { proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_deviation, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); } break; case REP_RSP_ZONE_SPECIFIC_PHY_CINR_PUSC_SC1: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_pusc_sc1, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_mean, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); if (length == 2) { proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_deviation, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); } break; case REP_RSP_ZONE_SPECIFIC_PHY_CINR_FUSC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_fusc, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_mean, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); if (length == 2) { proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_deviation, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); } break; case REP_RSP_ZONE_SPECIFIC_PHY_CINR_OPTIONAL_FUSC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_optional_fusc, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_mean, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); if (length == 2) { proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_deviation, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); } break; case REP_RSP_ZONE_SPECIFIC_PHY_CINR_SAFETY_CHANNEL: @@ -675,12 +675,12 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro case REP_RSP_ZONE_SPECIFIC_PHY_CINR_AMC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_amc, tvb, (offset + tlv_offset), length, FALSE); proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_mean, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_report_type, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved1, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); if (length == 2) { proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_deviation, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_phy_cinr_rep_reserved2, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); } break; default: @@ -759,33 +759,33 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro { case REP_RSP_ZONE_SPECIFIC_EFFECTIVE_CINR_PUSC_SC0: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc0, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_ZONE_SPECIFIC_EFFECTIVE_CINR_PUSC_SC1: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_pusc_sc1, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_ZONE_SPECIFIC_EFFECTIVE_CINR_FUSC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_fusc, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_ZONE_SPECIFIC_EFFECTIVE_CINR_OPTIONAL_FUSC: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_optional_fusc, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_ZONE_SPECIFIC_EFFECTIVE_CINR_AMC_AAS: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_amc_aas, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_report_type, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; default: /* display the unknown tlv in hex */ @@ -818,20 +818,20 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro { case REP_RSP_PREAMBLE_EFFECTIVE_CINR_CONFIGURATION1: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_preamble_effective_cinr_rep_configuration_1, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_preamble_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_preamble_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_PREAMBLE_EFFECTIVE_CINR_CONFIGURATION3: ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_preamble_effective_cinr_rep_configuration_3, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, FALSE); - proto_tree_add_item(ti_tree, hf_rep_rsp_preamble_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, FALSE); + proto_tree_add_item(ti_tree, hf_rep_rsp_zone_spec_effective_cinr_rep_effective_cinr, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_rep_rsp_preamble_effective_cinr_rep_cqich_id, tvb, (offset + tlv_offset), length, ENC_BIG_ENDIAN); break; case REP_RSP_CHANNEL_SELECTIVITY: /* decode and display the channel selectivity report type */ tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, rep_tree, hf_rep_rsp_channel_selectivity_report, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_a, tvb, (offset + tlv_offset + 2), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_b, tvb, (offset + tlv_offset + 1), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_c, tvb, (offset + tlv_offset), 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_a, tvb, (offset + tlv_offset + 2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_b, tvb, (offset + tlv_offset + 1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rep_rsp_channel_selectivity_rep_frequency_c, tvb, (offset + tlv_offset), 1, ENC_BIG_ENDIAN); break; default: /* display the unknown tlv in hex */ @@ -846,7 +846,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, rep_tree, hf_rep_unknown_type, tvb, offset, tlv_len, FALSE); value = tvb_get_guint8(tvb, offset); current_power = ((gfloat)value - 128) / 2; - ti = proto_tree_add_item(tlv_tree, hf_rep_rsp_current_transmitted_power, tvb, offset, tlv_len, FALSE); + ti = proto_tree_add_item(tlv_tree, hf_rep_rsp_current_transmitted_power, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(ti, " (%.1f dBm)", current_power); break; default: diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index aa5a4b0c4d..80cdc17aef 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -79,7 +79,7 @@ void dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pro res_cmd_tree = proto_item_add_subtree(res_cmd_item, ett_mac_mgmt_msg_res_cmd_decoder); /* Decode and display the Reset Command (RES-CMD) */ /* display the Message Type */ - proto_tree_add_item(res_cmd_tree, hf_res_cmd_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(res_cmd_tree, hf_res_cmd_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the RES-CMD TLVs */ diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c index 7d1efdbdcb..66b43932f4 100644 --- a/plugins/wimax/msg_rng_req.c +++ b/plugins/wimax/msg_rng_req.c @@ -162,50 +162,50 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_ /* display Power Saving Class Flags */ /* add subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Power Saving Class (%u byte)", tlv_len); - proto_tree_add_item(tlv_tree, hf_rng_definition_of_power_saving_class_present, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_definition_of_power_saving_class_present, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_rng_activation_of_power_saving_class, tvb, tlv_offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_rng_trf_ind_required, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_reserved, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_reserved, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_POWER_SAVING_CLASS_ID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_class_id, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_id, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_id, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_POWER_SAVING_CLASS_TYPE: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_class_type, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_type, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_class_type, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_START_FRAME_NUMBER: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_first_sleep_window_frame, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_first_sleep_window_frame, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_first_sleep_window_frame, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_INITIAL_SLEEP_WINDOW: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_initial_sleep_window, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_initial_sleep_window, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_initial_sleep_window, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_LISTENING_WINDOW: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_listening_window, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_listening_window, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_listening_window, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_FINAL_SLEEP_WINDOW_BASE: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_final_sleep_window_base, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_base, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_base, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_FINAL_SLEEP_WINDOW_EXPONENT: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_final_sleep_window_exp, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_exp, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_final_sleep_window_exp, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_SLPID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_slpid, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_slpid, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_slpid, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_CID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_included_cid, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_included_cid, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_included_cid, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case RNG_DIRECTION: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_rng_power_saving_mgmt_connection_direction, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_power_saving_mgmt_connection_direction, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_power_saving_mgmt_connection_direction, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; default: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, power_saving_class_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE); @@ -248,8 +248,8 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add MAC RNG-REQ subtree */ rng_req_tree = proto_item_add_subtree(rng_req_item, ett_mac_mgmt_msg_rng_req_decoder); /* display the Message Type */ - proto_tree_add_item(rng_req_tree, hf_rng_req_message_type, tvb, offset, 1, FALSE); - proto_tree_add_item(rng_req_tree, hf_rng_req_reserved, tvb, 1, 1, FALSE); + proto_tree_add_item(rng_req_tree, hf_rng_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rng_req_tree, hf_rng_req_reserved, tvb, 1, 1, ENC_BIG_ENDIAN); offset += 2; while(offset < tvb_len) @@ -273,8 +273,8 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro case RNG_REQ_DL_BURST_PROFILE: /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Requested Downlink Burst Profile 0x%02x", tvb_get_guint8(tvb, tlv_offset)); - proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_diuc, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_lsb_ccc, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_diuc, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rng_req_dl_burst_profile_lsb_ccc, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_REQ_SS_MAC_ADDRESS: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_ss_mac_address, tvb, tlv_offset, 6, FALSE); @@ -299,28 +299,28 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the Ranging Purpose Flags */ /* add subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Ranging Purpose Flags (%u byte(s))", tlv_len); - proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_ho_indication, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_location_update_request, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_reserved, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_ho_indication, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_location_update_request, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rng_req_ranging_purpose_reserved, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_REQ_HO_ID: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_ho_id, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_ho_id, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_ho_id, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_REQ_POWER_DOWN_INDICATOR: tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_power_down_indicator, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_power_down_indicator, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_power_down_indicator, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_REQ_REQUESTED_DNLK_REP_CODING_LEVEL: /* add subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, proto_mac_mgmt_msg_rng_req_decoder, tvb, tlv_offset, tlv_len, "Requested downlink repetition coding level (%u byte(s))", tlv_len); - proto_tree_add_item(tlv_tree, hf_rng_req_repetition_coding_level, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_requested_downlink_repetition_coding_level_reserved, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_repetition_coding_level, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_rng_req_requested_downlink_repetition_coding_level_reserved, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_REQ_CMAC_KEY_COUNT: if (include_cor2_changes) { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_rng_req_cmac_key_count, tvb, tlv_offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_rng_req_cmac_key_count, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_rng_req_cmac_key_count, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); } else { /* Unknown TLV type */ tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rng_req_decoder, rng_req_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE); diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index 22e7cd3e49..f56eb83beb 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -314,8 +314,8 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add MAC RNG-RSP subtree */ rng_rsp_tree = proto_item_add_subtree(rng_rsp_item, ett_mac_mgmt_msg_rng_rsp_decoder); /* display the Message Type */ - proto_tree_add_item(rng_rsp_tree, hf_rng_rsp_message_type, tvb, offset, 1, FALSE); - proto_tree_add_item(rng_rsp_tree, hf_rng_req_reserved, tvb, 1, 1, FALSE); + proto_tree_add_item(rng_rsp_tree, hf_rng_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(rng_rsp_tree, hf_rng_req_reserved, tvb, 1, 1, ENC_BIG_ENDIAN); offset += 2; while(offset < tvb_len) @@ -361,22 +361,22 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro } case RNG_RSP_RANGING_STATUS: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_ranging_status, tvb, tlv_offset, 1, FALSE); - ranging_status_item = proto_tree_add_item(sub_tree, hf_rng_rsp_ranging_status, tvb, tlv_offset, 1, FALSE); + ranging_status_item = proto_tree_add_item(sub_tree, hf_rng_rsp_ranging_status, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_RSP_DL_FREQ_OVERRIDE: { sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_dl_freq_override, tvb, tlv_offset, 4, FALSE); - dl_freq_override_item = proto_tree_add_item(sub_tree, hf_rng_rsp_dl_freq_override, tvb, tlv_offset, 4, FALSE); + dl_freq_override_item = proto_tree_add_item(sub_tree, hf_rng_rsp_dl_freq_override, tvb, tlv_offset, 4, ENC_BIG_ENDIAN); proto_item_append_text(dl_freq_override_item, " kHz"); break; } case RNG_RSP_UL_CHANNEL_ID_OVERRIDE: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_ul_chan_id_override, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_ul_chan_id_override, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_ul_chan_id_override, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_RSP_DL_OPERATIONAL_BURST_PROFILE: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_dl_operational_burst_profile, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_dl_operational_burst_profile_diuc, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_dl_operational_burst_profile_ccc, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_dl_operational_burst_profile_diuc, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_dl_operational_burst_profile_ccc, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case RNG_RSP_SS_MAC_ADDRESS: if (tlv_len == 6) @@ -390,11 +390,11 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case RNG_RSP_BASIC_CID: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_basic_cid, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_basic_cid, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_basic_cid, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case RNG_RSP_PRIMARY_MGMT_CID: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_primary_mgmt_cid, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_primary_mgmt_cid, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_primary_mgmt_cid, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case RNG_RSP_AAS_BROADCAST_PERMISSION: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_broadcast, tvb, tlv_offset, 1, FALSE); @@ -402,17 +402,17 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro break; case RNG_RSP_FRAME_NUMBER: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_frame_number, tvb, tlv_offset, 3, FALSE); - frame_number_item = proto_tree_add_item(sub_tree, hf_rng_rsp_frame_number, tvb, tlv_offset, 3, FALSE); + frame_number_item = proto_tree_add_item(sub_tree, hf_rng_rsp_frame_number, tvb, tlv_offset, 3, ENC_BIG_ENDIAN); break; case RNG_RSP_OPPORTUNITY_NUMBER: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_opportunity_number, tvb, tlv_offset, 1, FALSE); - opportunity_number_item = proto_tree_add_item(sub_tree, hf_rng_rsp_opportunity_number, tvb, tlv_offset, 1, FALSE); + opportunity_number_item = proto_tree_add_item(sub_tree, hf_rng_rsp_opportunity_number, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); if (tvb_get_ntohl(tvb, tlv_offset) == 0) proto_item_append_text(opportunity_number_item, " (may not be 0!)"); break; case RNG_RSP_SERVICE_LEVEL_PREDICTION: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_service_level_prediction, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_service_level_prediction, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_service_level_prediction, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_RSP_RESOURCE_RETAIN_FLAG: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_resource_retain_flag, tvb, tlv_offset, 1, FALSE); @@ -447,23 +447,23 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* Implemented message encoding 33 (Table 367 in IEEE 802.16e-2007) */ case RNG_RSP_DL_OP_BURST_PROFILE_OFDMA: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_dl_op_burst_profile_ofdma, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_least_robust_diuc, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_repetition_coding_indication, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_config_change_count_of_dcd, tvb, tlv_offset, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_least_robust_diuc, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_repetition_coding_indication, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_config_change_count_of_dcd, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); break; case RNG_RSP_HO_ID: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_ho_id, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_ho_id, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_ho_id, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_RSP_LOCATION_UPDATE_RESPONSE: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_location_update_response, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_location_update_response, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_location_update_response, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case RNG_RSP_PAGING_INFORMATION: sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_paging_information, tvb, tlv_offset, 5, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_paging_cycle, tvb, tlv_offset, 2, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_paging_offset, tvb, tlv_offset+2, 1, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_paging_group_id, tvb, tlv_offset+3, 2, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_paging_cycle, tvb, tlv_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_paging_offset, tvb, tlv_offset+2, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_paging_group_id, tvb, tlv_offset+3, 2, ENC_BIG_ENDIAN); break; case RNG_RSP_POWER_SAVING_CLASS_PARAMETERS: sub_tree = add_protocol_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, proto_mac_mgmt_msg_rng_rsp_decoder, tvb, tlv_offset, tlv_len, "Power Saving Class Parameters (%u byte(s))", tlv_len); @@ -524,10 +524,10 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro case RNG_RSP_RANGING_CODE_ATTRIBUTES: /* case SHORT_HMAC_TUPLE: */ sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_rng_rsp_ranging_subchan, tvb, tlv_offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_time_symbol_reference, tvb, tlv_offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_subchannel_reference, tvb, tlv_offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_ranging_code_index, tvb, tlv_offset, 4, FALSE); - proto_tree_add_item(sub_tree, hf_rng_rsp_frame_number2, tvb, tlv_offset, 4, FALSE); + proto_tree_add_item(sub_tree, hf_rng_rsp_time_symbol_reference, tvb, tlv_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_subchannel_reference, tvb, tlv_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_ranging_code_index, tvb, tlv_offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(sub_tree, hf_rng_rsp_frame_number2, tvb, tlv_offset, 4, ENC_BIG_ENDIAN); break; case SHORT_HMAC_TUPLE_COR2: if (include_cor2_changes) { diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index 2f2b3e84cc..50de7eae20 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -571,7 +571,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro sbc_tree = proto_item_add_subtree(sbc_item, ett_mac_mgmt_msg_sbc_decoder); /* Decode and display the SS Basic Capability Request (SBC-REQ) */ /* display the Message Type */ - proto_tree_add_item(sbc_tree, hf_sbc_req_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(sbc_tree, hf_sbc_req_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the SBC TLVs */ @@ -610,17 +610,17 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_bw_alloc_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd0, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd0, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_duplex, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd1, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd1, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TRANSITION_GAPS: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_transition_gaps, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - ti = proto_tree_add_item(tlv_tree, hf_sbc_ssttg, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tlv_tree, hf_sbc_ssttg, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " us (ranges: TDD 0-50; H-FDD 0-100)"); - ti = proto_tree_add_item(tlv_tree, hf_sbc_ssrtg, tvb, (offset + 1), 1, FALSE); + ti = proto_tree_add_item(tlv_tree, hf_sbc_ssrtg, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " us (ranges: TDD 0-50; H-FDD 0-100)"); break; case SBC_MAC_PDU: @@ -629,7 +629,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_piggybacked, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_fsn, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_REQ_MAX_TRANSMIT_POWER: /* TODO: This TLV comes up as INVALID in wireshark... why? */ /* add TLV subtree */ @@ -658,7 +658,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ if (include_cor2_changes) { - proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd1, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd1, tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_256, tvb, offset, 1, FALSE); } @@ -666,7 +666,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_128, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_512, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_1024, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd2, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd2, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_DEMODULATOR: /* add TLV subtree */ @@ -681,7 +681,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_cc_with_optional_interleaver, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_chase, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_ctc_ir, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } else { @@ -692,7 +692,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_cc_with_optional_interleaver_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_chase_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_ctc_ir_2, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved_2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved_2, tvb, offset, 2, ENC_BIG_ENDIAN); #if 0 if (tlv_len == 1) { @@ -704,7 +704,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_cc_ir_2, tvb, offset , 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_ldpc_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_dedicated_pilots_2, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved1_2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved1_2, tvb, offset, 2, ENC_BIG_ENDIAN); } } break; @@ -760,16 +760,16 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_rsvd, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_rsvd, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_SS_MIMO_UPLINK_SUPPORT: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_ss_mimo_uplink_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sttd, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sttd, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_OFDMA_AAS_PRIVATE_MAP_SUPPORT: /* add TLV subtree */ @@ -781,7 +781,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_chain_enable, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_dl_frame_offset, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_ul_frame_offset, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_concurrency, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_concurrency, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_OFDMA_AAS_CAPABILITIES: /* add TLV subtree */ @@ -792,7 +792,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_fbck_rsp_support, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_downlink_aas_preamble, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_uplink_aas_preamble, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_capabilities_rsvd, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_capabilities_rsvd, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_SS_CINR_MEASUREMENT_CAPABILITY: /* add TLV subtree */ @@ -832,19 +832,19 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_tree = proto_item_add_subtree(tlv_item, ett_sbc_req_tlv_subtree); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_privacy_802_16, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_auth_policy, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_privacy_802_16, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); if (!include_cor2_changes) { /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_auth_policy, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_privacy_802_16, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); } else { @@ -875,7 +875,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_27_extension_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_bit0, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_28_HO_TRIGGER_METRIC_SUPPORT: /* add TLV subtree */ @@ -885,7 +885,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_167_ASSOCIATION_SUPPORT: /* add TLV subtree */ @@ -896,15 +896,15 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit2, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit3, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit4, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_170_UPLINK_POWER_CONTROL_SUPPORT: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_ofdma_ss_uplink_power_control_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_open_loop, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_open_loop, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_171_MINIMUM_NUM_OF_FRAMES: /* add TLV subtree */ @@ -921,7 +921,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_sub_map_capability_first_zone, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_sub_map_capability_other_zones, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_dl_region_definition_support, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_173_UL_CONTROL_CHANNEL_SUPPORT: /* add TLV subtree */ @@ -930,7 +930,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_enhanced_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_ul_ack, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_uep_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_measurement_report, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_primary_secondary_fast_feedback, tvb, offset, 1, FALSE); @@ -943,10 +943,10 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_csit_compatibility_type_a, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_csit_compatibility_type_b, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_power_assignment_capability, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_sounding_rsp_time_capability, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_sounding_rsp_time_capability, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_type_a_support, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_TLV_T_175_MAX_NUM_BST_PER_FRM_CAPABILITY_HARQ: /* add TLV subtree */ @@ -981,7 +981,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit17, tvb, offset, 3, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit18, tvb, offset, 3, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit19, tvb, offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_reserved, tvb, offset, 3, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_reserved, tvb, offset, 3, ENC_BIG_ENDIAN); break; case SBC_TLV_T_177_OFDMA_SS_MODULATOR_FOR_MIMO_SUPPORT: /* add TLV subtree */ @@ -1003,18 +1003,18 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro if (include_cor2_changes) { proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_capable_of_two_antenna, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_capable_of_two_antenna, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case SBC_TLV_T_178_SDMA_PILOT_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_178_sdma_pilot_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_179_OFDMA_MULTIPLE_DL_BURST_PROFILE_CAPABILITY: /* add TLV subtree */ @@ -1022,7 +1022,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_204_OFDMA_PARAMETERS_SETS: if (include_cor2_changes) @@ -1030,35 +1030,35 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case SBC_TLV_T_162_HARQ_INCREMENTAL_REDUNDANCY_BUFFER_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_TLV_T_163_HARQ_CHASE_COMBINING_AND_CC_IR_BUFFER_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_req_tlv_subtree, sbc_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); break; case PKM_ATTR_SECURITY_NEGOTIATION_PARAMETERS: /* display Security Negotiation Parameters Title */ @@ -1074,8 +1074,8 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit0, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit1, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit2, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits34, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits567, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits34, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits567, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: /* add TLV subtree */ @@ -1126,7 +1126,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro sbc_tree = proto_item_add_subtree(sbc_item, ett_mac_mgmt_msg_sbc_decoder); /* Decode and display the SS Basic Capability Response (SBC-RSP) */ /* display the Message Type */ - proto_tree_add_item(sbc_tree, hf_sbc_rsp_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(sbc_tree, hf_sbc_rsp_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* set the offset for the TLV Encoded info */ offset++; /* process the SBC TLVs */ @@ -1165,17 +1165,17 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_bw_alloc_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd0, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd0, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_duplex, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd1, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_bw_alloc_support_rsvd1, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TRANSITION_GAPS: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_transition_gaps, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - ti = proto_tree_add_item(tlv_tree, hf_sbc_ssttg, tvb, offset, 1, FALSE); + ti = proto_tree_add_item(tlv_tree, hf_sbc_ssttg, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " us (ranges: TDD 0-50; H-FDD 0-100)"); - ti = proto_tree_add_item(tlv_tree, hf_sbc_ssrtg, tvb, (offset + 1), 1, FALSE); + ti = proto_tree_add_item(tlv_tree, hf_sbc_ssrtg, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, " us (ranges: TDD 0-50; H-FDD 0-100)"); break; case SBC_MAC_PDU: @@ -1184,7 +1184,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_piggybacked, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_fsn, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_mac_pdu_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_REQ_MAX_TRANSMIT_POWER: /* add TLV subtree */ @@ -1213,7 +1213,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ if (include_cor2_changes) { - proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd1, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd1, tvb, offset, 1, ENC_BIG_ENDIAN); } else { proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_256, tvb, offset, 1, FALSE); } @@ -1221,7 +1221,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_128, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_512, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_1024, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd2, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_fft_rsvd2, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_DEMODULATOR: /* add TLV subtree */ @@ -1236,7 +1236,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_cc_with_optional_interleaver, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_chase, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_ctc_ir, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } else { @@ -1247,11 +1247,11 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_cc_with_optional_interleaver_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_chase_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_ctc_ir_2, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved_2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved_2, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_harq_cc_ir_2, tvb, offset , 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_ldpc_2, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_dedicated_pilots_2, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved1_2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_reserved1_2, tvb, offset, 2, ENC_BIG_ENDIAN); } break; case SBC_SS_MODULATOR: @@ -1306,16 +1306,16 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_b_horizontal, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_vertical, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_4_ann_stc_matrix_c_horizontal, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_rsvd, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_demodulator_mimo_rsvd, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_SS_MIMO_UPLINK_SUPPORT: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_ss_mimo_uplink_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sttd, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sttd, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_2_ann_sm_vertical, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_1_ann_coop_sm, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ss_mimo_uplink_support_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_OFDMA_AAS_PRIVATE_MAP_SUPPORT: /* add TLV subtree */ @@ -1327,7 +1327,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_chain_enable, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_dl_frame_offset, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_ul_frame_offset, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_concurrency, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_aas_private_map_concurrency, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_SS_OFDMA_AAS_CAPABILITIES: /* add TLV subtree */ @@ -1338,7 +1338,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_fbck_rsp_support, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_downlink_aas_preamble, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_uplink_aas_preamble, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_capabilities_rsvd, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ss_ofdma_aas_capabilities_rsvd, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_SS_CINR_MEASUREMENT_CAPABILITY: /* add TLV subtree */ @@ -1368,7 +1368,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_auth_policy, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_privacy_802_16, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_privacy_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_MAX_SECURITY_ASSOCIATIONS: /* add TLV subtree */ @@ -1381,7 +1381,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_tlv_t_27_extension_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_bit0, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_27_extension_capability_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_28_HO_TRIGGER_METRIC_SUPPORT: /* add TLV subtree */ @@ -1391,7 +1391,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit1, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit2, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_bit3, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_28_ho_trigger_metric_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_167_ASSOCIATION_SUPPORT: /* add TLV subtree */ @@ -1402,15 +1402,15 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit2, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit3, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_bit4, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_167_association_type_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_170_UPLINK_POWER_CONTROL_SUPPORT: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_ofdma_ss_uplink_power_control_support, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_open_loop, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_open_loop, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_aas_preamble, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_ofdma_ss_uplink_power_control_support_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_171_MINIMUM_NUM_OF_FRAMES: /* add TLV subtree */ @@ -1427,7 +1427,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_sub_map_capability_first_zone, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_sub_map_capability_other_zones, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_dl_region_definition_support, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_172_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_173_UL_CONTROL_CHANNEL_SUPPORT: /* add TLV subtree */ @@ -1436,7 +1436,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_3_bit_mimo_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_enhanced_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_ul_ack, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_uep_fast_feedback, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_measurement_report, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_173_primary_secondary_fast_feedback, tvb, offset, 1, FALSE); @@ -1449,10 +1449,10 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_csit_compatibility_type_a, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_csit_compatibility_type_b, tvb, offset, 2, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_power_assignment_capability, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_sounding_rsp_time_capability, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_sounding_rsp_time_capability, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_max_num_simultanous_sounding_instructions, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_type_a_support, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_reserved, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_174_ss_csit_reserved, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_TLV_T_175_MAX_NUM_BST_PER_FRM_CAPABILITY_HARQ: /* add TLV subtree */ @@ -1489,7 +1489,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit17, tvb, offset, 3, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit18, tvb, offset, 3, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_bit19, tvb, offset, 3, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_reserved, tvb, offset, 3, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_176_reserved, tvb, offset, 3, ENC_BIG_ENDIAN); break; case SBC_TLV_T_177_OFDMA_SS_MODULATOR_FOR_MIMO_SUPPORT: /* add TLV subtree */ @@ -1511,18 +1511,18 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro if (include_cor2_changes) { proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_one_antenna, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_collaborative_sm_with_two_antennas, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_capable_of_two_antenna, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_rsvd, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_capable_of_two_antenna, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_177_rsvd, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case SBC_TLV_T_178_SDMA_PILOT_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_tlv_t_178_sdma_pilot_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_sdma_pilot_pattern_support_for_amc_zone, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_178_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_179_OFDMA_MULTIPLE_DL_BURST_PROFILE_CAPABILITY: /* add TLV subtree */ @@ -1530,7 +1530,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* display the detail meanings of the TLV value */ proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_dl_bst_profile_for_multiple_fec, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_ul_bst_profile_for_multiple_fec, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_179_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case SBC_TLV_T_204_OFDMA_PARAMETERS_SETS: if (include_cor2_changes) @@ -1538,35 +1538,35 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_a, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_phy_set_b, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_harq_parameters_set, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_a, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_mac_set_b, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_204_ofdma_parameters_sets_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case SBC_TLV_T_162_HARQ_INCREMENTAL_REDUNDANCY_BUFFER_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_dl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved1, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_ul_harq_incremental_redundancy_buffer_capability_NEP, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_aggregation_flag_for_ul, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_162_harq_incremental_redundancy_buffer_capability_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); break; case SBC_TLV_T_163_HARQ_CHASE_COMBINING_AND_CC_IR_BUFFER_CAPABILITY: /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sbc_rsp_tlv_subtree, sbc_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability, tvb, offset, tlv_len, FALSE); /* display the detail meanings of the TLV value */ - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul, tvb, offset, 2, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2, tvb, offset, 2, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_dl_harq_buffering_capability_for_chase_combining, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_dl, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved1, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_ul_harq_buffering_capability_for_chase_combining, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_aggregation_flag_ul, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_tlv_t_163_harq_chase_combining_and_cc_ir_buffer_capability_reserved2, tvb, offset, 2, ENC_BIG_ENDIAN); break; case PKM_ATTR_SECURITY_NEGOTIATION_PARAMETERS: /* display Security Negotiation Parameters Title */ @@ -1583,8 +1583,8 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit0, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit1, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bit2, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits34, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits567, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits34, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_sbc_power_save_class_types_capability_bits567, tvb, offset, 1, ENC_BIG_ENDIAN); break; default: /* add TLV subtree */ diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index ae8dcf58e0..4426765d2b 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -238,7 +238,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t ucd_tree = proto_item_add_subtree(ucd_item, ett_mac_mgmt_msg_ucd_decoder); /* Decode and display the Uplink Channel Descriptor (UCD) */ /* display the Message Type */ - proto_tree_add_item(ucd_tree, hf_ucd_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ucd_tree, hf_ucd_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next field */ offset++; /* get the Configuration Change Count */ @@ -302,25 +302,25 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_TLV_T_203_UL_PUSC_SUBCHANNEL_ROTATION: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_203_ul_pusc_subchannel_rotation, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_205_RELATIVE_POWER_OFFSET_UL_HARQ_BURST: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_205_relative_power_offset_ul_harq_burst, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_206_RELATIVE_POWER_OFFSET_UL_BURST_CONTAINING_MAC_MGMT_MSG: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_206_relative_power_offset_ul_burst_containing_mac_mgmt_msg, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_207_UL_INITIAL_TRANSMIT_TIMING: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_207_ul_initial_transmit_timing, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_207_ul_initial_transmit_timing, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_207_ul_initial_transmit_timing, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_210_FAST_FEEDBACK_REGION: @@ -362,8 +362,8 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t ul_burst_uiuc = tvb_get_guint8(tvb, offset) & 0x0F; /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, proto_mac_mgmt_msg_ucd_decoder, tvb, offset, tlv_len, "Uplink Burst Profile (UIUC = %u) (%u bytes)", ul_burst_uiuc, tlv_len); - proto_tree_add_item(tlv_tree, hf_ucd_ul_burst_reserved, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_ul_burst_uiuc, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_ul_burst_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_ul_burst_uiuc, tvb, offset, 1, ENC_BIG_ENDIAN); for (tlv_offset = 1; tlv_offset < tlv_len;) { /* get the TLV information */ init_tlv_info(&tlv_info, tvb, (offset+tlv_offset)); @@ -386,13 +386,13 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_BURST_FEC: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, tlv_tree, hf_ucd_burst_fec, tvb, (offset+tlv_offset), 1, FALSE); - proto_tree_add_item(sub_tree, hf_ucd_burst_fec, tvb, (offset+tlv_offset), 1, FALSE); + proto_tree_add_item(sub_tree, hf_ucd_burst_fec, tvb, (offset+tlv_offset), 1, ENC_BIG_ENDIAN); break; } case UCD_BURST_RANGING_DATA_RATIO: { sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, tlv_tree, hf_ucd_burst_ranging_data_ratio, tvb, (offset+tlv_offset), 1, FALSE); - tlv_item2 = proto_tree_add_item(sub_tree, hf_ucd_burst_ranging_data_ratio, tvb, (offset+tlv_offset), 1, FALSE); + tlv_item2 = proto_tree_add_item(sub_tree, hf_ucd_burst_ranging_data_ratio, tvb, (offset+tlv_offset), 1, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item2, " dB"); break; } @@ -422,27 +422,27 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_RESERVATION_TIMEOUT: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_res_timeout, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_res_timeout, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_res_timeout, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_BW_REQ_SIZE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_bw_req_size, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_bw_req_size, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_bw_req_size, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " PS"); break; } case UCD_RANGING_REQ_SIZE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_ranging_req_size, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_ranging_req_size, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_ranging_req_size, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " PS"); break; } case UCD_FREQUENCY: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_freq, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_freq, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_freq, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " kHz"); break; } @@ -470,70 +470,70 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_TLV_T_159_BAND_AMC_ALLOCATION_THRESHHOLD: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_159_band_amc_allocation_threshold, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_159_band_amc_allocation_threshold, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_159_band_amc_allocation_threshold, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " dB"); break; } case UCD_TLV_T_160_BAND_AMC_RELEASE_THRESHOLD: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_160_band_amc_release_threshold, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_160_band_amc_release_threshold, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_160_band_amc_release_threshold, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " dB"); break; } case UCD_TLV_T_161_BAND_AMC_ALLOCATION_TIMER: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_161_band_amc_allocation_timer, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_161_band_amc_allocation_timer, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_161_band_amc_allocation_timer, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_162_BAND_AMC_RELEASE_TIMER: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_161_band_amc_allocation_timer, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_162_band_amc_release_timer, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_162_band_amc_release_timer, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_163_BAND_STATUS_REPORT_MAX_PERIOD: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_163_band_status_report_max_period, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_163_band_status_report_max_period, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_163_band_status_report_max_period, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_164_BAND_AMC_RETRY_TIMER: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_164_band_amc_retry_timer, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_164_band_amc_retry_timer, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_164_band_amc_retry_timer, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_170_SAFETY_CHANNEL_RETRY_TIMER: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_170_safety_channel_retry_timer, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_170_safety_channel_retry_timer, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_170_safety_channel_retry_timer, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_171_HARQ_ACK_DELAY_FOR_DL_BURST: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_171_harq_ack_delay_dl_burst, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_171_harq_ack_delay_dl_burst, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_171_harq_ack_delay_dl_burst, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames offset"); break; } case UCD_TLV_T_172_CQICH_BAND_AMC_TRANSITION_DELAY: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_172_cqich_band_amc_transition_delay, tvb, offset, tlv_len, FALSE); - tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_172_cqich_band_amc_transition_delay, tvb, offset, tlv_len, FALSE); + tlv_item1 = proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_172_cqich_band_amc_transition_delay, tvb, offset, tlv_len, ENC_BIG_ENDIAN); proto_item_append_text(tlv_item1, " frames"); break; } case UCD_TLV_T_174_MAXIMUM_RETRANSMISSION: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_174_maximum_retransmission, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_174_maximum_retransmission, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_174_maximum_retransmission, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_176_SIZE_OF_CQICH_ID_FIELD: @@ -545,93 +545,93 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t cqich_id_size = utemp + 2; } tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_176_size_of_cqich_id_field, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_176_size_of_cqich_id_field, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_176_size_of_cqich_id_field, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_177_NORMALIZED_CN_OVERRIDE_2: { /* add TLV subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_177_normalized_cn_override2, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_177_normalized_cn_override2_first_line, tvb, offset + 2, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_177_normalized_cn_override2_first_line, tvb, offset + 2, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_177_normalized_cn_override2_list, tvb, offset + 3, 7, FALSE); break; } case UCD_TLV_T_186_UPPER_BOUND__AAS_PREAMBLE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_186_upper_bound_aas_preamble, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_186_upper_bound_aas_preamble, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_186_upper_bound_aas_preamble, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_187_LOWER_BOUND_AAS_PREAMBLE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_187_lower_bound_aas_preamble, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_187_lower_bound_aas_preamble, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_187_lower_bound_aas_preamble, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_188_ALLOW_AAS_BEAM_SELECT_MESSAGE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_188_allow_aas_beam_select_message, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_188_allow_aas_beam_select_message, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_188_allow_aas_beam_select_message, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_189_USE_CQICH_INDICATION_FLAG: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_189_use_cqich_indication_flag, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_189_use_cqich_indication_flag, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_189_use_cqich_indication_flag, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_190_MS_SPECIFIC_UP_POWER_OFFSET_ADJUSTMENT_STEP: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_190_ms_specific_up_power_addjustment_step, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_191_MS_SPECIFIC_DOWN_POWER_OFSET_ADJUSTMENT_STEP: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_191_ms_specific_down_power_addjustment_step, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_192_MIN_LEVEL_POWER_OFFSET_ADJUSTMENT: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_192_min_level_power_offset_adjustment, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_192_min_level_power_offset_adjustment, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_192_min_level_power_offset_adjustment, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_193_MAX_LEVEL_POWER_OFFSETR_ADJUSTMENT: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_193_max_level_power_offset_adjustment, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_193_max_level_power_offset_adjustment, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_193_max_level_power_offset_adjustment, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_194_HANDOVER_RANGING_CODES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_194_handover_ranging_codes, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_194_handover_ranging_codes, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_194_handover_ranging_codes, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_195_INITIAL_RANGING_INTERVAL: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_195_initial_ranging_interval, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_195_initial_ranging_interval, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_195_initial_ranging_interval, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_196_TX_POWER_REPORT: { /* add TLV subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, proto_mac_mgmt_msg_ucd_decoder, tvb, offset, tlv_len, "Tx Power Report (%u bytes)", tlv_len); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_threshold, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_interval, tvb , offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_a_p_avg, tvb, (offset + 1), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_threshold_icqch, tvb, (offset + 1), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_interval_icqch, tvb, (offset + 2), 1, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch, tvb, (offset + 2), 1, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_threshold, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_interval, tvb , offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_a_p_avg, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_threshold_icqch, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_interval_icqch, tvb, (offset + 2), 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_196_tx_power_report_a_p_avg_icqch, tvb, (offset + 2), 1, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_197_NORMALIZED_CN_FOR_CHANNEL_SOUNDING: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_195_initial_ranging_interval, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_197_normalized_cn_channel_sounding, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_197_normalized_cn_channel_sounding, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_TLV_T_198_INTIAL_RANGING_BACKOFF_START: @@ -665,25 +665,25 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_TLV_T_202_UPLINK_BURST_PROFILE_FOR_MULTIPLE_FEC_TYPES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_202_uplink_burst_profile_for_multiple_fec_types, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_INITIAL_RANGING_CODES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_150_initial_ranging_codes, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_150_initial_ranging_codes, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_150_initial_ranging_codes, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_PERIODIC_RANGING_CODES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_151_periodic_ranging_codes, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_151_periodic_ranging_codes, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_151_periodic_ranging_codes, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_BANDWIDTH_REQUEST_CODES: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_152_bandwidth_request_codes, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_152_bandwidth_request_codes, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_152_bandwidth_request_codes, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_PERIODIC_RANGING_BACKOFF_START: @@ -704,14 +704,14 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t case UCD_START_OF_RANGING_CODES_GROUP: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_155_start_of_ranging_codes_group, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_155_start_of_ranging_codes_group, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_155_start_of_ranging_codes_group, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_PERMUTATION_BASE: { tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_156_permutation_base, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_156_permutation_base, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree,hf_ucd_tlv_t_156_permutation_base, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; } case UCD_UL_ALLOCATED_SUBCHANNELS_BITMAP: diff --git a/plugins/wimax/msg_ulmap.c b/plugins/wimax/msg_ulmap.c index 72b1442247..1bf6e40df5 100644 --- a/plugins/wimax/msg_ulmap.c +++ b/plugins/wimax/msg_ulmap.c @@ -1917,16 +1917,16 @@ void dissect_mac_mgmt_msg_ulmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, p ulmap_tree = proto_item_add_subtree(ti, ett_ulmap); /* Decode and display the UL-MAP */ - proto_tree_add_item(ulmap_tree, hf_ulmap_message_type, tvb, offset, 1, FALSE); + proto_tree_add_item(ulmap_tree, hf_ulmap_message_type, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ulmap_tree, hf_ulmap_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(ulmap_tree, hf_ulmap_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ulmap_tree, hf_ulmap_ucd_count, tvb, offset, 1, FALSE); + proto_tree_add_item(ulmap_tree, hf_ulmap_ucd_count, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - proto_tree_add_item(ulmap_tree, hf_ulmap_alloc_start_time, tvb, offset, 4, FALSE); + proto_tree_add_item(ulmap_tree, hf_ulmap_alloc_start_time, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; - proto_tree_add_item(ulmap_tree, hf_ulmap_ofdma_sym, tvb, offset, 1, FALSE); + proto_tree_add_item(ulmap_tree, hf_ulmap_ofdma_sym, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; /* UL-MAP IEs */ diff --git a/plugins/wimax/wimax_cdma_code_decoder.c b/plugins/wimax/wimax_cdma_code_decoder.c index c569154400..4471acdc60 100644 --- a/plugins/wimax/wimax_cdma_code_decoder.c +++ b/plugins/wimax/wimax_cdma_code_decoder.c @@ -63,11 +63,11 @@ static void dissect_wimax_cdma_code_decoder(tvbuff_t *tvb, packet_info *pinfo, p /* add CDMA Code subtree */ cdma_tree = proto_item_add_subtree(cdma_item, ett_wimax_cdma_code_decoder); /* display the first CDMA Code */ - proto_tree_add_item(cdma_tree, hf_wimax_ranging_code, tvb, offset, 1, FALSE); + proto_tree_add_item(cdma_tree, hf_wimax_ranging_code, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the 2nd CDMA Code */ - proto_tree_add_item(cdma_tree, hf_wimax_ranging_symbol_offset, tvb, offset+1, 1, FALSE); + proto_tree_add_item(cdma_tree, hf_wimax_ranging_symbol_offset, tvb, offset+1, 1, ENC_BIG_ENDIAN); /* display the 3rd CDMA Code */ - proto_tree_add_item(cdma_tree, hf_wimax_ranging_subchannel_offset, tvb, offset+2, 1, FALSE); + proto_tree_add_item(cdma_tree, hf_wimax_ranging_subchannel_offset, tvb, offset+2, 1, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c index 17f6206666..5299f4cba9 100644 --- a/plugins/wimax/wimax_compact_dlmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_dlmap_ie_decoder.c @@ -410,18 +410,18 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_DL_MAP_TYPE_NORMAL_SUBCHANNEL:/* 6.3.2.3.43.6.1 */ if(nibble_offset & 1) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the UL-MAP append */ - proto_tree_add_item(tree, hf_cdlmap_ul_map_append_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_ul_map_append_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; nibble_offset = 0; } else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the UL-MAP append */ - proto_tree_add_item(tree, hf_cdlmap_ul_map_append, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_ul_map_append, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -435,15 +435,15 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; - proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -453,13 +453,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened DIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ dl_map_offset++; @@ -481,13 +481,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened UIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_shortened_uiuc_1, tvb, dl_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_uiuc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_shortened_uiuc, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_uiuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ dl_map_offset++; @@ -497,15 +497,15 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; - proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -519,18 +519,18 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_DL_MAP_TYPE_BAND_AMC:/* 6.3.2.3.43.6.2 */ if(nibble_offset & 1) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; nibble_offset = 0; } else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -544,15 +544,15 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; - proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -562,13 +562,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened DIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ dl_map_offset++; @@ -582,7 +582,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { nband = (nband & LSB_NIBBLE_MASK); /* display the Nband */ - proto_tree_add_item(tree, hf_cdlmap_num_bands_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_bands_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; nibble_offset = 0; @@ -606,7 +606,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { nband = ((nband & MSB_NIBBLE_MASK) >> 4); /* display the Nband */ - proto_tree_add_item(tree, hf_cdlmap_num_bands, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_bands, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; if(max_logical_bands == 3) { @@ -635,14 +635,14 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the Nb-BITMAP */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nb_bitmap_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nb_bitmap_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_cdlmap_nb_bitmap, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nb_bitmap, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length++; @@ -652,16 +652,16 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf if(nibble_offset & 1) { allocation_mode = ((byte & 0x0C) >> 2); - proto_tree_add_item(tree, hf_cdlmap_allocation_mode_1, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_allocation_mode_rsvd_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_allocation_mode_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_allocation_mode_rsvd_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 0; dl_map_offset++; } else { allocation_mode = ((byte & 0xC0) >> 6); - proto_tree_add_item(tree, hf_cdlmap_allocation_mode, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_allocation_mode_rsvd, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_allocation_mode, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_allocation_mode_rsvd, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } /* Decode Allocation Mode - need to be done */ @@ -669,11 +669,11 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_num_subchannels_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_subchannels_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_num_subchannels, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_subchannels, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } dl_map_offset++; } @@ -683,11 +683,11 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_num_subchannels_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_subchannels_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_num_subchannels, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_num_subchannels, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } dl_map_offset++; } @@ -704,18 +704,18 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_DL_MAP_TYPE_SAFETY:/* 6.3.2.3.43.6.3 */ if(nibble_offset & 1) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the UL-MAP append */ - proto_tree_add_item(tree, hf_cdlmap_ul_map_append_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_ul_map_append_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; nibble_offset = 0; } else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the UL-MAP append */ - proto_tree_add_item(tree, hf_cdlmap_ul_map_append, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_ul_map_append, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -729,15 +729,15 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; - proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -747,13 +747,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened DIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ dl_map_offset++; @@ -762,13 +762,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display BIN offset */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_bin_offset_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bin_offset_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } else { - proto_tree_add_item(tree, hf_cdlmap_bin_offset, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bin_offset, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -789,13 +789,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened DIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_shortened_diuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_companded_sc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ dl_map_offset++; @@ -805,15 +805,15 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; - proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nsch_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_nep_code, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_nsch_code_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -822,13 +822,13 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display BIN offset */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_bin_offset_1, tvb, dl_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bin_offset_1, tvb, dl_map_offset, 2, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } else { - proto_tree_add_item(tree, hf_cdlmap_bin_offset, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bin_offset, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -841,9 +841,9 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_DL_MAP_TYPE_UIUC:/* 6.3.2.3.43.6.4 */ if(nibble_offset & 1) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; /* get the new byte */ @@ -851,18 +851,18 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* get the DIUC */ diuc = ((byte & MSB_NIBBLE_MASK) >> 4); /* display the DIUC */ - proto_tree_add_item(tree, hf_cdlmap_diuc, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* get the DIUC */ diuc = (tvb_get_guint8(tvb, dl_map_offset) & LSB_NIBBLE_MASK); /* display the DIUC */ - proto_tree_add_item(tree, hf_cdlmap_diuc_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ dl_map_offset++; } @@ -882,20 +882,20 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf nibble_offset = (nibble_length & 1); /* display Number of subchannels */ if(nibble_offset & 1) - proto_tree_add_item(tree, hf_cdlmap_diuc_num_of_subchannels_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc_num_of_subchannels_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); else - proto_tree_add_item(tree, hf_cdlmap_diuc_num_of_subchannels, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc_num_of_subchannels, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); length += 2; /* display the repetition coding indication and reserved bits */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_cdlmap_diuc_repetition_coding_indication_1, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_diuc_reserved_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc_repetition_coding_indication_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_diuc_reserved_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_cdlmap_diuc_repetition_coding_indication, tvb, dl_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_cdlmap_diuc_reserved, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_diuc_repetition_coding_indication, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_cdlmap_diuc_reserved, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); } length += 1; } @@ -916,9 +916,9 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_DL_MAP_TYPE_HARQ_ACK_BITMAP_IE:/* 6.3.2.3.43.6.5 */ if(nibble_offset & 1) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); length = 1; /* move to next byte */ dl_map_offset++; @@ -926,7 +926,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf byte = tvb_get_guint8(tvb, dl_map_offset); bit_map_length = ((byte & MSB_NIBBLE_MASK) >> 4); /* display BITMAP Length */ - proto_tree_add_item(tree, hf_cdlmap_bit_map_length, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bit_map_length, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display BITMAP */ proto_tree_add_item(tree, hf_cdlmap_bit_map, tvb, dl_map_offset, bit_map_length + 1, ENC_NA); length += (1 + bit_map_length * 2); @@ -934,11 +934,11 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display BITMAP Length */ - proto_tree_add_item(tree, hf_cdlmap_bit_map_length_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_bit_map_length_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); length = 2; /* get the bit map length */ bit_map_length = (byte & LSB_NIBBLE_MASK); @@ -956,7 +956,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf break; default:/* Reserved Type */ /* display the reserved type */ - proto_tree_add_item(tree, hf_cdlmap_reserved_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_reserved_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); length = 1; break; } @@ -1004,7 +1004,7 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre return 0; new_format_ind = (tvb_value & 0x01); /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_format_config_ie_dl_map_type_1, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_dl_map_type_1, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the New format Indication */ proto_tree_add_item(tree, hf_format_config_ie_new_format_indication_1, tvb, dl_map_offset, 1, FALSE); /* update the length in nibble */ @@ -1013,19 +1013,19 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre dl_map_offset++; if(new_format_ind) { /* display the CID Type */ - proto_tree_add_item(tree, hf_format_config_ie_cid_type, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_cid_type, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the Safety Pattern */ - proto_tree_add_item(tree, hf_format_config_ie_safety_pattern, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_safety_pattern, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the Subchannel pattern */ - proto_tree_add_item(tree, hf_format_config_ie_subchannel_type, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_subchannel_type, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the max logical bands */ - proto_tree_add_item(tree, hf_format_config_ie_max_logical_bands, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_max_logical_bands, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of broadcast symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_broadcast_symbol, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_broadcast_symbol, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of dl band AMC symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_dl_band_amc_symbol, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_dl_band_amc_symbol, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of ul band AMC symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_ul_band_amc_symbol, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_ul_band_amc_symbol, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* update the length in nibble */ length += 7; /* Get the next 32-bit word */ @@ -1053,23 +1053,23 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre new_format_ind = (tvb_value & 0x10); if(new_format_ind) { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_format_config_ie_dl_map_type_32, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_dl_map_type_32, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the New format Indication */ proto_tree_add_item(tree, hf_format_config_ie_new_format_indication_32, tvb, dl_map_offset, 4, FALSE); /* display the CID Type */ - proto_tree_add_item(tree, hf_format_config_ie_cid_type_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_cid_type_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the Safety Pattern */ - proto_tree_add_item(tree, hf_format_config_ie_safety_pattern_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_safety_pattern_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the Subchannel pattern */ - proto_tree_add_item(tree, hf_format_config_ie_subchannel_type_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_subchannel_type_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the max logical bands */ - proto_tree_add_item(tree, hf_format_config_ie_max_logical_bands_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_max_logical_bands_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of broadcast symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_broadcast_symbol_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_broadcast_symbol_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of dl band AMC symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_dl_band_amc_symbol_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_dl_band_amc_symbol_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of ul band AMC symbols */ - proto_tree_add_item(tree, hf_format_config_ie_num_of_ul_band_amc_symbol_1, tvb, dl_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_num_of_ul_band_amc_symbol_1, tvb, dl_map_offset, 4, ENC_BIG_ENDIAN); /* update the length in nibble */ length = 8; /* Get the next 32-bit word */ @@ -1089,7 +1089,7 @@ static guint wimax_compact_dlmap_format_configuration_ie_decoder(proto_tree *tre } else { /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_format_config_ie_dl_map_type, tvb, dl_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_format_config_ie_dl_map_type, tvb, dl_map_offset, 1, ENC_BIG_ENDIAN); /* display the New format Indication */ proto_tree_add_item(tree, hf_format_config_ie_new_format_indication, tvb, dl_map_offset, 1, FALSE); /* update the length in nibble */ @@ -1114,14 +1114,14 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_NORMAL) { /* display the normal CID */ - proto_tree_add_item(tree, hf_harq_rcid_ie_normal_cid_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_normal_cid_1, tvb, offset, 3, ENC_BIG_ENDIAN); length = 4; } else { /* Get the prefix bit */ prefix = (tvb_get_guint8(tvb, offset) & 0x08); /* display the prefix */ - proto_tree_add_item(tree, hf_harq_rcid_ie_prefix_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_prefix_1, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix) { /* display the CID11 */ proto_tree_add_item(tree, hf_harq_rcid_ie_cid11_3, tvb, offset, 2, FALSE); @@ -1131,17 +1131,17 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_RCID11) { /* display the CID11 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid11_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid11_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 3; } else if(cid_type == CID_TYPE_RCID7) { /* display the normal CID7 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid7_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid7_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else if(cid_type == CID_TYPE_RCID3) { /* display the CID3 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid3_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid3_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1151,14 +1151,14 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_NORMAL) { /* display the normal CID */ - proto_tree_add_item(tree, hf_harq_rcid_ie_normal_cid, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_normal_cid, tvb, offset, 2, ENC_BIG_ENDIAN); length = 4; } else { /* Get the prefix bit */ prefix = (tvb_get_guint8(tvb, offset) & 0x08); /* display the prefix */ - proto_tree_add_item(tree, hf_harq_rcid_ie_prefix, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_prefix, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix || (cid_type == CID_TYPE_RCID11)) { /* display the CID11 */ proto_tree_add_item(tree, hf_harq_rcid_ie_cid11_2, tvb, offset, 2, FALSE); @@ -1168,17 +1168,17 @@ static guint wimax_compact_dlmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_RCID11) { /* display the CID11 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid11, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid11, tvb, offset, 2, ENC_BIG_ENDIAN); length = 3; } else if(cid_type == CID_TYPE_RCID7) { /* display the CID7 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid7, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid7, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else if(cid_type == CID_TYPE_RCID3) { /* display the CID3 */ - proto_tree_add_item(tree, hf_harq_rcid_ie_cid3, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_rcid_ie_cid3, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1206,16 +1206,16 @@ static guint wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packe proto_tree_add_item(tree, hf_harq_control_ie_prefix_1, tvb, offset, 2, FALSE); if(prefix) { /* display the ai_sn */ - proto_tree_add_item(tree, hf_harq_control_ie_ai_sn_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_ai_sn_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the spid */ - proto_tree_add_item(tree, hf_harq_control_ie_spid_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_spid_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the acid */ - proto_tree_add_item(tree, hf_harq_control_ie_acid_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_acid_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else { /* display the reserved bits */ - proto_tree_add_item(tree, hf_harq_control_ie_reserved_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_reserved_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1226,16 +1226,16 @@ static guint wimax_compact_dlmap_harq_control_ie_decoder(proto_tree *tree, packe proto_tree_add_item(tree, hf_harq_control_ie_prefix, tvb, offset, 1, FALSE); if(prefix) { /* display the ai_sn */ - proto_tree_add_item(tree, hf_harq_control_ie_ai_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_ai_sn, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the spid */ - proto_tree_add_item(tree, hf_harq_control_ie_spid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_spid, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the acid */ - proto_tree_add_item(tree, hf_harq_control_ie_acid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_acid, tvb, offset, 1, ENC_BIG_ENDIAN); length = 2; } else { /* display the reserved bits */ - proto_tree_add_item(tree, hf_harq_control_ie_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); length = 1; } } @@ -1261,20 +1261,20 @@ static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, pack { /* display the CQICH indicator */ proto_tree_add_item(tree, hf_cqich_control_ie_indicator_1, tvb, offset, 3, FALSE); /* display the allocation index */ - proto_tree_add_item(tree, hf_cqich_control_ie_alloc_id_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_alloc_id_1, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the period */ - proto_tree_add_item(tree, hf_cqich_control_ie_period_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_period_1, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the frame offset */ - proto_tree_add_item(tree, hf_cqich_control_ie_frame_offset_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_frame_offset_1, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the duration */ - proto_tree_add_item(tree, hf_cqich_control_ie_duration_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_duration_1, tvb, offset, 3, ENC_BIG_ENDIAN); length = 4; } else { /* display the CQICH indicator */ proto_tree_add_item(tree, hf_cqich_control_ie_indicator_1, tvb, offset, 1, FALSE); /* display the CQI reporting threshold */ - proto_tree_add_item(tree, hf_cqich_control_ie_cqi_rep_threshold_1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_cqi_rep_threshold_1, tvb, offset, 1, ENC_BIG_ENDIAN); length = 1; } } @@ -1285,20 +1285,20 @@ static guint wimax_compact_dlmap_cqich_control_ie_decoder(proto_tree *tree, pack { /* display the CQICH indicator */ proto_tree_add_item(tree, hf_cqich_control_ie_indicator, tvb, offset, 2, FALSE); /* display the allocation index */ - proto_tree_add_item(tree, hf_cqich_control_ie_alloc_id, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_alloc_id, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the period */ - proto_tree_add_item(tree, hf_cqich_control_ie_period, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_period, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the frame offset */ - proto_tree_add_item(tree, hf_cqich_control_ie_frame_offset, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_frame_offset, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the duration */ - proto_tree_add_item(tree, hf_cqich_control_ie_duration, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_duration, tvb, offset, 2, ENC_BIG_ENDIAN); length = 4; } else { /* display the CQICH indicator */ proto_tree_add_item(tree, hf_cqich_control_ie_indicator, tvb, offset, 1, FALSE); /* display the CQI reporting threshold */ - proto_tree_add_item(tree, hf_cqich_control_ie_cqi_rep_threshold, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_cqich_control_ie_cqi_rep_threshold, tvb, offset, 1, ENC_BIG_ENDIAN); length = 1; } } @@ -1331,11 +1331,11 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* Get the IE length */ length = (tvb_value & 0x000F); /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_extension_type_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_type_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the DL-MAP extension subtype */ - proto_tree_add_item(tree, hf_cdlmap_extension_subtype_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_subtype_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the IE length */ - proto_tree_add_item(tree, hf_cdlmap_extension_length_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_length_1, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (sub_type) { @@ -1345,7 +1345,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi break; case HARQ_MODE_SWITCH: /* display the HARQ mode */ - proto_tree_add_item(tree, hf_cdlmap_extension_harq_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_harq_mode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the next byte */ tvb_value = tvb_get_guint8(tvb, offset); /* get the HARQ mode */ @@ -1367,11 +1367,11 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* Get the IE length */ length = ((tvb_value & 0x00F0) >> 4); /* display the DL-MAP type */ - proto_tree_add_item(tree, hf_cdlmap_extension_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_type, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the DL-MAP extension subtype */ - proto_tree_add_item(tree, hf_cdlmap_extension_subtype, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_subtype, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the IE length */ - proto_tree_add_item(tree, hf_cdlmap_extension_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_length, tvb, offset, 2, ENC_BIG_ENDIAN); switch (sub_type) { case TIME_DIVERSITY_MBS: @@ -1380,7 +1380,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi break; case HARQ_MODE_SWITCH: /* display the HARQ mode */ - proto_tree_add_item(tree, hf_cdlmap_extension_harq_mode_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_cdlmap_extension_harq_mode_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* get the HARQ mode */ harq_mode = (tvb_value & 0x000F); break; @@ -1419,7 +1419,7 @@ guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi { /* get the extended DIUC */ ext_diuc = (byte & LSB_NIBBLE_MASK); /* display extended DIUC */ - proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_diuc_1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_diuc_1, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ offset++; /* get the 2nd byte */ @@ -1427,7 +1427,7 @@ guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi /* get the length */ length = ((byte & MSB_NIBBLE_MASK) >> 4); /* display extended DIUC length */ - proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_length, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_length, tvb, offset, 1, ENC_BIG_ENDIAN); /* 8.4.5.3.2.1 (table 277a) */ switch (ext_diuc) { @@ -1486,9 +1486,9 @@ guint wimax_extended_diuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi /* get the length */ length = (byte & LSB_NIBBLE_MASK); /* display extended DIUC */ - proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_diuc, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_diuc, tvb, offset, 1, ENC_BIG_ENDIAN); /* display extended DIUC length */ - proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_length_1, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_diuc_dependent_ie_length_1, tvb, offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ offset++; /* 8.4.5.3.2.1 (table 277a) */ diff --git a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c index f4b1c682d4..b3d83f3bde 100644 --- a/plugins/wimax/wimax_compact_ulmap_ie_decoder.c +++ b/plugins/wimax/wimax_compact_ulmap_ie_decoder.c @@ -410,18 +410,18 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the UL-MAP type and reserved bit */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -435,15 +435,15 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; - proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; } @@ -453,13 +453,13 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened UIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ ul_map_offset++; @@ -473,18 +473,18 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the UL-MAP type and reserved bit */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -498,15 +498,15 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; - proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; } @@ -516,13 +516,13 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened UIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ ul_map_offset++; @@ -537,7 +537,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { nband = (nband & LSB_NIBBLE_MASK); /* display the Nband */ - proto_tree_add_item(tree, hf_culmap_num_bands_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_num_bands_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; nibble_offset = 0; @@ -561,7 +561,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { nband = ((nband & MSB_NIBBLE_MASK) >> 4); /* display the Nband */ - proto_tree_add_item(tree, hf_culmap_num_bands, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_num_bands, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; if(max_logical_bands == 3) { @@ -589,14 +589,14 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the Nb-BITMAP */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_nb_bitmap_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nb_bitmap_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_culmap_nb_bitmap, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nb_bitmap, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length++; @@ -606,16 +606,16 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf if(nibble_offset & 1) { allocation_mode = ((byte & ALLOCATION_MODE_MASK_1) >> 2); - proto_tree_add_item(tree, hf_culmap_allocation_mode_1, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_allocation_mode_rsvd_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_allocation_mode_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_allocation_mode_rsvd_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 0; ul_map_offset++; } else { allocation_mode = ((byte & ALLOCATION_MODE_MASK) >> 6); - proto_tree_add_item(tree, hf_culmap_allocation_mode, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_allocation_mode_rsvd, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_allocation_mode, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_allocation_mode_rsvd, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length++; @@ -624,11 +624,11 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_num_subchannels_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_num_subchannels_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_num_subchannels, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_num_subchannels, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } ul_map_offset++; length += 2; @@ -639,11 +639,11 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_num_subchannels_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_num_subchannels_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_num_subchannels, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_num_subchannels, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } ul_map_offset++; } @@ -657,18 +657,18 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the UL-MAP type and reserved bit */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length = 1; @@ -682,15 +682,15 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Nep and Nsch Code */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; - proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nsch_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_nep_code, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_nsch_code_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; } @@ -700,13 +700,13 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf { /* display the Shortened UIUC and Companded SC */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_shortened_uiuc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_companded_sc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } /* move to next byte */ ul_map_offset++; @@ -715,13 +715,13 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display BIN offset */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_bin_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_bin_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; } else { - proto_tree_add_item(tree, hf_culmap_bin_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_bin_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; } @@ -734,9 +734,9 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* display the UL-MAP type and reserved bit */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* move to next byte */ ul_map_offset++; /* get the new byte */ @@ -744,18 +744,18 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf /* get the UIUC */ uiuc = ((byte & MSB_NIBBLE_MASK) >> 4); /* display the UIUC */ - proto_tree_add_item(tree, hf_culmap_uiuc, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } else { /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* get the UIUC */ uiuc = (byte & LSB_NIBBLE_MASK); /* display the UIUC */ - proto_tree_add_item(tree, hf_culmap_uiuc_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); } length = 2; /* decode RCID IE */ @@ -782,34 +782,34 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf if(nibble_offset & 1) { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_7_1, tvb, ul_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_7_1, tvb, ul_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_7_1, tvb, ul_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_7_1, tvb, ul_map_offset, 4, ENC_BIG_ENDIAN); /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_7_1, tvb, ul_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_7_1, tvb, ul_map_offset, 4, ENC_BIG_ENDIAN); /* display the ranging method */ - proto_tree_add_item(tree, hf_culmap_uiuc_ranging_method_1, tvb, ul_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ranging_method_1, tvb, ul_map_offset, 4, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_uiuc_reserved_1, tvb, ul_map_offset, 4, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_reserved_1, tvb, ul_map_offset, 4, ENC_BIG_ENDIAN); ul_map_offset += 3; } else { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_7, tvb, ul_map_offset, 3, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_7, tvb, ul_map_offset, 3, ENC_BIG_ENDIAN); /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_7, tvb, ul_map_offset, 3, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_7, tvb, ul_map_offset, 3, ENC_BIG_ENDIAN); /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_7, tvb, ul_map_offset, 3, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_7, tvb, ul_map_offset, 3, ENC_BIG_ENDIAN); /* display the ranging method */ - proto_tree_add_item(tree, hf_culmap_uiuc_ranging_method, tvb, ul_map_offset, 3, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ranging_method, tvb, ul_map_offset, 3, ENC_BIG_ENDIAN); /* display the reserved */ - proto_tree_add_item(tree, hf_culmap_uiuc_reserved, tvb, ul_map_offset, 3, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_reserved, tvb, ul_map_offset, 3, ENC_BIG_ENDIAN); ul_map_offset += 3; } length += 8; @@ -817,21 +817,21 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf else { /* display Number of subchannels */ if(nibble_offset & 1) - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); else - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); length += 2; /* display the repetition coding indication and reserved bits */ if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_culmap_uiuc_repetition_coding_indication_1, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_uiuc_reserved_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_repetition_coding_indication_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_uiuc_reserved_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 0; } else { - proto_tree_add_item(tree, hf_culmap_uiuc_repetition_coding_indication, tvb, ul_map_offset, 1, FALSE); - proto_tree_add_item(tree, hf_culmap_uiuc_reserved, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_repetition_coding_indication, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_culmap_uiuc_reserved, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); nibble_offset = 1; } length += 1; @@ -843,7 +843,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_UL_MAP_TYPE_HARQ_REGION_IE:/* 6.3.2.3.43.7.5 */ if(nibble_offset & 1) { /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the HARQ Region Change Indication */ proto_tree_add_item(tree, hf_culmap_harq_region_change_indication_1, tvb, ul_map_offset, 1, FALSE); /* get the HARQ Region Change Indication */ @@ -854,7 +854,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf } else { /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the HARQ Region Change Indication */ proto_tree_add_item(tree, hf_culmap_harq_region_change_indication, tvb, ul_map_offset, 1, FALSE); /* get the HARQ Region Change Indication */ @@ -867,30 +867,30 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf if(nibble_offset & 1) { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; } else { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; } length += 8; @@ -899,7 +899,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf case COMPACT_UL_MAP_TYPE_CQICH_REGION_IE:/* 6.3.2.3.43.7.6 */ if(nibble_offset & 1) { /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the CQI Region Change Indication */ proto_tree_add_item(tree, hf_culmap_cqi_region_change_indication_1, tvb, ul_map_offset, 1, FALSE); /* get the CQI Region Change Indication */ @@ -910,7 +910,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf } else { /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_ul_map_type, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); /* display the CQI Region Change Indication */ proto_tree_add_item(tree, hf_culmap_cqi_region_change_indication, tvb, ul_map_offset, 1, FALSE); /* get the CQI Region Change Indication */ @@ -923,30 +923,30 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf if(nibble_offset & 1) { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels_1, tvb, ul_map_offset, 2, ENC_BIG_ENDIAN); ul_map_offset++; } else { /* display the OFDMA symbol offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_ofdma_symbol_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the subchannel offset */ - proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_subchannel_offset, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of OFDMA symbols */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_ofdma_symbols, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; /* display the number of subchannels */ - proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_uiuc_num_of_subchannels, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); ul_map_offset++; } length += 8; @@ -959,7 +959,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf break; default:/* Reserved Type */ /* display the reserved type */ - proto_tree_add_item(tree, hf_culmap_reserved_type_1, tvb, ul_map_offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_reserved_type_1, tvb, ul_map_offset, 1, ENC_BIG_ENDIAN); length = 1; break; } @@ -981,14 +981,14 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_NORMAL) { /* display the normal CID */ - proto_tree_add_item(tree, hf_rcid_ie_normal_cid_1, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_normal_cid_1, tvb, offset, 3, ENC_BIG_ENDIAN); length = 4; } else { /* Get the prefix bit */ prefix = (tvb_get_guint8(tvb, offset) & 0x08); /* display the prefix */ - proto_tree_add_item(tree, hf_rcid_ie_prefix_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_prefix_1, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix) { /* display the CID11 */ proto_tree_add_item(tree, hf_rcid_ie_cid11_3, tvb, offset, 2, FALSE); @@ -998,17 +998,17 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_RCID11) { /* display the CID11 */ - proto_tree_add_item(tree, hf_rcid_ie_cid11_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid11_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 3; } else if(cid_type == CID_TYPE_RCID7) { /* display the normal CID7 */ - proto_tree_add_item(tree, hf_rcid_ie_cid7_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid7_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else if(cid_type == CID_TYPE_RCID3) { /* display the CID3 */ - proto_tree_add_item(tree, hf_rcid_ie_cid3_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid3_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1018,14 +1018,14 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_NORMAL) { /* display the normal CID */ - proto_tree_add_item(tree, hf_rcid_ie_normal_cid, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_normal_cid, tvb, offset, 2, ENC_BIG_ENDIAN); length = 4; } else { /* Get the prefix bit */ prefix = (tvb_get_guint8(tvb, offset) & 0x08); /* display the prefix */ - proto_tree_add_item(tree, hf_rcid_ie_prefix, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_prefix, tvb, offset, 2, ENC_BIG_ENDIAN); if(prefix || (cid_type == CID_TYPE_RCID11)) { /* display the CID11 */ proto_tree_add_item(tree, hf_rcid_ie_cid11_2, tvb, offset, 2, FALSE); @@ -1035,17 +1035,17 @@ static guint wimax_compact_ulmap_rcid_ie_decoder(proto_tree *tree, packet_info * { if(cid_type == CID_TYPE_RCID11) { /* display the CID11 */ - proto_tree_add_item(tree, hf_rcid_ie_cid11, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid11, tvb, offset, 2, ENC_BIG_ENDIAN); length = 3; } else if(cid_type == CID_TYPE_RCID7) { /* display the CID7 */ - proto_tree_add_item(tree, hf_rcid_ie_cid7, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid7, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else if(cid_type == CID_TYPE_RCID3) { /* display the CID3 */ - proto_tree_add_item(tree, hf_rcid_ie_cid3, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_rcid_ie_cid3, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1073,16 +1073,16 @@ static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packe proto_tree_add_item(tree, hf_harq_control_ie_prefix_1, tvb, offset, 2, FALSE); if(prefix) { /* display the ai_sn */ - proto_tree_add_item(tree, hf_harq_control_ie_ai_sn_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_ai_sn_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the spid */ - proto_tree_add_item(tree, hf_harq_control_ie_spid_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_spid_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the acid */ - proto_tree_add_item(tree, hf_harq_control_ie_acid_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_acid_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 2; } else { /* display the reserved bits */ - proto_tree_add_item(tree, hf_harq_control_ie_reserved_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_reserved_1, tvb, offset, 2, ENC_BIG_ENDIAN); length = 1; } } @@ -1093,16 +1093,16 @@ static guint wimax_compact_ulmap_harq_control_ie_decoder(proto_tree *tree, packe proto_tree_add_item(tree, hf_harq_control_ie_prefix, tvb, offset, 1, FALSE); if(prefix) { /* display the ai_sn */ - proto_tree_add_item(tree, hf_harq_control_ie_ai_sn, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_ai_sn, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the spid */ - proto_tree_add_item(tree, hf_harq_control_ie_spid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_spid, tvb, offset, 1, ENC_BIG_ENDIAN); /* display the acid */ - proto_tree_add_item(tree, hf_harq_control_ie_acid, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_acid, tvb, offset, 1, ENC_BIG_ENDIAN); length = 2; } else { /* display the reserved bits */ - proto_tree_add_item(tree, hf_harq_control_ie_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_harq_control_ie_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); length = 1; } } @@ -1139,17 +1139,17 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* Get the IE length */ length = (tvb_value & EXTENSION_LENGTH_MASK_1); /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_extension_type_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_type_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the UL-MAP extension subtype */ - proto_tree_add_item(tree, hf_culmap_extension_subtype_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_subtype_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the IE length */ - proto_tree_add_item(tree, hf_culmap_extension_length_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_length_1, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; switch (sub_type) { case HARQ_MODE_SWITCH: /* display the HARQ mode */ - proto_tree_add_item(tree, hf_culmap_extension_harq_mode, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_harq_mode, tvb, offset, 1, ENC_BIG_ENDIAN); /* Get the next byte */ tvb_value = tvb_get_guint8(tvb, offset); /* get the HARQ mode */ @@ -1171,16 +1171,16 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi /* Get the IE length */ length = ((tvb_value & EXTENSION_LENGTH_MASK) >> EXTENSION_LENGTH_SHIFT); /* display the UL-MAP type */ - proto_tree_add_item(tree, hf_culmap_extension_type, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_type, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the UL-MAP extension subtype */ - proto_tree_add_item(tree, hf_culmap_extension_subtype, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_subtype, tvb, offset, 2, ENC_BIG_ENDIAN); /* display the IE length */ - proto_tree_add_item(tree, hf_culmap_extension_length, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_length, tvb, offset, 2, ENC_BIG_ENDIAN); switch (sub_type) { case HARQ_MODE_SWITCH: /* display the HARQ mode */ - proto_tree_add_item(tree, hf_culmap_extension_harq_mode_1, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_culmap_extension_harq_mode_1, tvb, offset, 2, ENC_BIG_ENDIAN); /* get the HARQ mode */ harq_mode = (tvb_value & LSB_NIBBLE_MASK); break; @@ -1302,13 +1302,13 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi { /* display power control value */ proto_tree_add_item(tree, hf_extended_uiuc_ie_power_control_24, tvb, offset, 3, FALSE); /* display power measurement frame value */ - proto_tree_add_item(tree, hf_extended_uiuc_ie_power_measurement_frame_24, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_power_measurement_frame_24, tvb, offset, 3, ENC_BIG_ENDIAN); } else { /* display power control value */ proto_tree_add_item(tree, hf_extended_uiuc_ie_power_control, tvb, offset, 1, FALSE); /* display power measurement frame value */ - proto_tree_add_item(tree, hf_extended_uiuc_ie_power_measurement_frame, tvb, (offset + 1), 1, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_power_measurement_frame, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); } break; case MINI_SUBCHANNEL_ALLOCATION_IE: @@ -1330,15 +1330,15 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi if(nibble_offset & 1) { /* display MINI Subchannel Allocation CType value */ - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_ctype_16, tvb, offset, 2, ENC_BIG_ENDIAN); /* display MINI Subchannel Allocation Duration value */ - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16, tvb, offset, 2, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_duration_16, tvb, offset, 2, ENC_BIG_ENDIAN); } else { /* display MINI Subchannel Allocation CType value */ proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_ctype, tvb, offset, 1, FALSE); /* display MINI Subchannel Allocation Duration value */ - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_duration, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_duration, tvb, offset, 1, ENC_BIG_ENDIAN); } offset++; /* decode and display CIDs, UIUCs, and Repetitions */ @@ -1346,42 +1346,42 @@ guint wimax_extended_uiuc_dependent_ie_decoder(proto_tree *tree, packet_info *pi { if(nibble_offset & 1) { - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_1, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_1, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_1, tvb, offset, 4, ENC_BIG_ENDIAN); if(i < (m-2)) { offset += 3; - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_3, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_3, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_3, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 3; } else if(m == 3) { - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_padding_1, tvb, offset, 4, ENC_BIG_ENDIAN); } } else { - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc, tvb, offset, 3, FALSE); - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition, tvb, offset, 3, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc, tvb, offset, 3, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition, tvb, offset, 3, ENC_BIG_ENDIAN); offset += 3; if(i < (m-2)) { - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_cid_2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2, tvb, offset, 4, FALSE); - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2, tvb, offset, 4, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_uiuc_2, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_repetition_2, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if(m == 3) { - proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_padding, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_extended_uiuc_ie_mini_subchannel_alloc_padding, tvb, offset, 1, ENC_BIG_ENDIAN); } } } diff --git a/plugins/wimax/wimax_fch_decoder.c b/plugins/wimax/wimax_fch_decoder.c index 6fa34b60cf..dee8ba290b 100644 --- a/plugins/wimax/wimax_fch_decoder.c +++ b/plugins/wimax/wimax_fch_decoder.c @@ -118,20 +118,20 @@ static void dissect_wimax_fch_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t /* add FCH subtree */ fch_tree = proto_item_add_subtree(fch_item, ett_wimax_fch_decoder); /* Decode and display the used sub-channel groups */ - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group0, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group1, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group2, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group3, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group4, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group5, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_reserved_1, tvb, offset, FCH_BURST_LENGTH, FALSE); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group0, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group1, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group2, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group3, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group4, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_used_subchannel_group5, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_reserved_1, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); /* Decode and display the repetition coding indication */ - proto_tree_add_item(fch_tree, hf_fch_repetition_coding_indication, tvb, offset, FCH_BURST_LENGTH, FALSE); + proto_tree_add_item(fch_tree, hf_fch_repetition_coding_indication, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); /* Decode and display the coding indication */ - proto_tree_add_item(fch_tree, hf_fch_coding_indication, tvb, offset, FCH_BURST_LENGTH, FALSE); + proto_tree_add_item(fch_tree, hf_fch_coding_indication, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); /* Decode and display the DL MAP length */ - proto_tree_add_item(fch_tree, hf_fch_dlmap_length, tvb, offset, FCH_BURST_LENGTH, FALSE); - proto_tree_add_item(fch_tree, hf_fch_reserved_2, tvb, offset, FCH_BURST_LENGTH, FALSE); + proto_tree_add_item(fch_tree, hf_fch_dlmap_length, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); + proto_tree_add_item(fch_tree, hf_fch_reserved_2, tvb, offset, FCH_BURST_LENGTH, ENC_BIG_ENDIAN); } } diff --git a/plugins/wimax/wimax_ffb_decoder.c b/plugins/wimax/wimax_ffb_decoder.c index 3866f76f94..c991fb1ec4 100644 --- a/plugins/wimax/wimax_ffb_decoder.c +++ b/plugins/wimax/wimax_ffb_decoder.c @@ -68,15 +68,15 @@ static void dissect_wimax_ffb_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t /* get the number of FFBs */ num_of_ffbs = tvb_get_guint8(tvb, offset); /* display the number of FFBs */ - proto_tree_add_item(ffb_tree, hf_ffb_num_of_ffbs, tvb, offset++, 1, FALSE); + proto_tree_add_item(ffb_tree, hf_ffb_num_of_ffbs, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the FFB type */ - proto_tree_add_item(ffb_tree, hf_ffb_type, tvb, offset++, 1, FALSE); + proto_tree_add_item(ffb_tree, hf_ffb_type, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the FFBs */ for(i = 0; i < num_of_ffbs; i++) { - proto_tree_add_item(ffb_tree, hf_ffb_subchannel, tvb, offset++, 1, FALSE); - proto_tree_add_item(ffb_tree, hf_ffb_symboloffset, tvb, offset++, 1, FALSE); - proto_tree_add_item(ffb_tree, hf_ffb_value, tvb, offset++, 1, FALSE); + proto_tree_add_item(ffb_tree, hf_ffb_subchannel, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ffb_tree, hf_ffb_symboloffset, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ffb_tree, hf_ffb_value, tvb, offset++, 1, ENC_BIG_ENDIAN); } } } diff --git a/plugins/wimax/wimax_hack_decoder.c b/plugins/wimax/wimax_hack_decoder.c index 3f1b9220d4..147a00d6fc 100644 --- a/plugins/wimax/wimax_hack_decoder.c +++ b/plugins/wimax/wimax_hack_decoder.c @@ -82,14 +82,14 @@ static void dissect_wimax_hack_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ /* get the number of HARQ ACKs */ num_of_hacks = tvb_get_guint8(tvb, offset); /* display the number of HARQ ACKs */ - proto_tree_add_item(hack_tree, hf_hack_num_of_hacks, tvb, offset++, 1, FALSE); + proto_tree_add_item(hack_tree, hf_hack_num_of_hacks, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the HARQ ACKs */ for(i = 0; i < num_of_hacks; i++) { - proto_tree_add_item(hack_tree, hf_hack_subchannel, tvb, offset++, 1, FALSE); - proto_tree_add_item(hack_tree, hf_hack_symboloffset, tvb, offset++, 1, FALSE); - proto_tree_add_item(hack_tree, hf_hack_half_slot_flag, tvb, offset++, 1, FALSE); - proto_tree_add_item(hack_tree, hf_hack_value, tvb, offset++, 1, FALSE); + proto_tree_add_item(hack_tree, hf_hack_subchannel, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hack_tree, hf_hack_symboloffset, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hack_tree, hf_hack_half_slot_flag, tvb, offset++, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hack_tree, hf_hack_value, tvb, offset++, 1, ENC_BIG_ENDIAN); } } } diff --git a/plugins/wimax/wimax_harq_map_decoder.c b/plugins/wimax/wimax_harq_map_decoder.c index 7015db628b..b6ff5312f0 100644 --- a/plugins/wimax/wimax_harq_map_decoder.c +++ b/plugins/wimax/wimax_harq_map_decoder.c @@ -106,15 +106,15 @@ void dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t harq_map_item = proto_tree_add_protocol_format(tree, proto_wimax_harq_map_decoder, tvb, offset, tvb_len, "HARQ-MAP Message (%u bytes)", tvb_len); harq_map_tree = proto_item_add_subtree(harq_map_item, ett_wimax_harq_map_decoder); /* display the HARQ MAP Indicator */ - proto_tree_add_item(harq_map_tree, hf_harq_map_indicator, tvb, offset, 3, FALSE); + proto_tree_add_item(harq_map_tree, hf_harq_map_indicator, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the HARQ MAp UL-MAP Appended */ - proto_tree_add_item(harq_map_tree, hf_harq_ul_map_appended, tvb, offset, 3, FALSE); + proto_tree_add_item(harq_map_tree, hf_harq_ul_map_appended, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the reserved bit */ - proto_tree_add_item(harq_map_tree, hf_harq_map_reserved, tvb, offset, 3, FALSE); + proto_tree_add_item(harq_map_tree, hf_harq_map_reserved, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the HARQ MAP message length */ - proto_tree_add_item(harq_map_tree, hf_harq_map_msg_length, tvb, offset, 3, FALSE); + proto_tree_add_item(harq_map_tree, hf_harq_map_msg_length, tvb, offset, 3, ENC_BIG_ENDIAN); /* display the DL IE count */ - proto_tree_add_item(harq_map_tree, hf_harq_dl_ie_count, tvb, offset, 3, FALSE); + proto_tree_add_item(harq_map_tree, hf_harq_dl_ie_count, tvb, offset, 3, ENC_BIG_ENDIAN); /* get the message length */ length = ((first_24bits & WIMAX_HARQ_MAP_MSG_LENGTH_MASK) >> WIMAX_HARQ_MAP_MSG_LENGTH_SHIFT); /* get the DL IE count */ @@ -166,7 +166,7 @@ void dissector_wimax_harq_map_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t /* calculate the HARQ MAM Message CRC */ calculated_crc = wimax_mac_calc_crc32(tvb_get_ptr(tvb, 0, length - sizeof(harq_map_msg_crc)), length - sizeof(harq_map_msg_crc)); /* display the CRC */ - it = proto_tree_add_item(harq_map_tree, hf_harq_map_msg_crc, tvb, length - sizeof(harq_map_msg_crc), sizeof(harq_map_msg_crc), FALSE); + it = proto_tree_add_item(harq_map_tree, hf_harq_map_msg_crc, tvb, length - sizeof(harq_map_msg_crc), sizeof(harq_map_msg_crc), ENC_BIG_ENDIAN); /* verify the CRC */ if (harq_map_msg_crc != calculated_crc) { diff --git a/plugins/wimax/wimax_phy_attributes_decoder.c b/plugins/wimax/wimax_phy_attributes_decoder.c index 6c84a01aba..23dd0bfbb1 100644 --- a/plugins/wimax/wimax_phy_attributes_decoder.c +++ b/plugins/wimax/wimax_phy_attributes_decoder.c @@ -100,19 +100,19 @@ static void dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pin /* add PDU Burst Physical Attributes subtree */ phy_tree = proto_item_add_subtree(phy_item, ett_wimax_phy_attributes_decoder); /* display the subchannelization type */ - proto_tree_add_item(phy_tree, hf_phy_attributes_subchannelization_type, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_subchannelization_type, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the permbase */ - proto_tree_add_item(phy_tree, hf_phy_attributes_permbase, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_permbase, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the modulation rate */ - proto_tree_add_item(phy_tree, hf_phy_attributes_modulation_rate, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_modulation_rate, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the encoding type */ - proto_tree_add_item(phy_tree, hf_phy_attributes_encoding_type, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_encoding_type, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the numRepeat */ - proto_tree_add_item(phy_tree, hf_phy_attributes_num_repeat, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_num_repeat, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the symbol offset */ - proto_tree_add_item(phy_tree, hf_phy_attributes_symbol_offset, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_symbol_offset, tvb, offset++, 1, ENC_BIG_ENDIAN); /* display the number of slots */ - proto_tree_add_item(phy_tree, hf_phy_attributes_num_of_slots, tvb, offset, 2, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_num_of_slots, tvb, offset, 2, ENC_BIG_ENDIAN); /* get the number of slots */ /* num_of_slots = tvb_get_guint16(tvb, offset);*/ /* move to next field */ @@ -120,7 +120,7 @@ static void dissect_wimax_phy_attributes_decoder(tvbuff_t *tvb, packet_info *pin /* display the physical subchannel list */ while(offset < tvb_len) { - proto_tree_add_item(phy_tree, hf_phy_attributes_subchannel, tvb, offset++, 1, FALSE); + proto_tree_add_item(phy_tree, hf_phy_attributes_subchannel, tvb, offset++, 1, ENC_BIG_ENDIAN); } } } diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index a5abbf7f1d..46a0d4ec28 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -2007,8 +2007,8 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, case CST_PKT_CLASS_RULE_USER_PRIORITY: /* add TLV subtree */ ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_pkt_class_rule_user_priority, tvb, tlv_offset, length, FALSE); - proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_pri_low, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_pri_high, tvb, tlv_offset + 1, 1, FALSE); + proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_pri_low, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_pri_high, tvb, tlv_offset + 1, 1, ENC_BIG_ENDIAN); break; case CST_PKT_CLASS_RULE_VLAN_ID: /* add TLV subtree */ @@ -2037,7 +2037,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, /* add TLV subtree */ ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_pkt_class_rule_classifier_action_rule, tvb, tlv_offset, length, FALSE); proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_classifier_action_rule_bit0, tvb, tlv_offset, 1, FALSE); - proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_classifier_action_rule_bit1, tvb, tlv_offset, 1, FALSE); + proto_tree_add_item(ti_tree, hf_cst_pkt_class_rule_classifier_action_rule_bit1, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); break; case CST_PKT_CLASS_RULE_LARGE_CONTEXT_ID: ti_tree = add_tlv_subtree(&tlv_info, ett_wimax_cst_encoding_rules, tlv_tree, hf_cst_large_context_id, tvb, tlv_offset, length, FALSE); @@ -2396,7 +2396,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* 36 reserved */ case SFE_RESERVED_36: tlv_tree = add_tlv_subtree(&tlv_info, ett_wimax_service_flow_encodings, tree, hf_sfe_reserved_36, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_sfe_reserved_36, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_sfe_reserved_36, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; case SFE_SN_FEEDBACK_ENABLED: @@ -2495,8 +2495,8 @@ void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui /* init the local offset */ hmac_offset = offset; /* decode and display HMAC Tuple */ - proto_tree_add_item(hmac_tree, hf_xmac_tuple_rsvd, tvb, hmac_offset, 1, FALSE); - proto_tree_add_item(hmac_tree, hf_xmac_tuple_key_seq_num, tvb, hmac_offset, 1, FALSE); + proto_tree_add_item(hmac_tree, hf_xmac_tuple_rsvd, tvb, hmac_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hmac_tree, hf_xmac_tuple_key_seq_num, tvb, hmac_offset, 1, ENC_BIG_ENDIAN); hmac_offset++; proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, (length-1), ENC_NA); } @@ -2523,15 +2523,15 @@ void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui /* init the local offset */ cmac_offset = offset; /* decode and display CMAC Tuple */ - proto_tree_add_item(cmac_tree, hf_xmac_tuple_rsvd, tvb, cmac_offset, 1, FALSE); - proto_tree_add_item(cmac_tree, hf_xmac_tuple_key_seq_num, tvb, cmac_offset, 1, FALSE); + proto_tree_add_item(cmac_tree, hf_xmac_tuple_rsvd, tvb, cmac_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(cmac_tree, hf_xmac_tuple_key_seq_num, tvb, cmac_offset, 1, ENC_BIG_ENDIAN); cmac_offset++; if(length > 13) { proto_tree_add_item(cmac_tree, hf_cmac_tuple_bsid, tvb, cmac_offset, 6, FALSE); cmac_offset += 6; } - proto_tree_add_item(cmac_tree, hf_packet_number_counter, tvb, cmac_offset, 4, FALSE); + proto_tree_add_item(cmac_tree, hf_packet_number_counter, tvb, cmac_offset, 4, ENC_BIG_ENDIAN); cmac_offset += 4; proto_tree_add_item(cmac_tree, hf_cmac_tuple_cmac_value, tvb, cmac_offset, 8, ENC_NA); } @@ -2558,10 +2558,10 @@ void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offse /* init the local offset */ hmac_offset = offset; /* decode and display Short-HMAC Tuple */ - proto_tree_add_item(hmac_tree, hf_xmac_tuple_rsvd, tvb, hmac_offset, 1, FALSE); - proto_tree_add_item(hmac_tree, hf_xmac_tuple_key_seq_num, tvb, hmac_offset, 1, FALSE); + proto_tree_add_item(hmac_tree, hf_xmac_tuple_rsvd, tvb, hmac_offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(hmac_tree, hf_xmac_tuple_key_seq_num, tvb, hmac_offset, 1, ENC_BIG_ENDIAN); hmac_offset++; - proto_tree_add_item(hmac_tree, hf_packet_number_counter, tvb, hmac_offset, 4, FALSE); + proto_tree_add_item(hmac_tree, hf_packet_number_counter, tvb, hmac_offset, 4, ENC_BIG_ENDIAN); hmac_offset += 4; proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, length - offset - 3, ENC_NA); } @@ -2623,7 +2623,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p tlv_tree = add_tlv_subtree(&tlv_info, ett_security_negotiation_parameters, tree, hf_snp_pkm_version_support, tvb, offset, tlv_len, FALSE); proto_tree_add_item(tlv_tree, hf_snp_pkm_version_support_bit0, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_snp_pkm_version_support_bit1, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_snp_pkm_version_support_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_snp_pkm_version_support_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); break; case PKM_ATTR_SECURITY_NEGOTIATION_PARAMETER_SUB_AUTHORIZATION_POLICY_SUPPORT: /* add TLV subtree */ @@ -2631,11 +2631,11 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit0, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit1, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit2, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit3, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit3, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit4, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit5, tvb, offset, 1, FALSE); proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit6, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit7, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_snp_auth_policy_support_bit7, tvb, offset, 1, ENC_BIG_ENDIAN); break; case PKM_ATTR_SECURITY_NEGOTIATION_PARAMETER_SUB_MESSAGE_AUTHENTICATION_CODE: /* add TLV subtree */ @@ -2655,11 +2655,11 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p if (include_cor2_changes) { proto_tree_add_item(tlv_tree, hf_snp_mac_mode_bit5, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_snp_mac_mode_reserved1, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_snp_mac_mode_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN); } else { - proto_tree_add_item(tlv_tree, hf_snp_mac_mode_reserved, tvb, offset, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_snp_mac_mode_reserved, tvb, offset, 1, ENC_BIG_ENDIAN); } break; case PKM_ATTR_SECURITY_NEGOTIATION_PARAMETER_SUB_PN_WINDOW_SIZE: @@ -2737,9 +2737,9 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p case PKM_ATTR_CRYPTO_SUITE: /* add subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_cryptographic_suite_list_decoder, tree, hf_pkm_msg_crypto_suite, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; default: tlv_tree = add_tlv_subtree(&tlv_info, ett_cryptographic_suite_list_decoder, tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE); @@ -2859,9 +2859,9 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, case PKM_ATTR_CRYPTO_SUITE: /* add subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_msg_crypto_suite, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; case PKM_ATTR_CRYPTO_LIST: tlv_tree = add_protocol_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, "Cryptographic-Suite List (%u bytes)", tlv_len); @@ -3211,9 +3211,9 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree * case PKM_ATTR_CRYPTO_SUITE: /* add subtree */ tlv_tree = add_tlv_subtree(&tlv_info, ett_sa_descriptor_decoder, tree, hf_pkm_msg_crypto_suite, tvb, offset, tlv_len, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, FALSE); - proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, FALSE); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_msb, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_middle, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tlv_tree, hf_pkm_msg_crypto_suite_lsb, tvb, offset+2, 1, ENC_BIG_ENDIAN); break; default: tlv_tree = add_tlv_subtree(&tlv_info, ett_sa_descriptor_decoder, tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE); @@ -3348,15 +3348,15 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo else { /* decode and display the Vendor Specific Info */ - proto_tree_add_item(tree, hf_common_tlv_vendor_specific_type, tvb, offset, 1, FALSE); + proto_tree_add_item(tree, hf_common_tlv_vendor_specific_type, tvb, offset, 1, ENC_BIG_ENDIAN); if(get_tlv_length_type(&tlv_info) == 0) { /* single byte TLV length */ - proto_tree_add_item(tree, hf_common_tlv_vendor_specific_length, tvb, (offset + 1), 1, FALSE); + proto_tree_add_item(tree, hf_common_tlv_vendor_specific_length, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); } else { /* multiple bytes TLV length */ /* display the length of the TLV length with MSB */ - proto_tree_add_item(tree, hf_common_tlv_vendor_specific_length_size, tvb, (offset + 1), 1, FALSE); + proto_tree_add_item(tree, hf_common_tlv_vendor_specific_length_size, tvb, (offset + 1), 1, ENC_BIG_ENDIAN); if(get_tlv_size_of_length(&tlv_info)) { /* display the multiple byte TLV length */ proto_tree_add_text(tree, tvb, (offset + 2), get_tlv_size_of_length(&tlv_info), "Vendor Specific Length: %u", get_tlv_size_of_length(&tlv_info)); @@ -3466,7 +3466,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto /* add subtree */ tlv_tree = add_protocol_subtree(&tlv_info, ett_vendor_specific_info_decoder, tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, "MAC Version Encoding (%u byte)", tlv_len); /* decode and display the MAC Version Encoding */ - proto_tree_add_item(tlv_tree, hf_common_tlv_mac_version, tvb, offset, tlv_len, FALSE); + proto_tree_add_item(tlv_tree, hf_common_tlv_mac_version, tvb, offset, tlv_len, ENC_BIG_ENDIAN); break; case HMAC_TUPLE: /* Table 348d */ tlv_tree = add_protocol_subtree(&tlv_info, ett_vendor_specific_info_decoder, tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, "HMAC Tuple (%u byte(s))", tlv_len); |