osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Standardize the names of, and document, the taps and heuristic dissector tables made avaialble by these dissectors. 

Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93
Reviewed-on: https://code.wireshark.org/review/2688
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
David Ameiss 2014-06-26 10:33:37 -05:00 committed by Michael Mann
parent 78e328c02d
commit e1a8c9599f
7 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-lbm.h
View File

@ -25,6 +25,17 @@
#ifndef PACKET_LBM_H_INCLUDED
#define PACKET_LBM_H_INCLUDED
/* A list of the taps etc. made available by these dissectors:
Taps:
lbm_stream
lbm_uim
lbm_lbmr
lbm_lbtrm
lbm_lbtru
Heuristic subdissector tables:
lbm_msg_payload
*/
#if defined(__FreeBSD__)
#include <sys/types.h>
#include <netinet/in.h>

2
epan/dissectors/packet-lbmc.c
View File

@ -14303,7 +14303,7 @@ void proto_register_lbmc(void)
expert_lbmc = expert_register_protocol(proto_lbmc);
expert_register_field_array(expert_lbmc, ei, array_length(ei));
register_heur_dissector_list("29westdata", &lbmc_heuristic_subdissector_list);
register_heur_dissector_list("lbm_msg_payload", &lbmc_heuristic_subdissector_list);
prefs_register_protocol(tnw_protocol_handle, NULL);
lbmc_module = prefs_register_protocol_subtree("29West", proto_lbmc, proto_reg_handoff_lbmc);

24
epan/dissectors/packet-lbmr.c
View File

@ -6705,79 +6705,79 @@ void proto_register_lbmr(void)
"A table to define LBMR tags",
tag_uat);
lbmr_tap_handle = register_tap("lbmr");
lbmr_tap_handle = register_tap("lbm_lbmr");
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_ads_topic",
lbmr_stat_tree_name_topic_ads_topic,
0,
lbmr_topic_ads_topic_stats_tree_packet,
lbmr_topic_ads_topic_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_ads_source",
lbmr_stat_tree_name_topic_ads_source,
0,
lbmr_topic_ads_source_stats_tree_packet,
lbmr_topic_ads_source_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_ads_transport",
lbmr_stat_tree_name_topic_ads_transport,
0,
lbmr_topic_ads_transport_stats_tree_packet,
lbmr_topic_ads_transport_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_queries_topic",
lbmr_stat_tree_name_topic_queries_topic,
0,
lbmr_topic_queries_topic_stats_tree_packet,
lbmr_topic_queries_topic_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_queries_receiver",
lbmr_stat_tree_name_topic_queries_receiver,
0,
lbmr_topic_queries_receiver_stats_tree_packet,
lbmr_topic_queries_receiver_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_queries_pattern",
lbmr_stat_tree_name_topic_queries_pattern,
0,
lbmr_topic_queries_pattern_stats_tree_packet,
lbmr_topic_queries_pattern_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_topic_queries_pattern_receiver",
lbmr_stat_tree_name_topic_queries_pattern_receiver,
0,
lbmr_topic_queries_pattern_receiver_stats_tree_packet,
lbmr_topic_queries_pattern_receiver_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_queue_ads_queue",
lbmr_stat_tree_name_queue_ads_queue,
0,
lbmr_queue_ads_queue_stats_tree_packet,
lbmr_queue_ads_queue_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_queue_ads_source",
lbmr_stat_tree_name_queue_ads_source,
0,
lbmr_queue_ads_source_stats_tree_packet,
lbmr_queue_ads_source_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_queue_queries_queue",
lbmr_stat_tree_name_queue_queries_queue,
0,
lbmr_queue_queries_queue_stats_tree_packet,
lbmr_queue_queries_queue_stats_tree_init,
NULL);
stats_tree_register("lbmr",
stats_tree_register("lbm_lbmr",
"lbmr_queue_queries_receiver",
lbmr_stat_tree_name_queue_queries_receiver,
0,

2
epan/dissectors/packet-lbtrm.c
View File

@ -1894,7 +1894,7 @@ void proto_reg_handoff_lbtrm(void)
lbtrm_dissector_handle = new_create_dissector_handle(dissect_lbtrm, proto_lbtrm);
dissector_add_for_decode_as("udp.port", lbtrm_dissector_handle);
heur_dissector_add("udp", test_lbtrm_packet, proto_lbtrm);
lbtrm_tap_handle = register_tap("lbtrm");
lbtrm_tap_handle = register_tap("lbm_lbtrm");
}
/* Make sure the low MC address is <= the high MC address. If not, don't change them. */

2
epan/dissectors/packet-lbtru.c
View File

@ -2025,7 +2025,7 @@ void proto_reg_handoff_lbtru(void)
lbtru_dissector_handle = new_create_dissector_handle(dissect_lbtru, proto_lbtru);
dissector_add_for_decode_as("udp.port", lbtru_dissector_handle);
heur_dissector_add("udp", test_lbtru_packet, proto_lbtru);
lbtru_tap_handle = register_tap("lbtru");
lbtru_tap_handle = register_tap("lbm_lbtru");
}
/* Make sure the low source port is <= the high source port. If not, don't change them. */

2
ui/qt/lbm_lbtrm_transport_dialog.cpp
View File

@ -1303,7 +1303,7 @@ void LBMLBTRMTransportDialog::fillTree(void)
}
m_dialog_info->setDialog(this);
error_string = register_tap_listener("lbtrm",
error_string = register_tap_listener("lbm_lbtrm",
(void *)m_dialog_info,
m_ui->displayFilterLineEdit->text().toUtf8().constData(),
TL_REQUIRES_COLUMNS,

2
ui/qt/lbm_lbtru_transport_dialog.cpp
View File

@ -1721,7 +1721,7 @@ void LBMLBTRUTransportDialog::fillTree(void)
}
m_dialog_info->setDialog(this);
error_string = register_tap_listener("lbtru",
error_string = register_tap_listener("lbm_lbtru",
(void *)m_dialog_info,
m_ui->displayFilterLineEdit->text().toUtf8().constData(),
TL_REQUIRES_COLUMNS,