diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-btamp.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-btatt.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-btavctp.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-btavdtp.c | 29 | ||||
-rw-r--r-- | epan/dissectors/packet-btavrcp.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-btbnep.c | 25 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_acl.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_evt.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_sco.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-bthcrp.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-bthid.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-btl2cap.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-btmcap.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-btobex.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-btrfcomm.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-btsap.c | 27 | ||||
-rw-r--r-- | epan/dissectors/packet-btsmp.c | 28 |
18 files changed, 199 insertions, 242 deletions
diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index 6c404d3fcf..be12e1ea9c 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -387,24 +387,18 @@ dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U guint16 cmd_length; col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMP"); - switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } if (tree) { diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 9ccb7139e7..b215737c53 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -259,24 +259,18 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 opcode; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATT"); - - switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - break; - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } if (tvb_length_remaining(tvb, 0) < 1) diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index ca15f5449e..cecb4712bc 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -123,23 +123,16 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) l2cap_data = (btl2cap_data_t *) pinfo->private_data; switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } ti = proto_tree_add_item(tree, proto_btavctp, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 6d10007138..7390e681d7 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -949,25 +949,18 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) l2cap_data = (btl2cap_data_t *) pinfo->private_data; switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - goto LABEL_data; - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - goto LABEL_data; - break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + goto LABEL_data; + break; } if (!force_avdtp && !pinfo->fd->flags.visited && (l2cap_data->first_scid_frame == pinfo->fd->num || diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index e9e2e8ac47..db88a8e754 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -2093,23 +2093,16 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } ti = proto_tree_add_item(tree, proto_btavrcp, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 1fb0a9c6c7..5a213730d0 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -289,23 +289,16 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", pinfo->p2p_dir); - break; + break; } pi = proto_tree_add_item(tree, proto_btbnep, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 4bbee16296..afc2104850 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -119,6 +119,19 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) localhost_bdaddr_entry_t *localhost_bdaddr_entry; localhost_name_entry_t *localhost_name_entry; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; + } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_ACL"); if (tree) { diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 16e77fa214..4fe3758151 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -2644,10 +2644,22 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 opcode, ocf; guint8 param_length, ogf; int offset = 0; - proto_item *ti_opcode; proto_tree *opcode_tree; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; + } + if (tree) { ti_cmd = proto_tree_add_item(tree, proto_bthci_cmd, tvb, offset, -1, ENC_NA); bthci_cmd_tree = proto_item_add_subtree(ti_cmd, ett_bthci_cmd); @@ -2661,7 +2673,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_CMD"); - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_ext(opcode, &bthci_cmd_opcode_vals_ext, "Unknown 0x%04x")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(opcode, &bthci_cmd_opcode_vals_ext, "Unknown 0x%04x")); ti_opcode = proto_tree_add_item(bthci_cmd_tree, hf_bthci_cmd_opcode, tvb, offset, 2, ENC_LITTLE_ENDIAN); opcode_tree = proto_item_add_subtree(ti_opcode, ett_opcode); diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index a88208c5e5..e507559ee1 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -3353,6 +3353,19 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat guint8 bd_addr[6]; int offset = 0; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; + } + if (tree) { proto_item *ti; @@ -3372,7 +3385,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_EVT"); - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str_const(evt_code, evt_code_vals, "Unknown 0x%08x")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(evt_code, evt_code_vals, "Unknown 0x%08x")); if (param_length > 0) { switch(evt_code) { diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 908826731f..9cb7c78e7c 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -52,6 +52,19 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) proto_tree *bthci_sco_tree; int offset = 0; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; + } + ti = proto_tree_add_item(tree, proto_bthci_sco, tvb, offset, -1, ENC_NA); bthci_sco_tree = proto_item_add_subtree(ti, ett_bthci_sco); diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index 85a14bc467..d4865e0973 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -357,23 +357,16 @@ dissect_bthcrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } main_item = proto_tree_add_item(tree, proto_bthcrp, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 115727ccec..11d53dea55 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -697,23 +697,16 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } ti = proto_tree_add_item(tree, proto_bthid, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index cfb64f3bd5..6cedf829ec 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1563,24 +1563,18 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void *pd_save; col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2CAP"); - switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } if (tree) { diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c index b60fdc221b..1a8b252d99 100644 --- a/epan/dissectors/packet-btmcap.c +++ b/epan/dissectors/packet-btmcap.c @@ -112,23 +112,16 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } main_item = proto_tree_add_item(tree, proto_btmcap, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index fbdbdc24d3..4aef1fc47b 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1390,23 +1390,17 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) code = tvb_get_guint8(next_tvb, offset) & BTOBEX_CODE_VALS_MASK; final_flag = tvb_get_guint8(next_tvb, offset) & 0x80; - switch (pinfo->p2p_dir) - { - case P2P_DIR_SENT: - col_add_fstr(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_fstr(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } col_append_fstr(pinfo->cinfo, COL_INFO, "%s", diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 523f5fd00e..634d9226d6 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -547,26 +547,18 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) l2cap_data = (btl2cap_data_t *) pinfo->private_data; switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } - /* flags and dlci */ offset = dissect_btrfcomm_address(tvb, offset, rfcomm_tree, &ea_flag, &cr_flag, &dlci); /* pf and frame type */ diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index 829b64425d..db3f7efbe8 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -398,23 +398,16 @@ dissect_btsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); switch (pinfo->p2p_dir) { - - case P2P_DIR_SENT: - col_add_str(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - col_clear(pinfo->cinfo, COL_INFO); - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } ti = proto_tree_add_item(tree, proto_btsap, tvb, offset, -1, ENC_NA); diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c index 40c6b60a26..e58cdb4e8a 100644 --- a/epan/dissectors/packet-btsmp.c +++ b/epan/dissectors/packet-btsmp.c @@ -183,23 +183,17 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMP"); - switch (pinfo->p2p_dir) - { - case P2P_DIR_SENT: - col_add_fstr(pinfo->cinfo, COL_INFO, "Sent "); - break; - - case P2P_DIR_RECV: - col_add_fstr(pinfo->cinfo, COL_INFO, "Rcvd "); - break; - - case P2P_DIR_UNKNOWN: - break; - - default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); - break; + switch (pinfo->p2p_dir) { + case P2P_DIR_SENT: + col_add_str(pinfo->cinfo, COL_INFO, "Sent "); + break; + case P2P_DIR_RECV: + col_add_str(pinfo->cinfo, COL_INFO, "Rcvd "); + break; + default: + col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", + pinfo->p2p_dir); + break; } if (tvb_length_remaining(tvb, 0) < 1) |