diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-02-18 17:11:59 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-19 00:12:48 +0000 |
| commit | 7a5c04e243ff13b43618f8385f52c2186f753870 (patch) | |
| tree | 9b56567c31a0e0120a24d36bc8bb71112b453546 | |
| parent | 9e70d02c8aa5121a4bf129187ee536ddc4156e0d (diff) | |
| download | wireshark-7a5c04e243ff13b43618f8385f52c2186f753870.tar.gz | |
PPP: remove obsolete Van Jacobson decompression preference
As discussed in https://www.wireshark.org/lists/wireshark-dev/201309/msg00182.html
VJ decompressor was removed from Wireshark 1.12 due to license incompatibility
Let's mark the corresponding preference as obsolete so that people do not think
it is still supported
Change-Id: I7030ef5f402a0c7e242e77a52baf18f450a95024
Ping-Bug: 12138
Reviewed-on: https://code.wireshark.org/review/13993
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-ppp.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 21ed81bd16..e8d914ab94 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -469,8 +469,6 @@ const enum_val_t fcs_options[] = { {NULL, NULL, -1} }; -gboolean ppp_vj_decomp = TRUE; /* Default to VJ header decompression */ - /* * For Default Protocol ID negotiated with PPPMuxCP. We need to * this ID so that if the first subframe doesn't have protocol @@ -5951,10 +5949,7 @@ proto_register_ppp(void) "PPP Frame Checksum Type", "The type of PPP frame checksum (none, 16-bit, 32-bit)", &ppp_fcs_decode, fcs_options, FALSE); - prefs_register_bool_preference(ppp_module, "decompress_vj", - "Decompress Van Jacobson-compressed frames", - "Whether Van Jacobson-compressed PPP frames should be decompressed", - &ppp_vj_decomp); + prefs_register_obsolete_preference(ppp_module, "decompress_vj"); prefs_register_uint_preference(ppp_module, "default_proto_id", "PPPMuxCP Default PID (in hex)", "Default Protocol ID to be used for PPPMuxCP", diff --git a/epan/dissectors/packet-ppp.h b/epan/dissectors/packet-ppp.h index e02d39e268..40c056d06b 100644 --- a/epan/dissectors/packet-ppp.h +++ b/epan/dissectors/packet-ppp.h @@ -25,9 +25,6 @@ #include <epan/params.h> #include "ws_symbol_export.h" -/* PPP options */ -extern gboolean ppp_vj_decomp;/* FALSE = No VJ header decompression, - TRUE = Decompress VJ */ extern gboolean capture_ppp_hdlc(const guchar *, int, int, capture_packet_info_t *cpinfo, const union wtap_pseudo_header *pseudo_header _U_); |