diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-27 08:22:04 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-27 08:22:04 +0000 |
| commit | 68d2479947c088a90c1d1bc7094bfcc53bbbbded (patch) | |
| tree | b2fdc35c184fa6d1b212479b03749ceef7bdd05d /packet-kerberos.c | |
| parent | bd69337ab9f102a7e607cdc41f1ae0f355fe8a41 (diff) | |
make KRB_SAFE more consistent with the other PDUs by removing the SAFE expansion.
cosmetic: Put the application type on the kerberos subtree
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11012 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-kerberos.c')
| -rw-r--r-- | packet-kerberos.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packet-kerberos.c b/packet-kerberos.c index d062e1b28a..3e72d58310 100644 --- a/packet-kerberos.c +++ b/packet-kerberos.c @@ -23,7 +23,7 @@ * * Some structures from RFC2630 * - * $Id: packet-kerberos.c,v 1.66 2004/05/26 11:04:15 sahlberg Exp $ + * $Id: packet-kerberos.c,v 1.67 2004/05/27 08:22:04 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -207,7 +207,6 @@ static gint hf_krb_KDCOptions_enc_tkt_in_skey = -1; static gint hf_krb_KDCOptions_renew = -1; static gint hf_krb_KDCOptions_validate = -1; static gint hf_krb_KDC_REQ_BODY = -1; -static gint hf_krb_SAFE = -1; static gint hf_krb_PRIV_BODY = -1; static gint hf_krb_ENC_PRIV = -1; static gint hf_krb_authenticator_enc = -1; @@ -251,7 +250,6 @@ static gint ett_krb_request = -1; static gint ett_krb_recordmark = -1; static gint ett_krb_ticket = -1; static gint ett_krb_ticket_enc = -1; -static gint ett_krb_SAFE = -1; static gint ett_krb_PRIV = -1; static gint ett_krb_PRIV_enc = -1; @@ -1220,6 +1218,9 @@ dissect_krb5_msg_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o } do_col_info=FALSE; + /* append the application type to the subtree */ + proto_item_append_text(tree, " %s", val_to_str(msgtype, krb5_msg_types, "Unknown:0x%x")); + return offset; } @@ -2546,7 +2547,7 @@ static int dissect_krb5_SAFE(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, SAFE_sequence, hf_krb_SAFE, ett_krb_SAFE); + offset=dissect_ber_sequence(FALSE, pinfo, tree, tvb, offset, SAFE_sequence, -1, -1); return offset; } @@ -3285,7 +3286,6 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 4; } - offset=dissect_ber_choice(pinfo, kerberos_tree, tvb, offset, kerberos_applications_choice, -1, -1); proto_item_set_len(item, offset); @@ -3486,9 +3486,6 @@ proto_register_kerberos(void) { &hf_krb_PRIV_BODY, { "PRIV_BODY", "kerberos.priv_body", FT_NONE, BASE_NONE, NULL, 0, "Kerberos PRIVate BODY", HFILL }}, - { &hf_krb_SAFE, { - "SAFE", "kerberos.safe", FT_NONE, BASE_NONE, - NULL, 0, "Kerberos SAFE structure", HFILL }}, { &hf_krb_encrypted_PRIV, { "Encrypted PRIV", "kerberos.enc_priv", FT_NONE, BASE_NONE, NULL, 0, "Kerberos Encrypted PRIVate blob data", HFILL }}, @@ -3732,7 +3729,6 @@ proto_register_kerberos(void) &ett_krb_recordmark, &ett_krb_ticket, &ett_krb_ticket_enc, - &ett_krb_SAFE, &ett_krb_PRIV, &ett_krb_PRIV_enc, &ett_krb_EncTicketPart, |