aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/h225
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-01-17 22:27:39 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-01-17 22:27:39 +0000
commitb33945c4b092c51aa9c84e2aa5b7300f240f48ef (patch)
tree8fb04caa85a164958d0eedd30738c6b006cffe0b /asn1/h225
parent232ab9d15867cae0a041f972232b5cade2e0d64b (diff)
Use the new h450 dissector
svn path=/trunk/; revision=13099
Diffstat (limited to 'asn1/h225')
-rw-r--r--asn1/h225/h225.cnf16
-rw-r--r--asn1/h225/packet-h225-template.c1
2 files changed, 16 insertions, 1 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf
index ca87bca6e1..9bf120a43a 100644
--- a/asn1/h225/h225.cnf
+++ b/asn1/h225/h225.cnf
@@ -436,7 +436,20 @@ guint32 value_len;
1U, 65535U, &(h225_pi.requestSeqNum), NULL, FALSE);
#----------------------------------------------------------------------------------------
+#.FN_BODY H323-UU-PDU/h4501SupplementaryService/_item
+ tvbuff_t *h4501_tvb;
+ guint32 h4501_offset=0;
+ guint32 h4501_len=0;
+
+ offset=dissect_per_octet_string(tvb, offset, pinfo, tree, -1, -1, -1, &h4501_offset, &h4501_len);
+
+ if(h4501_len){
+ h4501_tvb = tvb_new_subset(tvb, h4501_offset, h4501_len, h4501_len);
+ call_dissector(h4501_handle, h4501_tvb, pinfo, tree);
+ }
+#.END
+#----------------------------------------------------------------------------------------
#.TYPE_ATTR
H221NonStandard/t35CountryCode TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(T35CountryCode_vals)
TransportAddress/ipAddress/ip TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL
@@ -444,4 +457,5 @@ TransportAddress/ip6Address/ip TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = N
H245TransportAddress/h245ipAddress/h245ipv4 TYPE = FT_IPv4 DISPLAY = BASE_NONE STRINGS = NULL
H245TransportAddress/h245ip6Address/h245ipv6 TYPE = FT_IPv6 DISPLAY = BASE_NONE STRINGS = NULL
VendorIdentifier/productId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL
-VendorIdentifier/versionId TYPE = FT_STRING DISPLAY = BASE_HEX STRINGS = NULL \ No newline at end of file
+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) \ No newline at end of file
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index c9fa1cc8bb..d43b6d97a6 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -53,6 +53,7 @@
#include "packet-ber.h"
#include "packet-h235.h"
#include "packet-h245.h"
+#include "packet-q931.h"
#define PNAME "h225"
#define PSNAME "H225"