aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-13CMake: Allow user build flags to override default build flagsJoão Valverde20-57/+42
Autotools has the very useful feature by design of allowing the user to override the default build flags (you break it you keep it). Apparently CMake applies COMPILE_OPTIONS target property after CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those variables instead to make it work then. Specific target flag overrides can still be added with COMPILER_OPTIONS (e.g: generated files with -Wno-warning) but this is less effective and then we're back at the point where this overrides user flags. It's less of a concern though. Change-Id: I44761a79be4289238e02d4e781fef0099628817b Reviewed-on: https://code.wireshark.org/review/23675 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-10-13docsis: fix ↵Alexis La Goutte1-6/+6
'docsis_vsif.gex.sav.spr.static_prefix_address/.gex.imja.imja_ssr_source_prefix_address/.imja.imja_ssr_group_prefix_address' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: I7c978870eb3cc54e718fe3c810f7b4e7f6ea67c9 Reviewed-on: https://code.wireshark.org/review/23897 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-13docsis: fixAlexis La Goutte1-1/+1
'docsis_vsif.gex.extended_cmts_mic_hmac_type' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8 Change-Id: Ic3a0f7f6edf5a28ffde6703276d4747d138081c7 Reviewed-on: https://code.wireshark.org/review/23896 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-13Add ptvcursor APIs that return the values it retrievesMichael Mann4-24/+296
ptvcursor_add_ret_uint ptvcursor_add_ret_int ptvcursor_add_ret_string ptvcursor_add_ret_boolean Change-Id: I41fa91b1ab805778d34a61215830b12a1331e864 Reviewed-on: https://code.wireshark.org/review/23895 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-13WiMAX ASN CP: Leak less memory.Gerald Combs2-59/+52
Replace some g_new()s, g_strdup()s and GArrays used in prefix registration with their epan_scoped wmem equivalents. This reduces the amount of memory we leak so that we come in below the Valgrind fuzzer's current threshold (102400). Bug: 14106 Change-Id: I7308ac89465316c06773552253dabc876b6c2425 Reviewed-on: https://code.wireshark.org/review/23891 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-12win-setup: Don't bother downloading UPX.Gerald Combs1-2/+0
We haven't used UPX since g85eec7f603 (2014). Don't bother downloading it. Change-Id: Id86ca6ae8f29adab3eb40a2ea3bd1de5ff45d868 Reviewed-on: https://code.wireshark.org/review/23894 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-12FTP: setup conversation properly for PASV sessionsMartin Mathieson1-36/+42
Also keep track of last frame of data response, and work out duration of ftp-data stream. Change-Id: I460aaa5c8736e044410eab428707651cede39d7e Reviewed-on: https://code.wireshark.org/review/23880 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-10-12IEEE 802.11: fix a segmentation fault introduced in gd6eda2a3Pascal Quantin1-1/+2
Bug: 14114 Change-Id: Ie377b1b3ccf29014935b9e5796567cdb8bb466a3 Reviewed-on: https://code.wireshark.org/review/23893 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-12[TCAP] Make "tid" a generated item rather than hidden to make it obviousAndersBroman2-4/+4
that it exists. Change-Id: I1986b7678193f3b4c9ed8cabff7e411cef5bf185 Reviewed-on: https://code.wireshark.org/review/23892 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-12infiniband: add PSN and RETH DMA length to infinibandinfo structJorge Mora2-8/+10
Expose the PSN (packet sequence number) and the RETH DMA length to protocol's dissectors. Change-Id: Ied53a8964d7cd5c3d148ec7c7642017951e56118 Reviewed-on: https://code.wireshark.org/review/23886 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-11IEEE 802.11: add missing breaksPascal Quantin1-0/+6
Change-Id: Ie26b0c869a778f7e27cb6d944c2e32ced0d3337e Reviewed-on: https://code.wireshark.org/review/23889 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-11Add --print as an alias for -P, to match tcpdump.Guy Harris2-3/+10
tcpdump just got a --print option, which causes packet information to be printed even if the raw packets are being saved to a file with -w. We have -P for the same purpose; make --print another name for it. While we're at it: document --help and --version; just speak of -P/--print as causing printing even of the packet details, even though -V forces printing with -w, for consistency with how --print is documented for tcpdump; fix the description of -h/--help. Change-Id: Idf650a202a09a2d1682edbd9d76123f1b1412b55 Reviewed-on: https://code.wireshark.org/review/23888 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-11ProtoBuf: Remove an unused variable.Gerald Combs1-9/+1
Remove protobuf_message_direction_type: ../epan/dissectors/packet-protobuf.c:125:20: error: unused variable 'protobuf_message_direction_type' [-Werror,-Wunused-const-variable] VALUE_STRING_ARRAY(protobuf_message_direction_type); ^ Have dissect_one_protobuf_field return a gboolean while we're here. Change-Id: I5d9d2e3414b5668ca26d5c0a450225c3cdf5da56 Reviewed-on: https://code.wireshark.org/review/23887 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-11Decode SNR in Compressed MIMO Beamforming report per ieee80211at_2013 ↵Jason Uher1-8/+30
sections 8.4.1.{29,48} Change-Id: I4f3af7e06169461a15507ed8ecce8f15075b9667 Reviewed-on: https://code.wireshark.org/review/23835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-11[Solaredge] Fix SuSE 11.4 build packet-solaredge.c:1013: error:AndersBroman1-7/+7
declaration of rand shadows a global declaration Change-Id: I98f4edb14cd241bd709d50e8ac9151448773a658 Reviewed-on: https://code.wireshark.org/review/23884 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10Start of adding Protobuf (Protocol Buffers) dissector.Huang Qiangxiong5-0/+763
1. Protobuf dissector supports the almost all basic protobuf types of varint, sint, string, and so on. 2. Protobuf messages are not self-described protocol, for example, varint in protobuf may be int32, int64, uint32, uint64, sint32, sint64, bool or enum. Currently dissector will dissect field without detail definition in common way, for numeric field it show uint32 or uint64, for length-delimited field it just show as bytes. But user turn the try_dissect_all_length_delimited_field_as_string or show_all_possible_field_types options on, that dissect will show all possible value for each field according to wire type. (for example, a numeric field will parsed in int32, uint32, sint32, sint64 and so on). Ping-Bug: 13932 Change-Id: Idfe49307b1c84fe461603756f75daeb3e410a905 Reviewed-on: https://code.wireshark.org/review/23814 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10[GSM SMS] If the digits are E164 International number add an E.164AndersBroman1-1/+11
filter. Change-Id: Idcfa53d1db9e9f7b5501ca92592fb0fa0790ffe9 Reviewed-on: https://code.wireshark.org/review/23873 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10Change FI_VARINT to account for FI_BITS_XXX flagsMichael Mann1-2/+2
FI_BITS_XXX were using bits 5-15 of the field_info->flags bitmask. Move FI_VARINT to be outside of that range. Change-Id: I92efcb5644cdbb562537d2813b611e583315874b Reviewed-on: https://code.wireshark.org/review/23871 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10[gvcp] fix extendedblockids check and resend cmd parsingFelix Ruess1-3/+3
Change-Id: I9e0314ae2e975a1c50cfaf2b00e469ad7f640357 Reviewed-on: https://code.wireshark.org/review/23866 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-09Fuzz: Limit the number of packets we process with Valgrind.Gerald Combs1-7/+8
Estimating the effort required to process a capture based on its size isn't very reliable. Instead of rejecting files that are too large, just limit Valgrind fuzzing to the first 100,000 packets in each file. This should fix a timeout issue we're seeing on the master fuzzer. Change-Id: I0117735341d3a183c6131f5f05dbd1d559fc4b3f Reviewed-on: https://code.wireshark.org/review/23872 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-09infiniband: fix OpCodeMap string for UC_RDMA_WRITE_MIDDLEJorge Mora1-5/+1
Make string mapping for UC_RDMA_WRITE_MIDDLE consistent with all other mappings in the OpCodeMap table. Remove extra blank lines in the OpCodeMap table. Change-Id: Ifb3e242a89458103f3db3b5718d5d939dffb6dae Reviewed-on: https://code.wireshark.org/review/23867 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-09Fuzz: Write memory leak info to the error log.Gerald Combs1-0/+1
When we exit due to excessive memory leaks make sure we say so in the error log. Change-Id: I03f60271f3e4bb467fbaa5b9ac17431eed96f300 Reviewed-on: https://code.wireshark.org/review/23870 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-09[Diameter 3GPP] Fix bitmask in feature list B26 and add B27.AndersBroman1-3/+11
Change-Id: I0f035da3f5305ce6935c79e0c1b5f63f955d099d Reviewed-on: https://code.wireshark.org/review/23865 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-09Add ENC_VARINT_PROTOBUFMichael Mann6-41/+378
Encoding of integer datatypes of Protocol buffers https://developers.google.cn/protocol-buffers/docs/encoding Change-Id: I9f6d65ddca099c15c0634984e9394131f98d35a9 Reviewed-on: https://code.wireshark.org/review/23813 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-09packet.c: fix a control flow issue reported by Coverity (CID 1418671)Pascal Quantin1-6/+6
Let's perform the check before potentially breaking the loop. While we are at it, let's update the test to remove the last layer so as to match the one used to add it. Change-Id: I5807219de75c4e2c23b9435d6271ad60aec45783 Reviewed-on: https://code.wireshark.org/review/23844 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-08ftypes(.h): fix indent (use tabs)Alexis La Goutte1-15/+15
Change-Id: Ic824910d4ec8c9987e8deec8d61809feb9849b9b Reviewed-on: https://code.wireshark.org/review/23863 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-08proto(.h): fix indent (use spaces)Alexis La Goutte1-2/+2
Change-Id: I029a9db40c8ca5a67bb1db69c50d8f08b7f59ab2 Reviewed-on: https://code.wireshark.org/review/23864 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-08[Automatic update for 2017-10-08]Gerald Combs2-2/+36
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I700244d357bcb8d37866b296ea7c6bb671f983af Reviewed-on: https://code.wireshark.org/review/23859 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-07X2AP: fill gaps in extended value string arrayPascal Quantin2-0/+12
Change-Id: I6d8594de78dd46d679072cc17211e940155f0012 Reviewed-on: https://code.wireshark.org/review/23858 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-07S1AP: upgrade dissector to v14.4.0Pascal Quantin9-15/+25
Change-Id: I1124a691ec004507e6e144038b13f9d432d88c5f Reviewed-on: https://code.wireshark.org/review/23857 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-06tap-flow (ui): fix no previous prototype for ↵Alexis La Goutte1-1/+1
‘register_tap_listener_flow’ [-Wmissing-prototypes] Change-Id: I6031600ee3d764a7b2690ff88dbbfb01a1d6244b Reviewed-on: https://code.wireshark.org/review/23824 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-06RPC-over-RDMA: fix write list chunk countJorge Mora1-0/+1
Add the chunk_size to the offset to get the correct write list count, this issue was introduced by the fix for Bug: 13558 Change-Id: I306a9c0c9d601f7bdf4cc0e49eacd5466a6adb89 Reviewed-on: https://code.wireshark.org/review/23851 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-06DOCSIS: added vsif general extension dissectionBruno Verstuyft1-5/+614
Change-Id: Ic61815b967fac412fb1a324c470ff5171b97acbb Reviewed-on: https://code.wireshark.org/review/23840 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-06Make osx-app.sh a configured file and remove Autotools targets.Gerald Combs8-76/+9
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-05M3AP: avoid appending m3ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: Iff7cc711ae1fba0a7c239dec47d83d5b4ac84e2c Reviewed-on: https://code.wireshark.org/review/23849 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05M2AP: avoid appending m2ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: I4e9fee5ae98cd776d168006c4119aff5767dfa16 Reviewed-on: https://code.wireshark.org/review/23848 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05LPPa: avoid appending lppa multiple times to frame.protocols fieldPascal Quantin2-8/+8
Change-Id: I89557fc4ee5bce4802cc2b34e020d567ab34c79b Reviewed-on: https://code.wireshark.org/review/23847 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05X2AP: avoid appending x2ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: I521ffa43ff81b9a41f8e3f01a0d39e18f590a050 Reviewed-on: https://code.wireshark.org/review/23846 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05S1AP: avoid appending s1ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: Ide44391bf18d2f301f32cd6a65b246e9a1cc5891 Reviewed-on: https://code.wireshark.org/review/23845 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05gRPC: Several bugfixesVladimir Rutsky1-3/+3
1. fix returing new offset value dissect_grpc_message() is called with the offset to the message that needs to be parsed and returns new offset (e.g. offset to the next message in stream). Before this change length of the parsed message (including 5 bytes header) were returned which was incorrect and may lead to infinite loops. 2. fix reported length in case of invalid packet 3. fix typo in comment: "streaam" Change-Id: I577cdcc0203a87122a4d8d8c660f43295609e8aa Signed-off-by: Vladimir Rutsky <rutsky@google.com> Reviewed-on: https://code.wireshark.org/review/23843 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05Qt: Free dynamic menu actions at shutdownMikael Kanstrup4-4/+13
Some menu actions registered at startup are not freed at shutdown making Valgrind complain. Fix by clearing the lists holding them and making sure all actions have a parent to free them. Bug: 14071 Change-Id: I8d99d062d394a7262b0f9b7ddea4ed71049636ac Reviewed-on: https://code.wireshark.org/review/23793 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-05qt: Fix leaked dialogsMikael Kanstrup8-7/+20
Some dialogs are allocated on heap but not freed when the dialog boxes are closed. This means one dialog instance is leaked each time opened/closed. Also dialogs being subclasses of GeometryStateDialog means they might lack a parent reference and are not automatically freed on application shutdown either. Fix these leaks by letting the dialogs automatically destroy themselves on close (via WA_DeleteOnClose). Capture filter, display filter and capture interfaces dialogs are also leaked on application shutdown. These dialogs are protected by a NULL check that at least prevent multiple instances. Though none of them are freed on application shutdown. Fix leaks by freeing when main window is destroyed. Bug: 14071 Change-Id: I8c5c5a75ad3c89abb5996941875ba5d616a22d9c Reviewed-on: https://code.wireshark.org/review/23747 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-05sharkd: export field filter string.Jakub Zawadzki3-8/+22
This extra parameter allows to use wireshark functionality like: prepare as filter, and also apply quick filter in protocol tree (for instance show only TCP protocol fields: tcp.), Change-Id: I1f380b79e3802e6aaf646fdd4770c903ee9f3781 Reviewed-on: https://code.wireshark.org/review/23837 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-05HTTP: Add http.file_data based on the captured length.Gerald Combs1-8/+8
Switch the file_data handling to use the captured length. In a test capture here this lets us call the GIF dissector in a truncated packet. Fixup a variable type and some whitespace. Change-Id: I21b64519ad84f730e1412115035125c2bf1f361c Reviewed-on: https://code.wireshark.org/review/23838 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04gsm_sim: fix conflicting entry in its value_stringAlexis La Goutte1-9/+0
Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 24384 is at indices 72 (DF.EIA/TIA-533) and 78 (DF.WLAN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28421 is at indices 31 (EF.LP) and 80 (EF.LI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28472 is at indices 37 (EF.SST) and 89 (EF.USI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28481 is at indices 41 (EF.PUCT) and 96 (EF.PUCI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28489 is at indices 23 (EF.SDN) and 103 (EF.SIN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28494 is at indices 28 (EF.EXT4) and 107 (EF.EXT5) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28495 is at indices 29 (EF.ECCP) and 108 (EF.CCP2)) Change-Id: I4bde0cc644131e9b088fca07837fa1b909f30f44 Reviewed-on: https://code.wireshark.org/review/21381 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04sharkd: check if JSON value is string or primitive (true/false/null/number).Jakub Zawadzki1-2/+8
Add extra check for token type, previously it was possible to pass for example: {"columns":["one","two","three"]}. Such format is not supported. Change-Id: I6ac2e3ca9eba868cd72ed886ad40745ebbc43d73 Reviewed-on: https://code.wireshark.org/review/23834 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-04sharkd: support for user column-set in "frames" request.Jakub Zawadzki1-0/+82
Change-Id: If6a10cc252f2ad362ba3a91318cedd15d954db2b Reviewed-on: https://code.wireshark.org/review/23768 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-10-04Qt: add preference to restore display filter after Follow Streamcheloftus3-0/+12
Added new user preference 'restore_filter_after_following_stream', defaults to false. When true, the current display filter is restored after following a stream. Change-Id: I153107761003658c6d7f1464711da7b3adeb60a8 Reviewed-on: https://code.wireshark.org/review/22455 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Instroduce col_finalize(), to allow creating column_info based not only on ↵Jakub Zawadzki2-11/+30
preferences. Change-Id: I417e6accff3390a9b1839cd6b44266b76aa754c3 Reviewed-on: https://code.wireshark.org/review/23767 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Remove unused code from osx-app.shGerald Combs1-98/+0
Remove Autotools-specific code from osx-app.sh. The official builders have used CMake for a while and as far as I know no one else uses our packaging scripts. Change-Id: I6fc20114b42e10dacc69346c379055b68184b85c Reviewed-on: https://code.wireshark.org/review/23833 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 20:28:51 +0000