aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-ansi_a.c4
-rw-r--r--epan/dissectors/packet-aprs.c4
-rw-r--r--epan/dissectors/packet-ax25-nol3.c35
-rw-r--r--epan/dissectors/packet-fmp_notify.c4
-rw-r--r--epan/dissectors/packet-gdsdb.c405
-rw-r--r--epan/dissectors/packet-gsm_rlcmac.c4
-rw-r--r--epan/dissectors/packet-gtpv2.c4
-rw-r--r--epan/dissectors/packet-h248_annex_e.c4
-rw-r--r--epan/dissectors/packet-netperfmeter.c12
-rw-r--r--epan/dissectors/packet-v5dl.c9
-rw-r--r--epan/dissectors/packet-vntag.c4
11 files changed, 265 insertions, 224 deletions
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 251a1ae5a5..ba654d9c37 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -668,7 +668,9 @@ static int hf_ansi_a_imsi = -1;
static int hf_ansi_a_min = -1;
static int hf_ansi_a_meid = -1;
static int hf_ansi_a_cld_party_bcd_num = -1;
+#ifdef MAYBE_USED_FOR_OLDER_CODECS
static int hf_ansi_a_clg_party_bcd_num = -1;
+#endif
static int hf_ansi_a_cld_party_ascii_num = -1;
static int hf_ansi_a_clg_party_ascii_num = -1;
static int hf_ansi_a_cell_ci = -1;
@@ -11977,11 +11979,13 @@ proto_register_ansi_a(void)
FT_STRING, BASE_NONE, 0, 0,
NULL, HFILL }
},
+#ifdef MAYBE_USED_FOR_OLDER_CODECS
{ &hf_ansi_a_clg_party_bcd_num,
{ "Calling Party BCD Number", "ansi_a_bsmap.clg_party_bcd_num",
FT_STRING, BASE_NONE, 0, 0,
NULL, HFILL }
},
+#endif
{ &hf_ansi_a_cld_party_ascii_num,
{ "Called Party ASCII Number", "ansi_a_bsmap.cld_party_ascii_num",
FT_STRING, BASE_NONE, 0, 0,
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c
index a5d762c565..92496a28f3 100644
--- a/epan/dissectors/packet-aprs.c
+++ b/epan/dissectors/packet-aprs.c
@@ -64,7 +64,7 @@ static int hf_aprs_mdhm = -1;
static int hf_aprs_tz = -1;
/* aprs position items */
-static int hf_aprs_position = -1;
+/* static int hf_aprs_position = -1; */
static int hf_aprs_lat = -1;
static int hf_aprs_long = -1;
@@ -1544,11 +1544,13 @@ proto_register_aprs( void )
},
/* Position */
+#if 0
{ &hf_aprs_position,
{ "Position", "aprs.position",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
+#endif
{ &hf_aprs_lat,
{ "Latitude", "aprs.position.lat",
FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-ax25-nol3.c b/epan/dissectors/packet-ax25-nol3.c
index cb94cb1c35..293f7b3108 100644
--- a/epan/dissectors/packet-ax25-nol3.c
+++ b/epan/dissectors/packet-ax25-nol3.c
@@ -67,7 +67,7 @@ static int proto_dx = -1;
static int hf_dx_report = -1;
-static int hf_text = -1;
+/* static int hf_text = -1; */
/* Global preferences */
static gboolean gPREF_APRS = FALSE;
@@ -89,11 +89,10 @@ dissect_dx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
int data_len;
int offset;
- offset = 0;
+ offset = 0;
data_len = tvb_length_remaining( tvb, offset );
col_set_str( pinfo->cinfo, COL_PROTOCOL, "DX" );
-
col_clear( pinfo->cinfo, COL_INFO );
col_add_fstr( pinfo->cinfo, COL_INFO, "%s", tvb_format_text( tvb, offset, 15 ) );
@@ -101,7 +100,7 @@ dissect_dx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
if ( parent_tree )
{
/* create display subtree for the protocol */
- ti = proto_tree_add_protocol_format( parent_tree, proto_dx, tvb, 0, tvb_length_remaining( tvb, offset ),
+ ti = proto_tree_add_protocol_format( parent_tree, proto_dx, tvb, 0, -1,
"DX (%s)", tvb_format_text( tvb, offset, 15 ) );
dx_tree = proto_item_add_subtree( ti, ett_dx );
offset = 0;
@@ -154,12 +153,12 @@ dissect_ax25_nol3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
{
proto_item *ti;
proto_tree *ax25_nol3_tree;
- char *info_buffer;
- int offset;
- void *saved_private_data;
- tvbuff_t *next_tvb = NULL;
- guint8 dti = 0;
- gboolean dissected;
+ char *info_buffer;
+ int offset;
+ void *saved_private_data;
+ tvbuff_t *next_tvb = NULL;
+ guint8 dti = 0;
+ gboolean dissected;
info_buffer = ep_alloc( STRLEN );
info_buffer[0] = '\0';
@@ -194,7 +193,7 @@ dissect_ax25_nol3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree )
proto_ax25_nol3,
tvb,
0,
- tvb_length_remaining( tvb, offset ),
+ -1,
"AX.25 No Layer 3 - (%s)", info_buffer );
ax25_nol3_tree = proto_item_add_subtree( ti, ett_ax25_nol3 );
@@ -231,6 +230,7 @@ proto_register_ax25_nol3(void)
module_t *ax25_nol3_module;
/* Setup list of header fields */
+#if 0 /* not used ? */
static hf_register_info hf[] = {
{ &hf_text,
{ "Text", "ax25_nol3.text",
@@ -238,6 +238,7 @@ proto_register_ax25_nol3(void)
NULL, HFILL }
},
};
+#endif
static hf_register_info hf_dx[] = {
{ &hf_dx_report,
@@ -257,20 +258,20 @@ proto_register_ax25_nol3(void)
proto_ax25_nol3 = proto_register_protocol("AX.25 no Layer 3", "AX.25 no L3", "ax25_nol3");
/* Required function calls to register the header fields and subtrees used */
- proto_register_field_array( proto_ax25_nol3, hf, array_length(hf ) );
+ /* proto_register_field_array( proto_ax25_nol3, hf, array_length(hf ) ); */
proto_register_subtree_array( ett, array_length( ett ) );
/* Register preferences module */
- ax25_nol3_module = prefs_register_protocol( proto_ax25_nol3, NULL);
+ ax25_nol3_module = prefs_register_protocol( proto_ax25_nol3, NULL);
/* Register any preference */
- prefs_register_bool_preference(ax25_nol3_module, "showaprs",
- "Decode the APRS info field",
+ prefs_register_bool_preference(ax25_nol3_module, "showaprs",
+ "Decode the APRS info field",
"Enable decoding of the payload as APRS.",
&gPREF_APRS );
- prefs_register_bool_preference(ax25_nol3_module, "showcluster",
- "Decode DX cluster info field",
+ prefs_register_bool_preference(ax25_nol3_module, "showcluster",
+ "Decode DX cluster info field",
"Enable decoding of the payload as DX cluster info.",
&gPREF_DX );
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 3410ecccb3..055370a706 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -56,7 +56,7 @@ static int proto_fmp_notify = -1;
static int hf_fmp_handleListLen = -1;
static int hf_fmp_notify_procedure = -1;
static int hf_fmp_fsID = -1;
-static int hf_fmp_fsBlkSz = -1;
+/* static int hf_fmp_fsBlkSz = -1; */
static int hf_fmp_sessionHandle = -1;
static int hf_fmp_fmpFHandle = -1;
static int hf_fmp_msgNum = -1;
@@ -562,9 +562,11 @@ proto_register_fmp_notify(void)
"File System ID", "fmp_notify.fsID", FT_UINT32, BASE_HEX,
NULL, 0, NULL, HFILL }},
+#if 0
{ &hf_fmp_fsBlkSz, {
"FS Block Size", "fmp_notify.fsBlkSz", FT_UINT32, BASE_DEC,
NULL, 0, "File System Block Size", HFILL }},
+#endif
{ &hf_fmp_numBlksReq, {
diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c
index 662801c83b..d9aef20b3c 100644
--- a/epan/dissectors/packet-gdsdb.c
+++ b/epan/dissectors/packet-gdsdb.c
@@ -34,7 +34,7 @@
static int proto_gdsdb = -1;
static gint ett_gdsdb = -1;
static int hf_gdsdb_opcode = -1;
-static gint ett_gdsdb_opcode = -1;
+/* static gint ett_gdsdb_opcode = -1; */
/* gdsdb_dummy */
/* gdsdb_connect */
@@ -87,7 +87,9 @@ static int hf_gdsdb_response_status = -1;
/* gdsdb_transact */
static int hf_gdsdb_transact_database = -1;
static int hf_gdsdb_transact_transaction = -1;
+#if 0
static int hf_gdsdb_transact_messages = -1;
+#endif
/* gdsdb_transact_response */
static int hf_gdsdb_transactresponse_messages = -1;
/* gdsdb_open_blob2 */
@@ -95,6 +97,7 @@ static int hf_gdsdb_openblob2_bpb = -1;
/* gdsdb_open_blob */
static int hf_gdsdb_openblob_transaction = -1;
static int hf_gdsdb_openblob_id = -1;
+#if 0
/* gdsdb_segment */
static int hf_gdsdb_segment_blob = -1;
static int hf_gdsdb_segment_length = -1;
@@ -104,11 +107,13 @@ static int hf_gdsdb_seekblob_blob = -1;
static int hf_gdsdb_seekblob_mode = -1;
/* gdsdb_reconnect */
static int hf_gdsdb_reconnect_database = -1;
+#endif
/* gdsdb_info & gdsdb_service_start */
static int hf_gdsdb_info_object = -1;
static int hf_gdsdb_info_incarnation = -1;
static int hf_gdsdb_info_items = -1;
static int hf_gdsdb_info_buffer_length = -1;
+#if 0
/* gdsdb_release */
static int hf_gdsdb_release_object = -1;
/* gdsdb_prepare2 */
@@ -144,6 +149,7 @@ static int hf_gdsdb_prepare2_number = -1;
static int hf_gdsdb_prepare2_messages = -1;
static int hf_gdsdb_prepare2_outblr = -1;
static int hf_gdsdb_prepare2_outmsgnr = -1;
+#endif
/* gdsdb_prepare */
static int hf_gdsdb_prepare_transaction = -1;
static int hf_gdsdb_prepare_statement = -1;
@@ -151,6 +157,7 @@ static int hf_gdsdb_prepare_dialect = -1;
static int hf_gdsdb_prepare_querystr = -1;
static int hf_gdsdb_prepare_items = -1;
static int hf_gdsdb_prepare_bufferlength = -1;
+#if 0
/* gdsdb_fetch */
static int hf_gdsdb_fetch_statement = -1;
static int hf_gdsdb_fetch_message_number = -1;
@@ -170,6 +177,7 @@ static int hf_gdsdb_cursor_statement = -1;
static int hf_gdsdb_cursor_type = -1;
/* gdsdb_sql_response */
static int hf_gdsdb_sqlresponse_messages = -1;
+#endif
enum
{
@@ -264,106 +272,106 @@ enum
};
static const value_string gdsdb_opcode[] = {
- { op_void, "Void" },
- { op_connect, "Connect" },
- { op_exit, "Exit" },
- { op_accept, "Accept" },
- { op_reject, "Reject" },
- { op_protocol, "Protocol" },
- { op_disconnect, "Disconnect" },
- { op_credit, "Credit" },
- { op_continuation, "Continuation" },
- { op_response, "Response" },
- { op_open_file, "Open file" },
- { op_create_file, "Create file" },
- { op_close_file, "Close file" },
- { op_read_page, "Read page" },
- { op_write_page, "Write page" },
- { op_lock, "Lock" },
- { op_convert_lock, "Convert lock" },
- { op_release_lock, "Release lock" },
- { op_blocking, "Blocking" },
- { op_attach, "Attach" },
- { op_create, "Create" },
- { op_detach, "Detach" },
- { op_compile, "Compile" },
- { op_start, "Start" },
- { op_start_and_send, "Start and send" },
- { op_send, "Send" },
- { op_receive, "Receive" },
- { op_unwind, "Unwind" },
- { op_release, "Release" },
- { op_transaction, "Transaction" },
- { op_commit, "Commit" },
- { op_rollback, "Rollback" },
- { op_prepare, "Prepare" },
- { op_reconnect, "Reconnect" },
- { op_create_blob, "Create blob" },
- { op_open_blob, "Open blob" },
- { op_get_segment, "Get segment" },
- { op_put_segment, "Put segment" },
- { op_cancel_blob, "Cancel blob" },
- { op_close_blob, "Close blob" },
- { op_info_database, "Info database" },
- { op_info_request, "Info request" },
- { op_info_transaction, "Info transaction" },
- { op_info_blob, "Info blob" },
- { op_batch_segments, "Batch segments" },
- { op_mgr_set_affinity, "Mgr set affinity" },
- { op_mgr_clear_affinity, "Mgr clear affinity" },
- { op_mgr_report, "Mgr report" },
- { op_que_events, "Que events" },
- { op_cancel_events, "Cancel events" },
- { op_commit_retaining, "Commit retaining" },
- { op_prepare2, "Prepare 2" },
- { op_event, "Event" },
- { op_connect_request, "Connect request" },
- { op_aux_connect, "Aux connect" },
- { op_ddl, "DDl" },
- { op_open_blob2, "Open blob 2" },
- { op_create_blob2, "Create blob 2" },
- { op_get_slice, "Get slice" },
- { op_put_slice, "Put slice" },
- { op_slice, "Slice" },
- { op_seek_blob, "Seek blob" },
- { op_allocate_statement, "Allocate statement" },
- { op_execute, "Execute" },
- { op_exec_immediate, "Exec immediate" },
- { op_fetch, "Fetch" },
- { op_fetch_response, "Fetch response" },
- { op_free_statement, "Free statement" },
- { op_prepare_statement, "Prepare statement" },
- { op_set_cursor, "Set cursor" },
- { op_info_sql, "Info sql" },
- { op_dummy, "Dummy" },
- { op_response_piggyback, "Response piggyback" },
- { op_start_and_receive, "Start and receive" },
+ { op_void, "Void" },
+ { op_connect, "Connect" },
+ { op_exit, "Exit" },
+ { op_accept, "Accept" },
+ { op_reject, "Reject" },
+ { op_protocol, "Protocol" },
+ { op_disconnect, "Disconnect" },
+ { op_credit, "Credit" },
+ { op_continuation, "Continuation" },
+ { op_response, "Response" },
+ { op_open_file, "Open file" },
+ { op_create_file, "Create file" },
+ { op_close_file, "Close file" },
+ { op_read_page, "Read page" },
+ { op_write_page, "Write page" },
+ { op_lock, "Lock" },
+ { op_convert_lock, "Convert lock" },
+ { op_release_lock, "Release lock" },
+ { op_blocking, "Blocking" },
+ { op_attach, "Attach" },
+ { op_create, "Create" },
+ { op_detach, "Detach" },
+ { op_compile, "Compile" },
+ { op_start, "Start" },
+ { op_start_and_send, "Start and send" },
+ { op_send, "Send" },
+ { op_receive, "Receive" },
+ { op_unwind, "Unwind" },
+ { op_release, "Release" },
+ { op_transaction, "Transaction" },
+ { op_commit, "Commit" },
+ { op_rollback, "Rollback" },
+ { op_prepare, "Prepare" },
+ { op_reconnect, "Reconnect" },
+ { op_create_blob, "Create blob" },
+ { op_open_blob, "Open blob" },
+ { op_get_segment, "Get segment" },
+ { op_put_segment, "Put segment" },
+ { op_cancel_blob, "Cancel blob" },
+ { op_close_blob, "Close blob" },
+ { op_info_database, "Info database" },
+ { op_info_request, "Info request" },
+ { op_info_transaction, "Info transaction" },
+ { op_info_blob, "Info blob" },
+ { op_batch_segments, "Batch segments" },
+ { op_mgr_set_affinity, "Mgr set affinity" },
+ { op_mgr_clear_affinity, "Mgr clear affinity" },
+ { op_mgr_report, "Mgr report" },
+ { op_que_events, "Que events" },
+ { op_cancel_events, "Cancel events" },
+ { op_commit_retaining, "Commit retaining" },
+ { op_prepare2, "Prepare 2" },
+ { op_event, "Event" },
+ { op_connect_request, "Connect request" },
+ { op_aux_connect, "Aux connect" },
+ { op_ddl, "DDl" },
+ { op_open_blob2, "Open blob 2" },
+ { op_create_blob2, "Create blob 2" },
+ { op_get_slice, "Get slice" },
+ { op_put_slice, "Put slice" },
+ { op_slice, "Slice" },
+ { op_seek_blob, "Seek blob" },
+ { op_allocate_statement, "Allocate statement" },
+ { op_execute, "Execute" },
+ { op_exec_immediate, "Exec immediate" },
+ { op_fetch, "Fetch" },
+ { op_fetch_response, "Fetch response" },
+ { op_free_statement, "Free statement" },
+ { op_prepare_statement, "Prepare statement" },
+ { op_set_cursor, "Set cursor" },
+ { op_info_sql, "Info sql" },
+ { op_dummy, "Dummy" },
+ { op_response_piggyback, "Response piggyback" },
+ { op_start_and_receive, "Start and receive" },
{ op_start_send_and_receive, "Start send and receive" },
- { op_exec_immediate2, "Exec immediate 2" },
- { op_execute2, "Execute 2" },
- { op_insert, "Insert" },
- { op_sql_response, "Sql response" },
- { op_transact, "Transact" },
- { op_transact_response, "Transact response" },
- { op_drop_database, "Drop database" },
- { op_service_attach, "Service attach" },
- { op_service_detach, "Service detach" },
- { op_service_info, "Service info" },
- { op_service_start, "Service start" },
- { op_rollback_retaining, "Rollback retaining" },
+ { op_exec_immediate2, "Exec immediate 2" },
+ { op_execute2, "Execute 2" },
+ { op_insert, "Insert" },
+ { op_sql_response, "Sql response" },
+ { op_transact, "Transact" },
+ { op_transact_response, "Transact response" },
+ { op_drop_database, "Drop database" },
+ { op_service_attach, "Service attach" },
+ { op_service_detach, "Service detach" },
+ { op_service_info, "Service info" },
+ { op_service_start, "Service start" },
+ { op_rollback_retaining, "Rollback retaining" },
{ 0, NULL }
};
static const value_string gdsdb_architectures[] = {
- { 1, "Generic" },
- { 2, "Apollo" },
- { 3, "Sun" },
- { 4, "Vms" },
- { 5, "Ultrix" },
- { 6, "Alliant" },
- { 7, "MS-Dos" },
- { 8, "Sun 4" },
- { 9, "Sun 386" },
+ { 1, "Generic" },
+ { 2, "Apollo" },
+ { 3, "Sun" },
+ { 4, "Vms" },
+ { 5, "Ultrix" },
+ { 6, "Alliant" },
+ { 7, "MS-Dos" },
+ { 8, "Sun 4" },
+ { 9, "Sun 386" },
{ 10, "HP-UX" },
{ 11, "HP MPE/xl" },
{ 12, "Mac" },
@@ -692,7 +700,6 @@ gdsdb_transact(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
static int
gdsdb_transact_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
{
-
int offset;
if (tvb_length(tvb) < 8) {
@@ -721,7 +728,7 @@ gdsdb_open_blob2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
proto_tree_add_item(tree, hf_gdsdb_openblob2_bpb, tvb, offset,
4, ENC_ASCII|ENC_NA);
length = tvb_get_ntohl(tvb, offset);
- offset += length + 6;
+ offset += length + 6;
proto_tree_add_item(tree, hf_gdsdb_openblob_transaction, tvb,
offset, 4, ENC_BIG_ENDIAN);
offset += 4;
@@ -803,8 +810,8 @@ gdsdb_reconnect(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
static int
gdsdb_info(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
{
- int offset;
- int length;
+ int offset;
+ int length;
guint opcode;
if (tvb_length(tvb) < 20) {
@@ -1037,7 +1044,7 @@ gdsdb_prepare(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
proto_tree_add_uint_format_value(tree,
hf_gdsdb_prepare_items, tvb, offset, 4 + length,
length, "%i data bytes", length);
- offset += tvb_get_ntohl(tvb, offset) + 6;
+ offset += tvb_get_ntohl(tvb, offset) + 6;
proto_tree_add_item(tree, hf_gdsdb_prepare_bufferlength, tvb,
offset, 2, ENC_BIG_ENDIAN);
}
@@ -1143,102 +1150,102 @@ gdsdb_sql_response(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree)
}
static int (*gdsdb_handle_opcode[])(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) = {
- gdsdb_dummy, /* op_void */
- gdsdb_connect, /* op_connect */
- gdsdb_dummy, /* op_exit */
- gdsdb_accept, /* op_accept */
- gdsdb_dummy, /* op_reject */
- gdsdb_dummy, /* op_protocol */
- gdsdb_dummy, /* op_disconnect */
- gdsdb_dummy, /* op_credit */
- gdsdb_dummy, /* op_continuation */
- gdsdb_response, /* op_response */
- gdsdb_dummy, /* op_open_file */
- gdsdb_dummy, /* op_create_file */
- gdsdb_dummy, /* op_close_file */
- gdsdb_dummy, /* op_read_page */
- gdsdb_dummy, /* op_write_page */
- gdsdb_dummy, /* op_lock */
- gdsdb_dummy, /* op_convert_lock */
- gdsdb_dummy, /* op_release_lock */
- gdsdb_dummy, /* op_blocking */
- gdsdb_attach, /* op_attach */
- gdsdb_attach, /* op_create */
- gdsdb_release, /* op_detach */
- gdsdb_compile, /* op_compile */
- gdsdb_receive, /* op_start */
- gdsdb_send, /* op_start_and_send */
- gdsdb_send, /* op_send */
- gdsdb_receive, /* op_receive */
- gdsdb_release, /* op_unwind */
- gdsdb_release, /* op_release */
- gdsdb_reconnect, /* op_transaction */
- gdsdb_release, /* op_commit */
- gdsdb_release, /* op_rollback */
- gdsdb_release, /* op_prepare */
- gdsdb_reconnect, /* op_reconnect */
- gdsdb_open_blob2, /* op_create_blob */
- gdsdb_open_blob, /* op_open_blob */
- gdsdb_segment, /* op_get_segment */
- gdsdb_segment, /* op_put_segment */
- gdsdb_release, /* op_cancel_blob */
- gdsdb_release, /* op_close_blob */
- gdsdb_info, /* op_info_database */
- gdsdb_info, /* op_info_request */
- gdsdb_info, /* op_info_transaction */
- gdsdb_info, /* op_info_blob */
- gdsdb_segment, /* op_batch_segments */
- gdsdb_dummy, /* op_mgr_set_affinity */
- gdsdb_dummy, /* op_mgr_clear_affinity */
- gdsdb_dummy, /* op_mgr_report */
- gdsdb_event, /* op_que_events */
- gdsdb_cancel_events, /* op_cancel_events */
- gdsdb_release, /* op_commit_retaining */
- gdsdb_release, /* op_prepare */
- gdsdb_event, /* op_event */
- gdsdb_request, /* op_connect_request */
- gdsdb_request, /* op_aux_connect */
- gdsdb_ddl, /* op_ddl */
- gdsdb_open_blob2, /* op_open_blob2 */
- gdsdb_open_blob2, /* op_create_blob2 */
- gdsdb_slice, /* op_get_slice */
- gdsdb_slice, /* op_put_slice */
- gdsdb_slice_response, /* op_slice */
- gdsdb_seek_blob, /* op_seek_blob */
- gdsdb_release, /* op_allocate_statement */
- gdsdb_execute, /* op_execute */
- gdsdb_prepare, /* op_exec_immediate */
- gdsdb_fetch, /* op_fetch */
- gdsdb_fetch_response, /* op_fetch_response */
- gdsdb_free_statement, /* op_free_statement */
- gdsdb_prepare, /* op_prepare_statement */
- gdsdb_cursor, /* op_set_cursor */
- gdsdb_info, /* op_info_sql */
- gdsdb_dummy, /* op_dummy */
- gdsdb_response, /* op_response_piggyback */
- gdsdb_receive, /* op_start_and_receive */
- gdsdb_send, /* op_start_send_and_receive */
- gdsdb_exec_immediate2, /* op_exec_immediate2 */
- gdsdb_execute, /* op_execute2 */
- gdsdb_insert, /* op_insert */
- gdsdb_sql_response, /* op_sql_response */
- gdsdb_transact, /* op_transact */
- gdsdb_transact_response, /* op_transact_response */
- gdsdb_release, /* op_drop_database */
- gdsdb_attach, /* op_service_attach */
- gdsdb_release, /* op_service_detach */
- gdsdb_info, /* op_service_info */
- gdsdb_service_start, /* op_service_start */
- gdsdb_release /* op_rollback_retaining */
+ gdsdb_dummy, /* op_void */
+ gdsdb_connect, /* op_connect */
+ gdsdb_dummy, /* op_exit */
+ gdsdb_accept, /* op_accept */
+ gdsdb_dummy, /* op_reject */
+ gdsdb_dummy, /* op_protocol */
+ gdsdb_dummy, /* op_disconnect */
+ gdsdb_dummy, /* op_credit */
+ gdsdb_dummy, /* op_continuation */
+ gdsdb_response, /* op_response */
+ gdsdb_dummy, /* op_open_file */
+ gdsdb_dummy, /* op_create_file */
+ gdsdb_dummy, /* op_close_file */
+ gdsdb_dummy, /* op_read_page */
+ gdsdb_dummy, /* op_write_page */
+ gdsdb_dummy, /* op_lock */
+ gdsdb_dummy, /* op_convert_lock */
+ gdsdb_dummy, /* op_release_lock */
+ gdsdb_dummy, /* op_blocking */
+ gdsdb_attach, /* op_attach */
+ gdsdb_attach, /* op_create */
+ gdsdb_release, /* op_detach */
+ gdsdb_compile, /* op_compile */
+ gdsdb_receive, /* op_start */
+ gdsdb_send, /* op_start_and_send */
+ gdsdb_send, /* op_send */
+ gdsdb_receive, /* op_receive */
+ gdsdb_release, /* op_unwind */
+ gdsdb_release, /* op_release */
+ gdsdb_reconnect, /* op_transaction */
+ gdsdb_release, /* op_commit */
+ gdsdb_release, /* op_rollback */
+ gdsdb_release, /* op_prepare */
+ gdsdb_reconnect, /* op_reconnect */
+ gdsdb_open_blob2, /* op_create_blob */
+ gdsdb_open_blob, /* op_open_blob */
+ gdsdb_segment, /* op_get_segment */
+ gdsdb_segment, /* op_put_segment */
+ gdsdb_release, /* op_cancel_blob */
+ gdsdb_release, /* op_close_blob */
+ gdsdb_info, /* op_info_database */
+ gdsdb_info, /* op_info_request */
+ gdsdb_info, /* op_info_transaction */
+ gdsdb_info, /* op_info_blob */
+ gdsdb_segment, /* op_batch_segments */
+ gdsdb_dummy, /* op_mgr_set_affinity */
+ gdsdb_dummy, /* op_mgr_clear_affinity */
+ gdsdb_dummy, /* op_mgr_report */
+ gdsdb_event, /* op_que_events */
+ gdsdb_cancel_events, /* op_cancel_events */
+ gdsdb_release, /* op_commit_retaining */
+ gdsdb_release, /* op_prepare */
+ gdsdb_event, /* op_event */
+ gdsdb_request, /* op_connect_request */
+ gdsdb_request, /* op_aux_connect */
+ gdsdb_ddl, /* op_ddl */
+ gdsdb_open_blob2, /* op_open_blob2 */
+ gdsdb_open_blob2, /* op_create_blob2 */
+ gdsdb_slice, /* op_get_slice */
+ gdsdb_slice, /* op_put_slice */
+ gdsdb_slice_response, /* op_slice */
+ gdsdb_seek_blob, /* op_seek_blob */
+ gdsdb_release, /* op_allocate_statement */
+ gdsdb_execute, /* op_execute */
+ gdsdb_prepare, /* op_exec_immediate */
+ gdsdb_fetch, /* op_fetch */
+ gdsdb_fetch_response, /* op_fetch_response */
+ gdsdb_free_statement, /* op_free_statement */
+ gdsdb_prepare, /* op_prepare_statement */
+ gdsdb_cursor, /* op_set_cursor */
+ gdsdb_info, /* op_info_sql */
+ gdsdb_dummy, /* op_dummy */
+ gdsdb_response, /* op_response_piggyback */
+ gdsdb_receive, /* op_start_and_receive */
+ gdsdb_send, /* op_start_send_and_receive */
+ gdsdb_exec_immediate2, /* op_exec_immediate2 */
+ gdsdb_execute, /* op_execute2 */
+ gdsdb_insert, /* op_insert */
+ gdsdb_sql_response, /* op_sql_response */
+ gdsdb_transact, /* op_transact */
+ gdsdb_transact_response, /* op_transact_response */
+ gdsdb_release, /* op_drop_database */
+ gdsdb_attach, /* op_service_attach */
+ gdsdb_release, /* op_service_detach */
+ gdsdb_info, /* op_service_info */
+ gdsdb_service_start, /* op_service_start */
+ gdsdb_release /* op_rollback_retaining */
};
static int
dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
- proto_item *ti;
- proto_tree *gdsdb_tree;
- guint opcode;
- packet_info nopi;
+ proto_item *ti;
+ proto_tree *gdsdb_tree;
+ guint opcode;
+ packet_info nopi;
gdsdb_tree = NULL; /* So the opcode functions can check on if(tree) */
nopi.cinfo = NULL;
@@ -1489,11 +1496,13 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#if 0
{ &hf_gdsdb_transact_messages,
{ "Messages", "gdsdb.transact.messages",
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#endif
/* gdsdb_transact_response */
{ &hf_gdsdb_transactresponse_messages,
{ "Messages", "gdsdb.transactresponse.messages",
@@ -1517,6 +1526,7 @@ proto_register_gdsdb(void)
FT_UINT64, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
+#if 0
/* gdsdb_segment */
{ &hf_gdsdb_segment_blob,
{ "Blob", "gdsdb.segment.blob",
@@ -1550,6 +1560,7 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#endif
/* gdsdb_info & gdsdb_service_start */
{ &hf_gdsdb_info_object,
{ "Object", "gdsdb.info.object",
@@ -1571,6 +1582,7 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#if 0
/* gdsdb_release */
{ &hf_gdsdb_release_object,
{ "Object", "gdsdb.release.object",
@@ -1710,6 +1722,7 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#endif
/* gdsdb_prepare */
{ &hf_gdsdb_prepare_transaction,
{ "Prepare, Transaction", "gdsdb.prepare.transaction",
@@ -1741,6 +1754,7 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
+#if 0
/* gdsdb_fetch */
{ &hf_gdsdb_fetch_statement,
{ "Statement", "gdsdb.fetch.statement",
@@ -1812,11 +1826,12 @@ proto_register_gdsdb(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }
}
+#endif
};
static gint *ett[] = {
&ett_gdsdb,
- &ett_gdsdb_opcode,
+ /* &ett_gdsdb_opcode, */
&ett_gdsdb_connect_pref
};
@@ -1824,8 +1839,8 @@ proto_register_gdsdb(void)
"Firebird SQL Database Remote Protocol",
"FB/IB GDS DB", "gdsdb");
- proto_register_field_array(proto_gdsdb, hf, array_length(hf));
- proto_register_subtree_array(ett, array_length(ett));
+ proto_register_field_array(proto_gdsdb, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
}
void
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c
index b8edd71e4f..b0d406cede 100644
--- a/epan/dissectors/packet-gsm_rlcmac.c
+++ b/epan/dissectors/packet-gsm_rlcmac.c
@@ -874,7 +874,7 @@ static int hf_packet_non_gprs_cell_opt_max_retrans = -1;
static int hf_packet_non_gprs_cell_opt_tx_int = -1;
static int hf_packet_non_gprs_cell_opt_ec = -1;
static int hf_packet_non_gprs_cell_opt_ms_txpwr_max_ccch = -1;
-static int hf_packet_non_gprs_cell_opt_ext_len = -1;
+/* static int hf_packet_non_gprs_cell_opt_ext_len = -1; */
/* <End Packet System Information Type 2> */
@@ -11875,12 +11875,14 @@ proto_register_gsm_rlcmac(void)
NULL, HFILL
}
},
+#if 0
{ &hf_packet_non_gprs_cell_opt_ext_len,
{ "Extention_Length", "gsm_rlcmac.dl.non_gprs_cell_opt_extention_length",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL
}
},
+#endif
{ &hf_packet_system_info_type2_ref_freq_num,
{ "RFL_NUMBER", "gsm_rlcmac.dl.psi2_ref_freq_number",
FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 8c28216854..bea3862921 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -164,7 +164,7 @@ static int hf_gtpv2_ip_address_ipv6= -1;
static int hf_gtpv2_mei= -1;
/* Trace Information */
-static int hf_gtpv2_tra_info = -1;
+/* static int hf_gtpv2_tra_info = -1; */
static int hf_gtpv2_tra_info_msc_momt_calls = -1;
static int hf_gtpv2_tra_info_msc_momt_sms = -1;
static int hf_gtpv2_tra_info_msc_lu_imsi_ad = -1;
@@ -5588,11 +5588,13 @@ void proto_register_gtpv2(void)
FT_UINT8, BASE_DEC, VALS(gtpv2_pdn_type_vals), 0x07,
NULL, HFILL}
},
+#if 0
{ &hf_gtpv2_tra_info,
{"Trace ID", "gtpv2.tra_info",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL}
},
+#endif
{ &hf_gtpv2_tra_info_msc_momt_calls,
{"MO and MT calls", "gtpv2.tra_info_msc_momt_calls",
FT_UINT8, BASE_DEC, NULL, 0x01,
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index 8554109325..162c20a6bd 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -690,7 +690,7 @@ static h248_package_t h248_pkg_cd = {
static int hf_h248_pkg_al = -1;
static int hf_h248_pkg_al_sig_cadence = -1;
static int hf_h248_pkg_al_sig_cadence_on_off = -1;
-static int hf_h248_pkg_al_sig_freq = -1;
+/* static int hf_h248_pkg_al_sig_freq = -1; */
static int hf_h248_pkg_al_evt_onhook = -1;
static int hf_h248_pkg_al_evt_offhook = -1;
static int hf_h248_pkg_al_evt_flashhook = -1;
@@ -1029,7 +1029,9 @@ void proto_register_h248_annex_e(void) {
{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.pkg.al", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_al_sig_cadence, { "Cadence", "h248.pkg.al.sig.cadence", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_al_sig_cadence_on_off, { "On/Off Cadence", "h248.pkg.al.sig.cadence_on_off", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+#if 0
{ &hf_h248_pkg_al_sig_freq, { "Ring Frequency", "h248.pkg.al.sig.freq", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+#endif
{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.pkg.al.onhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_al_evt_offhook, { "offhook", "h248.pkg.al.offhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_h248_pkg_al_evt_flashhook, { "flashhook", "h248.pkg.al.flashhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-netperfmeter.c b/epan/dissectors/packet-netperfmeter.c
index 36fc3e5464..269b7ac86d 100644
--- a/epan/dissectors/packet-netperfmeter.c
+++ b/epan/dissectors/packet-netperfmeter.c
@@ -77,7 +77,7 @@ INIT_FIELD(message_length, 2, 2)
INIT_FIELD(acknowledge_flowid, 4, 4)
INIT_FIELD(acknowledge_measurementid, 8, 8)
INIT_FIELD(acknowledge_streamid, 16, 2)
-INIT_FIELD(acknowledge_padding, 18, 2)
+/* INIT_FIELD(acknowledge_padding, 18, 2) */
INIT_FIELD(acknowledge_status, 20, 4)
INIT_FIELD(addflow_flowid, 4, 4)
@@ -126,10 +126,10 @@ INIT_FIELD(data_byteseqnumber, 32, 8)
INIT_FIELD(data_timestamp, 40, 8)
INIT_FIELD(data_payload, 48, 0)
-INIT_FIELD(start_padding, 4, 4)
+/* INIT_FIELD(start_padding, 4, 4) */
INIT_FIELD(start_measurementid, 8, 8)
-INIT_FIELD(stop_padding, 4, 4)
+/* INIT_FIELD(stop_padding, 4, 4) */
INIT_FIELD(stop_measurementid, 8, 8)
INIT_FIELD(results_data, 4, 0)
@@ -172,7 +172,9 @@ static hf_register_info hf[] = {
{ &hf_acknowledge_flowid, { "Flow ID", "npmp.acknowledge_flowid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
{ &hf_acknowledge_measurementid, { "Measurement ID", "npmp.acknowledge_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
{ &hf_acknowledge_streamid, { "Stream ID", "npmp.acknowledge_streamid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+#if 0
{ &hf_acknowledge_padding, { "Padding", "npmp.acknowledge_padding", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+#endif
{ &hf_acknowledge_status, { "Status", "npmp.acknowledge_status", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_addflow_flowid, { "Flow ID", "npmp.addflow_flowid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
@@ -221,10 +223,14 @@ static hf_register_info hf[] = {
{ &hf_data_timestamp, { "Time Stamp", "npmp.data_timestamp", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL } },
{ &hf_data_payload, { "Payload", "npmp.data_payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
+#if 0
{ &hf_start_padding, { "Padding", "npmp.start_padding", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+#endif
{ &hf_start_measurementid, { "Measurement ID", "npmp.start_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+#if 0
{ &hf_stop_padding, { "Padding", "npmp.stop_padding", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+#endif
{ &hf_stop_measurementid, { "Measurement ID", "npmp.stop_measurementid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
{ &hf_results_data, { "Data", "npmp.results_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c
index 21d370da68..39e38abd9d 100644
--- a/epan/dissectors/packet-v5dl.c
+++ b/epan/dissectors/packet-v5dl.c
@@ -63,14 +63,15 @@ static int hf_v5dl_u_modifier_resp = -1;
static int hf_v5dl_ftype_i = -1;
static int hf_v5dl_ftype_s_u = -1;
static int hf_v5dl_ftype_s_u_ext = -1;
+#if 0
static int hf_v5dl_checksum = -1;
static int hf_v5dl_checksum_good = -1;
static int hf_v5dl_checksum_bad = -1;
-
+#endif
static gint ett_v5dl = -1;
static gint ett_v5dl_address = -1;
static gint ett_v5dl_control = -1;
-static gint ett_v5dl_checksum = -1;
+/* static gint ett_v5dl_checksum = -1; */
static dissector_handle_t v52_handle;
@@ -406,6 +407,7 @@ proto_register_v5dl(void)
{ "Frame type", "v5dl.control.ftype", FT_UINT16, BASE_HEX,
VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
+#if 0
{ &hf_v5dl_checksum,
{ "Checksum", "v5dl.checksum", FT_UINT16, BASE_HEX,
NULL, 0x0, "Details at: http://www.wireshark.org/docs/wsug_html_chunked/ChAdvChecksums.html", HFILL }},
@@ -417,13 +419,14 @@ proto_register_v5dl(void)
{ &hf_v5dl_checksum_bad,
{ "Bad Checksum", "v5dl.checksum_bad", FT_BOOLEAN, BASE_NONE,
NULL, 0x0, "True: checksum doesn't match packet content; False: matches content or not checked", HFILL }}
+#endif
};
static gint *ett[] = {
&ett_v5dl,
&ett_v5dl_address,
&ett_v5dl_control,
- &ett_v5dl_checksum
+ /* &ett_v5dl_checksum */
};
proto_v5dl = proto_register_protocol("V5 Data Link Layer",
diff --git a/epan/dissectors/packet-vntag.c b/epan/dissectors/packet-vntag.c
index a55d2dc42e..37c9d67743 100644
--- a/epan/dissectors/packet-vntag.c
+++ b/epan/dissectors/packet-vntag.c
@@ -30,7 +30,7 @@
static int proto_vntag = -1;
static int hf_vntag_etype = -1;
-static int hf_vntag_len = -1;
+/* static int hf_vntag_len = -1; */
static int hf_vntag_trailer = -1;
static gint ett_vntag = -1;
@@ -99,9 +99,11 @@ proto_register_vntag(void)
{ &hf_vntag_etype,
{ "Type", "vntag.etype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, NULL, HFILL }
},
+#if 0
{ &hf_vntag_len,
{ "Length", "vntag.len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
},
+#endif
{ &hf_vntag_trailer,
{ "Trailer", "vntag.trailer", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 03:25:20 +0000