diff options
author | Michal Labedzki <michal.labedzki@tieto.com> | 2015-01-18 10:44:04 +0100 |
---|---|---|
committer | Michal Labedzki <michal.labedzki@tieto.com> | 2015-02-02 10:48:56 +0000 |
commit | 65217711241a171dbff14ddfdd40afe0fdf5470e (patch) | |
tree | c62a9d54a5ce0949649254c8b8c7e9fd6c1204ac /epan | |
parent | 1786cfee3f6d4a5b7679aeb12e05751ff40d9a11 (diff) |
Bluetooth: Simplify to "UnknownDirection" in Info column when direction is unknown
Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68
Reviewed-on: https://code.wireshark.org/review/6903
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Diffstat (limited to 'epan')
26 files changed, 26 insertions, 51 deletions
diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index dfebdc817d..97700e25a6 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -1188,12 +1188,8 @@ dissect_bluetooth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat 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); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bt3ds.c b/epan/dissectors/packet-bt3ds.c index cee51c161d..a5ccf10dac 100644 --- a/epan/dissectors/packet-bt3ds.c +++ b/epan/dissectors/packet-bt3ds.c @@ -78,8 +78,7 @@ dissect_bt3ds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btamp.c b/epan/dissectors/packet-btamp.c index ee2727531e..d8fab866a1 100644 --- a/epan/dissectors/packet-btamp.c +++ b/epan/dissectors/packet-btamp.c @@ -400,8 +400,7 @@ dissect_btamp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 3fd754872f..ac42a029ee 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -178,8 +178,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 1c0f9ead02..db40ddc810 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -165,8 +165,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index 6336574a8d..cf4f572d05 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -1304,8 +1304,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - direction); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); goto LABEL_data; } diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index ac8e3b1db2..e68670d981 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -2137,8 +2137,7 @@ dissect_btavrcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 1aa98cb0c3..217907b585 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -301,8 +301,7 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index fffaf37d9d..9ed71f28c8 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -178,8 +178,7 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 5cfaf27b74..e07c542f8d 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -3077,8 +3077,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 7a9d2cf298..aff94bf188 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -3479,8 +3479,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 9eb43fc6f1..517455c430 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -79,8 +79,7 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_add_fstr(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthci_vendor.c b/epan/dissectors/packet-bthci_vendor.c index c97d200bb0..e4bd4c26fe 100644 --- a/epan/dissectors/packet-bthci_vendor.c +++ b/epan/dissectors/packet-bthci_vendor.c @@ -900,8 +900,7 @@ dissect_bthci_vendor_broadcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre case P2P_DIR_UNKNOWN: default: col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_BROADCOM"); - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d Broadcom ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection Broadcom "); if (tvb_captured_length_remaining(tvb, offset) > 0) { proto_tree_add_item(main_tree, hf_data, tvb, offset, tvb_captured_length_remaining(tvb, offset), ENC_NA); diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index a1c8575795..23594e37c3 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -401,8 +401,7 @@ dissect_bthcrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index df7263afce..f35aa39cc4 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1175,7 +1175,7 @@ dissect_bthfp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthid.c b/epan/dissectors/packet-bthid.c index 35e6222bea..1019b554b0 100644 --- a/epan/dissectors/packet-bthid.c +++ b/epan/dissectors/packet-bthid.c @@ -711,8 +711,7 @@ dissect_bthid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index 3f8c1b8099..bf90e537aa 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -674,7 +674,7 @@ dissect_bthsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 074143f199..f9e01d147d 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1760,8 +1760,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btmcap.c b/epan/dissectors/packet-btmcap.c index cd19dc7a70..decb40faf6 100644 --- a/epan/dissectors/packet-btmcap.c +++ b/epan/dissectors/packet-btmcap.c @@ -123,8 +123,7 @@ dissect_btmcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 0c72753ead..c19e5200eb 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -1548,8 +1548,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 946fcc2cab..8f2f9c9902 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -641,8 +641,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index 89185ca183..8d8eb77bd8 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -407,8 +407,7 @@ dissect_btsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 5f85b2c871..c9e5b32d2d 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -4414,8 +4414,7 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-btsmp.c b/epan/dissectors/packet-btsmp.c index d361272b05..5a11c1e38a 100644 --- a/epan/dissectors/packet-btsmp.c +++ b/epan/dissectors/packet-btsmp.c @@ -200,8 +200,7 @@ dissect_btsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U col_set_str(pinfo->cinfo, COL_INFO, "Rcvd "); break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction %d ", - pinfo->p2p_dir); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index b5dae922b0..d6bf045823 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -135,7 +135,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction "); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection "); break; } diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 4223bfb992..dbd87a11b8 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -147,7 +147,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) break; default: - col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown direction"); + col_set_str(pinfo->cinfo, COL_INFO, "UnknownDirection"); break; } |