diff options
author | Stephen Fisher <steve@stephen-fisher.com> | 2010-11-02 20:36:36 +0000 |
---|---|---|
committer | Stephen Fisher <steve@stephen-fisher.com> | 2010-11-02 20:36:36 +0000 |
commit | dc27b7da2dfa076185675543bc1030229d81aeea (patch) | |
tree | e23c5b2d84c50918c84f25112c6bc3010ed43e69 /epan/dissectors/packet-tftp.c | |
parent | fcdeae7c694ba81e8ca9a88fd2fa7e4eb7132692 (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-tftp.c')
-rw-r--r-- | epan/dissectors/packet-tftp.c | 10 |
1 files changed, 5 insertions, 5 deletions
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"); |