diff options
author | Gerald Combs <gerald@wireshark.org> | 2019-04-03 14:32:30 -0700 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-04-04 04:03:38 +0000 |
commit | 8d3ac3af866ecc7b847dd5b621d828872fe9ba18 (patch) | |
tree | 3fa7aa1a57e1b828f636829f08d1adb9dfb5b395 /plugins/epan/profinet | |
parent | bdf26a35f696a1524364945a2c868e57c97d1729 (diff) |
epan: Convert our PROTO_ITEM_ macros to inline functions.
Convert our various PROTO_ITEM_ macros to inline functions and document
them.
Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c
Reviewed-on: https://code.wireshark.org/review/32706
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'plugins/epan/profinet')
-rw-r--r-- | plugins/epan/profinet/packet-dcerpc-pn-io.c | 16 | ||||
-rw-r--r-- | plugins/epan/profinet/packet-dcom-cba-acco.c | 110 | ||||
-rw-r--r-- | plugins/epan/profinet/packet-pn-rtc-one.c | 12 |
3 files changed, 69 insertions, 69 deletions
diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c index 3437cbba6e..e1019772ad 100644 --- a/plugins/epan/profinet/packet-dcerpc-pn-io.c +++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c @@ -2567,25 +2567,25 @@ pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar) address_to_str(wmem_packet_scope(), &controllermac_addr), ar->controlleralarmref, address_to_str(wmem_packet_scope(), &devicemac_addr), ar->devicealarmref, ar->inputframeid, ar->outputframeid); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); item = proto_tree_add_guid(sub_tree, hf_pn_io_ar_uuid, tvb, 0, 0, (e_guid_t *) &ar->aruuid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_ether(sub_tree, hf_pn_io_cminitiator_macadd, tvb, 0, 0, ar->controllermac); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->controlleralarmref); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_ether(sub_tree, hf_pn_io_cmresponder_macadd, tvb, 0, 0, ar->devicemac); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_pn_io_localalarmref, tvb, 0, 0, ar->devicealarmref); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->inputframeid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_pn_io_frame_id, tvb, 0, 0, ar->outputframeid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } diff --git a/plugins/epan/profinet/packet-dcom-cba-acco.c b/plugins/epan/profinet/packet-dcom-cba-acco.c index b39f678edd..6c242895a2 100644 --- a/plugins/epan/profinet/packet-dcom-cba-acco.c +++ b/plugins/epan/profinet/packet-dcom-cba-acco.c @@ -681,43 +681,43 @@ cba_frame_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cba_fram frame->provparent ? frame->provparent->name : "", frame->provcrid, val_to_str(frame->qostype, cba_qos_type_short_vals, "%u"), frame->qosvalue, frame->length); - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_qos_type, tvb, 0, 0, frame->qostype); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_qos_value, tvb, 0, 0, frame->qosvalue); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_serversrt_cr_id, tvb, 0, 0, frame->conscrid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_prov_crid, tvb, 0, 0, frame->provcrid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_serversrt_cr_length, tvb, 0, 0, frame->length); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (frame->consparent != NULL) { item = proto_tree_add_string(sub_tree, hf_cba_acco_conn_consumer, tvb, 0, 0, frame->consparent->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } if (frame->provparent != NULL) { item = proto_tree_add_string(sub_tree, hf_cba_acco_conn_provider, tvb, 0, 0, frame->provparent->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } item = proto_tree_add_uint(sub_tree, hf_cba_connectcr_in, tvb, 0, 0, frame->packet_connect); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_data_first_in, tvb, 0, 0, frame->packet_first); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_data_last_in, tvb, 0, 0, frame->packet_last); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_disconnectcr_in, tvb, 0, 0, frame->packet_disconnect); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_disconnectme_in, tvb, 0, 0, frame->packet_disconnectme); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -906,39 +906,39 @@ cba_connection_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, cba "ProvItem:\"%s\" PID:0x%x CID:0x%x Len:%u", conn->provitem, conn->provid, conn->consid, conn->length); } - PROTO_ITEM_SET_GENERATED(sub_item); + proto_item_set_generated(sub_item); item = proto_tree_add_string(sub_tree, hf_cba_acco_conn_provider_item, tvb, 0, 0 /* len */, conn->provitem); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_prov_id, tvb, 0, 0 /* len */, conn->provid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_cons_id, tvb, 0, 0 /* len */, conn->consid); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_serversrt_record_length, tvb, 0, 0 /* len */, conn->length); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); if (conn->qostype != 0x30) { item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_qos_type, tvb, 0, 0, conn->qostype); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_acco_conn_qos_value, tvb, 0, 0, conn->qosvalue); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_connect_in, tvb, 0, 0, conn->packet_connect); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_data_first_in, tvb, 0, 0, conn->packet_first); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_data_last_in, tvb, 0, 0, conn->packet_last); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_disconnect_in, tvb, 0, 0, conn->packet_disconnect); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); item = proto_tree_add_uint(sub_tree, hf_cba_disconnectme_in, tvb, 0, 0, conn->packet_disconnectme); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } } @@ -1142,7 +1142,7 @@ dissect_ICBAAccoServer_SetActivation_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -1187,7 +1187,7 @@ dissect_ICBAAccoServerSRT_Disconnect_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -1232,7 +1232,7 @@ dissect_ICBAAccoServerSRT_SetActivation_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -1297,7 +1297,7 @@ dissect_ICBAAccoServer_Connect_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -1449,7 +1449,7 @@ dissect_ICBAAccoServer2_Connect2_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -1627,7 +1627,7 @@ dissect_ICBAAccoServer_Connect_resp(tvbuff_t *tvb, int offset, } item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); offset = dissect_dcom_BOOLEAN(tvb, offset, pinfo, tree, di, drep, @@ -1711,7 +1711,7 @@ dissect_ICBAAccoServer_Disconnect_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, di, drep, @@ -1778,7 +1778,7 @@ dissect_ICBAAccoServer_Disconnect_resp(tvbuff_t *tvb, int offset, } item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -1831,7 +1831,7 @@ dissect_ICBAAccoServerSRT_Disconnect_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, di, drep, @@ -1872,7 +1872,7 @@ dissect_ICBAAccoServer_DisconnectMe_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -1907,7 +1907,7 @@ dissect_ICBAAccoServer_DisconnectMe_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, di, drep, @@ -1943,7 +1943,7 @@ dissect_ICBAAccoServerSRT_DisconnectMe_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -1978,7 +1978,7 @@ dissect_ICBAAccoServerSRT_DisconnectMe_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, di, drep, @@ -2007,7 +2007,7 @@ dissect_ICBAAccoServer_Ping_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, di, drep, @@ -2035,7 +2035,7 @@ dissect_ICBAAccoServer_SetActivation_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_BOOLEAN(tvb, offset, pinfo, tree, di, drep, @@ -2077,7 +2077,7 @@ dissect_ICBAAccoServerSRT_SetActivation_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_BOOLEAN(tvb, offset, pinfo, tree, di, drep, @@ -2115,7 +2115,7 @@ dissect_ICBAAccoServer_Ping_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -2159,7 +2159,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); /* szCons */ @@ -2294,7 +2294,7 @@ dissect_ICBAAccoServerSRT_ConnectCR_resp(tvbuff_t *tvb, int offset, } item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_BOOLEAN(tvb, offset, pinfo, tree, di, drep, @@ -2389,7 +2389,7 @@ dissect_ICBAAccoServerSRT_DisconnectCR_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, di, drep, @@ -2448,7 +2448,7 @@ dissect_ICBAAccoServerSRT_DisconnectCR_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -2524,7 +2524,7 @@ dissect_ICBAAccoServerSRT_Connect_rqst(tvbuff_t *tvb, int offset, prov_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, di, drep, @@ -2682,7 +2682,7 @@ dissect_ICBAAccoServerSRT_Connect_resp(tvbuff_t *tvb, int offset, } item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, di, drep, @@ -3007,7 +3007,7 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, if (cons_ldev && cons_ldev->name) { proto_item *item; item = proto_tree_add_string(conn_data_tree, hf_cba_acco_conn_consumer, tvb, offset, 0, cons_ldev->name); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); } } @@ -3239,7 +3239,7 @@ dissect_ICBAAccoCallback_OnDataChanged_rqst(tvbuff_t *tvb, int offset, cons_ldev = cba_ldev_find(pinfo, &pinfo->net_dst, &di->call_data->object_uuid); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); /* length */ @@ -3271,7 +3271,7 @@ dissect_ICBAAccoCallback_OnDataChanged_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, di, drep, @@ -3294,7 +3294,7 @@ dissect_ICBAAccoCallback_Gnip_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(3)); return offset; @@ -3312,7 +3312,7 @@ dissect_ICBAAccoCallback_Gnip_resp(tvbuff_t *tvb, int offset, offset = dissect_dcom_that(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_srt_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(4)); offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, di, drep, @@ -3339,7 +3339,7 @@ dissect_ICBAAccoServer2_GetConnectionData_rqst(tvbuff_t *tvb, int offset, offset = dissect_dcom_this(tvb, offset, pinfo, tree, di, drep); item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, TRUE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(2)); offset = dissect_dcom_LPWSTR(tvb, offset, pinfo, tree, di, drep, @@ -3382,7 +3382,7 @@ dissect_ICBAAccoServer2_GetConnectionData_resp(tvbuff_t *tvb, int offset, } item = proto_tree_add_boolean (tree, hf_cba_acco_dcom_call, tvb, offset, 0, FALSE); - PROTO_ITEM_SET_GENERATED(item); + proto_item_set_generated(item); p_add_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0, GUINT_TO_POINTER(1)); /* length */ diff --git a/plugins/epan/profinet/packet-pn-rtc-one.c b/plugins/epan/profinet/packet-pn-rtc-one.c index 46c190e5f7..8fee08abdf 100644 --- a/plugins/epan/profinet/packet-pn-rtc-one.c +++ b/plugins/epan/profinet/packet-pn-rtc-one.c @@ -538,13 +538,13 @@ dissect_PNIO_C_SDU_RTC1(tvbuff_t *tvb, int offset, if (io_data_object->lastToggleBit != toggleBitSb) { /* ToggleBit has changed --> new Data incoming */ /* Special Filter for ToggleBit within Statusbyte */ ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_sb_toggelBitChanged, tvb, offset, 0, toggleBitSb); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_sb_toggelBitChange_slot_nr, tvb, offset, 0, io_data_object->slotNr); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_sb_toggelBitChange_subslot_nr, tvb, offset, 0, io_data_object->subSlotNr); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); } offset = dissect_pn_io_ps_SB(tvb, offset, pinfo, IODataObject_tree, drep, hf_pn_io_ps_sb, ps_sb_fields); @@ -733,13 +733,13 @@ dissect_PNIO_C_SDU_RTC1(tvbuff_t *tvb, int offset, if (io_data_object->lastToggleBit != toggleBitCb) { /* ToggleBit has changed --> new Data incoming */ /* Special Filter for ToggleBit within Controlbyte */ ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_cb_toggelBitChanged, tvb, offset, 0, toggleBitCb); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_cb_toggelBitChange_slot_nr, tvb, offset, 0, io_data_object->slotNr); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); ModuleID_item = proto_tree_add_uint(IODataObject_tree, hf_pn_io_ps_cb_toggelBitChange_subslot_nr, tvb, offset, 0, io_data_object->subSlotNr); - PROTO_ITEM_SET_HIDDEN(ModuleID_item); + proto_item_set_hidden(ModuleID_item); } offset = dissect_pn_io_ps_CB(tvb, offset, pinfo, IODataObject_tree, drep, hf_pn_io_ps_cb, ps_cb_fields); |