diff options
| author | tuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-15 16:02:01 +0000 |
|---|---|---|
| committer | tuexen <tuexen@f5534014-38df-0310-8fa8-9805f1628bb7> | 2012-08-15 16:02:01 +0000 |
| commit | 0871319bdcc41647c8882f7cb2a52e08537315f8 (patch) | |
| tree | 42d3fee474c700bd36a663bf0c49d1dd133a6cc8 /epan/dissectors/packet-dtls.c | |
| parent | c8077ce521aedb1f645137ac7eb38c2a150674c0 (diff) | |
Recommit:
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44502
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44511
and do some whitespace cleanups while there.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44522 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
| -rw-r--r-- | epan/dissectors/packet-dtls.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 3e96544875..bac43f4b74 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -64,6 +64,7 @@ #include "packet-ssl-utils.h" #include <wsutil/file_util.h> #include <epan/uat.h> +#include <epan/sctpppids.h> /* DTLS User Access Table */ static ssldecrypt_assoc_t *dtlskeylist_uats = NULL; @@ -2484,21 +2485,21 @@ proto_register_dtls(void) FT_BYTES, BASE_NONE, NULL, 0x0, "Hello Extension data", HFILL } }, - { &hf_dtls_handshake_session_ticket_lifetime_hint, - { "Session Ticket Lifetime Hint", "dtls.handshake.session_ticket_lifetime_hint", - FT_UINT32, BASE_DEC, NULL, 0x0, - "New DTLS Session Ticket Lifetime Hint", HFILL } - }, - { &hf_dtls_handshake_session_ticket_len, - { "Session Ticket Length", "dtls.handshake.session_ticket_length", - FT_UINT16, BASE_DEC, NULL, 0x0, - "New DTLS Session Ticket Length", HFILL } - }, - { &hf_dtls_handshake_session_ticket, - { "Session Ticket", "dtls.handshake.session_ticket", - FT_BYTES, BASE_NONE, NULL, 0x0, - "New DTLS Session Ticket", HFILL } - }, + { &hf_dtls_handshake_session_ticket_lifetime_hint, + { "Session Ticket Lifetime Hint", "dtls.handshake.session_ticket_lifetime_hint", + FT_UINT32, BASE_DEC, NULL, 0x0, + "New DTLS Session Ticket Lifetime Hint", HFILL } + }, + { &hf_dtls_handshake_session_ticket_len, + { "Session Ticket Length", "dtls.handshake.session_ticket_length", + FT_UINT16, BASE_DEC, NULL, 0x0, + "New DTLS Session Ticket Length", HFILL } + }, + { &hf_dtls_handshake_session_ticket, + { "Session Ticket", "dtls.handshake.session_ticket", + FT_BYTES, BASE_NONE, NULL, 0x0, + "New DTLS Session Ticket", HFILL } + }, { &hf_dtls_handshake_certificates_len, { "Certificates Length", "dtls.handshake.certificates_length", FT_UINT24, BASE_DEC, NULL, 0x0, @@ -2745,8 +2746,10 @@ proto_reg_handoff_dtls(void) dtls_parse_uat(); dtls_parse_old_keys(); - if (initialized == FALSE) + if (initialized == FALSE) { heur_dissector_add("udp", dissect_dtls_heur, proto_dtls); + dissector_add_uint("sctp.ppi", DIAMETER_DTLS_PROTOCOL_ID, find_dissector("dtls")); + } initialized = TRUE; } |