From 853e391dfac349ac65a3f187d3223d62eadb4c8f Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Thu, 24 Apr 2014 00:07:18 +0200 Subject: Kerberos: use dissect_kerberos_ADDR_TYPE (removes an unused function warning) Change-Id: I87d9c88d9db06c8f7dedd6e39152c39c13f8d32d Reviewed-on: https://code.wireshark.org/review/1314 Reviewed-by: Pascal Quantin --- asn1/kerberos/kerberos.cnf | 6 ++---- epan/dissectors/packet-kerberos.c | 24 +++++++----------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index ff275fa0d8..b39da9756a 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -372,11 +372,9 @@ guint32 msgtype; offset=dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL); } -#.FN_BODY HostAddress/addr-type +#.FN_BODY ADDR-TYPE VAL_PTR=(guint32*)actx->value_ptr actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); - - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - (guint32*)actx->value_ptr); +%(DEFAULT_BODY)s #.FN_BODY KDC-REQ-BODY conversation_t *conversation; diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index aa6c5377ee..c37aea6c85 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -175,7 +175,7 @@ static int hf_kerberos_krb_error = -1; /* KRB_ERROR */ static int hf_kerberos_name_type = -1; /* NAME_TYPE */ static int hf_kerberos_name_string = -1; /* SEQUENCE_OF_KerberosString */ static int hf_kerberos_name_string_item = -1; /* KerberosString */ -static int hf_kerberos_addr_type = -1; /* T_addr_type */ +static int hf_kerberos_addr_type = -1; /* ADDR_TYPE */ static int hf_kerberos_address = -1; /* T_address */ static int hf_kerberos_HostAddresses_item = -1; /* HostAddress */ static int hf_kerberos_AuthorizationData_item = -1; /* AuthorizationData_item */ @@ -2469,21 +2469,11 @@ static const value_string kerberos_ADDR_TYPE_vals[] = { static int dissect_kerberos_ADDR_TYPE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - - - -static int -dissect_kerberos_T_addr_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 376 "../../asn1/kerberos/kerberos.cnf" actx->value_ptr = wmem_alloc(wmem_packet_scope(), sizeof(guint32)); + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + (guint32*)actx->value_ptr); - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - (guint32*)actx->value_ptr); @@ -2555,7 +2545,7 @@ dissect_kerberos_T_address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static const ber_sequence_t HostAddress_sequence[] = { - { &hf_kerberos_addr_type , BER_CLASS_CON, 0, 0, dissect_kerberos_T_addr_type }, + { &hf_kerberos_addr_type , BER_CLASS_CON, 0, 0, dissect_kerberos_ADDR_TYPE }, { &hf_kerberos_address , BER_CLASS_CON, 1, 0, dissect_kerberos_T_address }, { NULL, 0, 0, 0, NULL } }; @@ -2920,7 +2910,7 @@ static const ber_sequence_t KDC_REQ_BODY_sequence[] = { static int dissect_kerberos_KDC_REQ_BODY(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 382 "../../asn1/kerberos/kerberos.cnf" +#line 380 "../../asn1/kerberos/kerberos.cnf" conversation_t *conversation; /* @@ -3172,7 +3162,7 @@ dissect_kerberos_AP_REP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_kerberos_T_kRB_SAFE_BODY_user_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 405 "../../asn1/kerberos/kerberos.cnf" +#line 403 "../../asn1/kerberos/kerberos.cnf" tvbuff_t *new_tvb; offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -3494,7 +3484,7 @@ dissect_kerberos_EncAPRepPart(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_kerberos_T_encKrbPrivPart_user_data(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 412 "../../asn1/kerberos/kerberos.cnf" +#line 410 "../../asn1/kerberos/kerberos.cnf" tvbuff_t *new_tvb; offset=dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { -- cgit v1.2.1