diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-08-31 15:03:12 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2005-08-31 15:03:12 +0000 |
commit | fd99f4837119e2b9446596cf602f5378e1ab7b11 (patch) | |
tree | ed572b63e01653dd36a5ff45d9cca1d20a8fa30f /asn1/h225 | |
parent | bcdfd08b84f09e753df7b00472b7bd2649b2d202 (diff) |
- more standard way for FastStart item dissection
- protocol names fixed
svn path=/trunk/; revision=15636
Diffstat (limited to 'asn1/h225')
-rw-r--r-- | asn1/h225/h225.cnf | 18 | ||||
-rw-r--r-- | asn1/h225/packet-h225-template.c | 12 |
2 files changed, 14 insertions, 16 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 091cb55417..86b373b53a 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -166,25 +166,22 @@ CallIdentifier/guid guid #.END #---------------------------------------------------------------------------------------- +#.FN_PARS FastStart/_item + VAL_PTR = &value_tvb #.FN_BODY FastStart/_item - guint32 newoffset; - guint32 length; + tvbuff_t *value_tvb = NULL; char codec_str[50]; - offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, hf_h225_fastStart_item_length, &length); - newoffset=offset + (length<<3); /* please note that offset is in bits in - PER dissectors, but the item length - is in octets */ - offset=dissect_h245_OpenLogicalChannelCodec(tvb,offset, pinfo, tree, hf_index, codec_str); +%(DEFAULT_BODY)s + if (value_tvb && tvb_length(value_tvb)) { + dissect_h245_OpenLogicalChannelCodec(value_tvb, pinfo, tree, codec_str); + } /* Add to packet info */ g_snprintf(h225_pi->frame_label, 50, "%%s %%s", h225_pi->frame_label, codec_str); contains_faststart = TRUE; h225_pi->is_faststart = TRUE; - - return newoffset; - #.END #---------------------------------------------------------------------------------------- #.FN_PARS RasMessage @@ -575,6 +572,7 @@ VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL H323-UserInformation/user-data/protocol-discriminator TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(q931_protocol_discriminator_vals) H323-UU-PDU/tunnelledSignallingMessage/messageContent/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC NonStandardParameter/data TYPE = FT_UINT32 DISPLAY = BASE_DEC +FastStart/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC ParallelH245Control/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC H245Control/_item TYPE = FT_UINT32 DISPLAY = BASE_DEC GloballyUniqueID TYPE = FT_GUID DISPLAY = BASE_NONE diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 4cf4e49457..b1b087686b 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -55,8 +55,8 @@ #include "packet-h245.h" #include "packet-q931.h" -#define PNAME "h225" -#define PSNAME "H225" +#define PNAME "H323-MESSAGES" +#define PSNAME "H.225.0" #define PFNAME "h225" #define UDP_PORT_RAS1 1718 @@ -145,13 +145,13 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * h225_pi->msg_type = H225_CS; if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.225.0"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); } if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } - it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), "H.225.0 CS"); + it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); offset = dissect_h225_H323_UserInformation(tvb, offset,pinfo, tr, hf_h225_H323_UserInformation); @@ -177,10 +177,10 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree h225_pi->msg_type = H225_RAS; if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.225.0"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); } - it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), "H.225.0 RAS"); + it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS"); tr=proto_item_add_subtree(it, ett_h225); offset = dissect_h225_RasMessage(tvb, 0, pinfo,tr, hf_h225_RasMessage ); |