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-rlogin.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-rlogin.c')
-rw-r--r-- | epan/dissectors/packet-rlogin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 8b0c7acbee..928c91fcc1 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -220,7 +220,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Check for text data in front */ if (urgent_offset > offset) { - proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, FALSE); + proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, urgent_offset, ENC_ASCII|ENC_NA); } /* Show control byte */ @@ -278,13 +278,13 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, /* Client user name. */ str_len = tvb_strsize(tvb, offset); proto_tree_add_item(user_info_tree, hf_user_info_client_user_name, - tvb, offset, str_len, FALSE); + tvb, offset, str_len, ENC_ASCII|ENC_NA); offset += str_len; /* Server user name. */ str_len = tvb_strsize(tvb, offset); proto_tree_add_item(user_info_tree, hf_user_info_server_user_name, - tvb, offset, str_len, FALSE); + tvb, offset, str_len, ENC_ASCII|ENC_NA); offset += str_len; /* Terminal type/speed. */ @@ -293,7 +293,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, { /* Terminal type */ proto_tree_add_item(user_info_tree, hf_user_info_terminal_type, - tvb, offset, slash_offset-offset, FALSE); + tvb, offset, slash_offset-offset, ENC_ASCII|ENC_NA); offset = slash_offset + 1; /* Terminal speed */ @@ -327,7 +327,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, { /* There's data before the terminal info. */ proto_tree_add_item(rlogin_tree, hf_data, tvb, - offset, ti_offset - offset, FALSE); + offset, ti_offset - offset, ENC_ASCII|ENC_NA); } /* Create window info tree */ @@ -340,7 +340,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, offset += 2; /* These bytes should be "ss" */ - proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, FALSE); + proto_tree_add_item(window_tree, hf_window_info_ss, tvb, offset, 2, ENC_ASCII|ENC_NA); offset += 2; /* Character rows */ @@ -376,7 +376,7 @@ static void rlogin_display(rlogin_hash_entry_t *hash_info, if (tvb_offset_exists(tvb, offset)) { /* There's more data in the frame. */ - proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, FALSE); + proto_tree_add_item(rlogin_tree, hf_data, tvb, offset, -1, ENC_ASCII|ENC_NA); } } |