summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Labedzki <michal.labedzki@tieto.com>2016-01-27 13:01:49 +0100
committerAnders Broman <a.broman58@gmail.com>2016-02-08 06:06:19 +0000
commitc41bf48c9eb5ad00913a537be7e31640c5175842 (patch)
treeabdd219f9e789a98706cd21fdf1598d6f3de605c
parent9f28bce07d0502bd51963c8e777be6f588cc919d (diff)
downloadwireshark-c41bf48c9eb5ad00913a537be7e31640c5175842.tar.gz
Rename Bluetooth OBEX dissector to OBEX
For historiacal reasons OBEX protocol was implemented as "Bluetooth OBEX", that means it is OBEX + Bluetooth related stuff. However Bluetooth related stuff does not caused any issue right now, so allow to use this dissector in non-Bluetooth cases. Bug: 11724 Change-Id: Ic645308bc854602d009f254ebbfd1b703a4c6a25 Reviewed-on: https://code.wireshark.org/review/13740 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat
-rw-r--r--docbook/release-notes.asciidoc3
-rw-r--r--epan/CMakeLists.txt2
-rw-r--r--epan/dissectors/Makefile.common2
-rw-r--r--epan/dissectors/packet-obex.c (renamed from epan/dissectors/packet-btobex.c)936
-rw-r--r--profiles/Bluetooth/colorfilters2
5 files changed, 477 insertions, 468 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index f9bc104485..2ac64c395f 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -62,6 +62,9 @@ UserLog Protocol
=== Updated Protocol Support
+Bluetooth OBEX dissector (btobex) was renamed to Obex Dissector (obex), allow to
+DecodeAs it over USB, TCP and UDP.
+
Too many protocols have been updated to list here.
=== New and Updated Capture File Support
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 7899fd9c1d..c8619906b3 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -453,7 +453,6 @@ set(DISSECTOR_SRC
dissectors/packet-btle_rf.c
dissectors/packet-btl2cap.c
dissectors/packet-btmcap.c
- dissectors/packet-btobex.c
dissectors/packet-btrfcomm.c
dissectors/packet-btsap.c
dissectors/packet-btsdp.c
@@ -1088,6 +1087,7 @@ set(DISSECTOR_SRC
dissectors/packet-nwmtp.c
dissectors/packet-nwp.c
dissectors/packet-oampdu.c
+ dissectors/packet-obex.c
dissectors/packet-ocfs2.c
dissectors/packet-oicq.c
dissectors/packet-oipf.c
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index 52edbf8753..a4a28c49de 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -374,7 +374,6 @@ DISSECTOR_SRC = \
packet-btle.c \
packet-btle_rf.c \
packet-btmcap.c \
- packet-btobex.c \
packet-btrfcomm.c \
packet-btsap.c \
packet-btsdp.c \
@@ -1007,6 +1006,7 @@ DISSECTOR_SRC = \
packet-nwmtp.c \
packet-nwp.c \
packet-oampdu.c \
+ packet-obex.c \
packet-ocfs2.c \
packet-oicq.c \
packet-oipf.c \
diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-obex.c
index 1399f076b1..e7dc2447f3 100644
--- a/epan/dissectors/packet-btobex.c
+++ b/epan/dissectors/packet-obex.c
@@ -1,5 +1,5 @@
-/* packet-btobex.c
- * Routines for Bluetooth OBEX dissection
+/* packet-obex.c
+ * Routines for OBEX dissection
*
* Copyright 2010, Allan M. Madsen
* Copyright 2013, Michal Labedzki for Tieto Corporation
@@ -37,7 +37,7 @@
#include "packet-btsdp.h"
/* Initialize the protocol and registered fields */
-static int proto_btobex = -1;
+static int proto_obex = -1;
static int hf_opcode = -1;
static int hf_response_code = -1;
static int hf_final_flag = -1;
@@ -343,66 +343,66 @@ static expert_field ei_unexpected_data = EI_INIT;
static expert_field ei_application_parameter_length_bad = EI_INIT;
static expert_field ei_decoded_as_profile = EI_INIT;
-static dissector_table_t btobex_profile;
+static dissector_table_t obex_profile_table;
static dissector_table_t media_type_dissector_table;
/* ************************************************************************* */
/* Header values for reassembly */
/* ************************************************************************* */
-static int hf_btobex_fragments = -1;
-static int hf_btobex_fragment = -1;
-static int hf_btobex_fragment_overlap = -1;
-static int hf_btobex_fragment_overlap_conflict = -1;
-static int hf_btobex_fragment_multiple_tails = -1;
-static int hf_btobex_fragment_too_long_fragment = -1;
-static int hf_btobex_fragment_error = -1;
-static int hf_btobex_fragment_count = -1;
-static int hf_btobex_reassembled_in = -1;
-static int hf_btobex_reassembled_length = -1;
-
-static gint ett_btobex_fragment = -1;
-static gint ett_btobex_fragments = -1;
-
-static dissector_handle_t btobex_handle;
+static int hf_obex_fragments = -1;
+static int hf_obex_fragment = -1;
+static int hf_obex_fragment_overlap = -1;
+static int hf_obex_fragment_overlap_conflict = -1;
+static int hf_obex_fragment_multiple_tails = -1;
+static int hf_obex_fragment_too_long_fragment = -1;
+static int hf_obex_fragment_error = -1;
+static int hf_obex_fragment_count = -1;
+static int hf_obex_reassembled_in = -1;
+static int hf_obex_reassembled_length = -1;
+
+static gint ett_obex_fragment = -1;
+static gint ett_obex_fragments = -1;
+
+static dissector_handle_t obex_handle;
static dissector_handle_t raw_application_parameters_handle;
-static dissector_handle_t bpp_application_parameters_handle;
-static dissector_handle_t bip_application_parameters_handle;
-static dissector_handle_t gpp_application_parameters_handle;
-static dissector_handle_t ctn_application_parameters_handle;
-static dissector_handle_t map_application_parameters_handle;
-static dissector_handle_t pbap_application_parameters_handle;
-
-static reassembly_table btobex_reassembly_table;
-
-static const fragment_items btobex_frag_items = {
- &ett_btobex_fragment,
- &ett_btobex_fragments,
- &hf_btobex_fragments,
- &hf_btobex_fragment,
- &hf_btobex_fragment_overlap,
- &hf_btobex_fragment_overlap_conflict,
- &hf_btobex_fragment_multiple_tails,
- &hf_btobex_fragment_too_long_fragment,
- &hf_btobex_fragment_error,
- &hf_btobex_fragment_count,
- &hf_btobex_reassembled_in,
- &hf_btobex_reassembled_length,
+static dissector_handle_t bt_bpp_application_parameters_handle;
+static dissector_handle_t bt_bip_application_parameters_handle;
+static dissector_handle_t bt_gpp_application_parameters_handle;
+static dissector_handle_t bt_ctn_application_parameters_handle;
+static dissector_handle_t bt_map_application_parameters_handle;
+static dissector_handle_t bt_pbap_application_parameters_handle;
+
+static reassembly_table obex_reassembly_table;
+
+static const fragment_items obex_frag_items = {
+ &ett_obex_fragment,
+ &ett_obex_fragments,
+ &hf_obex_fragments,
+ &hf_obex_fragment,
+ &hf_obex_fragment_overlap,
+ &hf_obex_fragment_overlap_conflict,
+ &hf_obex_fragment_multiple_tails,
+ &hf_obex_fragment_too_long_fragment,
+ &hf_obex_fragment_error,
+ &hf_obex_fragment_count,
+ &hf_obex_reassembled_in,
+ &hf_obex_reassembled_length,
/* Reassembled data field */
NULL,
"fragments"
};
/* Initialize the subtree pointers */
-static gint ett_btobex = -1;
-static gint ett_btobex_hdrs = -1;
-static gint ett_btobex_hdr = -1;
-static gint ett_btobex_hdr_id = -1;
-static gint ett_btobex_filter = -1;
-static gint ett_btobex_parameter = -1;
-static gint ett_btobex_session_parameters = -1;
-static gint ett_btobex_application_parameters = -1;
-static gint ett_btobex_authentication_parameters = -1;
+static gint ett_obex = -1;
+static gint ett_obex_hdrs = -1;
+static gint ett_obex_hdr = -1;
+static gint ett_obex_hdr_id = -1;
+static gint ett_obex_filter = -1;
+static gint ett_obex_parameter = -1;
+static gint ett_obex_session_parameters = -1;
+static gint ett_obex_application_parameters = -1;
+static gint ett_obex_authentication_parameters = -1;
static wmem_tree_t *obex_path = NULL;
static wmem_tree_t *obex_profile = NULL;
@@ -488,7 +488,7 @@ typedef struct _obex_last_opcode_data_t {
#define PROFILE_GPP 10
#define PROTO_DATA_MEDIA_TYPE 0x00
-#define PROTO_DATA_BTOBEX_PROFILE 0x01
+#define PROTO_DATA_OBEX_PROFILE 0x01
static const value_string profile_vals[] = {
{ PROFILE_UNKNOWN, "Unknown" },
@@ -573,15 +573,15 @@ static const value_string header_id_encoding_vals[] = {
{ 0, NULL }
};
-#define BTOBEX_CODE_VALS_CONNECT 0x00
-#define BTOBEX_CODE_VALS_DISCONNECT 0x01
-#define BTOBEX_CODE_VALS_PUT 0x02
-#define BTOBEX_CODE_VALS_GET 0x03
-#define BTOBEX_CODE_VALS_SET_PATH 0x05
-#define BTOBEX_CODE_VALS_CONTINUE 0x10
-#define BTOBEX_CODE_VALS_SUCCESS 0x20
-#define BTOBEX_CODE_VALS_ABORT 0x7F
-#define BTOBEX_CODE_VALS_MASK 0x7F
+#define OBEX_CODE_VALS_CONNECT 0x00
+#define OBEX_CODE_VALS_DISCONNECT 0x01
+#define OBEX_CODE_VALS_PUT 0x02
+#define OBEX_CODE_VALS_GET 0x03
+#define OBEX_CODE_VALS_SET_PATH 0x05
+#define OBEX_CODE_VALS_CONTINUE 0x10
+#define OBEX_CODE_VALS_SUCCESS 0x20
+#define OBEX_CODE_VALS_ABORT 0x7F
+#define OBEX_CODE_VALS_MASK 0x7F
static const value_string code_vals[] = {
{ 0x00, "Connect" },
@@ -629,7 +629,7 @@ static const value_string code_vals[] = {
{ 0x55, "HTTP Version Not Supported" },
{ 0x60, "Database Full" },
{ 0x61, "Database Locked" },
- { BTOBEX_CODE_VALS_ABORT, "Abort" },
+ { OBEX_CODE_VALS_ABORT, "Abort" },
{ 0, NULL }
};
static value_string_ext(code_vals_ext) = VALUE_STRING_EXT_INIT(code_vals);
@@ -1002,8 +1002,8 @@ static value_string_ext pbap_application_parameters_vals_ext = VALUE_STRING_EXT_
static value_string_ext bpp_application_parameters_vals_ext = VALUE_STRING_EXT_INIT(bpp_application_parameters_vals);
static value_string_ext bip_application_parameters_vals_ext = VALUE_STRING_EXT_INIT(bip_application_parameters_vals);
-void proto_register_btobex(void);
-void proto_reg_handoff_btobex(void);
+void proto_register_obex(void);
+void proto_reg_handoff_obex(void);
static void
save_path(packet_info *pinfo, const gchar *current_path, const gchar *name,
@@ -1073,7 +1073,7 @@ static void media_type_prompt(packet_info *pinfo, gchar* result)
{
gchar *value_data;
- value_data = (gchar *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE);
+ value_data = (gchar *) p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE);
if (value_data)
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Media Type %s as", (gchar *) value_data);
else
@@ -1084,7 +1084,7 @@ static gpointer media_type_value(packet_info *pinfo)
{
gchar *value_data;
- value_data = (gchar *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE);
+ value_data = (gchar *) p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE);
if (value_data)
return (gpointer) value_data;
@@ -1092,22 +1092,22 @@ static gpointer media_type_value(packet_info *pinfo)
return NULL;
}
-static void btobex_profile_prompt(packet_info *pinfo _U_, gchar* result)
+static void obex_profile_prompt(packet_info *pinfo _U_, gchar* result)
{
guint8 *value_data;
- value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE);
+ value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_OBEX_PROFILE);
if (value_data)
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "OBEX Profile 0x%04x as", (guint) *value_data);
else
g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Unknown OBEX Profile");
}
-static gpointer btobex_profile_value(packet_info *pinfo _U_)
+static gpointer obex_profile_value(packet_info *pinfo _U_)
{
guint8 *value_data;
- value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE);
+ value_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_OBEX_PROFILE);
if (value_data)
return GUINT_TO_POINTER((gulong)*value_data);
@@ -1118,14 +1118,14 @@ static gpointer btobex_profile_value(packet_info *pinfo _U_)
static void
defragment_init(void)
{
- reassembly_table_init(&btobex_reassembly_table,
+ reassembly_table_init(&obex_reassembly_table,
&addresses_reassembly_table_functions);
}
static void
defragment_cleanup(void)
{
- reassembly_table_destroy(&btobex_reassembly_table);
+ reassembly_table_destroy(&obex_reassembly_table);
}
static int
@@ -1148,7 +1148,7 @@ is_ascii_str(const guint8 *str, int length)
}
static gint
-dissect_btobex_application_parameter_raw(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_raw(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void *data _U_)
{
proto_item *parameter_item;
proto_tree *parameter_tree;
@@ -1163,7 +1163,7 @@ dissect_btobex_application_parameter_raw(tvbuff_t *tvb, packet_info *pinfo _U_,
parameter_id = tvb_get_guint8(tvb, offset);
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset,
tvb_captured_length_remaining(tvb, offset), "Parameter: 0x%02x", parameter_id);
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_application_parameter_id, tvb, offset,
1, ENC_BIG_ENDIAN);
@@ -1186,7 +1186,7 @@ dissect_btobex_application_parameter_raw(tvbuff_t *tvb, packet_info *pinfo _U_,
}
static gint
-dissect_btobex_application_parameter_bpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_bpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1205,7 +1205,7 @@ dissect_btobex_application_parameter_bpp(tvbuff_t *tvb, packet_info *pinfo, prot
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
bpp_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_bpp_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1242,7 +1242,7 @@ dissect_btobex_application_parameter_bpp(tvbuff_t *tvb, packet_info *pinfo, prot
}
static gint
-dissect_btobex_application_parameter_bip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_bip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1262,7 +1262,7 @@ dissect_btobex_application_parameter_bip(tvbuff_t *tvb, packet_info *pinfo, prot
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
bip_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_bip_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1319,7 +1319,7 @@ dissect_btobex_application_parameter_bip(tvbuff_t *tvb, packet_info *pinfo, prot
}
static gint
-dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_pbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1339,7 +1339,7 @@ dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, pro
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
pbap_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1371,8 +1371,8 @@ dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, pro
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_list_start_offset, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 0x06: /* Filter */
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_filter, ett_btobex_filter, hfx_pbap_application_parameter_data_filter_1, ENC_BIG_ENDIAN);
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_filter, ett_btobex_filter, hfx_pbap_application_parameter_data_filter_0, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_filter, ett_obex_filter, hfx_pbap_application_parameter_data_filter_1, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_filter, ett_obex_filter, hfx_pbap_application_parameter_data_filter_0, ENC_BIG_ENDIAN);
break;
case 0x07: /* Format */
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_format, tvb, offset, 1, ENC_NA);
@@ -1390,8 +1390,8 @@ dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, pro
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_secondary_version_counter, tvb, offset, 16, ENC_NA);
break;
case 0x0C: /* vCard Selector */
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_vcard_selector, ett_btobex_filter, hfx_pbap_application_parameter_data_filter_1, ENC_BIG_ENDIAN);
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_vcard_selector, ett_btobex_filter, hfx_pbap_application_parameter_data_filter_0, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_vcard_selector, ett_obex_filter, hfx_pbap_application_parameter_data_filter_1, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_vcard_selector, ett_obex_filter, hfx_pbap_application_parameter_data_filter_0, ENC_BIG_ENDIAN);
break;
case 0x0D: /* Database Identifier */
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_database_identifier, tvb, offset, 16, ENC_NA);
@@ -1403,7 +1403,7 @@ dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, pro
proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_reset_new_missed_calls, tvb, offset, 1, ENC_NA);
break;
case 0x10: /* PBAP Supported Features */
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_supported_features, ett_btobex_parameter, hfx_pbap_application_parameter_data_supported_features, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_pbap_application_parameter_data_supported_features, ett_obex_parameter, hfx_pbap_application_parameter_data_supported_features, ENC_BIG_ENDIAN);
break;
default:
proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA);
@@ -1417,7 +1417,7 @@ dissect_btobex_application_parameter_pbap(tvbuff_t *tvb, packet_info *pinfo, pro
}
static gint
-dissect_btobex_application_parameter_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1437,7 +1437,7 @@ dissect_btobex_application_parameter_map(tvbuff_t *tvb, packet_info *pinfo, prot
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
map_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_map_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1575,7 +1575,7 @@ dissect_btobex_application_parameter_map(tvbuff_t *tvb, packet_info *pinfo, prot
}
static gint
-dissect_btobex_application_parameter_gpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_gpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1595,7 +1595,7 @@ dissect_btobex_application_parameter_gpp(tvbuff_t *tvb, packet_info *pinfo, prot
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
gpp_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_gpp_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1639,7 +1639,7 @@ dissect_btobex_application_parameter_gpp(tvbuff_t *tvb, packet_info *pinfo, prot
}
static gint
-dissect_btobex_application_parameter_ctn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+dissect_obex_application_parameter_bt_ctn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_item *item;
proto_item *parameter_item;
@@ -1660,7 +1660,7 @@ dissect_btobex_application_parameter_ctn(tvbuff_t *tvb, packet_info *pinfo, prot
parameter_item = proto_tree_add_none_format(tree, hf_application_parameter, tvb, offset, parameter_length + 2,
"Parameter: %s", val_to_str_const(parameter_id,
ctn_application_parameters_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_application_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_application_parameters);
proto_tree_add_item(parameter_tree, hf_ctn_application_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -1715,7 +1715,7 @@ dissect_btobex_application_parameter_ctn(tvbuff_t *tvb, packet_info *pinfo, prot
proto_tree_add_item(parameter_tree, hf_ctn_application_parameter_data_filter_period_end, tvb, offset, parameter_length, ENC_NA | ENC_ASCII);
break;
case 0x06: /* Parameter Mask */
- proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_ctn_application_parameter_data_parameter_mask, ett_btobex_filter, hfx_ctn_application_parameter_data_parameter_mask, ENC_BIG_ENDIAN);
+ proto_tree_add_bitmask(parameter_tree, tvb, offset, hf_ctn_application_parameter_data_parameter_mask, ett_obex_filter, hfx_ctn_application_parameter_data_parameter_mask, ENC_BIG_ENDIAN);
break;
case 0x07: /* Status Indicator */
proto_tree_add_item(parameter_tree, hf_ctn_application_parameter_data_status_indicator, tvb, offset, 1, ENC_NA);
@@ -1774,7 +1774,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
if (tvb_reported_length_remaining(tvb, offset) > 0) {
proto_item *hdrs;
hdrs = proto_tree_add_item(tree, hf_headers, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
- hdrs_tree = proto_item_add_subtree(hdrs, ett_btobex_hdrs);
+ hdrs_tree = proto_item_add_subtree(hdrs, ett_obex_hdrs);
}
else {
return offset;
@@ -1805,9 +1805,9 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
hdr = proto_tree_add_none_format(hdrs_tree, hf_header, tvb, offset, item_length, "%s",
val_to_str_ext_const(hdr_id, &header_id_vals_ext, "Unknown"));
- hdr_tree = proto_item_add_subtree(hdr, ett_btobex_hdr);
+ hdr_tree = proto_item_add_subtree(hdr, ett_obex_hdr);
- proto_tree_add_bitmask_with_flags(hdr_tree, tvb, offset, hf_hdr_id, ett_btobex_hdr_id, hfx_hdr_id, ENC_NA, BMT_NO_APPEND);
+ proto_tree_add_bitmask_with_flags(hdr_tree, tvb, offset, hf_hdr_id, ett_obex_hdr_id, hfx_hdr_id, ENC_NA, BMT_NO_APPEND);
offset++;
@@ -1821,9 +1821,9 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
case 0x01: /* Name */
proto_tree_add_item(hdr_tree, hf_name, tvb, offset, value_length, ENC_UCS_2 | ENC_BIG_ENDIAN);
if (!pinfo->fd->flags.visited && obex_last_opcode_data) {
- if (obex_last_opcode_data->code == BTOBEX_CODE_VALS_SET_PATH)
+ if (obex_last_opcode_data->code == OBEX_CODE_VALS_SET_PATH)
obex_last_opcode_data->data.set_data.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_UCS_2 | ENC_BIG_ENDIAN);
- else if (obex_last_opcode_data->code == BTOBEX_CODE_VALS_GET || obex_last_opcode_data->code == BTOBEX_CODE_VALS_PUT)
+ else if (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)
obex_last_opcode_data->data.get_put.name = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_UCS_2 | ENC_BIG_ENDIAN);
}
break;
@@ -1844,7 +1844,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
switch (hdr_id) {
case 0x4c: /* Application Parameters */
next_tvb = tvb_new_subset_length(tvb, offset, value_length);
- if (!(new_offset = dissector_try_uint_new(btobex_profile, profile, next_tvb, pinfo, hdr_tree, TRUE, NULL))) {
+ if (!(new_offset = dissector_try_uint_new(obex_profile_table, profile, next_tvb, pinfo, hdr_tree, TRUE, NULL))) {
new_offset = call_dissector(raw_application_parameters_handle, next_tvb, pinfo, hdr_tree);
}
offset += new_offset;
@@ -1863,7 +1863,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
parameter_item = proto_tree_add_none_format(hdr_tree, hf_authentication_parameter, tvb, offset,
2 + sub_parameter_length, "Tag: %s", val_to_str_const(parameter_id,
authentication_challenge_tag_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_authentication_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_authentication_parameters);
proto_tree_add_item(parameter_tree, hf_authentication_challenge_tag, tvb, offset, 1, ENC_BIG_ENDIAN);
tag = tvb_get_guint8(tvb, offset);
@@ -1910,7 +1910,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
parameter_item = proto_tree_add_none_format(hdr_tree, hf_authentication_parameter, tvb, offset,
2 + sub_parameter_length, "Tag: %s", val_to_str_const(parameter_id,
authentication_response_tag_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_authentication_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_authentication_parameters);
proto_tree_add_item(parameter_tree, hf_authentication_response_tag, tvb, offset, 1, ENC_BIG_ENDIAN);
tag = tvb_get_guint8(tvb, offset);
@@ -1946,15 +1946,15 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
case 0x42: /* Type */
proto_tree_add_item(hdr_tree, hf_type, tvb, offset, value_length, ENC_ASCII | ENC_NA);
proto_item_append_text(hdr_tree, ": \"%s\"", tvb_get_string_enc(wmem_packet_scope(), tvb, offset, value_length, ENC_ASCII));
- if (!pinfo->fd->flags.visited && obex_last_opcode_data && (obex_last_opcode_data->code == BTOBEX_CODE_VALS_GET || obex_last_opcode_data->code == BTOBEX_CODE_VALS_PUT)) {
+ if (!pinfo->fd->flags.visited && obex_last_opcode_data && (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT)) {
obex_last_opcode_data->data.get_put.type = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_ASCII | ENC_NA);
}
- if (p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE) == NULL) {
+ if (p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE) == NULL) {
guint8 *value_data;
value_data = tvb_get_string_enc(wmem_file_scope(), tvb, offset, value_length, ENC_ASCII | ENC_NA);
- p_add_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE, value_data);
+ p_add_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE, value_data);
}
offset += value_length;
@@ -1972,16 +1972,16 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
next_tvb = tvb_new_subset_length(tvb, offset, value_length);
if (value_length > 0 && obex_last_opcode_data &&
- (obex_last_opcode_data->code == BTOBEX_CODE_VALS_GET || obex_last_opcode_data->code == BTOBEX_CODE_VALS_PUT) &&
- p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE) == NULL) {
+ (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT) &&
+ p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE) == NULL) {
guint8 *value_data;
value_data = obex_last_opcode_data->data.get_put.type;
- p_add_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_MEDIA_TYPE, value_data);
+ p_add_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_MEDIA_TYPE, value_data);
}
if (value_length > 0 && obex_last_opcode_data &&
- (obex_last_opcode_data->code == BTOBEX_CODE_VALS_GET || obex_last_opcode_data->code == BTOBEX_CODE_VALS_PUT) &&
+ (obex_last_opcode_data->code == OBEX_CODE_VALS_GET || obex_last_opcode_data->code == OBEX_CODE_VALS_PUT) &&
obex_last_opcode_data->data.get_put.type &&
dissector_try_string(media_type_dissector_table, obex_last_opcode_data->data.get_put.type, next_tvb, pinfo, tree, NULL) > 0) {
offset += value_length;
@@ -2077,7 +2077,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
parameter_item = proto_tree_add_none_format(hdr_tree, hf_session_parameter, tvb, offset,
2 + sub_parameter_length, "Tag: %s", val_to_str_const(parameter_id,
session_tag_vals, "Unknown"));
- parameter_tree = proto_item_add_subtree(parameter_item, ett_btobex_session_parameters);
+ parameter_tree = proto_item_add_subtree(parameter_item, ett_obex_session_parameters);
proto_tree_add_item(parameter_tree, hf_session_parameter_tag, tvb, offset, 1, ENC_BIG_ENDIAN);
tag = tvb_get_guint8(tvb, offset);
@@ -2239,7 +2239,7 @@ dissect_headers(proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
}
static gint
-dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
+dissect_obex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *main_item;
proto_tree *main_tree;
@@ -2292,8 +2292,8 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "OBEX");
- main_item = proto_tree_add_item(tree, proto_btobex, tvb, 0, tvb_captured_length(tvb), ENC_NA);
- main_tree = proto_item_add_subtree(main_item, ett_btobex);
+ main_item = proto_tree_add_item(tree, proto_obex, tvb, 0, tvb_captured_length(tvb), ENC_NA);
+ main_tree = proto_item_add_subtree(main_item, ett_obex);
save_fragmented = pinfo->fragmented;
@@ -2312,7 +2312,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
key[5].length = 0;
key[5].key = NULL;
- profile_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE);
+ profile_data = (guint8 *) p_get_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_OBEX_PROFILE);
if (profile_data == NULL) {
obex_profile_data = (obex_profile_data_t *)wmem_tree_lookup32_array_le(obex_profile, key);
if (obex_profile_data && obex_profile_data->interface_id == obex_proto_data.interface_id &&
@@ -2325,7 +2325,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
profile_data = wmem_new(wmem_file_scope(), guint8);
*profile_data = profile;
- p_add_proto_data(pinfo->pool, pinfo, proto_btobex, PROTO_DATA_BTOBEX_PROFILE, profile_data);
+ p_add_proto_data(pinfo->pool, pinfo, proto_obex, PROTO_DATA_OBEX_PROFILE, profile_data);
}
obex_path_data = (obex_path_data_t *)wmem_tree_lookup32_array_le(obex_path, key);
@@ -2344,8 +2344,8 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
PROTO_ITEM_SET_GENERATED(sub_item);
}
- current_handle = dissector_get_uint_handle(btobex_profile, profile);
- default_handle = dissector_get_default_uint_handle("btobex.profile", profile);
+ current_handle = dissector_get_uint_handle(obex_profile_table, profile);
+ default_handle = dissector_get_default_uint_handle("obex.profile", profile);
if (current_handle != default_handle) {
expert_add_info_format(pinfo, main_item, &ei_decoded_as_profile, "Decoded As %s", dissector_handle_get_long_name(current_handle));
}
@@ -2353,19 +2353,19 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
complete = FALSE;
if (tvb_captured_length(tvb) == tvb_reported_length(tvb)) {
- frag_msg = fragment_get_reassembled_id(&btobex_reassembly_table, pinfo, pinfo->p2p_dir);
+ frag_msg = fragment_get_reassembled_id(&obex_reassembly_table, pinfo, pinfo->p2p_dir);
if (frag_msg && pinfo->num != frag_msg->reassembled_in) {
/* reassembled but not last */
new_tvb = process_reassembled_data(tvb, 0, pinfo,
- "Reassembled Obex packet", frag_msg, &btobex_frag_items, NULL, main_tree);
+ "Reassembled Obex packet", frag_msg, &obex_frag_items, NULL, main_tree);
} else if (frag_msg && pinfo->num == frag_msg->reassembled_in) {
/* reassembled and last, so dissect reassembled packet here */
new_tvb = process_reassembled_data(tvb, 0, pinfo,
- "Reassembled Obex packet", frag_msg, &btobex_frag_items, NULL, main_tree);
+ "Reassembled Obex packet", frag_msg, &obex_frag_items, NULL, main_tree);
} else {
- frag_msg = fragment_get(&btobex_reassembly_table, pinfo, pinfo->p2p_dir, NULL);
+ frag_msg = fragment_get(&obex_reassembly_table, pinfo, pinfo->p2p_dir, NULL);
if (frag_msg) {
/* not the first fragment */
@@ -2376,14 +2376,14 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
frag_msg = frag_msg->next;
}
- frag_msg = fragment_add_check(&btobex_reassembly_table,
+ frag_msg = fragment_add_check(&obex_reassembly_table,
tvb, 0, pinfo, pinfo->p2p_dir, NULL,
frag_msg->offset + frag_msg->len, tvb_reported_length(tvb),
((frag_msg->offset + frag_msg->len + tvb_reported_length(tvb)) <
- fragment_get_tot_len(&btobex_reassembly_table, pinfo, pinfo->p2p_dir, NULL)) ? TRUE : FALSE);
+ fragment_get_tot_len(&obex_reassembly_table, pinfo, pinfo->p2p_dir, NULL)) ? TRUE : FALSE);
new_tvb = process_reassembled_data(tvb, 0, pinfo,
- "Reassembled Obex packet", frag_msg, &btobex_frag_items, NULL, main_tree);
+ "Reassembled Obex packet", frag_msg, &obex_frag_items, NULL, main_tree);
pinfo->fragmented = TRUE;
} else {
@@ -2395,16 +2395,16 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
return tvb_reported_length(tvb);
} else if (tvb_reported_length(tvb) >= 3 && tvb_reported_length(tvb) < tvb_get_ntohs(tvb, offset+1)) {
/* first fragment in a sequence */
- frag_msg = fragment_add_check(&btobex_reassembly_table,
+ frag_msg = fragment_add_check(&obex_reassembly_table,
tvb, 0, pinfo, pinfo->p2p_dir, NULL,
0, tvb_reported_length(tvb), TRUE);
- fragment_set_tot_len(&btobex_reassembly_table,
+ fragment_set_tot_len(&obex_reassembly_table,
pinfo, pinfo->p2p_dir, NULL,
tvb_get_ntohs(tvb, offset + 1));
new_tvb = process_reassembled_data(tvb, 0, pinfo,
- "Reassembled Obex packet", frag_msg, &btobex_frag_items, NULL, main_tree);
+ "Reassembled Obex packet", frag_msg, &obex_frag_items, NULL, main_tree);
pinfo->fragmented = TRUE;
} else if (tvb_reported_length(tvb) == tvb_get_ntohs(tvb, offset+1)) {
/* non-fragmented */
@@ -2429,7 +2429,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* fully dissectable packet ready */
/* op/response code */
- code = tvb_get_guint8(next_tvb, offset) & BTOBEX_CODE_VALS_MASK;
+ code = tvb_get_guint8(next_tvb, offset) & OBEX_CODE_VALS_MASK;
final_flag = tvb_get_guint8(next_tvb, offset) & 0x80;
switch (pinfo->p2p_dir) {
@@ -2447,7 +2447,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
col_append_str(pinfo->cinfo, COL_INFO,
val_to_str_ext_const(code, &code_vals_ext, "Unknown"));
- if (code < BTOBEX_CODE_VALS_CONTINUE || code == BTOBEX_CODE_VALS_ABORT) {
+ if (code < OBEX_CODE_VALS_CONTINUE || code == OBEX_CODE_VALS_ABORT) {
proto_tree_add_item(main_tree, hf_opcode, next_tvb, offset, 1, ENC_BIG_ENDIAN);
if (!pinfo->fd->flags.visited &&
(pinfo->p2p_dir == P2P_DIR_SENT ||
@@ -2528,7 +2528,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
switch(code)
{
- case BTOBEX_CODE_VALS_CONNECT:
+ case OBEX_CODE_VALS_CONNECT:
proto_tree_add_item(main_tree, hf_version, next_tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@@ -2539,12 +2539,12 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
offset += 2;
break;
- case BTOBEX_CODE_VALS_PUT:
- case BTOBEX_CODE_VALS_GET:
+ case OBEX_CODE_VALS_PUT:
+ case OBEX_CODE_VALS_GET:
col_append_fstr(pinfo->cinfo, COL_INFO, " %s", (final_flag == 0x80) ? "final" : "continue");
break;
- case BTOBEX_CODE_VALS_SET_PATH:
+ case OBEX_CODE_VALS_SET_PATH:
proto_tree_add_item(main_tree, hf_flags, next_tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(main_tree, hf_set_path_flags_0, next_tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(main_tree, hf_set_path_flags_1, next_tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -2560,8 +2560,8 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
offset++;
break;
- case BTOBEX_CODE_VALS_DISCONNECT:
- case BTOBEX_CODE_VALS_ABORT:
+ case OBEX_CODE_VALS_DISCONNECT:
+ case OBEX_CODE_VALS_ABORT:
break;
default:
@@ -2571,7 +2571,7 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
break;
} else if (length == 0) break;
- if (obex_last_opcode_data && obex_last_opcode_data->code == BTOBEX_CODE_VALS_CONNECT) {
+ if (obex_last_opcode_data && obex_last_opcode_data->code == OBEX_CODE_VALS_CONNECT) {
proto_tree_add_item(main_tree, hf_version, next_tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@@ -2591,8 +2591,8 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (!pinfo->fd->flags.visited &&
obex_last_opcode_data &&
obex_last_opcode_data->data.set_data.name &&
- obex_last_opcode_data->code == BTOBEX_CODE_VALS_SET_PATH &&
- code == BTOBEX_CODE_VALS_SUCCESS) {
+ obex_last_opcode_data->code == OBEX_CODE_VALS_SET_PATH &&
+ code == OBEX_CODE_VALS_SUCCESS) {
save_path(pinfo, path, obex_last_opcode_data->data.set_data.name, obex_last_opcode_data->data.set_data.go_up, &obex_proto_data);
}
} else {
@@ -2611,1204 +2611,1204 @@ dissect_btobex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
void
-proto_register_btobex(void)
+proto_register_obex(void)
{
module_t *module;
- expert_module_t *expert_btobex;
+ expert_module_t *expert_obex;
int proto_raw;
int proto_bpp;
int proto_bip;
int proto_map;
- int proto_gpp;
- int proto_ctn;
- int proto_pbap;
+ int proto_bt_gpp;
+ int proto_bt_ctn;
+ int proto_bt_pbap;
static hf_register_info hf[] = {
{ &hf_opcode,
- { "Opcode", "btobex.opcode",
- FT_UINT8, BASE_HEX|BASE_EXT_STRING, &code_vals_ext, BTOBEX_CODE_VALS_MASK,
+ { "Opcode", "obex.opcode",
+ FT_UINT8, BASE_HEX|BASE_EXT_STRING, &code_vals_ext, OBEX_CODE_VALS_MASK,
"Request Opcode", HFILL}
},
{ &hf_response_code,
- { "Response Code", "btobex.resp_code",
- FT_UINT8, BASE_HEX|BASE_EXT_STRING, &code_vals_ext, BTOBEX_CODE_VALS_MASK,
+ { "Response Code", "obex.resp_code",
+ FT_UINT8, BASE_HEX|BASE_EXT_STRING, &code_vals_ext, OBEX_CODE_VALS_MASK,
NULL, HFILL}
},
{ &hf_final_flag,
- { "Final Flag", "btobex.final_flag",
+ { "Final Flag", "obex.final_flag",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL}
},
{ &hf_length,
- { "Packet Length", "btobex.pkt_len",
+ { "Packet Length", "obex.pkt_len",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_version,
- { "Version", "btobex.version",
+ { "Version", "obex.version",
FT_UINT8, BASE_HEX, VALS(version_vals), 0x00,
"Obex Protocol Version", HFILL}
},
{ &hf_flags,
- { "Flags", "btobex.flags",
+ { "Flags", "obex.flags",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_constants,
- { "Constants", "btobex.constants",
+ { "Constants", "obex.constants",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_max_pkt_len,
- { "Max. Packet Length", "btobex.max_pkt_len",
+ { "Max. Packet Length", "obex.max_pkt_len",
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_set_path_flags_0,
- { "Go back one folder (../) first", "btobex.set_path_flags_0",
+ { "Go back one folder (../) first", "obex.set_path_flags_0",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_set_path_flags_1,
- { "Do not create folder, if not existing", "btobex.set_path_flags_1",
+ { "Do not create folder, if not existing", "obex.set_path_flags_1",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL}
},
{ &hf_headers,
- { "Headers", "btobex.headers",
+ { "Headers", "obex.headers",
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_header,
- { "Header", "btobex.header",
+ { "Header", "obex.header",
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_hdr_id,
- { "Header Id", "btobex.header.id",
+ { "Header Id", "obex.header.id",
FT_UINT8, BASE_HEX|BASE_EXT_STRING, &header_id_vals_ext, 0x00,
NULL, HFILL}
},
{ &hf_hdr_id_encoding,
- { "Encoding", "btobex.header.id.encoding",
+ { "Encoding", "obex.header.id.encoding",
FT_UINT8, BASE_HEX, VALS(header_id_encoding_vals), 0xC0,
NULL, HFILL}
},
{ &hf_hdr_id_meaning,
- { "Meaning", "btobex.header.id.meaning",
+ { "Meaning", "obex.header.id.meaning",
FT_UINT8, BASE_HEX, VALS(header_id_meaning_vals), 0x3F,
NULL, HFILL}
},
{ &hf_hdr_length,
- { "Length", "btobex.header.length",
+ { "Length", "obex.header.length",
FT_UINT16, BASE_DEC, NULL, 0,
"Header Length", HFILL}
},
{ &hf_hdr_val_unicode,
- { "Value", "btobex.header.value.unicode",
+ { "Value", "obex.header.value.unicode",
FT_STRING, BASE_NONE, NULL, 0,
"Unicode Value", HFILL }
},
{ &hf_hdr_val_byte_seq,
- { "Value", "btobex.header.value.byte_sequence",
+ { "Value", "obex.header.value.byte_sequence",
FT_BYTES, BASE_NONE, NULL, 0,
"Byte Sequence Value", HFILL}
},
{ &hf_hdr_val_byte,
- { "Value", "btobex.header.value.byte",
+ { "Value", "obex.header.value.byte",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
"Byte Value", HFILL}
},
{ &hf_hdr_val_long,
- { "Value", "btobex.header.value.long",
+ { "Value", "obex.header.value.long",
FT_UINT32, BASE_DEC, NULL, 0,
"4-byte Value", HFILL}
},
{ &hf_count,
- { "Count", "btobex.count",
+ { "Count", "obex.count",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_data_length,
- { "Length", "btobex.length",
+ { "Length", "obex.length",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_connection_id,
- { "Connection ID", "btobex.connection_id",
+ { "Connection ID", "obex.connection_id",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter,
- { "Session Parameter", "btobex.session",
+ { "Session Parameter", "obex.session",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_session_parameter_data,
- { "Parameter Value", "btobex.session.value",
+ { "Parameter Value", "obex.session.value",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_tag,
- { "Tag", "btobex.session.tag",
+ { "Tag", "obex.session.tag",
FT_UINT8, BASE_HEX, VALS(session_tag_vals), 0x00,
NULL, HFILL}
},
{ &hf_session_parameter_length,
- { "Length", "btobex.session.length",
+ { "Length", "obex.session.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_nonce,
- { "Nonce", "btobex.session.nonce",
+ { "Nonce", "obex.session.nonce",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_session_id,
- { "Session ID", "btobex.session.session_id",
+ { "Session ID", "obex.session.session_id",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_next_sequence_number,
- { "Next Sequence Number", "btobex.session.next_sequence_number",
+ { "Next Sequence Number", "obex.session.next_sequence_number",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_timeout,
- { "Timeout", "btobex.session.timeout",
+ { "Timeout", "obex.session.timeout",
FT_UINT32, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_session_parameter_opcode,
- { "Opcode", "btobex.session.opcode",
+ { "Opcode", "obex.session.opcode",
FT_UINT8, BASE_HEX, VALS(session_opcode_vals), 0,
NULL, HFILL}
},
{ &hf_authentication_parameter,
- { "Authentication Parameter", "btobex.authentication",
+ { "Authentication Parameter", "obex.authentication",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_authentication_parameter_data,
- { "Parameter Value", "btobex.authentication.value",
+ { "Parameter Value", "obex.authentication.value",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_authentication_challenge_tag,
- { "Tag", "btobex.authentication.challenge_tag",
+ { "Tag", "obex.authentication.challenge_tag",
FT_UINT8, BASE_HEX, VALS(authentication_challenge_tag_vals), 0x00,
NULL, HFILL}
},
{ &hf_authentication_response_tag,
- { "Tag", "btobex.authentication.response_tag",
+ { "Tag", "obex.authentication.response_tag",
FT_UINT8, BASE_HEX, VALS(authentication_response_tag_vals), 0x00,
NULL, HFILL}
},
{ &hf_authentication_length,
- { "Length", "btobex.authentication.length",
+ { "Length", "obex.authentication.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_authentication_key,
- { "Key", "btobex.authentication.key",
+ { "Key", "obex.authentication.key",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_authentication_result_key,
- { "Result Key", "btobex.authentication.result_key",
+ { "Result Key", "obex.authentication.result_key",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_authentication_user_id,
- { "User Id", "btobex.authentication.user_id",
+ { "User Id", "obex.authentication.user_id",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_authentication_option_reserved,
- { "Reserved", "btobex.authentication.option.reserved",
+ { "Reserved", "obex.authentication.option.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFC,
NULL, HFILL}
},
{ &hf_authentication_option_read_only,
- { "Read Only", "btobex.authentication.option.read_only",
+ { "Read Only", "obex.authentication.option.read_only",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL}
},
{ &hf_authentication_option_user_id,
- { "User ID", "btobex.authentication.option.user_id",
+ { "User ID", "obex.authentication.option.user_id",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_authentication_info_charset,
- { "Charset", "btobex.authentication.info.charset",
+ { "Charset", "obex.authentication.info.charset",
FT_UINT8, BASE_HEX, VALS(info_charset_vals), 0,
NULL, HFILL}
},
{ &hf_authentication_info,
- { "Info", "btobex.authentication.info",
+ { "Info", "obex.authentication.info",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_application_parameter,
- { "Parameter", "btobex.parameter",
+ { "Parameter", "obex.parameter",
FT_NONE, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_application_parameter_id,
- { "Parameter Id", "btobex.parameter.id",
+ { "Parameter Id", "obex.parameter.id",
FT_UINT8, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_application_parameter_length,
- { "Parameter Length", "btobex.parameter.length",
+ { "Parameter Length", "obex.parameter.length",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_application_parameter_data,
- { "Parameter Value", "btobex.parameter.value",
+ { "Parameter Value", "obex.parameter.value",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL}
},
/* application parameters for BPP */
{ &hf_bpp_application_parameter_id,
- { "Parameter Id", "btobex.parameter.id",
+ { "Parameter Id", "obex.parameter.id",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &bpp_application_parameters_vals_ext, 0x00,
NULL, HFILL}
},
{ &hf_bpp_application_parameter_data_offset,
- { "Offset", "btobex.parameter.value.offset",
+ { "Offset", "obex.parameter.value.offset",
FT_UINT32, BASE_DEC_HEX, NULL, 0,
"The byte offset into the image or file.", HFILL}
},
{ &hf_bpp_application_parameter_data_count,
- { "Count", "btobex.parameter.value.count",
+ { "Count", "obex.parameter.value.count",
FT_INT32, BASE_DEC, NULL, 0,
"The number of bytes of the image or file to be sent.", HFILL}
},
{ &hf_bpp_application_parameter_data_job_id,
- { "Job ID", "btobex.parameter.value.job_id",
+ { "Job ID", "obex.parameter.value.job_id",
FT_UINT32, BASE_DEC_HEX, NULL, 0,
"The job identifier of the print job.", HFILL}
},
{ &hf_bpp_application_parameter_data_file_size,
- { "File Size", "btobex.parameter.value.file_size",
+ { "File Size", "obex.parameter.value.file_size",
FT_INT32, BASE_DEC, NULL, 0,
"The size (in bytes) of object or file.", HFILL}
},
/* application parameters for BIP */
{ &hf_bip_application_parameter_id,
- { "Parameter Id", "btobex.parameter.id",
+ { "Parameter Id", "obex.parameter.id",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &bip_application_parameters_vals_ext, 0x00,
NULL, HFILL}
},
{ &hf_bip_application_parameter_data_number_of_returned_handles,
- { "Number of Returned Handles", "btobex.parameter.value.number_of_returned_handles",
+ { "Number of Returned Handles", "obex.parameter.value.number_of_returned_handles",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_list_start_offset,
- { "List Start Offset", "btobex.parameter.value.list_start_offset",
+ { "List Start Offset", "obex.parameter.value.list_start_offset",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_latest_captured_images,
- { "Latest Captured Images", "btobex.parameter.value.latest_captured_images",
+ { "Latest Captured Images", "obex.parameter.value.latest_captured_images",
FT_BOOLEAN, 8, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_partial_file_length,
- { "Partial File Length", "btobex.parameter.value.partial_file_length",
+ { "Partial File Length", "obex.parameter.value.partial_file_length",
FT_UINT32, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_partial_file_start_offset,
- { "Partial File Start Offset", "btobex.parameter.value.partial_file_start_offset",
+ { "Partial File Start Offset", "obex.parameter.value.partial_file_start_offset",
FT_UINT32, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_total_file_size,
- { "Total File Size", "btobex.parameter.value.total_file_size",
+ { "Total File Size", "obex.parameter.value.total_file_size",
FT_UINT32, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_end_flag,
- { "End Flag", "btobex.parameter.value.end_flag",
+ { "End Flag", "obex.parameter.value.end_flag",
FT_BOOLEAN, 8, NULL, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_remote_display,
- { "Remote Display", "btobex.parameter.value.remote_display",
+ { "Remote Display", "obex.parameter.value.remote_display",
FT_UINT8, BASE_HEX, VALS(bip_remote_display_vals), 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_service_id,
- { "Service ID", "btobex.parameter.value.service_id",
+ { "Service ID", "obex.parameter.value.service_id",
FT_UINT16, BASE_HEX | BASE_EXT_STRING, &bluetooth_uuid_vals_ext, 0x00,
NULL, HFILL }
},
{ &hf_bip_application_parameter_data_store_flag,
- { "Store Flag", "btobex.parameter.value.store_flag",
+ { "Store Flag", "obex.parameter.value.store_flag",
FT_BOOLEAN, 8, NULL, 0x00,
NULL, HFILL }
},
/* application parameters for PBAP */
{ &hf_pbap_application_parameter_id,
- { "Parameter Id", "btobex.parameter.id",
+ { "Parameter Id", "obex.parameter.id",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &pbap_application_parameters_vals_ext, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_order,
- { "Max List Count", "btobex.parameter.value.order",
+ { "Max List Count", "obex.parameter.value.order",
FT_UINT8, BASE_HEX, VALS(pbap_order_vals), 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_search_value,
- { "Search Value", "btobex.parameter.value.search_value",
+ { "Search Value", "obex.parameter.value.search_value",
FT_STRING, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_search_attribute,
- { "Search Attribute", "btobex.parameter.value.search_attribute",
+ { "Search Attribute", "obex.parameter.value.search_attribute",
FT_UINT8, BASE_HEX, VALS(pbap_search_attribute_vals), 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_max_list_count,
- { "Max List Count", "btobex.parameter.value.max_list_count",
+ { "Max List Count", "obex.parameter.value.max_list_count",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_list_start_offset,
- { "List Start Offset", "btobex.parameter.value.list_start_offset",
+ { "List Start Offset", "obex.parameter.value.list_start_offset",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter,
- { "Filter", "btobex.parameter.value.filter",
+ { "Filter", "obex.parameter.value.filter",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_vcard_selector,
- { "vCard Selector", "btobex.parameter.value.filter",
+ { "vCard Selector", "obex.parameter.value.filter",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_version,
- { "vCard Version", "btobex.parameter.value.filter.version",
+ { "vCard Version", "obex.parameter.value.filter.version",
FT_BOOLEAN, 32, NULL, 0x00000001,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_fn,
- { "Formatted Name", "btobex.parameter.value.filter.fn",
+ { "Formatted Name", "obex.parameter.value.filter.fn",
FT_BOOLEAN, 32, NULL, 0x00000002,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_n,
- { "Structured Presentation of Name", "btobex.parameter.value.filter.n",
+ { "Structured Presentation of Name", "obex.parameter.value.filter.n",
FT_BOOLEAN, 32, NULL, 0x00000004,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_photo,
- { "Associated Image or Photo", "btobex.parameter.value.filter.photo",
+ { "Associated Image or Photo", "obex.parameter.value.filter.photo",
FT_BOOLEAN, 32, NULL, 0x00000008,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_birthday,
- { "Birthday", "btobex.parameter.value.filter.birthday",
+ { "Birthday", "obex.parameter.value.filter.birthday",
FT_BOOLEAN, 32, NULL, 0x00000010,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_adr,
- { "Delivery Address", "btobex.parameter.value.filter.adr",
+ { "Delivery Address", "obex.parameter.value.filter.adr",
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_label,
- { "Delivery", "btobex.parameter.value.filter.label",
+ { "Delivery", "obex.parameter.value.filter.label",
FT_BOOLEAN, 32, NULL, 0x00000040,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_tel,
- { "Telephone Number", "btobex.parameter.value.filter.tel",
+ { "Telephone Number", "obex.parameter.value.filter.tel",
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_email,
- { "Electronic Mail Address", "btobex.parameter.value.filter.email",
+ { "Electronic Mail Address", "obex.parameter.value.filter.email",
FT_BOOLEAN, 32, NULL, 0x00000100,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_mailer,
- { "Electronic Mail", "btobex.parameter.value.filter.mailer",
+ { "Electronic Mail", "obex.parameter.value.filter.mailer",
FT_BOOLEAN, 32, NULL, 0x00000200,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_time_zone,
- { "Time Zone", "btobex.parameter.value.filter.time_zone",
+ { "Time Zone", "obex.parameter.value.filter.time_zone",
FT_BOOLEAN, 32, NULL, 0x00000400,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_geographic_position,
- { "Geographic Position", "btobex.parameter.value.filter.geographic_position",
+ { "Geographic Position", "obex.parameter.value.filter.geographic_position",
FT_BOOLEAN, 32, NULL, 0x00000800,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_title,
- { "Job", "btobex.parameter.value.filter.title",
+ { "Job", "obex.parameter.value.filter.title",
FT_BOOLEAN, 32, NULL, 0x00001000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_role,
- { "Role within the Organization", "btobex.parameter.value.filter.role",
+ { "Role within the Organization", "obex.parameter.value.filter.role",
FT_BOOLEAN, 32, NULL, 0x00002000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_logo,
- { "Organization Logo", "btobex.parameter.value.filter.logo",
+ { "Organization Logo", "obex.parameter.value.filter.logo",
FT_BOOLEAN, 32, NULL, 0x00004000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_agent,
- { "vCard of Person Representing", "btobex.parameter.value.filter.agent",
+ { "vCard of Person Representing", "obex.parameter.value.filter.agent",
FT_BOOLEAN, 32, NULL, 0x00008000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_name_of_organization,
- { "Name of Organization", "btobex.parameter.value.filter.name_of_organization",
+ { "Name of Organization", "obex.parameter.value.filter.name_of_organization",
FT_BOOLEAN, 32, NULL, 0x00010000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_comments,
- { "Comments", "btobex.parameter.value.filter.comments",
+ { "Comments", "obex.parameter.value.filter.comments",
FT_BOOLEAN, 32, NULL, 0x00020000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_revision,
- { "Revision", "btobex.parameter.value.filter.revision",
+ { "Revision", "obex.parameter.value.filter.revision",
FT_BOOLEAN, 32, NULL, 0x00040000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_pronunciation_of_name,
- { "Pronunciation of Name", "btobex.parameter.value.filter.pronunciation_of_name",
+ { "Pronunciation of Name", "obex.parameter.value.filter.pronunciation_of_name",
FT_BOOLEAN, 32, NULL, 0x00080000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_url,
- { "Uniform Resource Locator", "btobex.parameter.value.filter.url",
+ { "Uniform Resource Locator", "obex.parameter.value.filter.url",
FT_BOOLEAN, 32, NULL, 0x00100000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_uid,
- { "Unique ID", "btobex.parameter.value.filter.uid",
+ { "Unique ID", "obex.parameter.value.filter.uid",
FT_BOOLEAN, 32, NULL, 0x00200000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_key,
- { "Public Encryption Key", "btobex.parameter.value.filter.key",
+ { "Public Encryption Key", "obex.parameter.value.filter.key",
FT_BOOLEAN, 32, NULL, 0x00400000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_nickname,
- { "Nickname", "btobex.parameter.value.filter.nickname",
+ { "Nickname", "obex.parameter.value.filter.nickname",
FT_BOOLEAN, 32, NULL, 0x00800000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_categories,
- { "Categories", "btobex.parameter.value.filter.categories",
+ { "Categories", "obex.parameter.value.filter.categories",
FT_BOOLEAN, 32, NULL, 0x01000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_product_id,
- { "Product ID", "btobex.parameter.value.filter.product_id",
+ { "Product ID", "obex.parameter.value.filter.product_id",
FT_BOOLEAN, 32, NULL, 0x02000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_class,
- { "Class Information", "btobex.parameter.value.filter.class",
+ { "Class Information", "obex.parameter.value.filter.class",
FT_BOOLEAN, 32, NULL, 0x04000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_sort_string,
- { "String Used For Sorting Operations", "btobex.parameter.value.filter.sort_string",
+ { "String Used For Sorting Operations", "obex.parameter.value.filter.sort_string",
FT_BOOLEAN, 32, NULL, 0x08000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_timestamp,
- { "Timestamp", "btobex.parameter.value.filter.timestamp",
+ { "Timestamp", "obex.parameter.value.filter.timestamp",
FT_BOOLEAN, 32, NULL, 0x10000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_reserved_29_31,
- { "Reserved", "btobex.parameter.value.filter.reserved_29_31",
+ { "Reserved", "obex.parameter.value.filter.reserved_29_31",
FT_UINT32, BASE_HEX, NULL, 0xE0000000,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_reserved_32_38,
- { "Reserved", "btobex.parameter.value.filter.reserved_32_38",
+ { "Reserved", "obex.parameter.value.filter.reserved_32_38",
FT_UINT32, BASE_HEX, NULL, 0x0000007F,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_proprietary_filter,
- { "Proprietary Filter", "btobex.parameter.value.filter.proprietary_filter",
+ { "Proprietary Filter", "obex.parameter.value.filter.proprietary_filter",
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_filter_reserved_for_proprietary_filter_usage,
- { "Reserved for Proprietary Filter Usage", "btobex.parameter.value.filter.reserved_for_proprietary_filter_usage",
+ { "Reserved for Proprietary Filter Usage", "obex.parameter.value.filter.reserved_for_proprietary_filter_usage",
FT_UINT32, BASE_HEX, NULL, 0xFFFFFF00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_format,
- { "Format", "btobex.parameter.value.format",
+ { "Format", "obex.parameter.value.format",
FT_UINT8, BASE_HEX, VALS(pbap_format_vals), 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_phonebook_size,
- { "Phonebook Size", "btobex.parameter.value.phonebook_size",
+ { "Phonebook Size", "obex.parameter.value.phonebook_size",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_new_missed_calls,
- { "New Missed Calls", "btobex.parameter.value.new_missed_calls",
+ { "New Missed Calls", "obex.parameter.value.new_missed_calls",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_primary_version_counter,
- { "Primary Version Counter", "btobex.parameter.value.primary_version_counter",
+ { "Primary Version Counter", "obex.parameter.value.primary_version_counter",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_secondary_version_counter,
- { "Secondary Version Counter", "btobex.parameter.value.secondary_version_counter",
+ { "Secondary Version Counter", "obex.parameter.value.secondary_version_counter",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_database_identifier,
- { "Database Identifier", "btobex.parameter.value.database_identifier",
+ { "Database Identifier", "obex.parameter.value.database_identifier",
FT_BYTES, BASE_NONE, NULL, 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_vcard_selector_operator,
- { "vCard Selector Operator", "btobex.parameter.value.vcard_selector_operator",
+ { "vCard Selector Operator", "obex.parameter.value.vcard_selector_operator",
FT_UINT8, BASE_HEX, VALS(pbap_application_parameter_data_vcard_selector_operator_vals), 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_reset_new_missed_calls,
- { "vCard Selector Operator", "btobex.parameter.value.reset_new_missed_calls",
+ { "vCard Selector Operator", "obex.parameter.value.reset_new_missed_calls",
FT_UINT8, BASE_HEX, VALS(pbap_application_parameter_data_reset_new_missed_calls_vals), 0x00,
NULL, HFILL}
},
{ &hf_pbap_application_parameter_data_supported_features,
- { "Supported Features", "btobex.parameter.supported_features",
+ { "Supported Features", "obex.parameter.supported_features",
FT_UINT32, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_reserved,
- { "Reserved", "btobex.parameter.supported_features.reserved",
+ { "Reserved", "obex.parameter.supported_features.reserved",
FT_UINT32, BASE_HEX, NULL, 0xFFFFFC00,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_default_contact_image_format,
- { "Default Contact Image Format", "btobex.parameter.supported_features.default_contact_image_format",
+ { "Default Contact Image Format", "obex.parameter.supported_features.default_contact_image_format",
FT_BOOLEAN, 32, NULL, 0x00000200,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_contact_referencing,
- { "Contact Referencing", "btobex.parameter.supported_features.contact_referencing",
+ { "Contact Referencing", "obex.parameter.supported_features.contact_referencing",
FT_BOOLEAN, 32, NULL, 0x00000100,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_x_bt_uid_vcard_property,
- { "X-BT-UID vCard Property", "btobex.parameter.supported_features.x_bt_uid_vcard_property",
+ { "X-BT-UID vCard Property", "obex.parameter.supported_features.x_bt_uid_vcard_property",
FT_BOOLEAN, 32, NULL, 0x00000080,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_x_bt_uci_vcard_property,
- { "X-BT-UCI vCard Property", "btobex.parameter.supported_features.x_bt_uci_vcard_property",
+ { "X-BT-UCI vCard Property", "obex.parameter.supported_features.x_bt_uci_vcard_property",
FT_BOOLEAN, 32, NULL, 0x00000040,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_enhanced_missed_calls,
- { "Enhanced Missed Calls", "btobex.parameter.supported_features.enhanced_missed_calls",
+ { "Enhanced Missed Calls", "obex.parameter.supported_features.enhanced_missed_calls",
FT_BOOLEAN, 32, NULL, 0x00000020,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_vcard_selecting,
- { "vCard Selecting", "btobex.parameter.supported_features.vcard_selecting",
+ { "vCard Selecting", "obex.parameter.supported_features.vcard_selecting",
FT_BOOLEAN, 32, NULL, 0x00000010,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_folder_version_counters,
- { "Folder Version Counters", "btobex.parameter.supported_features.folder_version_counters",
+ { "Folder Version Counters", "obex.parameter.supported_features.folder_version_counters",
FT_BOOLEAN, 32, NULL, 0x00000008,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_database_identifier,
- { "Database Identifier", "btobex.parameter.supported_features.database_identifier",
+ { "Database Identifier", "obex.parameter.supported_features.database_identifier",
FT_BOOLEAN, 32, NULL, 0x00000004,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_browsing,
- { "Browsing", "btobex.parameter.supported_features.browsing",
+ { "Browsing", "obex.parameter.supported_features.browsing",
FT_BOOLEAN, 32, NULL, 0x00000002,
NULL, HFILL }
},
{ &hf_pbap_application_parameter_data_supported_features_download,
- { "Download", "btobex.parameter.supported_features.download",
+ { "Download", "obex.parameter.supported_features.download",
FT_BOOLEAN, 32, NULL, 0x00000001,
NULL, HFILL }
},
/* application parameters for MAP */
{ &hf_map_application_parameter_id,
- { "Parameter Id", "btobex.parameter.id",
+ { "Parameter Id", "obex.parameter.id",
FT_UINT8, BASE_HEX | BASE_EXT_STRING, &map_application_parameters_vals_ext, 0x00,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_max_list_count,
- { "Max List Count", "btobex.parameter.value.max_list_count",
+ { "Max List Count", "obex.parameter.value.max_list_count",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_start_offset,
- { "Start Offset", "btobex.parameter.value.start_offset",
+ { "Start Offset", "obex.parameter.value.start_offset",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_message_type_reserved,
- { "Reserved", "btobex.parameter.value.filter_message_type.reserved",
+ { "Reserved", "obex.parameter.value.filter_message_type.reserved",
FT_UINT8, BASE_HEX, NULL, 0xF0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_message_type_mms,
- { "MMS", "btobex.parameter.value.filter_message_type.mms",
+ { "MMS", "obex.parameter.value.filter_message_type.mms",
FT_BOOLEAN, 8, NULL, 0x08,
"True to filter out, False to listing this type", HFILL}
},
{ &hf_map_application_parameter_data_filter_message_type_email,
- { "EMAIL", "btobex.parameter.value.filter_message_type.sms_email",
+ { "EMAIL", "obex.parameter.value.filter_message_type.sms_email",
FT_BOOLEAN, 8, NULL, 0x04,
"True to filter out, False to listing this type", HFILL}
},
{ &hf_map_application_parameter_data_filter_message_type_sms_cdma,
- { "SMS_CDMA", "btobex.parameter.value.filter_message_type.sms_cdma",
+ { "SMS_CDMA", "obex.parameter.value.filter_message_type.sms_cdma",
FT_BOOLEAN, 8, NULL, 0x02,
"True to filter out, False to listing this type", HFILL}
},
{ &hf_map_application_parameter_data_filter_message_type_sms_gsm,
- { "SMS_GSM", "btobex.parameter.value.filter_message_type.sms_gsm",
+ { "SMS_GSM", "obex.parameter.value.filter_message_type.sms_gsm",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_period_begin,
- { "Filter Period Begin", "btobex.parameter.value.filter_period_begin",
+ { "Filter Period Begin", "obex.parameter.value.filter_period_begin",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_period_end,
- { "Filter Period End", "btobex.parameter.value.filter_period_end",
+ { "Filter Period End", "obex.parameter.value.filter_period_end",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_read_status_reserved_6,
- { "Filter Read Status: Reserved", "btobex.parameter.value.filter_read_status.reserved",
+ { "Filter Read Status: Reserved", "obex.parameter.value.filter_read_status.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFC,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_read_status_get_read,
- { "Filter Read Status: Get Read", "btobex.parameter.value.filter_read_status.get_read",
+ { "Filter Read Status: Get Read", "obex.parameter.value.filter_read_status.get_read",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_read_status_get_unread,
- { "Filter Read Status: Get Unread", "btobex.parameter.value.filter_read_status.get_unread",
+ { "Filter Read Status: Get Unread", "obex.parameter.value.filter_read_status.get_unread",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_recipient,
- { "Filter Recipient", "btobex.parameter.value.filter_recipient",
+ { "Filter Recipient", "obex.parameter.value.filter_recipient",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_originator,
- { "Filter Originator", "btobex.parameter.value.filter_originator",
+ { "Filter Originator", "obex.parameter.value.filter_originator",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_priority_reserved_6,
- { "Filter Priority: Reserved", "btobex.parameter.value.filter_priority.reserved",
+ { "Filter Priority: Reserved", "obex.parameter.value.filter_priority.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFC,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_priority_get_high,
- { "Filter Priority: Get Read", "btobex.parameter.value.filter_priority.get_high",
+ { "Filter Priority: Get Read", "obex.parameter.value.filter_priority.get_high",
FT_BOOLEAN, 8, NULL, 0x02,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_filter_priority_non_high,
- { "Filter Priority: Get Non High", "btobex.parameter.value.filter_priority.non_high",
+ { "Filter Priority: Get Non High", "obex.parameter.value.filter_priority.non_high",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_reserved_7,
- { "Reserved", "btobex.parameter.value.reserved",
+ { "Reserved", "obex.parameter.value.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFE,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_attachment,
- { "Attachment", "btobex.parameter.value.attachment",
+ { "Attachment", "obex.parameter.value.attachment",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_transparent,
- { "Transparent", "btobex.parameter.value.transparent",
+ { "Transparent", "obex.parameter.value.transparent",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_retry,
- { "Retry", "btobex.parameter.value.retry",
+ { "Retry", "obex.parameter.value.retry",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_new_message,
- { "New Message", "btobex.parameter.value.new_message",
+ { "New Message", "obex.parameter.value.new_message",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_notification_status,
- { "Notification Status", "btobex.parameter.value.notification_status",
+ { "Notification Status", "obex.parameter.value.notification_status",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_mas_instance_id,
- { "MAS Instance ID", "btobex.parameter.value.mas_instance_id",
+ { "MAS Instance ID", "obex.parameter.value.mas_instance_id",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_reserved,
- { "Parameter Mask: Reserved", "btobex.parameter.value.parameter_mask.reserved",
+ { "Parameter Mask: Reserved", "obex.parameter.value.parameter_mask.reserved",
FT_UINT32, BASE_HEX, NULL, 0xFFFF0000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_reply_to_addressing,
- { "Parameter Mask: Reply to Addressing", "btobex.parameter.value.parameter_mask.reply_to_addressing",
+ { "Parameter Mask: Reply to Addressing", "obex.parameter.value.parameter_mask.reply_to_addressing",
FT_BOOLEAN, 32, NULL, 0x8000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_protected,
- { "Parameter Mask: Protected", "btobex.parameter.value.parameter_mask.protected",
+ { "Parameter Mask: Protected", "obex.parameter.value.parameter_mask.protected",
FT_BOOLEAN, 32, NULL, 0x4000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sent,
- { "Parameter Mask: Sent", "btobex.parameter.value.parameter_mask.sent",
+ { "Parameter Mask: Sent", "obex.parameter.value.parameter_mask.sent",
FT_BOOLEAN, 32, NULL, 0x2000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_read,
- { "Parameter Mask: Read", "btobex.parameter.value.parameter_mask.read",
+ { "Parameter Mask: Read", "obex.parameter.value.parameter_mask.read",
FT_BOOLEAN, 32, NULL, 0x1000,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_priority,
- { "Parameter Mask: Priority", "btobex.parameter.value.parameter_mask.priority",
+ { "Parameter Mask: Priority", "obex.parameter.value.parameter_mask.priority",
FT_BOOLEAN, 32, NULL, 0x0800,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_attachment_size,
- { "Parameter Mask: Attachment Size", "btobex.parameter.value.parameter_mask.attachment_size",
+ { "Parameter Mask: Attachment Size", "obex.parameter.value.parameter_mask.attachment_size",
FT_BOOLEAN, 32, NULL, 0x0400,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_text,
- { "Parameter Mask: Text", "btobex.parameter.value.parameter_mask.text",
+ { "Parameter Mask: Text", "obex.parameter.value.parameter_mask.text",
FT_BOOLEAN, 32, NULL, 0x0200,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_reception_status,
- { "Parameter Mask: Reception Status", "btobex.parameter.value.parameter_mask.reception_status",
+ { "Parameter Mask: Reception Status", "obex.parameter.value.parameter_mask.reception_status",
FT_BOOLEAN, 32, NULL, 0x0100,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_size,
- { "Parameter Mask: Size", "btobex.parameter.value.parameter_mask.size",
+ { "Parameter Mask: Size", "obex.parameter.value.parameter_mask.size",
FT_BOOLEAN, 32, NULL, 0x0080,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_type,
- { "Parameter Mask: Type", "btobex.parameter.value.parameter_mask.type",
+ { "Parameter Mask: Type", "obex.parameter.value.parameter_mask.type",
FT_BOOLEAN, 32, NULL, 0x0040,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_recipient_addressing,
- { "Parameter Mask: Recipient Addressing", "btobex.parameter.value.parameter_mask.recipient_addressing",
+ { "Parameter Mask: Recipient Addressing", "obex.parameter.value.parameter_mask.recipient_addressing",
FT_BOOLEAN, 32, NULL, 0x0020,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_recipient_name,
- { "Parameter Mask: Recipient Name", "btobex.parameter.value.parameter_mask.recipient_name",
+ { "Parameter Mask: Recipient Name", "obex.parameter.value.parameter_mask.recipient_name",
FT_BOOLEAN, 32, NULL, 0x0010,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sender_addressing,
- { "Parameter Mask: Sender Addressing", "btobex.parameter.value.parameter_mask.sender_addressing",
+ { "Parameter Mask: Sender Addressing", "obex.parameter.value.parameter_mask.sender_addressing",
FT_BOOLEAN, 32, NULL, 0x0008,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_sender_name,
- { "Parameter Mask: Sender Name", "btobex.parameter.value.parameter_mask.sender_name",
+ { "Parameter Mask: Sender Name", "obex.parameter.value.parameter_mask.sender_name",
FT_BOOLEAN, 32, NULL, 0x0004,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_datetime,
- { "Parameter Mask: Datetime", "btobex.parameter.value.parameter_mask.datetime",
+ { "Parameter Mask: Datetime", "obex.parameter.value.parameter_mask.datetime",
FT_BOOLEAN, 32, NULL, 0x0002,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_parameter_mask_subject,
- { "Parameter Mask: Subject", "btobex.parameter.value.parameter_mask.subject",
+ { "Parameter Mask: Subject", "obex.parameter.value.parameter_mask.subject",
FT_BOOLEAN, 32, NULL, 0x0001,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_folder_listing_size,
- { "Folder Listing Size", "btobex.parameter.value.folder_listing_size",
+ { "Folder Listing Size", "obex.parameter.value.folder_listing_size",
FT_UINT16, BASE_DEC_HEX, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_messages_listing_size,
- { "Messages Listing Size", "btobex.parameter.value.messages_listing_size",
+ { "Messages Listing Size", "obex.parameter.value.messages_listing_size",
FT_UINT16, BASE_DEC_HEX, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_subject_length,
- { "Subject Length", "btobex.parameter.value.subject_length",
+ { "Subject Length", "obex.parameter.value.subject_length",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_charset,
- { "Charset", "btobex.parameter.value.charset",
+ { "Charset", "obex.parameter.value.charset",
FT_UINT8, BASE_HEX, VALS(map_charset_vals), 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_fraction_request,
- { "Fraction Request", "btobex.parameter.value.fraction_request",
+ { "Fraction Request", "obex.parameter.value.fraction_request",
FT_UINT8, BASE_HEX, VALS(map_fraction_request_vals), 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_fraction_deliver,
- { "Fraction Deliver", "btobex.parameter.value.fraction_deliver",
+ { "Fraction Deliver", "obex.parameter.value.fraction_deliver",
FT_UINT8, BASE_HEX, VALS(map_fraction_deliver_vals), 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_status_indicator,
- { "Status Indicator", "btobex.parameter.value.status_indicator",
+ { "Status Indicator", "obex.parameter.value.status_indicator",
FT_UINT8, BASE_HEX, VALS(map_status_indicator_vals), 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_status_value,
- { "Status Value", "btobex.parameter.value.status_value",
+ { "Status Value", "obex.parameter.value.status_value",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_map_application_parameter_data_mse_time,
- { "MSE Time", "btobex.parameter.value.mse_time",
+ { "MSE Time", "obex.parameter.value.mse_time",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL}
},
/* application parameters for GPP */
{ &hf_gpp_application_parameter_id,
- { "Parameter Id", "btobex.parameter.gpp.id",
+ { "Parameter Id", "obex.parameter.gpp.id",
FT_UINT8, BASE_HEX, VALS(gpp_application_parameters_vals), 0x00,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_max_list_count,
- { "Max List Count", "btobex.parameter.gpp.value.max_list_count",
+ { "Max List Count", "obex.parameter.gpp.value.max_list_count",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_list_start_offset,
- { "List Start Offset", "btobex.parameter.gpp.value.list_start_offset",
+ { "List Start Offset", "obex.parameter.gpp.value.list_start_offset",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_reserved_7,
- { "Reserved", "btobex.parameter.gpp.value.reserved",
+ { "Reserved", "obex.parameter.gpp.value.reserved",
FT_UINT8, BASE_HEX, NULL, 0xFE,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_notification_status,
- { "Notification Status", "btobex.parameter.gpp.value.notification_status",
+ { "Notification Status", "obex.parameter.gpp.value.notification_status",
FT_BOOLEAN, 8, NULL, 0x01,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_instance_id,
- { "Instance ID", "btobex.parameter.gpp.value.instance_id",
+ { "Instance ID", "obex.parameter.gpp.value.instance_id",
FT_UINT8, BASE_DEC_HEX, NULL, 0,
NULL, HFILL}
},
{ &hf_gpp_application_parameter_data_listing_size,
- { "Listing Size", "btobex.parameter.gpp.value.listing_size",
+ { "Listing Size", "obex.parameter.gpp.value.listing_size",
FT_UINT16, BASE_DEC_HEX, NULL, 0x00,
NULL, HFILL}
},
/* application parameters for CTN */
{ &hf_ctn_application_parameter_id,
- { "Parameter Id", "btobex.parameter.ctn.id",
+ { "Parameter Id", "obex.parameter.ctn.id",
FT_UINT8, BASE_HEX, VALS(ctn_application_parameters_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_acoustic_alarm_status,
- { "Acoustic Alarm Status", "btobex.parameter.ctn.acoustic_alarm_status",
+ { "Acoustic Alarm Status", "obex.parameter.ctn.acoustic_alarm_status",
FT_UINT8, BASE_HEX, VALS(off_on_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_attachment,
- { "Attachment", "btobex.parameter.ctn.attachment",
+ { "Attachment", "obex.parameter.ctn.attachment",
FT_UINT8, BASE_HEX, VALS(ctn_application_parameter_data_attachment_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_send,
- { "Attachment", "btobex.parameter.ctn.attachment",
+ { "Attachment", "obex.parameter.ctn.attachment",
FT_UINT8, BASE_HEX, VALS(no_yes_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_filter_period_begin,
- { "Filter Period Begin", "btobex.parameter.ctn.filter_period_begin",
+ { "Filter Period Begin", "obex.parameter.ctn.filter_period_begin",
FT_STRING, STR_ASCII, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_filter_period_end,
- { "Filter Period End", "btobex.parameter.ctn.filter_period_end",
+ { "Filter Period End", "obex.parameter.ctn.filter_period_end",
FT_STRING, STR_ASCII, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask,
- { "Parameter Mask", "btobex.parameter.ctn.parameter_mask",
+ { "Parameter Mask", "obex.parameter.ctn.parameter_mask",
FT_UINT32, BASE_HEX, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_reserved,
- { "Reserved", "btobex.parameter.ctn.parameter_mask.reserved",
+ { "Reserved", "obex.parameter.ctn.parameter_mask.reserved",
FT_UINT32, BASE_HEX, NULL, 0xFFFFFC00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_recurrent,
- { "Recurrent", "btobex.parameter.ctn.parameter_mask.recurrent",
+ { "Recurrent", "obex.parameter.ctn.parameter_mask.recurrent",
FT_UINT32, BASE_HEX, NULL, 0x00000200,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_send_status,
- { "Send Status", "btobex.parameter.ctn.parameter_mask.send_status",
+ { "Send Status", "obex.parameter.ctn.parameter_mask.send_status",
FT_UINT32, BASE_HEX, NULL, 0x00000100,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_alarm_status,
- { "Alarm Status", "btobex.parameter.ctn.parameter_mask.",
+ { "Alarm Status", "obex.parameter.ctn.parameter_mask.",
FT_UINT32, BASE_HEX, NULL, 0x00000080,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_pstatus,
- { "pStatus", "btobex.parameter.ctn.parameter_mask.pstatus",
+ { "pStatus", "obex.parameter.ctn.parameter_mask.pstatus",
FT_UINT32, BASE_HEX, NULL, 0x00000040,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_priority,
- { "Priority", "btobex.parameter.ctn.parameter_mask.priority",
+ { "Priority", "obex.parameter.ctn.parameter_mask.priority",
FT_UINT32, BASE_HEX, NULL, 0x00000020,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_originator_address,
- { "Originator Address", "btobex.parameter.ctn.parameter_mask.originator_address",
+ { "Originator Address", "obex.parameter.ctn.parameter_mask.originator_address",
FT_UINT32, BASE_HEX, NULL, 0x00000010,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_originator_name,
- { "Originator Name", "btobex.parameter.ctn.parameter_mask.originator_name",
+ { "Originator Name", "obex.parameter.ctn.parameter_mask.originator_name",
FT_UINT32, BASE_HEX, NULL, 0x00000008,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_end_time,
- { "End Time", "btobex.parameter.ctn.parameter_mask.end_time",
+ { "End Time", "obex.parameter.ctn.parameter_mask.end_time",
FT_UINT32, BASE_HEX, NULL, 0x00000004,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_summary,
- { "Summary", "btobex.parameter.ctn.parameter_mask.summary",
+ { "Summary", "obex.parameter.ctn.parameter_mask.summary",
FT_UINT32, BASE_HEX, NULL, 0x00000002,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_parameter_mask_attachment,
- { "Attachment", "btobex.parameter.ctn.parameter_mask.attachment",
+ { "Attachment", "obex.parameter.ctn.parameter_mask.attachment",
FT_UINT32, BASE_HEX, NULL, 0x00000001,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_status_indicator,
- { "Status Indicator", "btobex.parameter.ctn.status_indicator",
+ { "Status Indicator", "obex.parameter.ctn.status_indicator",
FT_UINT8, BASE_HEX, VALS(ctn_application_parameter_data_status_indicator_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_status_value,
- { "Status Value", "btobex.parameter.ctn.status_value",
+ { "Status Value", "obex.parameter.ctn.status_value",
FT_UINT8, BASE_HEX, VALS(ctn_application_parameter_data_status_value_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_postpone_val,
- { "Postpone Val", "btobex.parameter.ctn.postpone_val",
+ { "Postpone Val", "obex.parameter.ctn.postpone_val",
FT_UINT32, BASE_DEC, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_email_uri,
- { "Email URI", "btobex.parameter.ctn.email_uri",
+ { "Email URI", "obex.parameter.ctn.email_uri",
FT_STRING, STR_ASCII, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_cse_time,
- { "CSE Time", "btobex.parameter.ctn.cse_time",
+ { "CSE Time", "obex.parameter.ctn.cse_time",
FT_STRING, STR_ASCII, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_recurrent,
- { "Recurrent", "btobex.parameter.ctn.recurrent",
+ { "Recurrent", "obex.parameter.ctn.recurrent",
FT_UINT8, BASE_HEX, VALS(no_yes_vals), 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_attach_id,
- { "Attach ID", "btobex.parameter.ctn.attach_id",
+ { "Attach ID", "obex.parameter.ctn.attach_id",
FT_UINT8, BASE_DEC, NULL, 0x00,
NULL, HFILL}
},
{ &hf_ctn_application_parameter_data_last_update,
- { "Last Update", "btobex.parameter.ctn.last_update",
+ { "Last Update", "obex.parameter.ctn.last_update",
FT_STRING, STR_ASCII, NULL, 0x00,
NULL, HFILL}
},
/* for fragmentation */
- { &hf_btobex_fragment_overlap,
- { "Fragment overlap", "btobex.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ { &hf_obex_fragment_overlap,
+ { "Fragment overlap", "obex.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Fragment overlaps with other fragments", HFILL }
},
- { &hf_btobex_fragment_overlap_conflict,
- { "Conflicting data in fragment overlap", "btobex.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ { &hf_obex_fragment_overlap_conflict,
+ { "Conflicting data in fragment overlap", "obex.fragment.overlap.conflict", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Overlapping fragments contained conflicting data", HFILL }
},
- { &hf_btobex_fragment_multiple_tails,
- { "Multiple tail fragments found", "btobex.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ { &hf_obex_fragment_multiple_tails,
+ { "Multiple tail fragments found", "obex.fragment.multipletails", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Several tails were found when defragmenting the packet", HFILL }
},
- { &hf_btobex_fragment_too_long_fragment,
- { "Fragment too long", "btobex.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ { &hf_obex_fragment_too_long_fragment,
+ { "Fragment too long", "obex.fragment.toolongfragment", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Fragment contained data past end of packet", HFILL }
},
- { &hf_btobex_fragment_error,
- { "Defragmentation error", "btobex.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+ { &hf_obex_fragment_error,
+ { "Defragmentation error", "obex.fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"Defragmentation error due to illegal fragments", HFILL }
},
- { &hf_btobex_fragment_count,
- { "Fragment count", "btobex.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0,
+ { &hf_obex_fragment_count,
+ { "Fragment count", "obex.fragment.count", FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
- { &hf_btobex_fragment,
- { "OBEX Fragment", "btobex.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
- "btobex Fragment", HFILL }
+ { &hf_obex_fragment,
+ { "OBEX Fragment", "obex.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }
},
- { &hf_btobex_fragments,
- { "OBEX Fragments", "btobex.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
- "btobex Fragments", HFILL }
+ { &hf_obex_fragments,
+ { "OBEX Fragments", "obex.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
+ NULL, HFILL }
},
- { &hf_btobex_reassembled_in,
- { "Reassembled OBEX in frame", "btobex.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
+ { &hf_obex_reassembled_in,
+ { "Reassembled OBEX in frame", "obex.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
"This OBEX frame is reassembled in this frame", HFILL }
},
- { &hf_btobex_reassembled_length,
- { "Reassembled OBEX length", "btobex.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0,
+ { &hf_obex_reassembled_length,
+ { "Reassembled OBEX length", "obex.reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x0,
"The total length of the reassembled payload", HFILL }
},
{ &hf_profile,
- { "Profile", "btobex.profile", FT_UINT32, BASE_DEC | BASE_EXT_STRING, &profile_vals_ext, 0x0,
+ { "Profile", "obex.profile", FT_UINT32, BASE_DEC | BASE_EXT_STRING, &profile_vals_ext, 0x0,
"Blutooth Profile used in this OBEX session", HFILL }
},
{ &hf_type,
- { "Type", "btobex.type", FT_STRINGZ, STR_ASCII, NULL, 0x0,
+ { "Type", "obex.type", FT_STRINGZ, STR_ASCII, NULL, 0x0,
NULL, HFILL }
},
{ &hf_object_class,
- { "Object Class", "btobex.object_class", FT_STRINGZ, STR_ASCII, NULL, 0x0,
+ { "Object Class", "obex.object_class", FT_STRINGZ, STR_ASCII, NULL, 0x0,
NULL, HFILL }
},
{ &hf_time_iso8601,
- { "Time", "btobex.time", FT_STRINGZ, STR_ASCII, NULL, 0x0,
+ { "Time", "obex.time", FT_STRINGZ, STR_ASCII, NULL, 0x0,
NULL, HFILL }
},
{ &hf_hdr_val_action,
- { "Action", "btobex.action", FT_UINT8, BASE_DEC, VALS(action_vals), 0x0,
+ { "Action", "obex.action", FT_UINT8, BASE_DEC, VALS(action_vals), 0x0,
NULL, HFILL }
},
{ &hf_hdr_val_single_response_mode,
- { "Single Response Mode", "btobex.single_response_mode", FT_UINT8, BASE_DEC, VALS(single_response_mode_vals), 0x0,
+ { "Single Response Mode", "obex.single_response_mode", FT_UINT8, BASE_DEC, VALS(single_response_mode_vals), 0x0,
NULL, HFILL }
},
{ &hf_hdr_val_single_response_mode_parameter,
- { "Single Response Mode Parameter", "btobex.single_response_mode_parameter", FT_UINT8, BASE_DEC, VALS(single_response_mode_parameter_vals), 0x0,
+ { "Single Response Mode Parameter", "obex.single_response_mode_parameter", FT_UINT8, BASE_DEC, VALS(single_response_mode_parameter_vals), 0x0,
NULL, HFILL }
},
{ &hf_wan_uuid,
- { "WAN UUID", "btobex.wan_uuid",
+ { "WAN UUID", "obex.wan_uuid",
FT_UINT16, BASE_HEX, NULL, 0x00,
NULL, HFILL }
},
{ &hf_sender_bd_addr,
- { "Sender Address", "btobex.sender_bd_addr",
+ { "Sender Address", "obex.sender_bd_addr",
FT_ETHER, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_name,
- { "Name", "btobex.name",
+ { "Name", "obex.name",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_current_path,
- { "Current Path", "btobex.current_path",
+ { "Current Path", "obex.current_path",
FT_STRINGZ, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_request_in_frame,
- { "Request in Frame", "btobex.request_in_frame", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_RESPONSE), 0x0,
+ { "Request in Frame", "obex.request_in_frame", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_RESPONSE), 0x0,
NULL, HFILL}
},
{ &hf_response_in_frame,
- { "Response in Frame", "btobex.response_in_frame", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_REQUEST), 0x0,
+ { "Response in Frame", "obex.response_in_frame", FT_FRAMENUM, BASE_NONE, FRAMENUM_TYPE(FT_FRAMENUM_REQUEST), 0x0,
NULL, HFILL}
}
};
/* Setup protocol subtree array */
static gint *ett[] = {
- &ett_btobex,
- &ett_btobex_hdrs,
- &ett_btobex_hdr,
- &ett_btobex_hdr_id,
- &ett_btobex_filter,
- &ett_btobex_parameter,
- &ett_btobex_fragment,
- &ett_btobex_fragments,
- &ett_btobex_session_parameters,
- &ett_btobex_application_parameters,
- &ett_btobex_authentication_parameters
+ &ett_obex,
+ &ett_obex_hdrs,
+ &ett_obex_hdr,
+ &ett_obex_hdr_id,
+ &ett_obex_filter,
+ &ett_obex_parameter,
+ &ett_obex_fragment,
+ &ett_obex_fragments,
+ &ett_obex_session_parameters,
+ &ett_obex_application_parameters,
+ &ett_obex_authentication_parameters
};
static ei_register_info ei[] = {
- { &ei_application_parameter_length_bad, { "btobex.parameter.length.bad", PI_PROTOCOL, PI_WARN, "Parameter length bad", EXPFILL }},
- { &ei_unexpected_data, { "btobex.expert.unexpected_data", PI_PROTOCOL, PI_WARN, "Unexpected data", EXPFILL }},
- { &ei_decoded_as_profile, { "btobex.expert.decoded_as.profile", PI_PROTOCOL, PI_NOTE, "Decoded As", EXPFILL }},
+ { &ei_application_parameter_length_bad, { "obex.parameter.length.bad", PI_PROTOCOL, PI_WARN, "Parameter length bad", EXPFILL }},
+ { &ei_unexpected_data, { "obex.expert.unexpected_data", PI_PROTOCOL, PI_WARN, "Unexpected data", EXPFILL }},
+ { &ei_decoded_as_profile, { "obex.expert.decoded_as.profile", PI_PROTOCOL, PI_NOTE, "Decoded As", EXPFILL }},
};
/* Decode As handling */
- static build_valid_func btobex_profile_da_build_value[1] = {btobex_profile_value};
- static decode_as_value_t btobex_profile_da_values = {btobex_profile_prompt, 1, btobex_profile_da_build_value};
- static decode_as_t btobex_profile_da = {"btobex", "OBEX Profile", "btobex.profile", 1, 0, &btobex_profile_da_values, NULL, NULL,
+ static build_valid_func obex_profile_da_build_value[1] = {obex_profile_value};
+ static decode_as_value_t obex_profile_da_values = {obex_profile_prompt, 1, obex_profile_da_build_value};
+ static decode_as_t obex_profile_da = {"obex", "OBEX Profile", "obex.profile", 1, 0, &obex_profile_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
static build_valid_func media_type_da_build_value[1] = {media_type_value};
static decode_as_value_t media_type_da_values = {media_type_prompt, 1, media_type_da_build_value};
- static decode_as_t media_type_da = {"btobex", "Media Type", "media_type",
+ static decode_as_t media_type_da = {"obex", "Media Type", "media_type",
1, 0, &media_type_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
@@ -3817,97 +3817,97 @@ proto_register_btobex(void)
obex_profile = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
obex_last_opcode = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
- proto_btobex = proto_register_protocol("Bluetooth OBEX Protocol", "BT OBEX", "btobex");
+ proto_obex = proto_register_protocol("OBEX Protocol", "OBEX", "obex");
- btobex_handle = register_dissector("btobex", dissect_btobex, proto_btobex);
+ obex_handle = register_dissector("obex", dissect_obex, proto_obex);
- btobex_profile = register_dissector_table("btobex.profile", "BTOBEX Profile", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
+ obex_profile_table = register_dissector_table("obex.profile", "OBEX Profile", FT_UINT8, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
/* Required function calls to register the header fields and subtrees used */
- proto_register_field_array(proto_btobex, hf, array_length(hf));
+ proto_register_field_array(proto_obex, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- expert_btobex = expert_register_protocol(proto_btobex);
- expert_register_field_array(expert_btobex, ei, array_length(ei));
+ expert_obex = expert_register_protocol(proto_obex);
+ expert_register_field_array(expert_obex, ei, array_length(ei));
register_init_routine(&defragment_init);
register_cleanup_routine(&defragment_cleanup);
- register_decode_as(&btobex_profile_da);
+ register_decode_as(&obex_profile_da);
- proto_raw = proto_register_protocol("BT OBEX Raw Application Parameters", "Raw Application Parameters", "btobex.parameter.raw");
- raw_application_parameters_handle = register_dissector("btobex.parameter.raw", dissect_btobex_application_parameter_raw, proto_raw);
+ proto_raw = proto_register_protocol("OBEX Raw Application Parameters", "Raw Application Parameters", "obex.parameter.raw");
+ raw_application_parameters_handle = register_dissector("obex.parameter.raw", dissect_obex_application_parameter_raw, proto_raw);
- proto_bpp = proto_register_protocol("BT OBEX BPP Application Parameters", "BPP Application Parameters", "btobex.parameter.bpp");
- bpp_application_parameters_handle = register_dissector("btobex.parameter.bpp", dissect_btobex_application_parameter_bpp, proto_bpp);
+ proto_bpp = proto_register_protocol("Bluetooth OBEX BPP Application Parameters", "BT BPP Application Parameters", "obex.parameter.bt.bpp");
+ bt_bpp_application_parameters_handle = register_dissector("obex.parameter.bt.bpp", dissect_obex_application_parameter_bt_bpp, proto_bpp);
- proto_bip = proto_register_protocol("BT OBEX BIP Application Parameters", "BIP Application Parameters", "btobex.parameter.bip");
- bip_application_parameters_handle = register_dissector("btobex.parameter.bip", dissect_btobex_application_parameter_bip, proto_bip);
+ proto_bip = proto_register_protocol("Bluetooth OBEX BIP Application Parameters", "BT BIP Application Parameters", "obex.parameter.bt.bip");
+ bt_bip_application_parameters_handle = register_dissector("obex.parameter.bt.bip", dissect_obex_application_parameter_bt_bip, proto_bip);
- proto_map = proto_register_protocol("BT OBEX MAP Application Parameters", "MAP Application Parameters", "btobex.parameter.map");
- map_application_parameters_handle = register_dissector("btobex.parameter.map", dissect_btobex_application_parameter_map, proto_map);
+ proto_map = proto_register_protocol("Bluetooth OBEX MAP Application Parameters", "BT MAP Application Parameters", "obex.parameter.bt.map");
+ bt_map_application_parameters_handle = register_dissector("obex.parameter.bt.map", dissect_obex_application_parameter_bt_map, proto_map);
- proto_gpp = proto_register_protocol("BT OBEX GPP Application Parameters", "GPP Application Parameters", "btobex.parameter.gpp");
- gpp_application_parameters_handle = register_dissector("btobex.parameter.gpp", dissect_btobex_application_parameter_gpp, proto_gpp);
+ proto_bt_gpp = proto_register_protocol("Bluetooth OBEX GPP Application Parameters", "BT GPP Application Parameters", "obex.parameter.bt.gpp");
+ bt_gpp_application_parameters_handle = register_dissector("obex.parameter.bt.gpp", dissect_obex_application_parameter_bt_gpp, proto_bt_gpp);
- proto_ctn = proto_register_protocol("BT OBEX CTN Application Parameters", "CTN Application Parameters", "btobex.parameter.ctn");
- ctn_application_parameters_handle = register_dissector("btobex.parameter.ctn", dissect_btobex_application_parameter_ctn, proto_ctn);
+ proto_bt_ctn = proto_register_protocol("Bluetooth OBEX CTN Application Parameters", "BT CTN Application Parameters", "obex.parameter.bt.ctn");
+ bt_ctn_application_parameters_handle = register_dissector("obex.parameter.bt.ctn", dissect_obex_application_parameter_bt_ctn, proto_bt_ctn);
- proto_pbap = proto_register_protocol("BT OBEX PBAP Application Parameters", "PBAP Application Parameters", "btobex.parameter.pbap");
- pbap_application_parameters_handle = register_dissector("btobex.parameter.pbap", dissect_btobex_application_parameter_pbap, proto_pbap);
+ proto_bt_pbap = proto_register_protocol("Bluetooth OBEX PBAP Application Parameters", "BT PBAP Application Parameters", "obex.parameter.bt.pbap");
+ bt_pbap_application_parameters_handle = register_dissector("obex.parameter.bt.pbap", dissect_obex_application_parameter_bt_pbap, proto_bt_pbap);
register_decode_as(&media_type_da);
- module = prefs_register_protocol(proto_btobex, NULL);
- prefs_register_static_text_preference(module, "obex.version",
- "Bluetooth Protocol OBEX support profiles: BIP 1.2, BPP 1.2, CTN 1.0, FTP 1.3, GOEP 1.3, GPP 1.0, MAP 1.2, OPP 1.2, PBAP 1.2, SYNCH 1.2",
- "Version of profiles supported by this dissector.");
+ module = prefs_register_protocol(proto_obex, NULL);
+ prefs_register_static_text_preference(module, "supported_bluetooth_profiles",
+ "Protocol OBEX support Bluetooth profiles: BIP 1.2, BPP 1.2, CTN 1.0, FTP 1.3, GOEP 1.3, GPP 1.0, MAP 1.2, OPP 1.2, PBAP 1.2, SYNCH 1.2",
+ "Versions of Bluetooth profiles supported by this dissector.");
}
void
-proto_reg_handoff_btobex(void)
+proto_reg_handoff_obex(void)
{
- dissector_add_string("bluetooth.uuid", "1104", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1105", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1106", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1107", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1118", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1119", btobex_handle);
- dissector_add_string("bluetooth.uuid", "111a", btobex_handle);
- dissector_add_string("bluetooth.uuid", "111b", btobex_handle);
- dissector_add_string("bluetooth.uuid", "111c", btobex_handle);
- dissector_add_string("bluetooth.uuid", "111d", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1120", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1121", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1122", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1123", btobex_handle);
- dissector_add_string("bluetooth.uuid", "112e", btobex_handle);
- dissector_add_string("bluetooth.uuid", "112f", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1130", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1132", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1133", btobex_handle);
- dissector_add_string("bluetooth.uuid", "1134", btobex_handle);
+ dissector_add_string("bluetooth.uuid", "1104", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1105", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1106", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1107", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1118", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1119", obex_handle);
+ dissector_add_string("bluetooth.uuid", "111a", obex_handle);
+ dissector_add_string("bluetooth.uuid", "111b", obex_handle);
+ dissector_add_string("bluetooth.uuid", "111c", obex_handle);
+ dissector_add_string("bluetooth.uuid", "111d", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1120", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1121", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1122", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1123", obex_handle);
+ dissector_add_string("bluetooth.uuid", "112e", obex_handle);
+ dissector_add_string("bluetooth.uuid", "112f", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1130", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1132", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1133", obex_handle);
+ dissector_add_string("bluetooth.uuid", "1134", obex_handle);
http_handle = find_dissector("http");
xml_handle = find_dissector("xml");
data_handle = find_dissector("data");
data_text_lines_handle = find_dissector("data-text-lines");
- dissector_add_uint("btobex.profile", PROFILE_UNKNOWN, raw_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_BPP, bpp_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_BIP, bip_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_CTN, ctn_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_GPP, gpp_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_MAP, map_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_PBAP, pbap_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_UNKNOWN, raw_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_BPP, bt_bpp_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_BIP, bt_bip_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_CTN, bt_ctn_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_GPP, bt_gpp_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_MAP, bt_map_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_PBAP, bt_pbap_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_OPP, raw_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_FTP, raw_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_SYNCML, raw_application_parameters_handle);
- dissector_add_uint("btobex.profile", PROFILE_SYNC, raw_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_OPP, raw_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_FTP, raw_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_SYNCML, raw_application_parameters_handle);
+ dissector_add_uint("obex.profile", PROFILE_SYNC, raw_application_parameters_handle);
- dissector_add_for_decode_as("btrfcomm.dlci", btobex_handle);
- dissector_add_for_decode_as("btl2cap.psm", btobex_handle);
- dissector_add_for_decode_as("btl2cap.cid", btobex_handle);
+ dissector_add_for_decode_as("btrfcomm.dlci", obex_handle);
+ dissector_add_for_decode_as("btl2cap.psm", obex_handle);
+ dissector_add_for_decode_as("btl2cap.cid", obex_handle);
/* PBAP */
dissector_add_string("media_type", "x-bt/phonebook", data_text_lines_handle);
@@ -3951,6 +3951,12 @@ proto_reg_handoff_btobex(void)
dissector_add_string("media_type", "x-bt/img-monitoring", data_handle);
media_type_dissector_table = find_dissector_table("media_type");
+
+ dissector_add_for_decode_as("usb.product", obex_handle);
+ dissector_add_for_decode_as("usb.device", obex_handle);
+ dissector_add_for_decode_as("usb.protocol", obex_handle);
+ dissector_add_for_decode_as("tcp.port", obex_handle);
+ dissector_add_for_decode_as("udp.port", obex_handle);
}
/*
diff --git a/profiles/Bluetooth/colorfilters b/profiles/Bluetooth/colorfilters
index 269e339b53..73b03f1b1f 100644
--- a/profiles/Bluetooth/colorfilters
+++ b/profiles/Bluetooth/colorfilters
@@ -33,7 +33,7 @@
@HCRP@bthcrp@[38416,38416,38416][5111,4915,4652]
@BNEP@btbnep@[46590,24119,49858][5111,4915,4652]
@HID@bthid@[47057,38562,38562][5111,4915,4652]
-@OBEX@btobex@[15856,45391,43152][5111,4915,4652]
+@OBEX@obex@[15856,45391,43152][5111,4915,4652]
@SAP@btsap@[51110,54321,18857][5111,4915,4652]
@HFP@bthfp@[57840,49413,65535][5111,4915,4652]
@HSP@bthsp@[52394,49749,56625][7995,7208,6946]
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-19 02:21:37 +0000