aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-01 15:27:53 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-01 23:28:35 +0000
commit2ce7dfe14f32e7bee1eceead1268d83e264446af (patch)
treebeb7d4cf82aa6fff88cf05fd0163b2e0bae89b3e /epan
parent6c24c7e3a8ede8630804959ce7bebd2965210965 (diff)
More indentation cleanups.
Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7 Reviewed-on: https://code.wireshark.org/review/6212 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-smtp.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index b24205d205..8e02a99f6f 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -830,53 +830,53 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
PROTO_ITEM_SET_HIDDEN(hidden_item);
if (session_state->username_frame == pinfo->fd->num) {
- if (decrypt == NULL) {
- /* This line wasn't already decrypted through the state machine */
- decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- if (stmp_decryption_enabled) {
- if (ws_base64_decode_inplace(decrypt) == 0) {
- /* Go back to the original string */
- decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- }
- }
+ if (decrypt == NULL) {
+ /* This line wasn't already decrypted through the state machine */
+ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
+ if (stmp_decryption_enabled) {
+ if (ws_base64_decode_inplace(decrypt) == 0) {
+ /* Go back to the original string */
+ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
+ }
}
- proto_tree_add_string(smtp_tree, hf_smtp_username, tvb,
- loffset, linelen, decrypt);
- col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", format_text(decrypt, linelen));
+ }
+ proto_tree_add_string(smtp_tree, hf_smtp_username, tvb,
+ loffset, linelen, decrypt);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "User: %s", format_text(decrypt, linelen));
} else if (session_state->password_frame == pinfo->fd->num) {
- if (decrypt == NULL) {
- /* This line wasn't already decrypted through the state machine */
- decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- if (stmp_decryption_enabled) {
- if (ws_base64_decode_inplace(decrypt) == 0) {
- /* Go back to the original string */
- decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- }
- }
- }
- proto_tree_add_string(smtp_tree, hf_smtp_password, tvb,
- loffset, linelen, decrypt);
- col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", format_text(decrypt, linelen));
- } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) {
+ if (decrypt == NULL) {
+ /* This line wasn't already decrypted through the state machine */
decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
if (stmp_decryption_enabled) {
if (ws_base64_decode_inplace(decrypt) == 0) {
/* Go back to the original string */
decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- col_append_str(pinfo->cinfo, COL_INFO, format_text(decrypt, linelen));
- proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb,
- loffset, linelen, ENC_ASCII|ENC_NA);
- }
- else {
- base64_string = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
- dissect_ntlm_auth(tvb, pinfo, smtp_tree, base64_string);
}
}
- else {
+ }
+ proto_tree_add_string(smtp_tree, hf_smtp_password, tvb,
+ loffset, linelen, decrypt);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "Pass: %s", format_text(decrypt, linelen));
+ } else if (session_state->ntlm_rsp_frame == pinfo->fd->num) {
+ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
+ if (stmp_decryption_enabled) {
+ if (ws_base64_decode_inplace(decrypt) == 0) {
+ /* Go back to the original string */
+ decrypt = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
col_append_str(pinfo->cinfo, COL_INFO, format_text(decrypt, linelen));
proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb,
loffset, linelen, ENC_ASCII|ENC_NA);
}
+ else {
+ base64_string = tvb_get_string_enc(wmem_packet_scope(), tvb, loffset, linelen, ENC_ASCII);
+ dissect_ntlm_auth(tvb, pinfo, smtp_tree, base64_string);
+ }
+ }
+ else {
+ col_append_str(pinfo->cinfo, COL_INFO, format_text(decrypt, linelen));
+ proto_tree_add_item(smtp_tree, hf_smtp_command_line, tvb,
+ loffset, linelen, ENC_ASCII|ENC_NA);
+ }
} else if (session_state->user_pass_frame == pinfo->fd->num) {
decode_plain_auth(tvb, pinfo, smtp_tree, loffset, linelen);
} else {