diff options
Diffstat (limited to 'epan/dissectors/packet-kink.c')
-rw-r--r-- | epan/dissectors/packet-kink.c | 99 |
1 files changed, 48 insertions, 51 deletions
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 569c46b238..5257336c64 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -23,56 +23,58 @@ void proto_register_kink(void); void proto_reg_handoff_kink(void); -#define KINK_PORT 57203 /* Not IANA registered */ +static dissector_handle_t kink_handle; + +#define KINK_PORT 910 #define KINK_ISAKMP_PAYLOAD_BASE 14 -static int proto_kink = -1; +static int proto_kink; /* Argument for proto_tree_add_uint() */ -static int hf_kink_type = -1; -static int hf_kink_length = -1; -static int hf_kink_transactionId = -1; -static int hf_kink_checkSumLength = -1; -static int hf_kink_A = -1; -static int hf_kink_version = -1; -static int hf_kink_domain_of_interpretation = -1; -static int hf_kink_qmversion = -1; -static int hf_kink_error_code = -1; -static int hf_kink_reserved8 = -1; -static int hf_kink_reserved15 = -1; -static int hf_kink_reserved16 = -1; -static int hf_kink_reserved24 = -1; -static int hf_kink_checkSum = -1; -static int hf_kink_next_payload = -1; -static int hf_kink_payload_length = -1; -static int hf_kink_epoch = -1; -static int hf_kink_inner_next_pload = -1; -static int hf_kink_realm_name_length = -1; -static int hf_kink_realm_name = -1; -static int hf_kink_princ_name_length = -1; -static int hf_kink_princ_name = -1; -static int hf_kink_tgt_length = -1; -static int hf_kink_tgt = -1; -static int hf_kink_payload = -1; +static int hf_kink_type; +static int hf_kink_length; +static int hf_kink_transactionId; +static int hf_kink_checkSumLength; +static int hf_kink_A; +static int hf_kink_version; +static int hf_kink_domain_of_interpretation; +static int hf_kink_qmversion; +static int hf_kink_error_code; +static int hf_kink_reserved8; +static int hf_kink_reserved15; +static int hf_kink_reserved16; +static int hf_kink_reserved24; +static int hf_kink_checkSum; +static int hf_kink_next_payload; +static int hf_kink_payload_length; +static int hf_kink_epoch; +static int hf_kink_inner_next_pload; +static int hf_kink_realm_name_length; +static int hf_kink_realm_name; +static int hf_kink_princ_name_length; +static int hf_kink_princ_name; +static int hf_kink_tgt_length; +static int hf_kink_tgt; +static int hf_kink_payload; /* Argument for making the subtree */ -static gint ett_kink = -1; -/*static gint ett_kink_version = -1;*/ -static gint ett_kink_payload = -1; -static gint ett_payload_kink_ap_req = -1; -static gint ett_payload_kink_ap_rep = -1; -static gint ett_payload_kink_krb_error = -1; -static gint ett_payload_kink_tgt_req = -1; -static gint ett_payload_kink_tgt_rep = -1; -static gint ett_payload_kink_isakmp = -1; -static gint ett_payload_kink_encrypt = -1; -static gint ett_payload_kink_error = -1; -static gint ett_payload_not_defined = -1; -static gint ett_decrypt_kink_encrypt = -1; - -static expert_field ei_kink_payload_length_small = EI_INIT; -static expert_field ei_kink_payload_length_mismatch = EI_INIT; +static gint ett_kink; +/*static gint ett_kink_version;*/ +static gint ett_kink_payload; +static gint ett_payload_kink_ap_req; +static gint ett_payload_kink_ap_rep; +static gint ett_payload_kink_krb_error; +static gint ett_payload_kink_tgt_req; +static gint ett_payload_kink_tgt_rep; +static gint ett_payload_kink_isakmp; +static gint ett_payload_kink_encrypt; +static gint ett_payload_kink_error; +static gint ett_payload_not_defined; +static gint ett_decrypt_kink_encrypt; + +static expert_field ei_kink_payload_length_small; +static expert_field ei_kink_payload_length_mismatch; /* Define the kink type value */ @@ -833,7 +835,7 @@ kink_fmt_version( gchar *result, guint32 version ) major_version = (guint8)((version & FRONT_FOUR_BIT) >> VERSION_BIT_SHIFT); minor_version = (guint8)(version & SECOND_FOUR_BIT); - g_snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", major_version, minor_version); + snprintf( result, ITEM_LABEL_LENGTH, "%d.%02d", major_version, minor_version); } /* Output part */ @@ -903,7 +905,7 @@ proto_register_kink(void) { NULL, HFILL }}, { &hf_kink_payload_length, { "Payload Length", "kink.payloadLength", - FT_UINT8, BASE_DEC, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_kink_epoch, { "EPOCH", "kink.epoch", @@ -974,16 +976,11 @@ proto_register_kink(void) { expert_kink = expert_register_protocol(proto_kink); expert_register_field_array(expert_kink, ei, array_length(ei)); + kink_handle = register_dissector("kink", dissect_kink, proto_kink); } void proto_reg_handoff_kink(void) { - - dissector_handle_t kink_handle; - - kink_handle = create_dissector_handle(dissect_kink, proto_kink); - dissector_add_uint_with_preference("udp.port", KINK_PORT, kink_handle); - } /* |