diff options
author | Anders Broman <anders.broman@ericsson.com> | 2007-10-15 20:11:25 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2007-10-15 20:11:25 +0000 |
commit | 840a048b7fc08b49ff020745c6de814eb9a3304c (patch) | |
tree | 7e7979c4445cbfb504b63cde46b184b1b6a2e2fb | |
parent | e922e453dde555dd2ac282a11986003016c77ac3 (diff) |
Implement some of the minor possible speed improvment patches.
svn path=/trunk/; revision=23192
-rw-r--r-- | epan/dissectors/packet-3com-njack.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-actrace.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-afp.c | 156 | ||||
-rw-r--r-- | epan/dissectors/packet-aim-buddylist.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-aim-generic.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-aim.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-amqp.c | 172 | ||||
-rw-r--r-- | epan/dissectors/packet-aodv.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-asf.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-atalk.c | 4 |
10 files changed, 186 insertions, 182 deletions
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c index 1efc4be25f..cc0334880a 100644 --- a/epan/dissectors/packet-3com-njack.c +++ b/epan/dissectors/packet-3com-njack.c @@ -578,7 +578,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, val_to_str(packet_type, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, njack_type_vals, "Type 0x%02x")); if (tree) { @@ -649,7 +649,7 @@ static gboolean test_njack(tvbuff_t *tvb) { /* We need at least 'NJ200' + 1 Byte packet type */ - if ( !tvb_bytes_exist(tvb, 0, 6) || + if ( tvb_length(tvb) < 6 || g_strncasecmp((const char *)tvb_get_ptr(tvb, 0, 5), "NJ200", 5) ) { return FALSE; } diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 6d885f0b5c..d7911fe101 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -497,7 +497,7 @@ static void dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } else { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, "Non CAS or ISDN AudioCodes trace message"); + col_set_str(pinfo->cinfo, COL_INFO, "Non CAS or ISDN AudioCodes trace message"); } } diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index 7392480104..149ce22a42 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -1002,20 +1002,20 @@ decode_vol_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) if (tree) { item = proto_tree_add_item(tree, hf_afp_vol_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_vol_bitmap); - } - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ModDate, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BackupDate, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ID, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesFree, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesTotal, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Name, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesFree, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesTotal, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BlockSize , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Attributes, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Signature, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_CreateDate, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ModDate, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BackupDate, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ID, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesFree, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BytesTotal, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_Name, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesFree, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_ExtBytesTotal, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_bitmap_BlockSize , tvb, offset, 2,FALSE); + } return bitmap; } @@ -1032,19 +1032,20 @@ decode_vol_attribute (proto_tree *tree, tvbuff_t *tvb, gint offset) if (tree) { item = proto_tree_add_item(tree, hf_afp_vol_attribute, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_vol_attribute); + + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_ReadOnly ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_HasVolumePassword ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsFileIDs ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsCatSearch ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoNetworkUserID ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_DefaultPrivsFromParent ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoExchangeFiles ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsExtAttrs ,tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsACLs ,tvb, offset, 2,FALSE); } - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_ReadOnly ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_HasVolumePassword ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsFileIDs ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsCatSearch ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsBlankAccessPrivs,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUnixPrivs ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsUTF8Names ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoNetworkUserID ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_DefaultPrivsFromParent ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_NoExchangeFiles ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsExtAttrs ,tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_vol_attribute_SupportsACLs ,tvb, offset, 2,FALSE); return bitmap; } @@ -1147,25 +1148,26 @@ decode_file_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) if (tree) { item = proto_tree_add_item(tree, hf_afp_file_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_file_bitmap); + + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_BackupDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_FinderInfo , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LongName , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2,FALSE); + + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UTF8Name , tvb, offset, 2,FALSE); + + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtRsrcForkLen , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UnixPrivs , tvb, offset, 2,FALSE); } - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_Attributes , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ParentDirID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_CreateDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ModDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_BackupDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_FinderInfo , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LongName , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ShortName , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_NodeID , tvb, offset, 2,FALSE); - - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_DataForkLen , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_RsrcForkLen , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtDataForkLen , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_LaunchLimit , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UTF8Name , tvb, offset, 2,FALSE); - - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_ExtRsrcForkLen , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_file_bitmap_UnixPrivs , tvb, offset, 2,FALSE); return bitmap; } @@ -1179,11 +1181,12 @@ decode_file_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset, int shared) guint16 attribute; attribute = tvb_get_ntohs(tvb, offset); - if (tree) { - item = proto_tree_add_text(tree, tvb, offset, 2, - "File Attributes: 0x%04x", attribute); - sub_tree = proto_item_add_subtree(item, ett_afp_file_attribute); + if (!tree) { + return attribute; } + item = proto_tree_add_text(tree, tvb, offset, 2, + "File Attributes: 0x%04x", attribute); + sub_tree = proto_item_add_subtree(item, ett_afp_file_attribute); proto_tree_add_item(sub_tree, hf_afp_file_attribute_Invisible , tvb, offset, 2,FALSE); if (!shared) proto_tree_add_item(sub_tree, hf_afp_file_attribute_MultiUser , tvb, offset, 2,FALSE); @@ -1428,23 +1431,23 @@ decode_dir_bitmap (proto_tree *tree, tvbuff_t *tvb, gint offset) if (tree) { item = proto_tree_add_item(tree, hf_afp_dir_bitmap, tvb, offset, 2,FALSE); sub_tree = proto_item_add_subtree(item, ett_afp_dir_bitmap); - } - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_BackupDate , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_FinderInfo , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_LongName , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ShortName , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_NodeID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OffspringCount , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OwnerID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_GroupID , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_AccessRights , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UTF8Name , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UnixPrivs , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_Attributes , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ParentDirID , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_CreateDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ModDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_BackupDate , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_FinderInfo , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_LongName , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_ShortName , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_NodeID , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OffspringCount , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_OwnerID , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_GroupID , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_AccessRights , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UTF8Name , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_bitmap_UnixPrivs , tvb, offset, 2,FALSE); + } return bitmap; } @@ -1462,15 +1465,16 @@ decode_dir_attribute(proto_tree *tree, tvbuff_t *tvb, gint offset) item = proto_tree_add_text(tree, tvb, offset, 2, "Directory Attributes: 0x%04x", attribute); sub_tree = proto_item_add_subtree(item, ett_afp_dir_attribute); + + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_InExpFolder , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_BackUpNeeded , tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_RenameInhibit, tvb, offset, 2,FALSE); + proto_tree_add_item(sub_tree, hf_afp_dir_attribute_DeleteInhibit, tvb, offset, 2,FALSE); } - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Invisible , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_IsExpFolder , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_System , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_Mounted , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_InExpFolder , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_BackUpNeeded , tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_RenameInhibit, tvb, offset, 2,FALSE); - proto_tree_add_item(sub_tree, hf_afp_dir_attribute_DeleteInhibit, tvb, offset, 2,FALSE); return(attribute); } @@ -3349,7 +3353,7 @@ dissect_reply_afp_map_name(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr /* We don't keep the type from the request */ /* If remain == 16, assume UUID */ - remain = tvb_reported_length_remaining(tvb,0); + remain = tvb_reported_length(tvb); if (remain == 16) { proto_tree_add_item(tree, hf_afp_UUID, tvb, offset, 16, FALSE); offset += 16; @@ -4028,7 +4032,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 afp_command; nstime_t delta_ts; - int len = tvb_reported_length_remaining(tvb,0); + int len = tvb_reported_length(tvb); gint col_info = check_col(pinfo->cinfo, COL_INFO); if (check_col(pinfo->cinfo, COL_PROTOCOL)) @@ -4068,7 +4072,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!request_val) { /* missing request */ if (col_info) - col_add_fstr(pinfo->cinfo, COL_INFO, "[Reply without query?]"); + col_set_str(pinfo->cinfo, COL_INFO, "[Reply without query?]"); return; } @@ -4102,7 +4106,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * ip1:2048 --> ip2:548 <SYN> use the same port but it's a new session! */ if (col_info) { - col_add_fstr(pinfo->cinfo, COL_INFO, + col_set_str(pinfo->cinfo, COL_INFO, "[Error!IP port reused, you need to split the capture file]"); return; } @@ -4350,7 +4354,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_reply_afp_get_acl(tvb, pinfo, afp_tree, offset);break; } } - if (tree && offset < len) { + if (offset < len) { call_dissector(data_handle, tvb_new_subset(tvb, offset, -1, -1), pinfo, afp_tree); } diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c index 7c0b0072d5..aacbb10a7d 100644 --- a/epan/dissectors/packet-aim-buddylist.c +++ b/epan/dissectors/packet-aim-buddylist.c @@ -87,7 +87,7 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro int buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 ); if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Oncoming Buddy"); + col_set_str(pinfo->cinfo, COL_INFO, "Oncoming Buddy"); col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", format_text(buddyname, buddyname_length)); } diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c index bf517fb7a5..f3c96ef88c 100644 --- a/epan/dissectors/packet-aim-generic.c +++ b/epan/dissectors/packet-aim-generic.c @@ -223,7 +223,7 @@ static int dissect_generic_rateinfo(tvbuff_t *tvb, packet_info *pinfo _U_, static int dissect_aim_generic_clientready(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { int offset = 0; - proto_item *ti = proto_tree_add_text(gen_tree, tvb, 0, tvb_length_remaining(tvb, 0), "Supported services"); + proto_item *ti = proto_tree_add_text(gen_tree, tvb, 0, tvb_length(tvb), "Supported services"); proto_tree *entry = proto_item_add_subtree(ti, ett_generic_clientready); while(tvb_length_remaining(tvb, offset) > 0) { @@ -246,7 +246,7 @@ static int dissect_aim_generic_clientready(tvbuff_t *tvb, packet_info *pinfo _U_ static int dissect_aim_generic_serverready(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { int offset = 0; - proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length_remaining(tvb, offset), "Supported services"); + proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length(tvb), "Supported services"); proto_tree *entry = proto_item_add_subtree(ti, ett_generic_clientready); while(tvb_length_remaining(tvb, offset) > 0) { @@ -277,7 +277,7 @@ static int dissect_aim_generic_redirect(tvbuff_t *tvb, packet_info *pinfo, proto static int dissect_aim_generic_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { int offset = 0; - proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length_remaining(tvb, offset), "Requested services"); + proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length(tvb), "Requested services"); proto_tree *entry = proto_item_add_subtree(ti, ett_generic_clientready); while(tvb_length_remaining(tvb, offset) > 0) { @@ -292,7 +292,7 @@ static int dissect_aim_generic_capabilities(tvbuff_t *tvb, packet_info *pinfo _U static int dissect_aim_generic_capack(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree) { int offset = 0; - proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length_remaining(tvb, offset), "Accepted requested services"); + proto_item *ti = proto_tree_add_text(gen_tree, tvb, offset, tvb_length(tvb), "Accepted requested services"); proto_tree *entry = proto_item_add_subtree(ti, ett_generic_clientready); while(tvb_length_remaining(tvb, offset) > 0) { diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index c007d42db8..1b04460515 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -421,7 +421,7 @@ static int dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* check, if this is really an AIM packet, they start with 0x2a */ /* XXX - I've seen some stuff starting with 0x5a followed by 0x2a */ - if(tvb_bytes_exist(tvb, 0, 1) && tvb_get_guint8(tvb, 0) != 0x2a) { + if(tvb_length(tvb) >= 1 && tvb_get_guint8(tvb, 0) != 0x2a) { /* Not an instant messenger packet, just happened to use the same port */ /* XXX - if desegmentation disabled, this might be a continuation packet, not a non-AIM packet */ @@ -466,7 +466,7 @@ static void dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM"); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); + col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); /* get relevant header information */ offset += 1; /* XXX - put the identifier into the tree? */ @@ -649,7 +649,7 @@ static void dissect_aim_newconn(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "New Connection"); + col_set_str(pinfo->cinfo, COL_INFO, "New Connection"); if (tvb_length_remaining(tvb, offset) > 0) { proto_tree_add_item(tree, hf_aim_version, tvb, offset, 4, FALSE); @@ -669,7 +669,7 @@ int dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo, if ((name = match_strval(tvb_get_ntohs(tvb, 0), aim_snac_errors)) != NULL) { if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, name); + col_add_str(pinfo->cinfo, COL_INFO, name); } proto_tree_add_item (aim_tree, hf_aim_snac_error, @@ -803,7 +803,7 @@ static void dissect_aim_flap_err(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "FLAP error"); + col_set_str(pinfo->cinfo, COL_INFO, "FLAP error"); } /* Show the undissected payload */ @@ -815,7 +815,7 @@ static void dissect_aim_keep_alive(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Keep Alive"); + col_set_str(pinfo->cinfo, COL_INFO, "Keep Alive"); } /* Show the undissected payload */ @@ -827,7 +827,7 @@ static void dissect_aim_close_conn(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Close Connection"); + col_set_str(pinfo->cinfo, COL_INFO, "Close Connection"); } offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, client_tlvs); @@ -837,7 +837,7 @@ static void dissect_aim_unknown_channel(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown Channel"); + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Channel"); } /* Show the undissected payload */ diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 23a581aea9..548956a279 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -1153,7 +1153,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_start(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Start "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1162,7 +1162,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_start_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Start-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1171,7 +1171,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_secure(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Secure "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1180,7 +1180,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_secure_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Secure-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1189,7 +1189,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_tune(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Tune "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1198,7 +1198,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_tune_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Tune-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1207,7 +1207,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_open(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Open "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1216,7 +1216,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_open_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Open-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1225,7 +1225,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_redirect(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Redirect "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1234,7 +1234,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_close(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Close "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1243,7 +1243,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_connection_close_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Connection.Close-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1263,7 +1263,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_open(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Open "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1272,7 +1272,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_open_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Open-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1281,7 +1281,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_flow(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Flow "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1290,7 +1290,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_flow_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Flow-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1299,7 +1299,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_close(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Close "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1308,7 +1308,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_close_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Close-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1317,7 +1317,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_resume(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Resume "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1326,7 +1326,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_ping(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Ping "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1335,7 +1335,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_pong(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Pong "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1344,7 +1344,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_channel_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Channel.Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1364,7 +1364,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_access_request(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Access.Request "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1373,7 +1373,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_access_request_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Access.Request-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1393,7 +1393,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_exchange_declare(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Exchange.Declare "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1402,7 +1402,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_exchange_declare_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Exchange.Declare-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1411,7 +1411,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_exchange_delete(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Exchange.Delete "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1420,7 +1420,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_exchange_delete_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Exchange.Delete-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1440,7 +1440,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_declare(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Declare "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1449,7 +1449,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_declare_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Declare-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1458,7 +1458,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_bind(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Bind "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1467,7 +1467,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_bind_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Bind-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1476,7 +1476,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_unbind(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Unbind "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1485,7 +1485,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_unbind_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Unbind-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1494,7 +1494,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_purge(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Purge "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1503,7 +1503,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_purge_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Purge-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1512,7 +1512,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_delete(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Delete "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1521,7 +1521,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_queue_delete_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Queue.Delete-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1541,7 +1541,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_qos(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Qos "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1550,7 +1550,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_qos_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Qos-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1559,7 +1559,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_consume(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Consume "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1568,7 +1568,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_consume_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Consume-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1577,7 +1577,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_cancel(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Cancel "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1586,7 +1586,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_cancel_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Cancel-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1595,7 +1595,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_publish(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Publish "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1604,7 +1604,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_return(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Return "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1613,7 +1613,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_deliver(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Deliver "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1622,7 +1622,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_get(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Get "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1631,7 +1631,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_get_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Get-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1640,7 +1640,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_get_empty(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Get-Empty "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1649,7 +1649,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_ack(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Ack "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1658,7 +1658,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_reject(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Reject "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1667,7 +1667,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_basic_recover(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Basic.Recover "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1687,7 +1687,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_qos(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Qos "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1696,7 +1696,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_qos_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Qos-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1705,7 +1705,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_consume(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Consume "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1714,7 +1714,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_consume_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Consume-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1723,7 +1723,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_cancel(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Cancel "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1732,7 +1732,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_cancel_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Cancel-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1741,7 +1741,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_open(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Open "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1750,7 +1750,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_open_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Open-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1759,7 +1759,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_stage(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Stage "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1768,7 +1768,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_publish(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Publish "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1777,7 +1777,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_return(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Return "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1786,7 +1786,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_deliver(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Deliver "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1795,7 +1795,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_ack(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Ack "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1804,7 +1804,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_file_reject(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "File.Reject "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1824,7 +1824,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_qos(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Qos "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1833,7 +1833,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_qos_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Qos-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1842,7 +1842,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_consume(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Consume "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1851,7 +1851,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_consume_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Consume-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1860,7 +1860,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_cancel(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Cancel "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1869,7 +1869,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_cancel_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Cancel-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1878,7 +1878,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_publish(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Publish "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1887,7 +1887,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_return(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Return "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1896,7 +1896,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_stream_deliver(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Stream.Deliver "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1916,7 +1916,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_select(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Select "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1925,7 +1925,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_select_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Select-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1934,7 +1934,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_commit(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Commit "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1943,7 +1943,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_commit_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Commit-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1952,7 +1952,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_rollback(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Rollback "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1961,7 +1961,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tx_rollback_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tx.Rollback-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1981,7 +1981,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_dtx_select(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Dtx.Select "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1990,7 +1990,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_dtx_select_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Dtx.Select-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -1999,7 +1999,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_dtx_start(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Dtx.Start "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -2008,7 +2008,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_dtx_start_ok(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Dtx.Start-Ok "); col_set_fence(pinfo->cinfo, COL_INFO); } @@ -2028,7 +2028,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = dissect_amqp_method_tunnel_request(tvb, 11, tvb_length (tvb), args_tree); if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, + col_append_str(pinfo->cinfo, COL_INFO, "Tunnel.Request "); col_set_fence(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index d228933504..3bc6ba9fe3 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -795,7 +795,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + col_add_str(pinfo->cinfo, COL_INFO, "%s", val_to_str(type, type_vals, "Unknown AODV Packet Type (%u)")); if (tree) { diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index be0b8553c6..6887017d9a 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -91,7 +91,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) len = tvb_get_guint8(tvb, 7); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + col_add_str(pinfo->cinfo, COL_INFO, "%s", val_to_str(type, asf_type_vals, "Unknown (0x%02x)")); if (tree) { diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index d1feaa7d35..40c35311a5 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -585,7 +585,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { function = tvb_get_guint8(tvb, 0); if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(function, rtmp_function_vals, "Unknown function (%02x)")); if (tree) { @@ -850,7 +850,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s transaction %u", val_to_str(op, atp_function_vals, "Unknown (0x%01x)"),tid); if (more_fragment) - col_append_fstr(pinfo->cinfo, COL_INFO, " [fragment]"); + col_append_str(pinfo->cinfo, COL_INFO, " [fragment]"); } if (tree) { |