diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-11-04 21:42:02 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-11-04 21:42:02 +0000 |
| commit | f35324d0fd73a8fbbfc922e91823ef6b3a1ae4ec (patch) | |
| tree | a93ec5381270aa4229984585ea3ec7320ccdcf33 /asn1/h235 | |
| parent | a3d5cbf5d82252d097dc4e637fc218a491d30bc5 (diff) | |
| download | wireshark-f35324d0fd73a8fbbfc922e91823ef6b3a1ae4ec.tar.gz | |
Minor cleanup mostly related to proto_reg_handoff
Remove code for unused handles;
Localize handles (in proto_reg_handoff) which need not be global;
Localize (in proto_reg_handoff) "saved prefs";
Use find_dissector instead of create_dissector_handle as appropriate;
Use gboolean for "initialized" flag in proto_reg_handoff.
svn path=/trunk/; revision=26693
Diffstat (limited to 'asn1/h235')
| -rw-r--r-- | asn1/h235/packet-h235-template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index ef6bb09115..ad4b2d5385 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -59,7 +59,6 @@ int proto_h235 = -1; /* Initialize the subtree pointers */ #include "packet-h235-ett.c" -static dissector_handle_t mikey_handle=NULL; static int dissect_xxx_ToBeSigned(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) { @@ -102,8 +101,8 @@ void proto_register_h235(void) { oid_add_from_string("HMAC-SHA1-96","0.0.8.235.0.1.6"); oid_add_from_string("HMAC-SHA1-96","0.0.8.235.0.2.6"); /* H.235.7, Chapter 5, Table 1 */ - oid_add_from_string("MIKEY", OID_MIKEY); - oid_add_from_string("MIKEY-PS", OID_MIKEY_PS); + oid_add_from_string("MIKEY", OID_MIKEY); + oid_add_from_string("MIKEY-PS", OID_MIKEY_PS); oid_add_from_string("MIKEY-DHHMAC", OID_MIKEY_DHHMAC); oid_add_from_string("MIKEY-PK-SIGN", OID_MIKEY_PK_SIGN); oid_add_from_string("MIKEY-DH-SIGN", OID_MIKEY_DH_SIGN); @@ -120,6 +119,7 @@ void proto_register_h235(void) { /*--- proto_reg_handoff_h235 -------------------------------------------*/ void proto_reg_handoff_h235(void) { + dissector_handle_t mikey_handle; mikey_handle = find_dissector("mikey"); |