diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-07-28 07:50:05 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-07-28 07:50:05 +0000 |
| commit | f01fcc936904ad78162930334a105709818e7f66 (patch) | |
| tree | 3c402d3dee4ca9e86f8b836827725370ef777cd0 /asn1/h450 | |
| parent | 3c9b213e8a705343d9a019ce9395ecb37db3d116 (diff) | |
fropm martin m
fix for h450 to prevent an assertion for uninitialized hffields
Thanks for the capture, Keith. The problem was with h450 hf fields that
weren't initialised sucessfully (at all in one case, or with non-unique
filter strings in several others) - it was hitting an assertion in proto.c
when an attempt was made to use those fields.
I was able to test by editing packet-h450.c directly, I couldn't regenerate
it from packet-h450-template.c. I'm attaching a patch to
packet-h450-template.c that hopefully does the same thing. If someone can
generate and check it packet-h450.c in for me I'll retest.
svn path=/trunk/; revision=18804
Diffstat (limited to 'asn1/h450')
| -rw-r--r-- | asn1/h450/packet-h450-template.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index 27c77d812a..587adb9dcd 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -881,26 +881,29 @@ void proto_register_h450(void) { { &hf_h4501, { "SupplementaryService", "h4501.SupplementaryService", FT_NONE, BASE_NONE, NULL, 0, "SupplementaryService sequence", HFILL }}, - { &hf_h4501_constrained_invokeId, + { &hf_h4501_dummy, + { "dummy", "h4501.dummy", FT_NONE, BASE_NONE, + NULL, 0, "Dummy", HFILL }}, + { &hf_h4501_constrained_invokeId, { "invokeId", "h4501.invokeId", FT_UINT32, BASE_DEC, - NULL, 0, "invokeId", HFILL }}, + NULL, 0, "constrained_invokeId", HFILL }}, { &hf_h4501_invokeId, { "invokeId", "h4501.invokeId", FT_INT32, BASE_DEC, NULL, 0, "invokeId", HFILL }}, { &hf_h4501_localOpcode, - { "opcode", "h4501.opcode", FT_INT32, BASE_DEC, + { "localOpcode", "h4501.localOpcode", FT_INT32, BASE_DEC, VALS(localOpcode_vals), 0, "local", HFILL }}, { &hf_h4501_globalCode, - { "global", "h4501.global", FT_STRING, BASE_HEX, + { "globalCode", "h4501.globalCode", FT_STRING, BASE_HEX, NULL, 0, "global", HFILL }}, { &hf_h4501_globalargument, - { "argument", "h4501.argument", FT_BYTES, BASE_HEX, + { "argumentArgument", "h4501.globalArgument", FT_BYTES, BASE_HEX, NULL, 0, "argument", HFILL }}, { &hf_h4501_opcode, { "opcode", "h4501.opcode", FT_UINT32, BASE_DEC, VALS(opcode_vals), 0, "opcode choice", HFILL }}, { &hf_h4501_ReturnResult_result, - { "result", "h4501.ReturnResult.result", FT_BYTES, BASE_HEX, + { "ReturnResult_result", "h4501.ReturnResult.result", FT_BYTES, BASE_HEX, NULL, 0, "result", HFILL }}, { &hf_h4501_result, { "result", "h4501.result", FT_NONE, BASE_NONE, @@ -909,7 +912,7 @@ void proto_register_h450(void) { { "ReturnResult", "h4501.ReturnResult", FT_NONE, BASE_NONE, NULL, 0, "ReturnResult sequence of", HFILL }}, { &hf_h4501_localErrorCode, - { "errorCode", "h4501.errorCode", FT_INT32, BASE_DEC, + { "localErrorCode", "h4501.localErrorCode", FT_INT32, BASE_DEC, VALS(localErrorCode_vals), 0, "local", HFILL }}, { &hf_h4501_errorCode, { "errorCode", "h4501.errorCode", FT_UINT32, BASE_DEC, |