diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-02-17 22:15:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-02-17 22:15:16 +0000 |
| commit | fd44f9a33940527be92a2c9c7d53f2c6da00270d (patch) | |
| tree | 49d927a32339d0be07989e0e0b3b965f1c2e6c8f /asn1/c1222/c1222.cnf | |
| parent | 73ef143f95ee3d313bf467e1a0a953429831594b (diff) | |
| download | wireshark-fd44f9a33940527be92a2c9c7d53f2c6da00270d.tar.gz | |
Remove C++ incompatibilities in c1222 dissector.
Also addresses an implicit cast in the epan/uat.h file
Bug 8342 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8342)
svn path=/trunk/; revision=47721
Diffstat (limited to 'asn1/c1222/c1222.cnf')
| -rw-r--r-- | asn1/c1222/c1222.cnf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index 2808a527ce..34721343f4 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -23,7 +23,7 @@ Calling-authentication-value-c1222/_untag/iv-element BLURB="c1222.iv-element" Calling-authentication-value-c1222/_untag/key-id-element BLURB = "c1222.key-id-element" #.FN_BODY User-information - gint8 class; + gint8 end_device_class; gboolean pc, ind; gint32 tag; guint32 len; @@ -32,11 +32,11 @@ Calling-authentication-value-c1222/_untag/key-id-element BLURB = "c1222.key-id-e FILL_START; /* get Tag and Length */ - offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); + offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &end_device_class, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); FILL_TABLE_TRUNCATE(user_information, len+offset-start_offset); if (tag == 0x8) { /* BER_TAG_EXTERNAL */ - offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); + offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &end_device_class, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); if (tag == 0x1) { /* implicit octet string */ tf = proto_tree_add_item(tree, hf_c1222_user_information, tvb, offset, len, ENC_NA); |