From dc27b7da2dfa076185675543bc1030229d81aeea Mon Sep 17 00:00:00 2001 From: Stephen Fisher Date: Tue, 2 Nov 2010 20:36:36 +0000 Subject: Don't show \000 at the end of null terminated strings in the info column of the tftp dissector: tvb_format_text() -> tvb_format_stringzpad() svn path=/trunk/; revision=34756 --- epan/dissectors/packet-tftp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-tftp.c') diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index faee582ce8..aabddc8f07 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -222,7 +222,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", - tvb_format_text(tvb, offset, i1)); + tvb_format_stringzpad(tvb, offset, i1)); } offset += i1; @@ -233,7 +233,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, } if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", - tvb_format_text(tvb, offset, i1)); + tvb_format_stringzpad(tvb, offset, i1)); } offset += i1; @@ -254,7 +254,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s", - tvb_format_text(tvb, offset, i1)); + tvb_format_stringzpad(tvb, offset, i1)); } offset += i1; @@ -266,7 +266,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Transfer type: %s", - tvb_format_text(tvb, offset, i1)); + tvb_format_stringzpad(tvb, offset, i1)); } offset += i1; @@ -336,7 +336,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, } if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Message: %s", - tvb_format_text(tvb, offset, i1)); + tvb_format_stringzpad(tvb, offset, i1)); } expert_add_info_format(pinfo, NULL, PI_RESPONSE_CODE, PI_NOTE, "TFTP blocksize out of range"); -- cgit v1.2.3