diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-10-15 18:46:26 +0000 |
| commit | 126aa8539380e6b0b465b48d30f349b76afdc489 (patch) | |
| tree | 16b43738b14751d74a8ca8e4de803ba0b6c87196 /epan/dissectors/packet-distcc.c | |
| parent | 4c9bb81ad7b0f609fa236c808a1ab9ef6cab5a79 (diff) | |
Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
then use ENC_ASCII.
2. For all but FT_UINT_STRING, always use ENC_NA
(replacing any existing True/1/FALSE/0
/ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).
svn path=/trunk/; revision=39426
Diffstat (limited to 'epan/dissectors/packet-distcc.c')
| -rw-r--r-- | epan/dissectors/packet-distcc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index f067917624..2c2d2dc6f7 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -151,7 +151,7 @@ dissect_distcc_argv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int tvb_memcpy(tvb, argv, offset, argv_len); argv[argv_len]=0; - proto_tree_add_item(tree, hf_distcc_argv, tvb, offset, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_distcc_argv, tvb, offset, len, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", argv); @@ -180,7 +180,7 @@ dissect_distcc_serr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int tvb_memcpy(tvb, argv, offset, argv_len); argv[argv_len]=0; - proto_tree_add_item(tree, hf_distcc_serr, tvb, offset, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_distcc_serr, tvb, offset, len, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "SERR:%s ", argv); @@ -209,7 +209,7 @@ dissect_distcc_sout(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int tvb_memcpy(tvb, argv, offset, argv_len); argv[argv_len]=0; - proto_tree_add_item(tree, hf_distcc_sout, tvb, offset, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_distcc_sout, tvb, offset, len, ENC_ASCII|ENC_NA); col_append_fstr(pinfo->cinfo, COL_INFO, "SOUT:%s ", argv); @@ -233,7 +233,7 @@ dissect_distcc_doti(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off col_append_str(pinfo->cinfo, COL_INFO, "DOTI source "); - proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_distcc_doti_source, tvb, offset, len, ENC_ASCII|ENC_NA); if(len!=parameter){ proto_tree_add_text(tree, tvb, 0, 0, "[Short DOTI PDU]"); } |