diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-06-23 12:45:32 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-23 19:45:51 +0000 |
| commit | a5e9e7e7aed75cfec58ff33fc488baf6236c92c6 (patch) | |
| tree | 243b50849b0800c4ba5e055c1ddf4fc23f7611ad /epan/dissectors/packet-prp.c | |
| parent | dd5f3c96c300688cb996e52c163fb3f5a614706c (diff) | |
Fix "disable this protocol by default".
Allow a dissector to mark its protocol as "disabled by default", which
means that the "enable all protocols" routine won't enable it. This is
necessary in order to allow the disabling of protocols not to be
unintentionally changed due to profile changes; see bug 9826.
Change-Id: I3947f794c21350b70a8de06899cfc7715b77f90f
Ping-Bug: 9826
Reviewed-on: https://code.wireshark.org/review/16109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-prp.c')
| -rw-r--r-- | epan/dissectors/packet-prp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index a804e06909..c0781269a8 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -272,6 +272,8 @@ void proto_reg_handoff_prp(void) prefs_initialized = TRUE; } + if (!prp_enable_dissector) + proto_disable_by_default(proto_prp); proto_set_decoding(proto_prp, prp_enable_dissector); } |