diff options
Diffstat (limited to 'asn1/h245')
-rw-r--r-- | asn1/h245/h245.cnf | 8 | ||||
-rw-r--r-- | asn1/h245/packet-h245-template.c | 17 | ||||
-rw-r--r-- | asn1/h245/packet-h245-template.h | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 6d8d5c8b8c..162c8b4a21 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -8,6 +8,9 @@ T38FaxProfile DataProtocolCapability NO_PROT_PREFIX OpenLogicalChannel +#.PDU +OpenLogicalChannel + #---------------------------------------------------------------------------------------- #.FN_PARS RequestMessage VAL_PTR = &value @@ -797,6 +800,7 @@ MulticastAddress/iPAddress/tsapIdentifier multicast_tsapIdentifier MulticastAddress/iP6Address/tsapIdentifier multicast_IPv6_tsapIdentifier CommunicationModeTableEntry/mediaChannel cm_mediaChannel CommunicationModeTableEntry/mediaControlChannel cm_mediaControlChannel + #---------------------------------------------------------------------------------------- #.TYPE_ATTR UnicastAddress/iPAddress/network TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL @@ -807,4 +811,8 @@ RTPPayloadType/payloadDescriptor/rfc-number TYPE = FT_UINT32 DISPLAY = BASE_DEC NonStandardIdentifier/h221NonStandard/t35CountryCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(T35CountryCode_vals) VendorIdentification/productNumber TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL VendorIdentification/versionNumber TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL + +#---------------------------------------------------------------------------------------- +#.FIELD_ATTR +AlternativeCapabilitySet/_item NAME = "alternativeCapability" #----------------------------------------------------------------------------------------
\ No newline at end of file diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 996e8e12df..e1f6267c4a 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -54,8 +54,8 @@ #include "packet-rtcp.h" #include "packet-ber.h" -#define PNAME "h245" -#define PSNAME "h245" +#define PNAME "MULTIMEDIA-SYSTEM-CONTROL" +#define PSNAME "H.245" #define PFNAME "h245" static dissector_handle_t rtp_handle=NULL; @@ -248,10 +248,10 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint32 offset=0; if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.245"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME); } - it=proto_tree_add_protocol_format(parent_tree, proto_h245, tvb, 0, tvb_length(tvb), "H.245"); + it=proto_tree_add_protocol_format(parent_tree, proto_h245, tvb, 0, tvb_length(tvb), PSNAME); tr=proto_item_add_subtree(it, ett_h245); /* assume that whilst there is more tvb data, there are more h245 commands */ @@ -264,11 +264,9 @@ dissect_h245_h245(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } } -int -dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index, char *codec_str) { - offset = dissect_per_sequence(tvb, offset, pinfo, tree, hf_index, - ett_h245_OpenLogicalChannel, OpenLogicalChannel_sequence); - +void +dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str) { + dissect_OpenLogicalChannel_PDU(tvb, pinfo, tree); if (h245_pi != NULL) h245_pi->msg_type = H245_OpenLogChn; @@ -276,7 +274,6 @@ dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, int offset, packet_info *pin strncpy(codec_str, codec_type, 50); } - return offset; } /*--- proto_register_h245 -------------------------------------------*/ diff --git a/asn1/h245/packet-h245-template.h b/asn1/h245/packet-h245-template.h index 598378ff91..883700ba17 100644 --- a/asn1/h245/packet-h245-template.h +++ b/asn1/h245/packet-h245-template.h @@ -51,7 +51,7 @@ typedef struct _h245_packet_info { #include "packet-h245-exp.h"*/ -int dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index, char *codec_str); +void dissect_h245_OpenLogicalChannelCodec(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, char *codec_str); #endif /* PACKET_H245_H */ |