diff options
Diffstat (limited to 'epan/dissectors/asn1/h225')
-rw-r--r-- | epan/dissectors/asn1/h225/h225.cnf | 84 | ||||
-rw-r--r-- | epan/dissectors/asn1/h225/packet-h225-template.c | 4 |
2 files changed, 44 insertions, 44 deletions
diff --git a/epan/dissectors/asn1/h225/h225.cnf b/epan/dissectors/asn1/h225/h225.cnf index 55cae73f00..5cdad7956d 100644 --- a/epan/dissectors/asn1/h225/h225.cnf +++ b/epan/dissectors/asn1/h225/h225.cnf @@ -244,10 +244,10 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber contains_faststart = FALSE; call_id_guid = NULL; %(DEFAULT_BODY)s - col_append_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "CS: %%s ", + col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CS: %%s ", val_to_str(message_body_val, T_h323_message_body_vals, "<unknown>")); - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), %(ACTX)s->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { if (h225_pi->msg_type == H225_CS) { /* Don't override msg_tag value from IRR */ @@ -261,10 +261,10 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart == TRUE ) { - col_append_str(%(ACTX)s->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); + col_append_str(actx->pinfo->cinfo, COL_INFO, "OpenLogicalChannel " ); } - col_set_fence(%(ACTX)s->pinfo->cinfo,COL_INFO); + col_set_fence(actx->pinfo->cinfo,COL_INFO); #.END #---------------------------------------------------------------------------------------- @@ -276,11 +276,11 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber %(DEFAULT_BODY)s if (value_tvb && tvb_reported_length(value_tvb)) { - dissect_h245_FastStart_OLC(value_tvb, %(ACTX)s->pinfo, tree, codec_str); + dissect_h245_FastStart_OLC(value_tvb, actx->pinfo, tree, codec_str); } /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), %(ACTX)s->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { char temp[50]; g_snprintf(temp, 50, "%%s %%s", h225_pi->frame_label, codec_str); @@ -296,10 +296,10 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber call_id_guid = NULL; %(DEFAULT_BODY)s - col_add_fstr(%(ACTX)s->pinfo->cinfo, COL_INFO, "RAS: %%s ", + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RAS: %%s ", val_to_str(rasmessage_value, h225_RasMessage_vals, "<unknown>")); - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), %(ACTX)s->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->msg_tag = rasmessage_value; if (call_id_guid) { @@ -311,7 +311,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_HDR DestinationInfo/_item h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->is_destinationInfo = TRUE; } @@ -323,7 +323,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber h225_packet_info* h225_pi; %(DEFAULT_BODY)s - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi && h225_pi->is_destinationInfo == TRUE) { if (value_tvb) { len = tvb_reported_length(value_tvb); @@ -378,7 +378,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.END #---------------------------------------------------------------------------------------- #.FN_FTR H323-UU-PDU/h323-message-body/empty - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_EMPTY; } @@ -390,7 +390,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Status-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_STATUS; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -403,7 +403,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Information-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_INFORMATION; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -416,7 +416,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Progress-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_PROGRESS; if (contains_faststart) { @@ -434,7 +434,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR SetupAcknowledge-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_SETUP_ACK; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -447,7 +447,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Facility-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_FACILITY; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -456,7 +456,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_HDR H323-UU-PDU/h245Tunnelling h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { #.END #---------------------------------------------------------------------------------------- @@ -473,7 +473,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Setup-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_SETUP; if (contains_faststart) { @@ -491,7 +491,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR CallProceeding-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_CALL_PROCEDING; if (contains_faststart) { @@ -509,7 +509,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Alerting-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_ALERTING; if (contains_faststart) { @@ -527,7 +527,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR ReleaseComplete-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_RELEASE_COMPLET; g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); @@ -540,7 +540,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR Connect-UUIE /* Add to packet info */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { h225_pi->cs_type = H225_CONNECT; if (contains_faststart) { @@ -562,7 +562,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #---------------------------------------------------------------------------------------- #.FN_FTR H245TransportAddress /* we need this info for TAPing */ - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi) { h225_pi->is_h245 = TRUE; @@ -592,7 +592,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY FacilityReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -603,7 +603,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY GatekeeperRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -614,7 +614,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY UnregRequestReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -625,7 +625,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY UnregRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -636,7 +636,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY BandRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -647,7 +647,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY DisengageReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -657,7 +657,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY DisengageRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -668,7 +668,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY AdmissionRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -679,7 +679,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY LocationRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -690,7 +690,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY RegistrationRejectReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -701,7 +701,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY InfoRequestNakReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -712,7 +712,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY ReleaseCompleteReason VAL_PTR = &value gint32 value; h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); %(DEFAULT_BODY)s if (h225_pi != NULL) { @@ -723,18 +723,18 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber #.FN_BODY CallIdentifier/guid tvbuff_t *guid_tvb = NULL; - %(ACTX)s->value_ptr = &guid_tvb; + actx->value_ptr = &guid_tvb; %(DEFAULT_BODY)s if (guid_tvb) tvb_get_ntohguid(guid_tvb, 0, call_id_guid = wmem_new(wmem_packet_scope(), e_guid_t)); - %(ACTX)s->value_ptr = NULL; + actx->value_ptr = NULL; #.END #---------------------------------------------------------------------------------------- -#.FN_PARS GloballyUniqueID VAL_PTR = (tvbuff_t **)%(ACTX)s->value_ptr +#.FN_PARS GloballyUniqueID VAL_PTR = (tvbuff_t **)actx->value_ptr #---------------------------------------------------------------------------------------- #.FN_HDR RequestSeqNum h225_packet_info* h225_pi; - h225_pi = (h225_packet_info*)p_get_proto_data(wmem_packet_scope(), actx->pinfo, proto_h225, 0); + h225_pi = (h225_packet_info*)p_get_proto_data(actx->pinfo->pool, actx->pinfo, proto_h225, 0); if (h225_pi != NULL) { #.END #---------------------------------------------------------------------------------------- @@ -749,7 +749,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber %(DEFAULT_BODY)s if (h4501_tvb && tvb_reported_length(h4501_tvb)) { - call_dissector(h4501_handle, h4501_tvb, %(ACTX)s->pinfo, tree); + call_dissector(h4501_handle, h4501_tvb, actx->pinfo, tree); } #.END #---------------------------------------------------------------------------------------- @@ -818,7 +818,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode %(DEFAULT_BODY)s if (next_tvb && tvb_reported_length(next_tvb)) { - call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, %(ACTX)s->pinfo, tree); + call_dissector((nsp_handle)?nsp_handle:data_handle, next_tvb, actx->pinfo, tree); } #.END @@ -899,7 +899,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode if (gefx) { ti = proto_tree_add_string(tree, hf_h225_debug_dissector_try_string, tvb, offset>>3, 0, gefx->key); PROTO_ITEM_SET_HIDDEN(ti); - dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, actx->pinfo, %(TREE)s, actx); } #.END diff --git a/epan/dissectors/asn1/h225/packet-h225-template.c b/epan/dissectors/asn1/h225/packet-h225-template.c index 93a88a2d40..4180bd2d06 100644 --- a/epan/dissectors/asn1/h225/packet-h225-template.c +++ b/epan/dissectors/asn1/h225/packet-h225-template.c @@ -371,7 +371,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* Init struct for collecting h225_packet_info */ h225_pi = create_h225_packet_info(pinfo); h225_pi->msg_type = H225_CS; - p_add_proto_data(wmem_packet_scope(), pinfo, proto_h225, 0, h225_pi); + p_add_proto_data(pinfo->pool, pinfo, proto_h225, 0, h225_pi); next_tvb_init(&h245_list); next_tvb_init(&tp_list); @@ -406,7 +406,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Init struct for collecting h225_packet_info */ h225_pi = create_h225_packet_info(pinfo); h225_pi->msg_type = H225_RAS; - p_add_proto_data(wmem_packet_scope(), pinfo, proto_h225, 0, h225_pi); + p_add_proto_data(pinfo->pool, pinfo, proto_h225, 0, h225_pi); col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); |