diff options
author | Bill Meier <wmeier@newsguy.com> | 2012-04-26 16:05:05 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2012-04-26 16:05:05 +0000 |
commit | f0c3ee5c4a2e0feacab56c5e058784951b0965e2 (patch) | |
tree | 22c3b1d776f0643c5a984297f50c8714894e448e /epan/dissectors/packet-dtls.c | |
parent | 81c1371d5ddc1d84cf30764418611b78af9fd4e1 (diff) |
Whitespace cleanup: Indentation, trailing, ...
svn path=/trunk/; revision=42266
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
-rw-r--r-- | epan/dissectors/packet-dtls.c | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 65cd5ce80d..1d3f15a5de 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -1525,71 +1525,71 @@ dissect_dtls_hnd_hello_common(tvbuff_t *tvb, proto_tree *tree, guint8 session_id_length; if (tree || ssl) + { + if (ssl) { - if (ssl) - { - /* get proper peer information*/ - StringInfo* rnd; - if (from_server) - rnd = &ssl->server_random; - else - rnd = &ssl->client_random; - - /* get provided random for keyring generation*/ - tvb_memcpy(tvb, rnd->data, offset, 32); - rnd->data_len = 32; - if (from_server) - ssl->state |= SSL_SERVER_RANDOM; - else - ssl->state |= SSL_CLIENT_RANDOM; - ssl_debug_printf("dissect_dtls_hnd_hello_common found random state %X\n", - ssl->state); - } - - /* show the time */ - if (tree) - { - gmt_unix_time.secs = tvb_get_ntohl(tvb, offset); - gmt_unix_time.nsecs = 0; - proto_tree_add_time(tree, hf_dtls_handshake_random_time, - tvb, offset, 4, &gmt_unix_time); - } - offset += 4; + /* get proper peer information*/ + StringInfo* rnd; + if (from_server) + rnd = &ssl->server_random; + else + rnd = &ssl->client_random; - /* show the random bytes */ - if (tree) - proto_tree_add_item(tree, hf_dtls_handshake_random_bytes, - tvb, offset, 28, ENC_NA); - offset += 28; + /* get provided random for keyring generation*/ + tvb_memcpy(tvb, rnd->data, offset, 32); + rnd->data_len = 32; + if (from_server) + ssl->state |= SSL_SERVER_RANDOM; + else + ssl->state |= SSL_CLIENT_RANDOM; + ssl_debug_printf("dissect_dtls_hnd_hello_common found random state %X\n", + ssl->state); + } - /* show the session id */ - session_id_length = tvb_get_guint8(tvb, offset); - if (tree) - proto_tree_add_item(tree, hf_dtls_handshake_session_id_len, - tvb, offset, 1, ENC_BIG_ENDIAN); - offset++; - if (ssl) - { - /* check stored session id info */ - if (from_server && (session_id_length == ssl->session_id.data_len) && - (tvb_memeql(tvb, offset, ssl->session_id.data, session_id_length) == 0)) - { - /* clinet/server id match: try to restore a previous cached session*/ - ssl_restore_session(ssl, dtls_session_hash); - } - else { - tvb_memcpy(tvb,ssl->session_id.data, offset, session_id_length); - ssl->session_id.data_len = session_id_length; - } - } - if (tree && session_id_length > 0) - proto_tree_add_bytes_format(tree, hf_dtls_handshake_session_id, - tvb, offset, session_id_length, - NULL, "Session ID (%u byte%s)", - session_id_length, - plurality(session_id_length, "", "s")); - offset += session_id_length; + /* show the time */ + if (tree) + { + gmt_unix_time.secs = tvb_get_ntohl(tvb, offset); + gmt_unix_time.nsecs = 0; + proto_tree_add_time(tree, hf_dtls_handshake_random_time, + tvb, offset, 4, &gmt_unix_time); } + offset += 4; + + /* show the random bytes */ + if (tree) + proto_tree_add_item(tree, hf_dtls_handshake_random_bytes, + tvb, offset, 28, ENC_NA); + offset += 28; + + /* show the session id */ + session_id_length = tvb_get_guint8(tvb, offset); + if (tree) + proto_tree_add_item(tree, hf_dtls_handshake_session_id_len, + tvb, offset, 1, ENC_BIG_ENDIAN); + offset++; + if (ssl) + { + /* check stored session id info */ + if (from_server && (session_id_length == ssl->session_id.data_len) && + (tvb_memeql(tvb, offset, ssl->session_id.data, session_id_length) == 0)) + { + /* clinet/server id match: try to restore a previous cached session*/ + ssl_restore_session(ssl, dtls_session_hash); + } + else { + tvb_memcpy(tvb,ssl->session_id.data, offset, session_id_length); + ssl->session_id.data_len = session_id_length; + } + } + if (tree && session_id_length > 0) + proto_tree_add_bytes_format(tree, hf_dtls_handshake_session_id, + tvb, offset, session_id_length, + NULL, "Session ID (%u byte%s)", + session_id_length, + plurality(session_id_length, "", "s")); + offset += session_id_length; + } /* XXXX */ return offset; |