diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-11-10 13:31:16 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-11-10 13:31:16 +0000 |
| commit | bfdccf3f9d57c2a0637e71734191ca84cdfde694 (patch) | |
| tree | 3f5b3ae8b36e30dca825fe2964ffa7ebe07705a1 /epan/dissectors/packet-h460.c | |
| parent | e20cfef6f9e20c390629fc2f112dfb54484c8fac (diff) | |
- update H.245 to v14 (06/2008)
- use #.MODULE_EXPORT to avoid conflict between TransportAddress from H.225 and H.245
- regenerate H.323 family dissectors
svn path=/trunk/; revision=26739
Diffstat (limited to 'epan/dissectors/packet-h460.c')
| -rw-r--r-- | epan/dissectors/packet-h460.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c index 2adcc1234d..cf91a3d93c 100644 --- a/epan/dissectors/packet-h460.c +++ b/epan/dissectors/packet-h460.c @@ -2806,11 +2806,11 @@ void proto_register_h460(void) { "h460_19.TraversalParameters", HFILL }}, { &hf_h460_19_multiplexedMediaChannel, { "multiplexedMediaChannel", "h460.19.multiplexedMediaChannel", - FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_TransportAddress_vals), 0, "h245.TransportAddress", HFILL }}, { &hf_h460_19_multiplexedMediaControlChannel, { "multiplexedMediaControlChannel", "h460.19.multiplexedMediaControlChannel", - FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_TransportAddress_vals), 0, "h245.TransportAddress", HFILL }}, { &hf_h460_19_multiplexID, { "multiplexID", "h460.19.multiplexID", @@ -2818,7 +2818,7 @@ void proto_register_h460(void) { "h460_19.INTEGER_0_4294967295", HFILL }}, { &hf_h460_19_keepAliveChannel, { "keepAliveChannel", "h460.19.keepAliveChannel", - FT_UINT32, BASE_DEC, VALS(h225_TransportAddress_vals), 0, + FT_UINT32, BASE_DEC, VALS(h245_TransportAddress_vals), 0, "h245.TransportAddress", HFILL }}, { &hf_h460_19_keepAlivePayloadType, { "keepAlivePayloadType", "h460.19.keepAlivePayloadType", @@ -2861,7 +2861,7 @@ void proto_register_h460(void) { "h460_21.INTEGER_1_65535", HFILL }}, { &hf_h460_21_groupIdentifer, { "groupIdentifer", "h460.21.groupIdentifer", - FT_GUID, BASE_NONE, NULL, 0, + FT_BYTES, BASE_HEX, NULL, 0, "h460_21.GloballyUniqueID", HFILL }}, { &hf_h460_21_capability, { "capability", "h460.21.capability", |