diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-10-14 21:12:13 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-10-15 01:29:09 +0000 |
| commit | 6206fa5a191ec67354648d6f3d8b6abd9c34519d (patch) | |
| tree | 7da73eead60966b0298c10db729090c946280c63 /epan/dissectors/packet-mcpe.c | |
| parent | 60e738cd2036af7c8f3654a44b7b6648360f1671 (diff) | |
raknet: fix two checkfiltername errors; mcpe,raknet: minor cleanup;
Change-Id: Ieac370d232c6349f7acc45f4817637a80915e315
Reviewed-on: https://code.wireshark.org/review/4695
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-mcpe.c')
| -rw-r--r-- | epan/dissectors/packet-mcpe.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mcpe.c b/epan/dissectors/packet-mcpe.c index 495f529877..e3f15414e2 100644 --- a/epan/dissectors/packet-mcpe.c +++ b/epan/dissectors/packet-mcpe.c @@ -36,7 +36,6 @@ static guint mcpe_udp_port_requested = MCPE_UDP_PORT_DEFAULT; static int proto_mcpe = -1; static gint ett_mcpe = -1; /* Should this node be expanded */ -static dissector_handle_t raknet_dissector = NULL; /* @@ -332,8 +331,8 @@ proto_register_mcpe(void) */ proto_mcpe = proto_register_protocol ( "Minecraft Pocket Edition", /* name */ - "MCPE", /* short name */ - "mcpe" /* abbrev */ + "MCPE", /* short name */ + "mcpe" /* abbrev */ ); /* @@ -354,7 +353,7 @@ proto_register_mcpe(void) void proto_reg_handoff_mcpe(void) { - dissector_handle_t mcpe_gen_handle; + static dissector_handle_t raknet_dissector = NULL; static guint last_server_port; static gboolean init_done = FALSE; @@ -367,6 +366,8 @@ proto_reg_handoff_mcpe(void) /* * First time, create dissector handle, and find raknet dissector. */ + dissector_handle_t mcpe_gen_handle; + init_done = TRUE; raknet_dissector = find_dissector("raknet"); @@ -388,15 +389,16 @@ proto_reg_handoff_mcpe(void) /* MCPE is the protocol that carries RakNet packets over UDP */ dissector_add_uint("udp.port", mcpe_udp_port_requested, raknet_dissector); } + /* - * Editor modelines + * Editor modelines - http://www.wireshark.org/tools/modelines.html * - * Local Variables: + * Local variables: * c-basic-offset: 4 * tab-width: 8 * indent-tabs-mode: nil * End: * - * ex: set shiftwidth=4 tabstop=8 expandtab: + * vi: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ |