osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types: 

FT_NONE
    FT_BYTES
    FT_IPV6
    FT_IPXNET
    FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39262
This commit is contained in:
Bill Meier 2011-10-05 01:00:06 +00:00
parent 799578fb29
commit ef8009abe3
49 changed files with 449 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/docsis/packet-bpkmattr.c
View File

@ -168,7 +168,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
case BPKM_MANUFACTURER_ID:
if (length == 3)
proto_tree_add_item (tree, hf_docsis_bpkmattr_manf_id, tvb, pos,
length, FALSE);
length, ENC_NA);
else
THROW (ReportedBoundsError);
break;
@ -181,7 +181,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case BPKM_RSA_PUB_KEY:
proto_tree_add_item (tree, hf_docsis_bpkmattr_rsa_pub_key, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case BPKM_CM_ID:
cmid_it =
@ -199,14 +199,14 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
case BPKM_AUTH_KEY:
if ((length == 96) || (length == 128))
proto_tree_add_item (tree, hf_docsis_bpkmattr_auth_key, tvb, pos,
length, FALSE);
length, ENC_NA);
else
THROW (ReportedBoundsError);
break;
case BPKM_TEK:
if (length == 8)
proto_tree_add_item (tree, hf_docsis_bpkmattr_tek, tvb, pos,
length, FALSE);
length, ENC_NA);
else
THROW (ReportedBoundsError);
break;
@ -227,7 +227,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
case BPKM_HMAC_DIGEST:
if (length == 20)
proto_tree_add_item (tree, hf_docsis_bpkmattr_hmac_digest, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
else
THROW (ReportedBoundsError);
break;
@ -251,7 +251,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
case BPKM_CBC_IV:
if (length == 8)
proto_tree_add_item (tree, hf_docsis_bpkmattr_cbc_iv, tvb, pos,
length, FALSE);
length, ENC_NA);
else
THROW (ReportedBoundsError);
break;
@ -264,11 +264,11 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case BPKM_CA_CERT:
proto_tree_add_item (tree, hf_docsis_bpkmattr_ca_cert, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case BPKM_CM_CERT:
proto_tree_add_item (tree, hf_docsis_bpkmattr_cm_cert, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case BPKM_SEC_CAPABILITIES:
scap_it =
@ -288,7 +288,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case BPKM_CRYPTO_SUITE_LIST:
proto_tree_add_item (tree, hf_docsis_bpkmattr_crypto_suite_list,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case BPKM_BPI_VERSION:
if (length == 1)
@ -336,7 +336,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case BPKM_VENDOR_DEFINED:
proto_tree_add_item (tree, hf_docsis_bpkmattr_vendor_def, tvb, pos,
length, FALSE);
length, ENC_NA);
case BPKM_DNLD_PARAMS:
dnld_it =
proto_tree_add_text (tree, tvb, pos, length,
@ -348,7 +348,7 @@ dissect_attrs (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
default:
proto_tree_add_item (tree, hf_docsis_bpkmattr_vendor_def, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
}
pos += length; /* switch */

2
plugins/docsis/packet-cmstatus.c
View File

@ -123,7 +123,7 @@ dissect_cmstatus_tlv (tvbuff_t * tvb, proto_tree * tree, guint8 start, guint16 l
case EVENT_DESCR:
if (length >= 3 && length <= 82)
{
proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_descr, tvb, pos + 1, length - 2, FALSE);
proto_tree_add_item (tlv_tree, hf_docsis_cmstatus_descr, tvb, pos + 1, length - 2, ENC_NA);
}
else
{

2
plugins/docsis/packet-dccack.c
View File

@ -88,7 +88,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 20)
{
proto_tree_add_item (dcc_tree, hf_docsis_dccack_hmac_digest, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{

4
plugins/docsis/packet-dccreq.c
View File

@ -311,7 +311,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case DCCREQ_UCD_SUB:
proto_tree_add_item (dcc_tree, hf_docsis_dccreq_ucd_sub, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case DCCREQ_SAID_SUB:
if (length == 4)
@ -355,7 +355,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 20)
{
proto_tree_add_item (dcc_tree, hf_docsis_dccreq_hmac_digest, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{

2
plugins/docsis/packet-dccrsp.c
View File

@ -148,7 +148,7 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 20)
{
proto_tree_add_item (dcc_tree, hf_docsis_dccrsp_hmac_digest, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{

6
plugins/docsis/packet-dcd.c
View File

@ -200,7 +200,7 @@ dissect_dcd_dsg_cfg (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
break;
case DCD_CFG_VENDOR_SPEC:
proto_tree_add_item (dcd_tree, hf_docsis_dcd_cfg_vendor_spec, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
}
@ -417,7 +417,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
break;
case DCD_RULE_UCID_RNG:
proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_ucid_list, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case DCD_RULE_CLIENT_ID:
dissect_dcd_clid (tvb , dcd_tree , pos , length );
@ -446,7 +446,7 @@ dissect_dcd_dsg_rule (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
break;
case DCD_RULE_VENDOR_SPEC:
proto_tree_add_item (dcd_tree, hf_docsis_dcd_rule_vendor_spec, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
}

2
plugins/docsis/packet-docsis.c
View File

@ -294,7 +294,7 @@ dissect_ehdr (tvbuff_t * tvb, proto_tree * tree, gboolean isfrag)
default:
if (len > 0)
proto_tree_add_item (ehdr_tree, hf_docsis_eh_val, tvb, pos + 1,
len, FALSE);
len, ENC_NA);
}
pos += len + 1;
}

2
plugins/docsis/packet-rngrsp.c
View File

@ -143,7 +143,7 @@ dissect_rngrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case RNGRSP_TRANSMIT_EQ_ADJ:
proto_tree_add_item (rngrsp_tree, hf_docsis_rngrsp_xmit_eq_adj,
tvb, pos, tlvlen, FALSE);
tvb, pos, tlvlen, ENC_NA);
break;
case RNGRSP_RANGING_STATUS:
if (tlvlen == 1)

10
plugins/docsis/packet-tlv-cmctrl.c
View File

@ -96,7 +96,7 @@ dissect_ds_event(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
if (length == 2)
{
proto_tree_add_item (event_tree, hf_ds_event_mask,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -141,7 +141,7 @@ dissect_us_event(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
if (length == 2)
{
proto_tree_add_item (event_tree, hf_us_event_mask,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -223,14 +223,14 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
case CM_CTRL_DS_EVENT:
if (length == 1)
proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_ds_event,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
else
dissect_ds_event(tvb, tlv_tree, pos, length);
break;
case CM_CTRL_US_EVENT:
if (length == 1)
proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_ds_event,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
else
dissect_us_event(tvb, tlv_tree, pos, length);
break;
@ -238,7 +238,7 @@ dissect_cmctrl_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
if (length == 2 || length == 1) /* response TLV always with len 1 */
{
proto_tree_add_item (tlv_tree, hf_cmctrl_tlv_event,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{

102
plugins/docsis/packet-tlv.c
View File

@ -765,7 +765,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
dissect_phs_err (tvb, phs_tree, pos, length);
case PHS_FIELD:
proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_phsf, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case PHS_INDEX:
if (length == 1)
@ -780,7 +780,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
break;
case PHS_MASK:
proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_phsm, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case PHS_SUP_SIZE:
if (length == 1)
@ -797,7 +797,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_phsf, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -806,7 +806,7 @@ dissect_phs (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len)
break;
case PHS_VENDOR_SPEC:
proto_tree_add_item (phs_tree, hf_docsis_tlv_phs_vendorspec, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -1239,7 +1239,7 @@ dissect_sflow (tvbuff_t * tvb, proto_tree * tree, int start, guint16 len,
break;
case SFW_VENDOR_SPEC:
proto_tree_add_item (sflow_tree, hf_docsis_tlv_sflow_vendor_spec,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
default:
if (direction == 24)
@ -1300,7 +1300,7 @@ dissect_dot1q_clsfr (tvbuff_t * tvb, proto_tree * tree, int start,
case CFR_D1Q_VENDOR_SPEC:
proto_tree_add_item (dot1qclsfr_tree,
hf_docsis_tlv_dot1qclsfr_vendorspec, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -1453,7 +1453,7 @@ dissect_ip_classifier (tvbuff_t * tvb, proto_tree * tree, int start,
{
proto_tree_add_item (ipclsfr_tree,
hf_docsis_tlv_ipclsfr_tosmask, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -1691,7 +1691,7 @@ dissect_classifiers (tvbuff_t * tvb, proto_tree * tree, int start,
break;
case CFR_VENDOR_SPEC:
proto_tree_add_item (clsfr_tree, hf_docsis_tlv_clsfr_vendor_spc,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -1956,15 +1956,15 @@ dissect_modemcap (tvbuff_t * tvb, proto_tree * tree, int start,
break;
case CAP_L2VPN:
proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_l2vpn, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case CAP_L2VPN_ESAFE:
proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_l2vpn_esafe, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case CAP_DUT_FILTERING:
proto_tree_add_item (mcap_tree, hf_docsis_tlv_mcap_dut_filtering, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case CAP_US_FREQ_RNG:
if (length == 1)
@ -2325,7 +2325,7 @@ dissect_svc_unavail(tvbuff_t * tvb, proto_tree * tree, int pos, guint16 length)
proto_tree *svc_unavail_tree;
svc_unavail_it = proto_tree_add_item (tree,
hf_docsis_tlv_svc_unavail,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
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,
@ -2348,7 +2348,7 @@ dissect_snmpv3_kickstart(tvbuff_t * tvb, proto_tree *tree, int start, guint16 le
snmpv3_it = proto_tree_add_item (tree,
hf_docsis_tlv_snmpv3_kick,
tvb, start, len, FALSE);
tvb, start, len, ENC_NA);
snmpv3_tree = proto_item_add_subtree(snmpv3_it, ett_docsis_tlv_snmpv3_kick);
while (pos < (start + len))
@ -2365,7 +2365,7 @@ dissect_snmpv3_kickstart(tvbuff_t * tvb, proto_tree *tree, int start, guint16 le
case SNMPV3_MGR_PUB_NUM:
proto_tree_add_item (snmpv3_tree,
hf_docsis_tlv_snmpv3_kick_publicnum, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
} /* switch */
pos += length;
@ -2518,7 +2518,7 @@ dissect_dut_filter (tvbuff_t * tvb, proto_tree * tree,
break;
case DUT_CMIM:
proto_tree_add_item (dut_tree, hf_docsis_tlv_dut_filter_cmim, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -2587,7 +2587,7 @@ dissect_tcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case TCC_ERR_SUBTYPE:
proto_tree_add_item (tccerr_tree,
hf_docsis_tcc_err_subtype, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case TCC_ERR_CODE:
if (length == 1)
@ -3121,17 +3121,17 @@ dissect_rcp_rcv_mod(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case RCV_MOD_ENC_RSQ_CH_SUBS_CAP:
proto_tree_add_item (rcvmod_tree,
hf_docsis_rcv_mod_enc_rsq_ch_subs_cap, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case RCV_MOD_ENC_CONN:
proto_tree_add_item (rcvmod_tree,
hf_docsis_rcv_mod_enc_conn, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case RCV_MOD_ENC_PHY_LAYR_PARMS:
proto_tree_add_item (rcvmod_tree,
hf_docsis_rcv_mod_enc_phy_layr_parms, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -3171,7 +3171,7 @@ dissect_rcp_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case RCV_CH_CONN:
proto_tree_add_item (rcvch_tree,
hf_docsis_rcv_ch_conn, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case RCV_CH_CONN_OFF:
if (length == 1)
@ -3229,7 +3229,7 @@ dissect_rcp(tvbuff_t * tvb, packet_info * pinfo _U_,
{
proto_tree_add_item (rcp_tree,
hf_docsis_tlv_rcp_id, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3241,7 +3241,7 @@ dissect_rcp(tvbuff_t * tvb, packet_info * pinfo _U_,
{
proto_tree_add_item (rcp_tree,
hf_docsis_tlv_rcp_name, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3320,7 +3320,7 @@ dissect_rcc_rcv_mod(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case RCV_MOD_ENC_CONN:
proto_tree_add_item (rcvmod_tree,
hf_docsis_rcc_rcv_mod_enc_conn, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -3360,7 +3360,7 @@ dissect_rcc_rcv_ch(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case RCV_CH_CONN:
proto_tree_add_item (rcvch_tree,
hf_docsis_rcc_rcv_ch_conn, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case RCV_CH_CTR_FREQ_ASGN:
if (length == 4)
@ -3460,7 +3460,7 @@ dissect_rcc_err(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case RCC_ERR_MSG:
proto_tree_add_item (err_tree,
hf_docsis_tlv_rcc_err_msg, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
} /* switch */
pos = pos + length;
@ -3493,7 +3493,7 @@ dissect_rcc(tvbuff_t * tvb, packet_info * pinfo _U_,
{
proto_tree_add_item (rcc_tree,
hf_docsis_tlv_rcc_id, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3551,7 +3551,7 @@ dissect_dsid_ds_reseq(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case DS_RESEQ_CH_LST:
proto_tree_add_item (dsid_tree,
hf_docsis_ds_reseq_ch_lst, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case DS_RESEQ_WAIT_TIME:
if (length == 1)
@ -3629,7 +3629,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_addr, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3665,12 +3665,12 @@ dissect_dsid_mc(tvbuff_t * tvb, proto_tree *tree, int start, guint16 len)
case TLV_DSID_MC_CMIM:
proto_tree_add_item (dsid_tree,
hf_docsis_tlv_dsid_mc_cmim, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case TLV_DSID_MC_GROUP:
proto_tree_add_item (dsid_tree,
hf_docsis_tlv_dsid_mc_group, tvb, pos,
length, FALSE);
length, ENC_NA);
break;
case TLV_DSID_MC_PHS:
dissect_phs(tvb, dsid_tree, pos, length);
@ -3768,7 +3768,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_desc, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3850,7 +3850,7 @@ dissect_cmts_mc_sess_enc(tvbuff_t * tvb, proto_tree *tree, int start, guint16 le
{
proto_tree_add_item (mc_tree,
hf_docsis_cmts_mc_sess_enc_grp, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3862,7 +3862,7 @@ dissect_cmts_mc_sess_enc(tvbuff_t * tvb, proto_tree *tree, int start, guint16 le
{
proto_tree_add_item (mc_tree,
hf_docsis_cmts_mc_sess_enc_src, tvb, pos,
length, FALSE);
length, ENC_NA);
}
else
{
@ -3945,7 +3945,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
if (length == 16)
{
proto_tree_add_item (tlv_tree, hf_docsis_tlv_cm_mic, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{
@ -3956,7 +3956,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
if (length == 16)
{
proto_tree_add_item (tlv_tree, hf_docsis_tlv_cmts_mic, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{
@ -3967,7 +3967,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
if (length == 3)
{
proto_tree_add_item (tlv_tree, hf_docsis_tlv_vendor_id, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{
@ -3980,11 +3980,11 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
break;
case TLV_SNMP_WRITE_CTRL:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_access, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case TLV_SNMP_OBJECT:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_snmp_obj, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case TLV_MODEM_IP:
if (length == 4)
@ -4022,7 +4022,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
break;
case TLV_BPI_CONFIG:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_bpi, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
break;
case TLV_MAX_CPES:
if (length == 1)
@ -4086,7 +4086,7 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
{
proto_tree_add_item (tlv_tree,
hf_docsis_tlv_hmac_digest, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{
@ -4118,13 +4118,13 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
break;
case TLV_AUTH_BLOCK:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_auth_block,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_KEY_SEQ_NUM:
if (length == 1)
{
proto_tree_add_item (tlv_tree, hf_docsis_tlv_key_seq_num, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
}
else
{
@ -4133,24 +4133,24 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
break;
case TLV_MFGR_CVC:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_mfgr_cvc,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_COSIGN_CVC:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_cosign_cvc,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_SNMPV3_KICKSTART:
dissect_snmpv3_kickstart(tvb, tlv_tree, pos, length);
break;
case TLV_SUBS_MGMT_CTRL:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ctrl,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_SUBS_MGMT_CPE:
if ((length % 4) == 0)
{
proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ip_table,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
for (x = 0; x < length; x+=4)
{
proto_tree_add_item (tlv_tree,
@ -4166,12 +4166,12 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
case TLV_SUBS_MGMT_FLTR:
proto_tree_add_item (tlv_tree,
hf_docsis_tlv_subs_mgmt_filter_grps,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_SNMPV3_NTFY_RCVR:
proto_tree_add_item(tlv_tree,
hf_docsis_tlv_snmpv3_ntfy_rcvr,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_ENABLE_20_MODE:
if (length == 1)
@ -4283,15 +4283,15 @@ dissect_tlv (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
break;
case TLV_US_DROP_CLFY:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_us_drop_clfy,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_SUBS_MGMT_IPV6_LST:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_subs_mgmt_ipv6_lst,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_US_DROP_CLFY_GROUP_ID:
proto_tree_add_item (tlv_tree, hf_docsis_tlv_us_drop_clfy_group_id,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
break;
case TLV_SUBS_MGMT_CTRL_MAX_CPE_IPV6:
if (length == 2)

24
plugins/docsis/packet-type29ucd.c
View File

@ -266,7 +266,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
break;
case type29ucd_PREAMBLE:
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_preamble_pat, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
pos = pos + length;
break;
/* DOCSIS 2.0 UCD TLV definitions
@ -284,14 +284,14 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
*/
case type29ucd_EXT_PREAMBLE:
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_ext_preamble, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
pos = pos + length;
break;
case type29ucd_SCDMA_MODE_ENABLE:
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_mode_enable,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -303,7 +303,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_spreading_interval,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -315,7 +315,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_codes_per_mini_slot,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -327,7 +327,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_active_codes,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -339,7 +339,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 2)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_code_hopping_seed,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -351,7 +351,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 2)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_us_ratio_num,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -363,7 +363,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 2)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_us_ratio_denom,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -375,7 +375,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 9)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_scdma_timestamp_snapshot,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -387,7 +387,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_maintain_power_spectral_density,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{
@ -399,7 +399,7 @@ dissect_type29ucd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (length == 1)
{
proto_tree_add_item (type29ucd_tree, hf_docsis_type29ucd_ranging_required,
tvb, pos, length, FALSE);
tvb, pos, length, ENC_NA);
}
else
{

2
plugins/docsis/packet-ucd.c
View File

@ -242,7 +242,7 @@ static void
break;
case UCD_PREAMBLE:
proto_tree_add_item (tlv_tree, hf_docsis_ucd_preamble_pat, tvb,
pos, length, FALSE);
pos, length, ENC_NA);
pos = pos + length;
break;
case UCD_BURST_DESCR:

2
plugins/docsis/packet-vendor.c
View File

@ -132,7 +132,7 @@ dissect_vsif (tvbuff_t * tvb, packet_info * pinfo _U_, proto_tree * tree)
default:
proto_item_append_text (it, " (Unknown)");
proto_tree_add_item (vsif_tree, hf_docsis_vsif_vendor_unknown, tvb,
0, -1, FALSE);
0, -1, ENC_NA);
break;
}

46
plugins/ethercat/packet-ams.c
View File

@ -468,7 +468,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadrequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadrequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadrequest);
@ -490,7 +490,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adswriterequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adswriterequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsWriteReq_Len - sizeof(guint16) )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriterequest);
@ -503,7 +503,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, 4, TRUE);
offset+=sizeof(guint32);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, TRUE);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA);
}
}
}
@ -514,7 +514,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriterequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriterequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadWriteReq_Len - sizeof(guint16))
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriterequest);
@ -530,7 +530,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ams_adstree, hf_ams_adscbwritelength, tvb, offset, sizeof(guint32), TRUE);
offset+=sizeof(guint32);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset+16, ams_length-offset, TRUE);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset+16, ams_length-offset, ENC_NA);
}
}
}
@ -541,7 +541,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstaterequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstaterequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadStateReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstaterequest);
@ -556,7 +556,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlrequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlrequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsWriteControlReq_Len - sizeof(guint16) )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlrequest);
@ -569,7 +569,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE);
offset+=sizeof(guint32);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, TRUE);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA);
}
}
}
@ -580,7 +580,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadDeviceInfoReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforequest);
@ -595,7 +595,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnrequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnrequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsAddDeviceNotificationReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnrequest);
@ -626,7 +626,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnrequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnrequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsDelDeviceNotificationReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnrequest);
@ -644,7 +644,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*guint32 cbLength;
guint32 nStamps;*/
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdnrequest, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdnrequest, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsDeviceNotificationReq_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdnrequest);
@ -674,7 +674,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadRes_Len - sizeof(guint16) )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadresponse);
@ -684,7 +684,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE);
offset+=sizeof(guint32);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, TRUE);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA);
}
}
}
@ -695,7 +695,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adswriteresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adswriteresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsWriteRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswriteresponse);
@ -710,7 +710,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriteresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadwriteresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadWriteRes_Len - sizeof(guint16) )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadwriteresponse);
@ -720,7 +720,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(ams_adstree, hf_ams_adscblength, tvb, offset, sizeof(guint32), TRUE);
offset+=sizeof(guint32);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, TRUE);
proto_tree_add_item(ams_adstree, hf_ams_adsdata, tvb, offset, ams_length-offset, ENC_NA);
}
}
}
@ -731,7 +731,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstateresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreadstateresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadStateRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreadstateresponse);
@ -752,7 +752,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adswritectrlresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsWriteControlRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adswritectrlresponse);
@ -767,7 +767,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforesponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsreaddinforesponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsReadDeviceInfoRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsreaddinforesponse);
@ -790,7 +790,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsadddnresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsAddDeviceNotificationRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsadddnresponse);
@ -808,7 +808,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if( tree )
{
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnresponse, tvb, offset, ams_length-offset, TRUE);
anItem = proto_tree_add_item(ams_tree, hf_ams_adsdeldnresponse, tvb, offset, ams_length-offset, ENC_NA);
if( ams_length-offset >= TAdsDelDeviceNotificationRes_Len )
{
ams_adstree = proto_item_add_subtree(anItem, ett_ams_adsdeldnresponse);
@ -827,7 +827,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
else
col_append_str(pinfo->cinfo, COL_INFO, "AMS Response");
if( tree && ams_length-offset > 0 )
proto_tree_add_item(ams_tree, hf_ams_data, tvb, offset, ams_length-offset, TRUE);
proto_tree_add_item(ams_tree, hf_ams_data, tvb, offset, ams_length-offset, ENC_NA);
}
}

48
plugins/ethercat/packet-ecatmb.c
View File

@ -595,7 +595,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_coe, tvb, offset, coe_length, TRUE);
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_coe, tvb, offset, coe_length, ENC_NA);
proto_item_set_text(anItem,"CoE");
aparent = proto_item_get_parent(anItem);
proto_item_append_text(aparent,":CoE ");
@ -666,7 +666,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, TRUE);
offset+=ETHERCAT_SDO_HEADER_LEN;
if ( len > 0 )
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, len, TRUE);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, len, ENC_NA);
}
else
{
@ -697,7 +697,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if ( coe_length-offset > 0 )
{
anItem = proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, coe_length-offset, TRUE);
anItem = proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, coe_length-offset, ENC_NA);
proto_item_append_text(anItem, "(len = %d)", coe_length-offset);
}
break;
@ -757,7 +757,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdolength, tvb, offset+4, 4, TRUE);
offset+=ETHERCAT_SDO_HEADER_LEN;
if ( len > 0 )
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, len, TRUE);
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);
@ -781,7 +781,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if ( coe_length-offset> 0 )
{
anItem = proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, coe_length-offset, TRUE);
anItem = proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoldata, tvb, offset, coe_length-offset, ENC_NA);
proto_item_append_text(anItem, "(len = %d)", coe_length-offset);
}
break;
@ -825,7 +825,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolisttype, tvb, offset, 2, TRUE);
offset+=2;
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfolist, tvb, offset, coe_length-offset, TRUE);
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:
@ -881,19 +881,19 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if ( (info.anSdoInfoUnion.Entry.ValueInfo & 0x10) != 0 )
{
objlen = BIT2BYTE(info.anSdoInfoUnion.Entry.Res.BitLen);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodefaultvalue, tvb, offset, objlen, TRUE);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfodefaultvalue, tvb, offset, objlen, ENC_NA);
offset+=objlen;
}
if ( (info.anSdoInfoUnion.Entry.ValueInfo & 0x20) != 0 )
{
objlen = BIT2BYTE(info.anSdoInfoUnion.Entry.Res.BitLen);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfominvalue, tvb, offset, objlen, TRUE);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfominvalue, tvb, offset, objlen, ENC_NA);
offset+=objlen;
}
if ( (info.anSdoInfoUnion.Entry.ValueInfo & 0x40) != 0 )
{
objlen = BIT2BYTE(info.anSdoInfoUnion.Entry.Res.BitLen);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfomaxvalue, tvb, offset, objlen, TRUE);
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfomaxvalue, tvb, offset, objlen, ENC_NA);
offset+=objlen;
}
proto_tree_add_item(ecat_coe_tree, hf_ecat_mailbox_coe_sdoinfoname, tvb, offset, coe_length-offset, TRUE);
@ -928,7 +928,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_soe, tvb, offset, soe_length, TRUE);
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_soe, tvb, offset, soe_length, ENC_NA);
aparent = proto_item_get_parent(anItem);
proto_item_append_text(aparent,":SoE ");
@ -980,7 +980,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
case ECAT_SOE_OPCODE_NFC:
proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_idn, tvb, offset, 2, TRUE);
offset+=2;
proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, TRUE);
proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, ENC_NA);
break;
}
}
@ -989,7 +989,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_frag, tvb, offset, 2, TRUE);
offset+=2;
proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, TRUE);
proto_tree_add_item(tree, hf_ecat_mailbox_soe_data, tvb, offset, soe_length-offset, ENC_NA);
}
}
else
@ -1019,7 +1019,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_eoe, tvb, offset, eoe_length, TRUE);
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_eoe, tvb, offset, eoe_length, ENC_NA);
proto_item_set_text(anItem, "EoE Fragment");
aparent = proto_item_get_parent(anItem);
@ -1039,7 +1039,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
{ /* Do the following even 'if (tree == NULL)' since a call_dissector() is done */
ecat_eoe_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe);
anItem = proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_fraghead, tvb, offset, 4, TRUE);
anItem = proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_fraghead, tvb, offset, 4, ENC_NA);
proto_item_set_text(anItem, "Header");
ecat_fraghead_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_fraghead);
@ -1079,7 +1079,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
}
offset+=ETHERCAT_EOE_HEADER_LEN;
proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_fragment, tvb, offset, eoe_length-offset, TRUE);
proto_tree_add_item(ecat_eoe_tree, hf_ecat_mailbox_eoe_fragment, tvb, offset, eoe_length-offset, ENC_NA);
if ( eoe.anEoeHeaderDataUnion.v.Fragment == 0 )
{
@ -1099,7 +1099,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
case EOE_TYPE_INIT_REQ:
offset+=ETHERCAT_EOE_HEADER_LEN;
anItem = proto_tree_add_item(ecat_fraghead_tree, hf_ecat_mailbox_eoe_init, tvb, offset, MIN(eoe_length-offset,ETHERCAT_EOE_INIT_LEN), TRUE);
anItem = proto_tree_add_item(ecat_fraghead_tree, hf_ecat_mailbox_eoe_init, tvb, offset, MIN(eoe_length-offset,ETHERCAT_EOE_INIT_LEN), ENC_NA);
if( eoe_length-offset >= ETHERCAT_EOE_INIT_LEN )
{
ecat_eoe_init_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_init);
@ -1138,7 +1138,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
{
EoeMacFilterOptionsUnion options;
offset+=ETHERCAT_EOE_HEADER_LEN;
anItem = proto_tree_add_item(ecat_fraghead_tree, hf_ecat_mailbox_eoe_macfilter, tvb, offset, MIN(eoe_length-offset, ETHERCAT_EOE_MACFILTER_LEN), TRUE);
anItem = proto_tree_add_item(ecat_fraghead_tree, hf_ecat_mailbox_eoe_macfilter, tvb, offset, MIN(eoe_length-offset, ETHERCAT_EOE_MACFILTER_LEN), ENC_NA);
if( eoe_length-offset >= ETHERCAT_EOE_MACFILTER_LEN )
{
proto_tree *ecat_eoe_macfilter_filtermask_tree;
@ -1150,13 +1150,13 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
options.Options = tvb_get_letohs(tvb, offset);
offset+=4;
anItem = proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_filter, tvb, offset, 16*ETHERNET_ADDRESS_LEN, TRUE);
anItem = proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_filter, tvb, offset, 16*ETHERNET_ADDRESS_LEN, ENC_NA);
ecat_eoe_macfilter_filter_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_macfilter_filter);
for( nCnt=0; nCnt<options.v.MacFilterCount; nCnt++)
proto_tree_add_item(ecat_eoe_macfilter_filter_tree, hf_ecat_mailbox_eoe_macfilter_filters[nCnt], tvb, offset+nCnt*ETHERNET_ADDRESS_LEN, ETHERNET_ADDRESS_LEN, TRUE);
offset+=16*ETHERNET_ADDRESS_LEN;
anItem = proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_filtermask, tvb, offset, 4*sizeof(guint32), TRUE);
anItem = proto_tree_add_item(ecat_eoe_macfilter_tree, hf_ecat_mailbox_eoe_macfilter_filtermask, tvb, offset, 4*sizeof(guint32), ENC_NA);
ecat_eoe_macfilter_filtermask_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_eoe_macfilter_filtermask);
for( nCnt=0; nCnt<options.v.MacFilterMaskCount; nCnt++)
proto_tree_add_item(ecat_eoe_macfilter_filtermask_tree, hf_ecat_mailbox_eoe_macfilter_filtermasks[nCnt], tvb, offset+nCnt*sizeof(guint32), sizeof(guint32), TRUE);
@ -1194,7 +1194,7 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_foe, tvb, offset, foe_length, TRUE);
anItem = proto_tree_add_item(tree, hf_ecat_mailbox_foe, tvb, offset, foe_length, ENC_NA);
proto_item_set_text(anItem, ":Foe");
aparent = proto_item_get_parent(anItem);
@ -1230,11 +1230,11 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_packetno, tvb, offset, 2, TRUE);
offset+=4; /*+2 for Reserved2*/
proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_data, tvb, offset, foe_length-offset, TRUE);
proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_data, tvb, offset, foe_length-offset, ENC_NA);
if( foe_length-offset >= sizeof(TEFWUPDATE_HEADER) )
{
anItem = proto_tree_add_item(ecat_foe_tree, hf_ecat_mailbox_foe_efw, tvb, offset, foe_length-offset, TRUE);
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);
offset+=2;
@ -1248,7 +1248,7 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_addresshw, tvb, offset, 2, TRUE);
offset+=2;
proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_data, tvb, offset, foe_length-offset, TRUE);
proto_tree_add_item(ecat_foe_efw_tree, hf_ecat_mailbox_foe_efw_data, tvb, offset, foe_length-offset, ENC_NA);
}
}
break;
@ -1359,7 +1359,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
break;
default:
proto_tree_add_item(ecat_mailbox_tree, hf_ecat_mailboxdata, tvb, offset, hdr.Length, TRUE);
proto_tree_add_item(ecat_mailbox_tree, hf_ecat_mailboxdata, tvb, offset, hdr.Length, ENC_NA);
}
col_append_str(pinfo->cinfo, COL_INFO, ")");

14
plugins/ethercat/packet-ethercat-datagram.c
View File

@ -629,7 +629,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* Fieldbus Memory Management Units (FMMU) */
for ( b=0; b < MIN(16, len/16); b++ )
{
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_fmmu, tvb, suboffset, 16, TRUE);
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_fmmu, tvb, suboffset, 16, ENC_NA);
proto_item_set_text(aitem, "Fieldbus Memory Management Units (FMMU)");
ecat_fmmu_tree = proto_item_add_subtree(aitem, ett_ecat_fmmu);
@ -663,7 +663,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
len -= 0x100;
for (b = 0; b < MIN(32, len / 8); b++)
{
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_syncman, tvb, suboffset, 8, TRUE);
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_syncman, tvb, suboffset, 8, ENC_NA);
proto_item_set_text(aitem, "SyncManager");
ecat_syncman_tree = proto_item_add_subtree(aitem, ett_ecat_syncman);
@ -698,7 +698,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* SyncManager */
for (b = 0; b < MIN(32, len / 8); b++)
{
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_syncman, tvb, suboffset, 8, TRUE);
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_syncman, tvb, suboffset, 8, ENC_NA);
proto_item_set_text(aitem, "SyncManager");
ecat_syncman_tree = proto_item_add_subtree(aitem, ett_ecat_syncman);
@ -736,7 +736,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if(!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, ecat_datagram_tree))
{
/* No sub dissector did recognize this data, dissect it as data only */
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, suboffset, ecHdr.len & 0x07ff, TRUE);
aitem = proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, suboffset, ecHdr.len & 0x07ff, ENC_NA);
ecat_dc_tree = proto_item_add_subtree(aitem, ett_ecat_dc);
}
else
@ -819,7 +819,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if(!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, ecat_datagram_tree))
{
/* No sub dissector did recognize this data, dissect it as data only */
proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, startOfData, dataLength, TRUE);
proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, startOfData, dataLength, ENC_NA);
}
if( subCount < 10 ){
@ -837,7 +837,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if(!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, ecat_datagram_tree))
{
/* No sub dissector did recognize this data, dissect it as data only */
proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, suboffset, ecHdr.len & 0x07ff, TRUE);
proto_tree_add_item(ecat_datagram_tree, hf_ecat_data, tvb, suboffset, ecHdr.len & 0x07ff, ENC_NA);
}
if( subCount < 10 ){
@ -866,7 +866,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
which is required by the protocol specification */
if(datagram_padding_bytes > 0)
{
proto_tree_add_item(tree, hf_ecat_padding, tvb, offset, tvb_length_remaining(tvb, offset), TRUE);
proto_tree_add_item(tree, hf_ecat_padding, tvb, offset, tvb_length_remaining(tvb, offset), ENC_NA);
}
}

4
plugins/ethercat/packet-ioraw.c
View File

@ -75,10 +75,10 @@ static void dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ioraw_tree = proto_item_add_subtree(ti, ett_ioraw);
proto_item_append_text(ti,": %s",szText);
proto_tree_add_item(ioraw_tree, hf_ioraw_header, tvb, offset, IoRawParserHDR_Len, TRUE);
proto_tree_add_item(ioraw_tree, hf_ioraw_header, tvb, offset, IoRawParserHDR_Len, ENC_NA);
offset+=IoRawParserHDR_Len;
proto_tree_add_item(ioraw_tree, hf_ioraw_data, tvb, offset, ioraw_length - offset, TRUE);
proto_tree_add_item(ioraw_tree, hf_ioraw_data, tvb, offset, ioraw_length - offset, ENC_NA);
}
}

10
plugins/ethercat/packet-nv.c
View File

@ -117,11 +117,11 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
nv_tree = proto_item_add_subtree(ti, ett_nv);
proto_item_append_text(ti,": %s",szText);
ti = proto_tree_add_item(nv_tree, hf_nv_header, tvb, offset, NvParserHDR_Len, TRUE);
ti = proto_tree_add_item(nv_tree, hf_nv_header, tvb, offset, NvParserHDR_Len, ENC_NA);
nv_header_tree = proto_item_add_subtree(ti, ett_nv_header);
ti= proto_tree_add_item(nv_header_tree, hf_nv_publisher, tvb, offset, sizeof(guint8)*6, TRUE);
ti= proto_tree_add_item(nv_header_tree, hf_nv_publisher, tvb, offset, sizeof(guint8)*6, ENC_NA);
NvPublisherFormater(tvb, offset, szText, nMax);
proto_item_set_text(ti, "%s", szText);
offset+=(sizeof(guint8)*6);
@ -137,12 +137,12 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint16 var_length = tvb_get_letohs(tvb, offset+4);
ti = proto_tree_add_item(nv_tree, hf_nv_variable, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len+var_length, TRUE);
ti = proto_tree_add_item(nv_tree, hf_nv_variable, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len+var_length, ENC_NA);
NvVarHeaderFormater(tvb, offset, szText, nMax);
proto_item_set_text(ti, "%s", szText);
nv_var_tree = proto_item_add_subtree(ti, ett_nv_var);
ti = proto_tree_add_item(nv_var_tree, hf_nv_varheader, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len, TRUE);
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);
@ -157,7 +157,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree_add_item(nv_varheader_tree, hf_nv_quality, tvb, offset, sizeof(guint16), TRUE);
offset+=sizeof(guint16);
proto_tree_add_item(nv_var_tree, hf_nv_data, tvb, offset, var_length, TRUE);
proto_tree_add_item(nv_var_tree, hf_nv_data, tvb, offset, var_length, ENC_NA);
offset+=var_length;
}
}

4
plugins/irda/packet-ircomm.c
View File

@ -196,7 +196,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
proto_tree* ctrl_tree;
ti = proto_tree_add_item(tree, hf_control, tvb, 0, clen + 1, FALSE);
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);
offset++;
@ -267,7 +267,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
guint8 p_len = tvb_get_guint8(tvb, offset + 1);
ti = proto_tree_add_item(tree, hf_ircomm_param, tvb, offset, p_len + 2, FALSE);
ti = proto_tree_add_item(tree, hf_ircomm_param, tvb, offset, p_len + 2, ENC_NA);
p_tree = proto_item_add_subtree(ti, ett_param[list_index * MAX_PARAMETERS + n]);
buf[0] = 0;

18
plugins/irda/packet-irda.c
View File

@ -444,7 +444,7 @@ unsigned dissect_param_tuple(tvbuff_t* tvb, proto_tree* tree, unsigned offset)
if (len > 0)
{
if (tree)
proto_tree_add_item(tree, hf_param_pv, tvb, offset, len, FALSE);
proto_tree_add_item(tree, hf_param_pv, tvb, offset, len, ENC_NA);
offset += len;
}
@ -805,7 +805,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
attr_len = 0;
}
ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, FALSE);
ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, ENC_NA);
proto_item_append_text(ti, "%d", n + 1);
entry_tree = proto_item_add_subtree(ti, ett_iap_entry[n]);
@ -830,7 +830,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
!iap_conv->pattr_dissector->value_dissector(tvb, offset, pinfo, entry_tree,
n, type))
proto_tree_add_item(entry_tree, hf_iap_oct_seq, tvb, offset + 2,
attr_len - 2, FALSE);
attr_len - 2, ENC_NA);
break;
case IAS_STRING:
@ -1266,7 +1266,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
if (tree)
{
ti = proto_tree_add_item(tree, hf_negotiation_param, tvb, offset, p_len + 2, FALSE);
ti = proto_tree_add_item(tree, hf_negotiation_param, tvb, offset, p_len + 2, ENC_NA);
p_tree = proto_item_add_subtree(ti, ett_param[n]);
pv = tvb_get_guint8(tvb, offset+2);
@ -1473,7 +1473,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
if (lap_tree)
{
ti = proto_tree_add_item(lap_tree, hf_lap_i, tvb, offset, -1, FALSE);
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);
@ -1555,7 +1555,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
if (root)
{
ti = proto_tree_add_item(lmp_tree, hf_lmp_xid_hints, tvb, offset, hints_len, FALSE);
ti = proto_tree_add_item(lmp_tree, hf_lmp_xid_hints, tvb, offset, hints_len, ENC_NA);
if ((hint1 | hint2) != 0)
{
char service_hints[256];
@ -1624,7 +1624,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
{
if (root)
proto_tree_add_item(lmp_tree, hf_lmp_xid_name_no_ascii, tvb, offset,
-1, FALSE);
-1, ENC_NA);
}
}
}
@ -1769,7 +1769,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
case XDLC_SNRM:
if (root)
{
ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, ENC_NA);
i_tree = proto_item_add_subtree(ti, ett_lap_i);
}
@ -1816,7 +1816,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
{
if (root)
{
ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, FALSE);
ti = proto_tree_add_item(tree, hf_lap_i, tvb, offset, -1, ENC_NA);
i_tree = proto_item_add_subtree(ti, ett_lap_i);
}

2
plugins/irda/packet-sir.c
View File

@ -158,7 +158,7 @@ dissect_sir(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root)
proto_tree* tree = proto_item_add_subtree(ti, ett_sir);
if (preamble_len > 0)
proto_tree_add_item(tree, hf_sir_preamble, tvb,
offset, preamble_len, FALSE);
offset, preamble_len, ENC_NA);
proto_tree_add_item(tree, hf_sir_bof, tvb,
bof_offset, 1, FALSE);
proto_tree_add_uint(tree, hf_sir_length,

2
plugins/m2m/packet-m2m.c
View File

@ -218,7 +218,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", "M2M TLV error");
/* display the invalid TLV in HEX */
proto_tree_add_item(m2m_tree, hf_wimax_invalid_tlv, tvb, offset, (length - offset), FALSE);
proto_tree_add_item(m2m_tree, hf_wimax_invalid_tlv, tvb, offset, (length - offset), ENC_NA);
break;
}
/* get the TLV value offset */

62
plugins/profinet/packet-dcerpc-pn-io.c
View File

@ -2567,7 +2567,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
/* status */
sub_item = proto_tree_add_item(tree, hf_pn_io_status, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_status, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_status);
u32SubStart = offset;
@ -2809,7 +2809,7 @@ dissect_Alarm_specifier(tvbuff_t *tvb, int offset,
proto_tree *sub_tree;
/* alarm specifier */
sub_item = proto_tree_add_item(tree, hf_pn_io_alarm_specifier, tvb, offset, 2, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_alarm_specifier, tvb, offset, 2, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
dissect_dcerpc_uint16(tvb, offset, pinfo, sub_tree, drep,
@ -3291,7 +3291,7 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
hf_pn_io_number_of_modules, &u16NumberOfModules);
while(u16NumberOfModules--) {
module_item = proto_tree_add_item(tree, hf_pn_io_subslot, tvb, offset, 6, ENC_BIG_ENDIAN);
module_item = proto_tree_add_item(tree, hf_pn_io_subslot, tvb, offset, 6, ENC_NA);
module_tree = proto_item_add_subtree(module_item, ett_pn_io_module);
u32ModuleStart = offset;
@ -3310,7 +3310,7 @@ dissect_IandM0FilterData_block(tvbuff_t *tvb, int offset,
u16SlotNr, u32ModuleIdentNumber, u16NumberOfSubmodules);
while(u16NumberOfSubmodules--) {
subslot_item = proto_tree_add_item(module_tree, hf_pn_io_subslot, tvb, offset, 6, ENC_BIG_ENDIAN);
subslot_item = proto_tree_add_item(module_tree, hf_pn_io_subslot, tvb, offset, 6, ENC_NA);
subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
/* SubslotNumber */
@ -3380,7 +3380,7 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Slots:%u", u16NumberOfSlots);
while(u16NumberOfSlots--) {
slot_item = proto_tree_add_item(tree, hf_pn_io_slot, tvb, offset, 0, ENC_BIG_ENDIAN);
slot_item = proto_tree_add_item(tree, hf_pn_io_slot, tvb, offset, 0, ENC_NA);
slot_tree = proto_item_add_subtree(slot_item, ett_pn_io_slot);
u32SlotStart = offset;
@ -3398,7 +3398,7 @@ dissect_IdentificationData_block(tvbuff_t *tvb, int offset,
u16SlotNr, u32ModuleIdentNumber, u16NumberOfSubslots);
while(u16NumberOfSubslots--) {
subslot_item = proto_tree_add_item(slot_tree, hf_pn_io_subslot, tvb, offset, 6, ENC_BIG_ENDIAN);
subslot_item = proto_tree_add_item(slot_tree, hf_pn_io_subslot, tvb, offset, 6, ENC_NA);
subslot_tree = proto_item_add_subtree(subslot_item, ett_pn_io_subslot);
/* SubslotNumber */
@ -5495,7 +5495,7 @@ dissect_PDIRFrameData_block(tvbuff_t *tvb, int offset,
n++;
/* new subtree for each IR frame */
ir_frame_data_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_frame_data, tvb, offset, 17, ENC_BIG_ENDIAN);
ir_frame_data_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_frame_data, tvb, offset, 17, ENC_NA);
ir_frame_data_tree = proto_item_add_subtree(ir_frame_data_sub_item, ett_pn_io_ir_frame_data);
/* FrameSendOffset */
@ -5609,7 +5609,7 @@ dissect_PDIRBeginEndData_block(tvbuff_t *tvb, int offset,
u32Tmp2 = u32NumberOfPorts;
while(u32Tmp2--) {
/* new subtree for each Port */
ir_begin_end_port_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_begin_end_port, tvb, offset, 0, ENC_BIG_ENDIAN);
ir_begin_end_port_sub_item = proto_tree_add_item(tree, hf_pn_io_ir_begin_end_port, tvb, offset, 0, ENC_NA);
ir_begin_end_port_tree = proto_item_add_subtree(ir_begin_end_port_sub_item, ett_pn_io_ir_begin_end_port);
u32SubStart = offset;
@ -5846,7 +5846,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
hf_pn_io_number_of_iocrs, &u16NumberOfIOCRs);
while(u16NumberOfIOCRs--) {
iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_NA);
iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
u32IOCRStart = offset;
@ -5989,7 +5989,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
offset = dissect_pn_padding(tvb, offset, pinfo, tree, 2);
while(u16NumberOfIOCRs--) {
iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
iocr_item = proto_tree_add_item(tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_NA);
iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
u32IOCRStart = offset;
@ -6489,7 +6489,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
u16SendClockFactor, u16ReductionRatio, u16Phase, u16NumberOfAPIs);
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_NA);
api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
@ -6502,7 +6502,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
u16Tmp = u16NumberOfIODataObjects;
while(u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_data_object, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_data_object, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_data_object);
u32SubStart = offset;
@ -6527,7 +6527,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
u16Tmp = u16NumberOfIOCS;
while(u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_cs, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_cs, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_cs);
u32SubStart = offset;
@ -7087,7 +7087,7 @@ dissect_DataDescription(tvbuff_t *tvb, int offset,
guint32 u32SubStart;
sub_item = proto_tree_add_item(tree, hf_pn_io_data_description_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_data_description_tree, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_data_description);
u32SubStart = offset;
@ -7149,7 +7149,7 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ": APIs:%u", u16NumberOfAPIs);
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_NA);
api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
@ -7175,7 +7175,7 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Submodules:%u", u16NumberOfSubmodules);
while(u16NumberOfSubmodules--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(api_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
u32SubStart = offset;
@ -7270,7 +7270,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ": APIs:%u", u16NumberOfAPIs);
while(u16NumberOfAPIs--) {
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
api_item = proto_tree_add_item(tree, hf_pn_io_api_tree, tvb, offset, 0, ENC_NA);
api_tree = proto_item_add_subtree(api_item, ett_pn_io_api);
u32ApiStart = offset;
@ -7287,7 +7287,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Modules:%u", u16NumberOfModules);
while(u16NumberOfModules--) {
module_item = proto_tree_add_item(api_tree, hf_pn_io_module_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
module_item = proto_tree_add_item(api_tree, hf_pn_io_module_tree, tvb, offset, 0, ENC_NA);
module_tree = proto_item_add_subtree(module_item, ett_pn_io_module);
u32ModuleStart = offset;
@ -7312,7 +7312,7 @@ dissect_ModuleDiffBlock_block(tvbuff_t *tvb, int offset,
proto_item_append_text(item, ", Submodules:%u", u16NumberOfSubmodules);
while(u16NumberOfSubmodules--) {
sub_item = proto_tree_add_item(module_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(module_tree, hf_pn_io_submodule_tree, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_submodule);
u32SubStart = offset;
@ -7532,11 +7532,11 @@ dissect_block(tvbuff_t *tvb, int offset,
/* from here, we only have big endian (network byte ordering)!!! */
drep[0] &= ~DREP_LITTLE_ENDIAN;
sub_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_block);
u32SubStart = offset;
header_item = proto_tree_add_item(sub_tree, hf_pn_io_block_header, tvb, offset, 6, ENC_BIG_ENDIAN);
header_item = proto_tree_add_item(sub_tree, hf_pn_io_block_header, tvb, offset, 6, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_pn_io_block_header);
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, header_tree, drep,
@ -7948,7 +7948,7 @@ dissect_IPNIO_rqst_header(tvbuff_t *tvb, int offset,
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_args_len, &u32ArgsLen);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
u32SubStart = offset;
@ -7991,7 +7991,7 @@ dissect_IPNIO_resp_header(tvbuff_t *tvb, int offset,
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_pn_io_args_len, &u32ArgsLen);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_io_array, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io);
u32SubStart = offset;
@ -8051,7 +8051,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset,
proto_item *profidrive_item;
proto_tree *profidrive_tree;
profidrive_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
profidrive_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
profidrive_tree = proto_item_add_subtree(profidrive_item, ett_pn_io_profidrive_parameter_request);
proto_item_set_text(profidrive_item, "PROFIDrive Parameter Request: ");
@ -8085,7 +8085,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset,
proto_item *sub_item;
proto_tree *sub_tree;
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_profidrive_parameter_address);
proto_item_set_text(sub_item, "Parameter Address %u: ", addr_idx+1);
@ -8118,7 +8118,7 @@ dissect_ProfiDriveParameterRequest(tvbuff_t *tvb, int offset,
proto_item *sub_item;
proto_tree *sub_tree;
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_profidrive_parameter_value);
proto_item_set_text(sub_item, "Parameter Value %u: ", addr_idx+1);
@ -8155,7 +8155,7 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset,
proto_item *profidrive_item;
proto_tree *profidrive_tree;
profidrive_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
profidrive_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
profidrive_tree = proto_item_add_subtree(profidrive_item, ett_pn_io_profidrive_parameter_response);
proto_item_set_text(profidrive_item, "PROFIDrive Parameter Response: ");
@ -8184,7 +8184,7 @@ dissect_ProfiDriveParameterResponse(tvbuff_t *tvb, int offset,
proto_item *sub_item;
proto_tree *sub_tree;
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(profidrive_tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_profidrive_parameter_value);
proto_item_set_text(sub_item, "Parameter Value %u: ", val_idx++);
@ -8437,7 +8437,7 @@ dissect_ProfiSafeParameterRequest(tvbuff_t *tvb, int offset,
prm_flag1 = prm_flag2 = 0;
f_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_BIG_ENDIAN);
f_item = proto_tree_add_item(tree, hf_pn_io_block, tvb, offset, 0, ENC_NA);
f_tree = proto_item_add_subtree(f_item, ett_pn_io_profisafe_f_parameter);
proto_item_set_text(f_item, "F-Parameter: ");
@ -8745,7 +8745,7 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
u16AlarmSrcEndpoint, u16AlarmDstEndpoint);
/* PDU type */
sub_item = proto_tree_add_item(rta_tree, hf_pn_io_pdu_type, tvb, offset, 1, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(rta_tree, hf_pn_io_pdu_type, tvb, offset, 1, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_pdu_type);
dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_pdu_type_type, &u8PDUType);
@ -8758,7 +8758,7 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
u8PDUVersion);
/* additional flags */
sub_item = proto_tree_add_item(rta_tree, hf_pn_io_add_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(rta_tree, hf_pn_io_add_flags, tvb, offset, 1, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_add_flags);
dissect_dcerpc_uint8(tvb, offset, pinfo, sub_tree, drep,
hf_pn_io_window_size, &u8WindowSize);

42
plugins/profinet/packet-dcom-cba-acco.c
View File

@ -1300,7 +1300,7 @@ dissect_ICBAAccoServer_Connect_rqst(tvbuff_t *tvb, int offset,
/* array of CONNECTINs */
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectin);
u32SubStart = offset;
@ -1458,7 +1458,7 @@ dissect_ICBAAccoServer2_Connect2_rqst(tvbuff_t *tvb, int offset,
/* array of CONNECTINs */
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectin);
u32SubStart = offset;
@ -1595,7 +1595,7 @@ dissect_ICBAAccoServer_Connect_resp(tvbuff_t *tvb, int offset,
/* array of CONNECTOUTs */
while(u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_connectout, tvb, offset, 8, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectout, tvb, offset, 8, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectout);
u32SubStart = offset;
@ -2183,7 +2183,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_rqst(tvbuff_t *tvb, int offset,
u32Idx = 1;
while (u32ArraySize--) {
/* array of CONNECTINCRs */
sub_item = proto_tree_add_item(tree, hf_cba_connectincr, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectincr, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectincr);
u32SubStart = offset;
@ -2276,7 +2276,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_resp(tvbuff_t *tvb, int offset,
while (u32ArraySize--) {
/* array of CONNECTOUTCRs */
sub_item = proto_tree_add_item(tree, hf_cba_connectoutcr, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectoutcr, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectoutcr);
u32SubStart = offset;
@ -2524,7 +2524,7 @@ dissect_ICBAAccoServerSRT_Connect_rqst(tvbuff_t *tvb, int offset,
u32Idx = 1;
while (u32ArraySize--) {
/* array of CONNECTINs */
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectin);
u32SubStart = offset;
@ -2656,7 +2656,7 @@ dissect_ICBAAccoServerSRT_Connect_resp(tvbuff_t *tvb, int offset,
/* array of CONNECTOUTs */
while(u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_connectout, tvb, offset, 8, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_connectout, tvb, offset, 8, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_connectout);
u32SubStart = offset;
@ -2832,7 +2832,7 @@ dissect_Server_GetProvConnections_resp(tvbuff_t *tvb, int offset,
u32TmpCount = u32Count;
u32Idx = 1;
while (u32TmpCount--) {
sub_item = proto_tree_add_item(tree, hf_cba_getprovconnout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_getprovconnout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_getprovconnout);
u32SubStart = offset;
@ -2933,7 +2933,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb,
/*** ALL data in this buffer is NOT aligned and always little endian ordered ***/
if (tree) {
conn_data_item = proto_tree_add_item(tree, hf_cba_acco_cb_conn_data, tvb, offset, 0, FALSE);
conn_data_item = proto_tree_add_item(tree, hf_cba_acco_cb_conn_data, tvb, offset, 0, ENC_NA);
conn_data_tree = proto_item_add_subtree(conn_data_item, ett_ICBAAccoCallback_Buffer);
}
@ -3018,7 +3018,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb,
}
/* add callback-item subtree */
sub_item = proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_item, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(conn_data_tree, hf_cba_acco_cb_item, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_ICBAAccoCallback_Item);
item_offset = offset;
@ -3422,7 +3422,7 @@ dissect_ICBAAccoMgt_AddConnections_rqst(tvbuff_t *tvb, int offset,
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_addconnectionin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_addconnectionin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_addconnectionin);
u32SubStart = offset;
@ -3499,7 +3499,7 @@ dissect_ICBAAccoMgt_AddConnections_resp(tvbuff_t *tvb, int offset,
u32Count = u32ArraySize;
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_addconnectionout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_addconnectionout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_addconnectionout);
u32SubStart = offset;
@ -3667,7 +3667,7 @@ dissect_ICBAAccoMgt_GetIDs_resp(tvbuff_t *tvb, int offset,
u32Idx = 1;
while (u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_getidout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_getidout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_getidout);
u32SubStart = offset;
@ -3809,7 +3809,7 @@ dissect_ICBAAccoMgt2_GetConsConnections_resp(tvbuff_t *tvb, int offset,
u32TmpCount = u32Count;
u32Idx = 1;
while (u32TmpCount--) {
sub_item = proto_tree_add_item(tree, hf_cba_getconsconnout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_getconsconnout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_getconnectionout);
u32SubStart = offset;
@ -3911,7 +3911,7 @@ dissect_ICBAAccoMgt2_DiagConsConnections_resp(tvbuff_t *tvb, int offset,
u32TmpCount = u32Count;
u32Idx = 1;
while (u32TmpCount--) {
sub_item = proto_tree_add_item(tree, hf_cba_diagconsconnout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_diagconsconnout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_getconnectionout);
u32SubStart = offset;
@ -4025,7 +4025,7 @@ dissect_ICBAAccoMgt_GetConnections_resp(tvbuff_t *tvb, int offset,
u32TmpCount = u32Count;
u32Idx = 1;
while (u32TmpCount--) {
sub_item = proto_tree_add_item(tree, hf_cba_getconnectionout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_getconnectionout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_getconnectionout);
u32SubStart = offset;
@ -4234,7 +4234,7 @@ dissect_ICBAAccoMgt_GetDiagnosis_rqst(tvbuff_t *tvb, int offset,
&u32ArraySize);
if(u32ArraySize != 0) {
proto_tree_add_item(tree, hf_cba_acco_diag_data, tvb, offset, u32InLength, FALSE);
proto_tree_add_item(tree, hf_cba_acco_diag_data, tvb, offset, u32InLength, ENC_NA);
}
col_append_fstr(pinfo->cinfo, COL_INFO, ": %s: %u bytes",
@ -4258,7 +4258,7 @@ dissect_ICBAAccoMgt_GetDiagnosis_resp(tvbuff_t *tvb, int offset,
hf_cba_acco_diag_out_length, &u32OutLength);
if(u32OutLength != 0) {
proto_tree_add_item(tree, hf_cba_acco_diag_data, tvb, offset, u32OutLength, FALSE);
proto_tree_add_item(tree, hf_cba_acco_diag_data, tvb, offset, u32OutLength, ENC_NA);
}
col_append_fstr(pinfo->cinfo, COL_INFO, ": %u bytes",
@ -4341,7 +4341,7 @@ dissect_ICBAAccoSync_ReadItems_resp(tvbuff_t *tvb, int offset,
u32Idx = 1;
u32Tmp = u32ArraySize;
while(u32Tmp--) {
sub_item = proto_tree_add_item(tree, hf_cba_readitemout, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_readitemout, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_readitemout);
u32SubStart = offset;
@ -4408,7 +4408,7 @@ dissect_ICBAAccoSync_WriteItems_rqst(tvbuff_t *tvb, int offset,
u32VariableOffset = offset + u32ArraySize * 8;
u32Idx = 1;
while(u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_writeitemin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_writeitemin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_writeitemin);
u32SubStart = offset;
@ -4465,7 +4465,7 @@ dissect_ICBAAccoSync_WriteItemsQCD_rqst(tvbuff_t *tvb, int offset,
u32VariableOffset = offset + u32ArraySize * 20;
u32Idx = 1;
while(u32ArraySize--) {
sub_item = proto_tree_add_item(tree, hf_cba_writeitemin, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_writeitemin, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_cba_writeitemin);
u32SubStart = offset;

2
plugins/profinet/packet-dcom-cba.c
View File

@ -908,7 +908,7 @@ dissect_PBAddressInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
while(u32ArraySize != 0) {
sub_item = proto_tree_add_item(tree, hf_cba_pbaddress, tvb, offset, 2, FALSE);
sub_item = proto_tree_add_item(tree, hf_cba_pbaddress, tvb, offset, 2, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_PBAddress);
offset = dissect_dcom_BYTE(tvb, offset, pinfo, sub_tree, drep,

2
plugins/profinet/packet-pn-dcp.c
View File

@ -597,7 +597,7 @@ dissect_PNDCP_Suboption_DHCP(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_item_append_text(block_item, ", BlockQualifier: %s", val_to_str(block_qualifier, pn_dcp_block_qualifier, "Unknown"));
if(have_block_info)
proto_item_append_text(block_item, ", BlockInfo: %s", val_to_str(block_info, pn_dcp_block_info, "Unknown"));
proto_tree_add_item(tree, hf_pn_dcp_suboption_dhcp_device_id, tvb, offset, block_length, FALSE);
proto_tree_add_item(tree, hf_pn_dcp_suboption_dhcp_device_id, tvb, offset, block_length, ENC_NA);
offset += block_length;
break;
default:

12
plugins/profinet/packet-pn-ptcp.c
View File

@ -480,12 +480,12 @@ dissect_PNPTCP_block(tvbuff_t *tvb, int offset,
*end = FALSE;
/* block subtree */
sub_item = proto_tree_add_item(tree, hf_pn_ptcp_block, tvb, offset, 0, FALSE);
sub_item = proto_tree_add_item(tree, hf_pn_ptcp_block, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_ptcp_block);
u32SubStart = offset;
/* tlvheader subtree */
tlvheader_item = proto_tree_add_item(sub_tree, hf_pn_ptcp_block_tlvheader, tvb, offset, 2 /* len */, FALSE);
tlvheader_item = proto_tree_add_item(sub_tree, hf_pn_ptcp_block_tlvheader, tvb, offset, 2 /* len */, ENC_NA);
tlvheader_tree = proto_item_add_subtree(tlvheader_item, ett_pn_ptcp_block_header);
offset = dissect_PNPTCP_TLVHeader(tvb, offset, pinfo, tlvheader_tree, sub_item, &type, &length);
@ -561,7 +561,7 @@ dissect_PNPTCP_FollowUpPDU(tvbuff_t *tvb, int offset,
/* dissect the header */
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, FALSE);
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_pn_ptcp_header);
/* Padding 12 bytes */
@ -604,7 +604,7 @@ dissect_PNPTCP_RTSyncPDU(tvbuff_t *tvb, int offset,
guint32 delayms;
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, FALSE);
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_pn_ptcp_header);
/* Reserved_1 */
@ -666,7 +666,7 @@ dissect_PNPTCP_AnnouncePDU(tvbuff_t *tvb, int offset,
/* dissect the header */
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, FALSE);
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_pn_ptcp_header);
/* Padding 12 bytes */
@ -701,7 +701,7 @@ dissect_PNPTCP_DelayPDU(tvbuff_t *tvb, int offset,
/* dissect the header */
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, FALSE);
header_item = proto_tree_add_item(tree, hf_pn_ptcp_header, tvb, offset, 20 /* len */, ENC_NA);
header_tree = proto_item_add_subtree(header_item, ett_pn_ptcp_header);
/* Padding 12 bytes */

6
plugins/profinet/packet-pn-rt.c
View File

@ -182,7 +182,7 @@ dissect_CSF_SDU_heur(tvbuff_t *tvb,
offset += 2;
while(1) {
sub_item = proto_tree_add_item(tree, hf_pn_rt_sf, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_rt_sf, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_sf);
u32SubStart = offset;
@ -265,14 +265,14 @@ dissect_FRAG_PDU_heur(tvbuff_t *tvb,
/* possible FrameID ranges for FRAG_PDU */
if (u16FrameID >= 0xFF80 && u16FrameID < 0xFF8F) {
sub_item = proto_tree_add_item(tree, hf_pn_rt_frag, tvb, offset, 0, ENC_BIG_ENDIAN);
sub_item = proto_tree_add_item(tree, hf_pn_rt_frag, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_frag);
u8FragDataLength = tvb_get_guint8(tvb, offset);
proto_tree_add_uint(sub_tree, hf_pn_rt_frag_data_length, tvb, offset, 1, u8FragDataLength);
offset += 1;
status_item = proto_tree_add_item(sub_tree, hf_pn_rt_frag_status, tvb, offset, 1, ENC_BIG_ENDIAN);
status_item = proto_tree_add_item(sub_tree, hf_pn_rt_frag_status, tvb, offset, 1, ENC_NA);
status_tree = proto_item_add_subtree(status_item, ett_pn_rt_frag_status);
u8FragStatus = tvb_get_guint8(tvb, offset);

118
plugins/unistim/packet-unistim.c
View File

@ -388,7 +388,7 @@ dissect_uftp_message(proto_tree *unistim_tree,packet_info *pinfo _U_,tvbuff_t *t
/* File Data Block */
/* Raw Data.. */
dat_len = tvb_length_remaining(tvb, offset);
proto_tree_add_item(msg_tree,hf_uftp_datablock,tvb,offset,dat_len,FALSE);
proto_tree_add_item(msg_tree,hf_uftp_datablock,tvb,offset,dat_len,ENC_NA);
offset += dat_len;
break;
}
@ -502,7 +502,7 @@ dissect_unistim_message(proto_tree *unistim_tree,packet_info *pinfo,tvbuff_t *tv
break;
default:
/*See some undocumented messages. Don't want to miss the ones we understand*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len-2,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len-2,ENC_NA);
offset+=(msg_len-2);
}
@ -556,7 +556,7 @@ dissect_basic_phone(proto_tree *msg_tree,
case 0x07:
/*Hardware ID*/
proto_tree_add_item(msg_tree,hf_basic_phone_hw_id,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x08:
@ -567,12 +567,12 @@ dissect_basic_phone(proto_tree *msg_tree,
break;
case 0x09:
/*Grey Market Info*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0a:
/*Encapsulate Command*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x11:
@ -590,7 +590,7 @@ dissect_basic_phone(proto_tree *msg_tree,
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -636,7 +636,7 @@ dissect_basic_switch(proto_tree *msg_tree,
tvb,offset,1,FALSE);
offset+=1;
proto_tree_add_item(msg_tree,hf_basic_switch_eeprom_data,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=1;
break;
case 0x07:
@ -650,18 +650,18 @@ dissect_basic_switch(proto_tree *msg_tree,
break;
case 0x08:
/*Encapsulate Command*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0f:
/*showing up in captures but not in pdf*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
case 0xff:
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -728,14 +728,14 @@ dissect_broadcast_switch(proto_tree *msg_tree,
case 0x03:
/*Set Default Character Table Config */
/* UGLY may work may not*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0xff:
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -746,7 +746,7 @@ static gint
dissect_broadcast_phone(proto_tree *msg_tree,
tvbuff_t *tvb, gint offset,guint msg_len){
proto_tree_add_item(msg_tree,hf_generic_data, tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data, tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
return offset;
@ -779,7 +779,7 @@ dissect_display_switch(proto_tree *msg_tree,
break;
case 0x05:
/*Query Status Bar Icon*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x06:
@ -812,17 +812,17 @@ dissect_display_switch(proto_tree *msg_tree,
break;
case 0x0c:
/*Query Display Manager*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0d:
/*Download Call Duration Timer Delay*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0e:
/*Disable Display Field*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0f:
@ -1204,7 +1204,7 @@ dissect_display_switch(proto_tree *msg_tree,
tvb,offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
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);
offset+=1;msg_len-=1;
@ -1280,14 +1280,14 @@ dissect_display_switch(proto_tree *msg_tree,
break;
case 0x21:
/*Set Default Character Table Configuration VERY UGLY*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x22:
/*Special Character Download*/
proto_tree_add_item(msg_tree,hf_display_char_address,tvb,offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x23:
@ -1309,7 +1309,7 @@ dissect_display_switch(proto_tree *msg_tree,
proto_tree_add_item(msg_tree,hf_display_cursor_line_number,tvb,offset,1,FALSE);
offset+=1;msg_len-=1;
}
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x24:
@ -1323,7 +1323,7 @@ dissect_display_switch(proto_tree *msg_tree,
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_broadcast_minute,tvb,offset,msg_len,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x30:
@ -1378,7 +1378,7 @@ dissect_display_switch(proto_tree *msg_tree,
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -1455,12 +1455,12 @@ dissect_display_phone(proto_tree *msg_tree,
break;
case 0x04:
/*Current Character Table Configuration Status VERY UGLY*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x05:
/*Default Character Table Configuration Status VERY UGLY*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x06:
@ -1484,7 +1484,7 @@ dissect_display_phone(proto_tree *msg_tree,
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -1524,7 +1524,7 @@ dissect_key_indicator_switch(proto_tree *msg_tree,
break;
case 0x06:
/*Query Key/Indicator Manager*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x07:
@ -1579,7 +1579,7 @@ dissect_key_indicator_switch(proto_tree *msg_tree,
/*Free Form Icon Download*/
proto_tree_add_item(msg_tree,hf_key_icon_id,tvb,offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0f:
@ -1593,11 +1593,11 @@ dissect_key_indicator_switch(proto_tree *msg_tree,
break;
case 0xff:
/*Reserved*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -1628,7 +1628,7 @@ dissect_key_indicator_phone(proto_tree *msg_tree,
break;
case 0x01:
/*LED Status Report*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x03:
@ -1679,14 +1679,14 @@ dissect_key_indicator_phone(proto_tree *msg_tree,
break;
case 0x0a:
/*Phone Icon Status Report*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0xff:
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -1731,12 +1731,12 @@ dissect_network_switch(proto_tree *msg_tree,
break;
case 0x06:
/*QoS Configuration*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x09:
/*Set RTCP Source Description Item*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0b:
@ -1772,7 +1772,7 @@ dissect_network_switch(proto_tree *msg_tree,
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);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,ENC_NA);
offset+=1;msg_len-=1;
string_len=tvb_strsize(tvb,offset);
proto_tree_add_item(msg_tree,hf_net_full_pathname,tvb,offset,string_len,ENC_NA);
@ -1789,7 +1789,7 @@ dissect_network_switch(proto_tree *msg_tree,
break;
case 0x0f:
/*Set RTCP Report Interval*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x10:
@ -1815,16 +1815,16 @@ dissect_network_switch(proto_tree *msg_tree,
case 0x14:
/*Transport Reliability Layer Parameters Download*/
proto_tree_add_item(msg_tree,hf_generic_data,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0xff:
/*Reserved*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -1921,7 +1921,7 @@ dissect_network_phone(proto_tree *msg_tree,
break;
case 0x02:
/*Network Manager Attributes Info*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x03:
@ -1943,7 +1943,7 @@ dissect_network_phone(proto_tree *msg_tree,
break;
case 0x04:
/*Manager IDs*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x05:
@ -1960,7 +1960,7 @@ dissect_network_phone(proto_tree *msg_tree,
break;
case 0x0b:
/*Network Configuration Element Report*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0c:
@ -2003,7 +2003,7 @@ dissect_network_phone(proto_tree *msg_tree,
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -2125,13 +2125,13 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
break;
case 0x15:
/*Alerting Tone Cadence Download*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
/*TODO UGLY*/
case 0x17:
/*Paging Tone Cadence Download*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
/*TODO UGLY*/
@ -2179,12 +2179,12 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
break;
case 0x1d:
/*Stream Based Tone Frequency Component List Download*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x1e:
/*Stream Based Tone Cadence Download*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x20:
@ -2194,19 +2194,19 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
break;
case 0x21:
/*Set APB's Rx Volume Level*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x22:
/*Change Adjustable Rx Volume (quieter) DONE*/
proto_tree_add_item(msg_tree,hf_generic_data,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x23:
/*Change Adjustable Rx Volume (louder) DONE*/
proto_tree_add_item(msg_tree,hf_generic_data,
tvb,offset,msg_len,FALSE);
tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x24:
@ -2235,7 +2235,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_audio_apb_data,tvb,
offset,apb_data_len,FALSE);
offset,apb_data_len,ENC_NA);
offset+=apb_data_len;msg_len-=apb_data_len;
}
}
@ -2263,7 +2263,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
tvb,offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_generic_data,
tvb,offset,4,FALSE);
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);
@ -2334,7 +2334,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
break;
case 0x34:
/*Filter Block Download*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x37:
@ -2432,7 +2432,7 @@ dissect_audio_switch(proto_tree *msg_tree,packet_info *pinfo,
case 0xff:
/*Reserved*/
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}
@ -2545,7 +2545,7 @@ dissect_audio_phone(proto_tree *msg_tree,
break;
case 0x0e:
/*RTCP Statistics Report UGLY*/
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
break;
case 0x0f:
@ -2600,7 +2600,7 @@ dissect_audio_phone(proto_tree *msg_tree,
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);
else
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,1,FALSE);
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);
offset+=1;msg_len-=1;
@ -2642,7 +2642,7 @@ dissect_audio_phone(proto_tree *msg_tree,
offset,1,FALSE);
offset+=1;msg_len-=1;
proto_tree_add_item(msg_tree,hf_audio_apb_data,tvb,
offset,apb_data_len,FALSE);
offset,apb_data_len,ENC_NA);
offset+=apb_data_len;msg_len-=apb_data_len;
}
}
@ -2651,7 +2651,7 @@ dissect_audio_phone(proto_tree *msg_tree,
/*Reserved*/
break;
default:
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,FALSE);
proto_tree_add_item(msg_tree,hf_generic_data,tvb,offset,msg_len,ENC_NA);
offset+=msg_len;
}

12
plugins/wimax/mac_hd_generic_decoder.c
View File

@ -746,7 +746,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
/* add subtree */
generic_tree = proto_item_add_subtree(generic_item, ett_mac_header_generic_decoder);
/* display the Generic MAC Header in Hex */
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, tvb_len, ENC_NA);
return;
}
/* get the parent */
@ -830,7 +830,7 @@ 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, "Encrypted PDU (%u bytes)", length);
/* add payload subtree */
generic_tree = proto_item_add_subtree(generic_item, ett_mac_data_pdu_decoder);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, length, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, length, ENC_NA);
goto check_crc;
}
@ -1004,7 +1004,7 @@ 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, frag_len, "Data transport PDU (%u bytes)", frag_len);
/* add payload subtree */
generic_tree = proto_item_add_subtree(generic_item, ett_mac_data_pdu_decoder);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, frag_len, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, tvb, offset, frag_len, ENC_NA);
}
/* defragment first if it is fragmented */
if (frag_type == NO_FRAG)
@ -1156,7 +1156,7 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
/* add payload subtree */
generic_tree = proto_item_add_subtree(generic_item, ett_mac_header_generic_decoder);
/* display the Padding CID payload in Hex */
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_payload_len, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_payload_len, ENC_NA);
}
else if ((mac_cid <= (2 * global_cid_max_basic)) || (mac_cid == cid_aas_ranging)
|| (mac_cid >= cid_normal_multicast))
@ -1200,10 +1200,10 @@ void dissect_mac_header_generic_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
if (mac_payload_handle)
call_dissector(mac_payload_handle, tvb_new_subset(payload_tvb, payload_offset, new_tvb_len, new_tvb_len), pinfo, generic_tree);
else /* display the Generic MAC Header in Hex */
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_tvb_len, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_tvb_len, ENC_NA);
}
else /* display the Generic MAC Header in Hex */
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_tvb_len, FALSE);
proto_tree_add_item(generic_tree, hf_mac_header_generic_value_bytes, payload_tvb, payload_offset, new_tvb_len, ENC_NA);
}
}
}

4
plugins/wimax/mac_hd_type1_decoder.c
View File

@ -228,7 +228,7 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
if(tvb_len < WIMAX_MAC_HEADER_SIZE)
{
/* display the MAC Type I Header in Hex */
proto_tree_add_item(ti_tree, hf_mac_header_type_1_value_bytes, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(ti_tree, hf_mac_header_type_1_value_bytes, tvb, offset, tvb_len, ENC_NA);
return;
}
#ifdef DEBUG
@ -257,7 +257,7 @@ void dissect_mac_header_type_1_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
/* display MAC Header Type I Subtype */
proto_tree_add_protocol_format(ti_tree, proto_mac_header_type_1_decoder, tvb, offset, tvb_len, "Unknown type 1 subtype: %u", sub_type);
/* display the MAC Type I Header in Hex */
proto_tree_add_item(ti_tree, hf_mac_header_type_1_value_bytes, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(ti_tree, hf_mac_header_type_1_value_bytes, tvb, offset, tvb_len, ENC_NA);
return;
}
/* add the MAC header info */

4
plugins/wimax/mac_hd_type2_decoder.c
View File

@ -403,7 +403,7 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
/* display the error message */
proto_tree_add_protocol_format(ti_tree, proto_mac_header_type_2_decoder, tvb, offset, tvb_len, "Error: the size of Mac Header Type II tvb is too small! (%u bytes)", tvb_len);
/* display the MAC Type II Header in Hex */
proto_tree_add_item(ti_tree, hf_mac_header_type_2_value_bytes, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(ti_tree, hf_mac_header_type_2_value_bytes, tvb, offset, tvb_len, ENC_NA);
return;
}
#ifdef DEBUG
@ -442,7 +442,7 @@ void dissect_mac_header_type_2_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
/* update the info column */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Unknown type 2 fb type");
/* display the MAC Type I Header in Hex */
proto_tree_add_item(ti_tree, hf_mac_header_type_2_value_bytes, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(ti_tree, hf_mac_header_type_2_value_bytes, tvb, offset, tvb_len, ENC_NA);
return;
}
/* move to the second byte */

58
plugins/wimax/mac_mgmt_msg_decoder.c
View File

@ -220,7 +220,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
return;
}
/* get the parent */
@ -314,7 +314,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MCA_RSP:
@ -329,7 +329,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_DBPC_REQ:
@ -344,7 +344,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_DBPC_RSP:
@ -359,7 +359,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_RES_CMD:
@ -398,7 +398,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_TFTP_RSP:
@ -413,7 +413,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_ARQ_FEEDBACK:
@ -451,7 +451,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MSH_NENT:
@ -466,7 +466,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MSH_DSCH:
@ -481,7 +481,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MSH_CSCH:
@ -496,7 +496,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MSH_CSCF:
@ -511,7 +511,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_AAS_FBCK_REQ:
@ -538,7 +538,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_AAS_BEAM_RSP:
@ -553,7 +553,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_DREG_REQ:
@ -572,7 +572,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_SLP_RSP:
@ -587,7 +587,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_TRF_IND:
@ -602,7 +602,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_NBR_ADV:
@ -617,7 +617,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_SCN_REQ:
@ -632,7 +632,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_SCN_RSP:
@ -647,7 +647,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_BSHO_REQ:
@ -662,7 +662,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_MSHO_REQ:
@ -677,7 +677,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_BSHO_RSP:
@ -692,7 +692,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_HO_IND:
@ -707,7 +707,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_SCN_REP:
@ -722,7 +722,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MOB_PAG_ADV:
@ -737,7 +737,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_MBS_MAP:
@ -752,7 +752,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
case MAC_MGMT_MSG_PMC_REQ:
@ -779,12 +779,12 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
/* add MAC payload subtree */
message_tree = proto_item_add_subtree(message_item, ett_mac_mgmt_msg_decoder);
/* display the MAC payload in Hex */
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, FALSE);
proto_tree_add_item(message_tree, hf_mac_mgmt_msg_values, tvb, offset, tvb_len, ENC_NA);
}
break;
default:
/* display the unknown message in hex */
proto_tree_add_item(tree, hf_mac_mgmt_msg_unknown_type, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_mac_mgmt_msg_unknown_type, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
}

12
plugins/wimax/msg_dcd.c
View File

@ -387,7 +387,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DCD TLV error");
proto_tree_add_item(dcd_tree, hf_dcd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(dcd_tree, hf_dcd_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -421,7 +421,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DL Burst Profile TLV error");
proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -620,13 +620,13 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
case DCD_TLV_T_22_DL_AMC_ALLOCATED_PHYSICAL_BANDS_BITMAP:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_tlv_t_22_dl_amc_allocated_physical_bands_bitmap, tvb, offset, tlv_len, ENC_NA);
break;
}
case DCD_TLV_T_34_DL_REGION_DEFINITION:
{
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, FALSE);
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);
@ -732,7 +732,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Trigger TLV error");
proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -793,7 +793,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
default:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_dcd_decoder, dcd_tree, hf_dcd_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_dcd_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
}

2
plugins/wimax/msg_dlmap.c
View File

@ -2096,7 +2096,7 @@ void dissect_mac_mgmt_msg_dlmap_decoder(tvbuff_t *tvb, packet_info *pinfo _U_, p
}
proto_tree_add_item(dlmap_tree, hf_dlmap_dcd, tvb, offset, 1, FALSE);
offset++;
proto_tree_add_item(dlmap_tree, hf_dlmap_bsid, tvb, offset, 6, FALSE);
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);
offset++;

6
plugins/wimax/msg_dreg.c
View File

@ -177,7 +177,7 @@ static void dissect_dreg_tlv(proto_tree *dreg_tree, gint tlv_type, tvbuff_t *tvb
proto_tree_add_item(dreg_tree, hf_dreg_paging_cycle_request, tvb, tlv_offset, 2, FALSE);
break;
default:
proto_tree_add_item(dreg_tree, hf_tlv_value, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(dreg_tree, hf_tlv_value, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}
}
@ -431,7 +431,7 @@ void dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pr
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-REQ TLV error");
proto_tree_add_item(dreg_req_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(dreg_req_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -517,7 +517,7 @@ void dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pr
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-CMD TLV error");
proto_tree_add_item(dreg_cmd_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(dreg_cmd_tree, hf_dreg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */

2
plugins/wimax/msg_dsd.c
View File

@ -177,7 +177,7 @@ void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
dsd_tree = proto_item_add_subtree(dsd_item, ett_mac_mgmt_msg_dsd_rsp_decoder);
/* Decode and display the DSD message */
/* display the Message Type */
proto_tree_add_item(dsd_tree, hf_dsd_rsp_message_type, tvb, offset, 1, FALSE);
proto_tree_add_item(dsd_tree, hf_dsd_rsp_message_type, tvb, offset, 1, ENC_NA);
/* move to next field */
offset++;
/* display the Transaction ID */

12
plugins/wimax/msg_reg_req.c
View File

@ -330,7 +330,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
} else {
/* Unknown TLV Type */
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, proto_registry, tvb, tlv_offset, (tvb_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, (tvb_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, (tvb_len - tlv_offset), ENC_NA);
}
break;
case REG_MCA_FLOW_CONTROL:
@ -370,7 +370,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* update the offset */
@ -400,7 +400,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
break;
default:
sub_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, tlv_tree, hf_reg_invalid_tlv, tvb, tlv_offset, (tlv_end - tlv_offset), FALSE);
proto_tree_add_item(sub_tree, hf_reg_invalid_tlv, tvb, tlv_offset, (tlv_end - tlv_offset), FALSE);
proto_tree_add_item(sub_tree, hf_reg_invalid_tlv, tvb, tlv_offset, (tlv_end - tlv_offset), ENC_NA);
break;
}
tlv_offset += length;
@ -503,7 +503,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, proto_registry, tvb, tlv_offset, (tvb_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, (tvb_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, (tvb_len - tlv_offset), ENC_NA);
break;
}
#endif
@ -555,7 +555,7 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error");
proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(reg_req_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -653,7 +653,7 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_reg_req_decoder, reg_req_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}
/* update the offset */

10
plugins/wimax/msg_reg_rsp.c
View File

@ -131,7 +131,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -195,7 +195,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if (tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error");
proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(reg_rsp_tree, hf_reg_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the sub TLV data */
@ -216,7 +216,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
break;
default:
tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_reg_rsp_message_tree, sub_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, ENC_NA);
break;
}
this_offset = sub_tlv_len + sub_tlv_offset;
@ -266,7 +266,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
} else {
/* Unknown TLV Type */
tlv_tree = add_tlv_subtree(&tlv_info, ett_reg_rsp_message_tree, reg_rsp_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
}
break;
case VENDOR_SPECIFIC_INFO:
@ -276,7 +276,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_reg_rsp_message_tree, reg_rsp_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}

40
plugins/wimax/msg_rep.c
View File

@ -299,7 +299,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ TLV error");
proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -325,7 +325,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ Report Request TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, (offset + tlv_offset), (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, (offset + tlv_offset), (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -404,7 +404,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -413,7 +413,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_req_decoder, rep_tree, hf_rep_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rep_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rep_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -467,7 +467,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP TLV error");
proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(rep_tree, hf_rep_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -493,7 +493,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP report subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -549,7 +549,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -568,7 +568,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP channel subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -585,11 +585,11 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
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);
proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_safety_channel, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_safety_channel, tvb, (offset + tlv_offset), length, ENC_NA);
break;
case REP_RSP_CHANNEL_TYPE_ENHANCED_BAND_AMC:
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_rsp_channel_type_enhanced_band_amc, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_enhanced_band_amc, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_rsp_channel_type_enhanced_band_amc, tvb, (offset + tlv_offset), length, ENC_NA);
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);
@ -598,7 +598,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -617,7 +617,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific phy CINR report subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -686,7 +686,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -705,7 +705,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble physical CINR report subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -731,7 +731,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -750,7 +750,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific effective CINR report subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -790,7 +790,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -809,7 +809,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble effective CINR report subtype TLV error");
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_rep_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* update the offset */
@ -836,7 +836,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
ti_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_rep_rsp_decoder, tlv_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, FALSE);
proto_tree_add_item(ti_tree, hf_rep_unknown_type, tvb, (offset + tlv_offset), length, ENC_NA);
break;
}
tlv_offset += length;
@ -852,7 +852,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
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);
proto_tree_add_item(tlv_tree, hf_rep_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rep_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;

4
plugins/wimax/msg_res_cmd.c
View File

@ -94,7 +94,7 @@ void dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RES-CMD TLV error");
proto_tree_add_item(res_cmd_tree, hf_res_cmd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(res_cmd_tree, hf_res_cmd_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -120,7 +120,7 @@ void dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
default:
/* display the unknown tlv in hex */
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_res_cmd_decoder, res_cmd_tree, hf_res_cmd_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_res_cmd_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_res_cmd_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;

12
plugins/wimax/msg_rng_req.c
View File

@ -151,7 +151,7 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
proto_tree_add_item(power_saving_class_tree, hf_rng_invalid_tlv, tvb, offset, (compound_tlv_len - offset), FALSE);
proto_tree_add_item(power_saving_class_tree, hf_rng_invalid_tlv, tvb, offset, (compound_tlv_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -209,7 +209,7 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_
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);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}
/* update the offset */
@ -263,7 +263,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error");
proto_tree_add_item(rng_req_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(rng_req_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -324,7 +324,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
} 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);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
}
break;
case SHORT_HMAC_TUPLE:
@ -337,7 +337,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
} 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);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
}
break;
case MAC_VERSION_ENCODING:
@ -350,7 +350,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
break;
default:
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);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}
/* update the offset */

14
plugins/wimax/msg_rng_rsp.c
View File

@ -329,7 +329,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the TLV data */
@ -485,7 +485,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error");
proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, tlv_offset, (tvb_len - offset), FALSE);
proto_tree_add_item(rng_rsp_tree, hf_rng_invalid_tlv, tvb, tlv_offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the offset to the sub TLV data */
@ -493,15 +493,15 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
switch (sub_tlv_type) {
case RNG_RSP_SA_CHALLENGE_BS_RANDOM:
tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_rng_rsp_message_tree, sub_tree, hf_rng_rsp_bs_random, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rng_rsp_bs_random, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rng_rsp_bs_random, tvb, sub_tlv_offset, sub_tlv_len, ENC_NA);
break;
case RNG_RSP_SA_CHALLENGE_AKID:
tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_rng_rsp_message_tree, sub_tree, hf_rng_rsp_akid, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rng_rsp_akid, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_rng_rsp_akid, tvb, sub_tlv_offset, sub_tlv_len, ENC_NA);
break;
default:
tlv_tree = add_tlv_subtree(&sub_tlv_info, ett_rng_rsp_message_tree, sub_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_tlv_type, tvb, sub_tlv_offset, sub_tlv_len, ENC_NA);
break;
}
this_offset = sub_tlv_len + sub_tlv_offset;
@ -536,13 +536,13 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
} else {
/* Unknown TLV type */
sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_tlv_type, tvb, tlv_offset, 1, FALSE);
proto_tree_add_item(sub_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(sub_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
}
break;
default:
sub_tree = add_tlv_subtree(&tlv_info, ett_rng_rsp_message_tree, rng_rsp_tree, hf_tlv_type, tvb, tlv_offset, 1, FALSE);
proto_tree_add_item(sub_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, FALSE);
proto_tree_add_item(sub_tree, hf_tlv_type, tvb, tlv_offset, tlv_len, ENC_NA);
break;
}

18
plugins/wimax/msg_sbc.c
View File

@ -586,13 +586,13 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-REQ TLV error");
proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
if (tlv_type == 0)
{ /* invalid tlv type */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, FALSE);
proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, ENC_NA);
offset++;
continue;
}
@ -822,7 +822,7 @@ 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_power_save_class_types_capability, tvb, offset, tlv_len, FALSE);
/* display the detail meanings of the TLV value */
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, ENC_NA);
}
break;
case SBC_AUTH_POLICY_SUPPORT:
@ -851,7 +851,7 @@ 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_power_save_class_types_capability, tvb, offset, tlv_len, FALSE);
/* display the detail meanings of the TLV value */
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, ENC_NA);
}
break;
case SBC_MAX_SECURITY_ASSOCIATIONS:
@ -867,7 +867,7 @@ 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_power_save_class_types_capability, tvb, offset, tlv_len, FALSE);
/* display the detail meanings of the TLV value */
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, ENC_NA);
}
break;
case SBC_TLV_T_27_EXTENSION_CAPABILITY:
@ -1081,7 +1081,7 @@ 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_power_save_class_types_capability, tvb, offset, tlv_len, FALSE);
/* display the detail meanings of the TLV value */
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -1141,13 +1141,13 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-RSP TLV error");
proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(sbc_tree, hf_sbc_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
if (tlv_type == 0)
{ /* invalid tlv type */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type");
proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, FALSE);
proto_tree_add_item(sbc_tree, hf_sbc_unknown_type, tvb, offset, 1, ENC_NA);
offset++;
continue;
}
@ -1590,7 +1590,7 @@ 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_unknown_type, tvb, offset, tlv_len, FALSE);
/* display the detail meanings of the TLV value */
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_sbc_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;

16
plugins/wimax/msg_ucd.c
View File

@ -282,7 +282,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UCD TLV error");
proto_tree_add_item(ucd_tree,hf_ucd_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(ucd_tree,hf_ucd_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -326,25 +326,25 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
case UCD_TLV_T_210_FAST_FEEDBACK_REGION:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_210_fast_feedback_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_210_fast_feedback_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_210_fast_feedback_region, tvb, offset, tlv_len, ENC_NA);
break;
}
case UCD_TLV_T_211_HARQ_ACK_REGION:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_211_harq_ack_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_211_harq_ack_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_211_harq_ack_region, tvb, offset, tlv_len, ENC_NA);
break;
}
case UCD_TLV_T_212_RANGING_REGION:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_212_ranging_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_212_ranging_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_212_ranging_region, tvb, offset, tlv_len, ENC_NA);
break;
}
case UCD_TLV_T_213_SOUNDING_REGION:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_213_sounding_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_213_sounding_region, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_213_sounding_region, tvb, offset, tlv_len, ENC_NA);
break;
}
}
@ -372,7 +372,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
if(tlv_type == -1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL Burst Profile error");
proto_tree_add_item(tlv_tree, hf_ucd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_invalid_tlv, tvb, offset, (tlv_len - offset - tlv_offset), ENC_NA);
break;
}
/* get the TLV length */
@ -463,7 +463,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
case UCD_TLV_T_158_OPTIONAL_PERMUTATION_UL_ALLOCATED_SUBCHANNELS_BITMAP:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_tlv_t_158_optional_permutation_ul_allocated_subchannels_bitmap, tvb, offset, tlv_len, ENC_NA);
break;
}
@ -717,7 +717,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
case UCD_UL_ALLOCATED_SUBCHANNELS_BITMAP:
{
tlv_tree = add_tlv_subtree(&tlv_info, ett_mac_mgmt_msg_ucd_decoder, ucd_tree, hf_ucd_ul_allocated_subchannles_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_ul_allocated_subchannles_bitmap, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_ucd_ul_allocated_subchannles_bitmap, tvb, offset, tlv_len, ENC_NA);
break;
}
case UCD_TLV_T_203_UL_PUSC_SUBCHANNEL_ROTATION:

20
plugins/wimax/wimax_compact_dlmap_ie_decoder.c
View File

@ -588,7 +588,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
nibble_offset = 0;
if(max_logical_bands == 3)
{
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, nband, FALSE);
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, nband, ENC_NA);
length += (nband * 2);
/* update offset */
dl_map_offset += nband;
@ -596,7 +596,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
else
{
nibble_offset = (nband & 1);
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, ((nband >> 1) + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, ((nband >> 1) + nibble_offset), ENC_NA);
length += nband;
/* update offset */
dl_map_offset += (nband >> 1);
@ -610,14 +610,14 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
nibble_offset = 1;
if(max_logical_bands == 3)
{
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, (nband + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, (nband + nibble_offset), ENC_NA);
length += (nband * 2);
/* update offset */
dl_map_offset += nband;
}
else
{
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, ((nband >> 1) + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_cdlmap_band_index, tvb, dl_map_offset, ((nband >> 1) + nibble_offset), ENC_NA);
length += nband;
/* update offset */
dl_map_offset += ((nband + nibble_offset) >> 1);
@ -928,7 +928,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
/* display BITMAP Length */
proto_tree_add_item(tree, hf_cdlmap_bit_map_length, tvb, dl_map_offset, 1, FALSE);
/* display BITMAP */
proto_tree_add_item(tree, hf_cdlmap_bit_map, tvb, dl_map_offset, bit_map_length + 1, FALSE);
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);
}
else
@ -945,7 +945,7 @@ guint wimax_compact_dlmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
/* move to next byte */
dl_map_offset++;
/* display BITMAP */
proto_tree_add_item(tree, hf_cdlmap_bit_map, tvb, dl_map_offset, bit_map_length, FALSE);
proto_tree_add_item(tree, hf_cdlmap_bit_map, tvb, dl_map_offset, bit_map_length, ENC_NA);
length += (bit_map_length * 2);
}
break;
@ -1341,7 +1341,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
{
case TIME_DIVERSITY_MBS:
/* display the time-diversity MBS in HEX */
proto_tree_add_item(tree, hf_cdlmap_extension_time_diversity_mbs_1, tvb, offset, (length - 2), FALSE);
proto_tree_add_item(tree, hf_cdlmap_extension_time_diversity_mbs_1, tvb, offset, (length - 2), ENC_NA);
break;
case HARQ_MODE_SWITCH:
/* display the HARQ mode */
@ -1353,7 +1353,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
break;
default:
/* display the unknown sub-type in HEX */
proto_tree_add_item(tree, hf_cdlmap_extension_unknown_sub_type_1, tvb, offset, (length - 2), FALSE);
proto_tree_add_item(tree, hf_cdlmap_extension_unknown_sub_type_1, tvb, offset, (length - 2), ENC_NA);
break;
}
}
@ -1376,7 +1376,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
{
case TIME_DIVERSITY_MBS:
/* display the time-diversity MBS in HEX */
proto_tree_add_item(tree, hf_cdlmap_extension_time_diversity_mbs, tvb, (offset + 1), (length - 1), FALSE);
proto_tree_add_item(tree, hf_cdlmap_extension_time_diversity_mbs, tvb, (offset + 1), (length - 1), ENC_NA);
break;
case HARQ_MODE_SWITCH:
/* display the HARQ mode */
@ -1386,7 +1386,7 @@ static guint wimax_cdlmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
break;
default:
/* display the unknown sub-type in HEX */
proto_tree_add_item(tree, hf_cdlmap_extension_unknown_sub_type, tvb, (offset + 1), (length - 1), FALSE);
proto_tree_add_item(tree, hf_cdlmap_extension_unknown_sub_type, tvb, (offset + 1), (length - 1), ENC_NA);
break;
}
}

12
plugins/wimax/wimax_compact_ulmap_ie_decoder.c
View File

@ -543,7 +543,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
nibble_offset = 0;
if(max_logical_bands == 3)
{
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, nband, FALSE);
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, nband, ENC_NA);
length += (nband * 2);
/* update offset */
ul_map_offset += nband;
@ -551,7 +551,7 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
else
{
nibble_offset = (nband & 1);
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, ((nband >> 1) + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, ((nband >> 1) + nibble_offset), ENC_NA);
length += nband;
/* update offset */
ul_map_offset += (nband >> 1);
@ -565,14 +565,14 @@ guint wimax_compact_ulmap_ie_decoder(proto_tree *tree, packet_info *pinfo, tvbuf
nibble_offset = 1;
if(max_logical_bands == 3)
{
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, (nband + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, (nband + nibble_offset), ENC_NA);
length += (nband * 2);
/* update offset */
ul_map_offset += nband;
}
else
{
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, ((nband >> 1) + nibble_offset), FALSE);
proto_tree_add_item(tree, hf_culmap_band_index, tvb, ul_map_offset, ((nband >> 1) + nibble_offset), ENC_NA);
length += nband;
/* update offset */
ul_map_offset += ((nband + nibble_offset) >> 1);
@ -1157,7 +1157,7 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
break;
default:
/* display the unknown sub-type in HEX */
proto_tree_add_item(tree, hf_culmap_extension_unknown_sub_type_1, tvb, offset, (length - 2), FALSE);
proto_tree_add_item(tree, hf_culmap_extension_unknown_sub_type_1, tvb, offset, (length - 2), ENC_NA);
break;
}
}
@ -1186,7 +1186,7 @@ static guint wimax_culmap_extension_ie_decoder(proto_tree *tree, packet_info *pi
break;
default:
/* display the unknown sub-type in HEX */
proto_tree_add_item(tree, hf_culmap_extension_unknown_sub_type, tvb, (offset + 1), (length - 1), FALSE);
proto_tree_add_item(tree, hf_culmap_extension_unknown_sub_type, tvb, (offset + 1), (length - 1), ENC_NA);
break;
}
}

6
plugins/wimax/wimax_pdu_decoder.c
View File

@ -113,7 +113,7 @@ static void dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
/* add subtree */
pdu_tree = proto_item_add_subtree(pdu_item, ett_wimax_pdu_decoder);
/* display the padding in Hex */
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, FALSE);
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, ENC_NA);
break;
}
else if((first_byte & WIMAX_MAP_TYPE_MASK) == WIMAX_HARQ_MAP_MSG_IND)
@ -153,7 +153,7 @@ static void dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
/* add subtree */
pdu_tree = proto_item_add_subtree(pdu_item, ett_wimax_pdu_decoder);
/* display the invalid MAC Header in Hex */
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, FALSE);
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, ENC_NA);
break;
}
/* calculate the MAC header HCS */
@ -170,7 +170,7 @@ static void dissect_wimax_pdu_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t
/* add subtree */
pdu_tree = proto_item_add_subtree(pdu_item, ett_wimax_pdu_decoder);
/* display the bad MAC Header in Hex */
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, FALSE);
proto_tree_add_item(pdu_tree, hf_wimax_value_bytes, tvb, offset, length, ENC_NA);
break;
}
/* get the Header Type (HT) */

60
plugins/wimax/wimax_utils.c
View File

@ -1729,7 +1729,7 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "EPS TLV error");
proto_tree_add_item(ceps_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(ceps_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -1811,7 +1811,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CSPER TLV error");
proto_tree_add_item(csper_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(csper_tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -1843,7 +1843,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ATM Classifier TLV error");
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -1917,7 +1917,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packet Classification Rule TLV error");
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -2074,7 +2074,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type,
if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHS n Rule TLV error");
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), FALSE);
proto_tree_add_item(tlv_tree, hf_cst_invalid_tlv, tvb, offset, (tlv_len - tlv_offset), ENC_NA);
break;
}
#ifdef DEBUG /* for debug only */
@ -2169,7 +2169,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Service Flow Encodings TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -2498,7 +2498,7 @@ void wimax_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui
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);
hmac_offset++;
proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, (length-1), FALSE);
proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, (length-1), ENC_NA);
}
/**************************************************************/
@ -2533,7 +2533,7 @@ void wimax_cmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offset, gui
}
proto_tree_add_item(cmac_tree, hf_packet_number_counter, tvb, cmac_offset, 4, FALSE);
cmac_offset += 4;
proto_tree_add_item(cmac_tree, hf_cmac_tuple_cmac_value, tvb, cmac_offset, 8, FALSE);
proto_tree_add_item(cmac_tree, hf_cmac_tuple_cmac_value, tvb, cmac_offset, 8, ENC_NA);
}
/******************************************************************/
@ -2563,7 +2563,7 @@ void wimax_short_hmac_tuple_decoder(proto_tree *tree, tvbuff_t *tvb, guint offse
hmac_offset++;
proto_tree_add_item(hmac_tree, hf_packet_number_counter, tvb, hmac_offset, 4, FALSE);
hmac_offset += 4;
proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, length - offset - 3, FALSE);
proto_tree_add_item(hmac_tree, hf_hmac_tuple_hmac_digest, tvb, hmac_offset, length - offset - 3, ENC_NA);
}
/******************************************************************/
@ -2605,7 +2605,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Negotiation Params TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -2676,7 +2676,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_security_negotiation_parameters, tree, hf_snp_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_snp_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_snp_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -2721,7 +2721,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Crypto Suite List TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -2743,7 +2743,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p
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);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -2789,7 +2789,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -2943,7 +2943,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
/* add TLV subtree */
tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_attr_cmac_digest, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_attr_cmac_digest_pn, tvb, offset, 4, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_attr_cmac_digest_value, tvb, (offset + 4), 8, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_attr_cmac_digest_value, tvb, (offset + 4), 8, ENC_NA);
break;
case PKM_ATTR_KEY_PUSH_MODES:
tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_attr_push_modes, tvb, offset, tlv_len, FALSE);
@ -2967,7 +2967,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo,
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -3013,7 +3013,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "TEK Param TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3048,7 +3048,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -3094,7 +3094,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo,
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM Config Settings TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3137,7 +3137,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo,
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_pkm_tlv_encoded_attributes_decoder, tree, hf_pkm_config_settings_authorize_reject_wait_timeout, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -3183,7 +3183,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SA-Descriptor TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3217,7 +3217,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_sa_descriptor_decoder, tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -3263,7 +3263,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Capabilities TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3283,7 +3283,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot
break;
default:
tlv_tree = add_tlv_subtree(&tlv_info, ett_security_capabilities_decoder, tree, proto_wimax_utility_decoders, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_pkm_msg_unknown_type, tvb, offset, tlv_len, ENC_NA);
break;
}
offset += tlv_len;
@ -3330,7 +3330,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Vendor Specific Info TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3343,7 +3343,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
{
/* decode and display the Vendor ID Encoding */
tlv_tree = add_tlv_subtree(&tlv_info, ett_vendor_id_encoding_decoder, tree, hf_common_tlv_vendor_id, tvb, (offset + tlv_value_offset), tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_common_tlv_vendor_id, tvb, (offset + tlv_value_offset), tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_common_tlv_vendor_id, tvb, (offset + tlv_value_offset), tlv_len, ENC_NA);
}
else
{
@ -3366,7 +3366,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo
continue;
}
}
proto_tree_add_item(tree, hf_common_tlv_vendor_specific_value, tvb, (offset + tlv_value_offset), tlv_len, FALSE);
proto_tree_add_item(tree, hf_common_tlv_vendor_specific_value, tvb, (offset + tlv_value_offset), tlv_len, ENC_NA);
}
/* update the offset */
offset += tlv_value_offset + tlv_len;
@ -3399,7 +3399,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
if(tvb_len < 2)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Common TLV encoding");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, 0, tvb_len, FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, 0, tvb_len, ENC_NA);
return 0;
}
/* process Common TLV Encoding (11.1) */
@ -3414,7 +3414,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto
if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1)
{ /* invalid tlv info */
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Common TLV encoding TLV error");
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), FALSE);
proto_tree_add_item(tree, hf_cst_invalid_tlv, tvb, offset, (tvb_len - offset), ENC_NA);
break;
}
/* get the TLV value offset */
@ -3439,7 +3439,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, "Vendor ID Encoding (%u bytes)", tlv_len);
/* decode and display the Vendor ID Encoding */
proto_tree_add_item(tlv_tree, hf_common_tlv_vendor_id, tvb, offset, tlv_len, FALSE);
proto_tree_add_item(tlv_tree, hf_common_tlv_vendor_id, tvb, offset, tlv_len, ENC_NA);
break;
case DSx_UPLINK_FLOW:
/* display Uplink Service Flow Encodings info */