Commit Graph

63985 Commits

Author SHA1 Message Date
João Valverde 917d34c4de Add PI_DEPRECATED expert info group
Change-Id: Ibc43b1976d5827e8c40252a5200852fbcd00b70c
Reviewed-on: https://code.wireshark.org/review/16763
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-05 13:59:25 +00:00
Harald Welte be16ff5f12 gsm_abis_om2000: Dissect "Reason Code" and "Result Code"
Change-Id: Ie2495b6333b021de53c674ca8bdad0712228a7c1
Reviewed-on: https://code.wireshark.org/review/16820
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-05 13:46:59 +00:00
Harald Welte e6e0a905bb gsm_abis_om2000: Decode "Attribute ID" Information Element
The "Attribute ID" IE is used by the RBS to indicate which particular
setting has caused it to reject a given request by the BSC.

Change-Id: I05621831f70fb53b5b752afceed9337f6cd0edb7
Reviewed-on: https://code.wireshark.org/review/16819
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-05 13:46:46 +00:00
AndersBroman c02e3e713c [Diameter] Dissect RX Feature list.
Change-Id: I64fc582bb9330402c18aeeadea52c968032ccb2c
Reviewed-on: https://code.wireshark.org/review/16895
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>
2016-08-05 10:45:30 +00:00
Yann Diorcet f5af708026 Add UDS dissector
Change-Id: Icc9b6c6bcaac1f3056fa83a4ae9ef66e1537b1a5
Reviewed-on: https://code.wireshark.org/review/16492
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>
2016-08-05 07:08:53 +00:00
Jaap Keuter 333ba807e7 pkix1implicit: Make sure distribution takes in all the files.
By including ../Makefile.inc (like all other ASN1 based dissectors)
assure the symbols are setup correctly for all make related actions,
including packaging the files for distribution.

Bug: 12703
Change-Id: Ia7279fcc30bb08e749f35b6d893136b053f3544c
Reviewed-on: https://code.wireshark.org/review/16893
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-05 07:06:42 +00:00
Dario Lombardo 9057699127 logcat-text: add cleanup function.
Found by valgrind.

==23399== 209 (40 direct, 169 indirect) bytes in 1 blocks are definitely lost in loss record 2,431 of 2,696
==23399==    at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==23399==    by 0xAAA2780: g_malloc0 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==23399==    by 0xAAB0760: g_regex_new (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==23399==    by 0x6B03162: proto_register_logcat_text (packet-logcat-text.c:373)
==23399==    by 0x71BA16D: register_all_protocols (register.c:2881)
==23399==    by 0x7296E67: proto_init (proto.c:529)
==23399==    by 0x7272A76: epan_init (epan.c:128)
==23399==    by 0x1160F2: main (tshark.c:804)

Change-Id: Ia47a4371a62eaadcdc8613d35030792d57e7f9dc
Reviewed-on: https://code.wireshark.org/review/16881
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-05 00:24:18 +00:00
Dario Lombardo 6b4e9707f0 kafka: remove unused assignment.
Found by valgrind:

==21035== 12 bytes in 1 blocks are definitely lost in loss record 279 of 2,696
==21035==    at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==21035==    by 0xAAA2728: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.1)
==21035==    by 0x72A361F: range_convert_str_work.part.0 (range.c:109)
==21035==    by 0x6AACBEC: proto_register_kafka (packet-kafka.c:1459)
==21035==    by 0x71BA055: register_all_protocols (register.c:2769)
==21035==    by 0x7296E67: proto_init (proto.c:529)
==21035==    by 0x7272A76: epan_init (epan.c:128)
==21035==    by 0x1160F2: main (tshark.c:804)
==21035==

Change-Id: I3249925acd3ed26d40be992fd228447d1b381b66
Reviewed-on: https://code.wireshark.org/review/16880
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2016-08-04 20:56:29 +00:00
Pascal Quantin 5661420d7f asn2wrs: put back parsetab.py file in ASN.1 source folder
Otherwise it breaks multi threaded compilation.
Follow-up of gd04be01

Bug: 12621
Change-Id: I2f6b7d6ca85a1cf5a6713c2b36c823a520d3bf3d
Reviewed-on: https://code.wireshark.org/review/16886
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-08-04 18:54:05 +00:00
João Valverde d217ac4410 Remove missed header
Follow up to d21295f9a6.

Change-Id: I971e2bb44d8d1b2977b6fcf6e4e492e45038b85e
Reviewed-on: https://code.wireshark.org/review/16889
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-04 17:07:47 +00:00
Pascal Quantin 6168d8bf80 Qt: fix a NULL pointer dereference in extcap_argument_multiselect.cpp
Guard treeView dereference by a cehck on viewModel (as it is done elsewhere in
the file, both are allocated at the same time).
This can happen for example when USBPcap lists a USB Hub with no devices connected.

Change-Id: Iee412b8c95539e9e3d65706c14f62194cafcaffc
Reviewed-on: https://code.wireshark.org/review/16885
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 16:47:04 +00:00
João Valverde d21295f9a6 Bump GLib minimum required version to 2.22.0
Change-Id: I0ab85be8090f234f9ca10914063f97f13c894413
Reviewed-on: https://code.wireshark.org/review/16879
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-04 16:13:41 +00:00
Roland Knall 47e2849ada openSAFETY: Remove SCM UDID check
This leads to too many false-negatives in certain traces

Change-Id: Ia081dc802b6f55926beec2383a864173cae6eb51
Reviewed-on: https://code.wireshark.org/review/16883
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-08-04 15:00:58 +00:00
Dario Lombardo a671bab337 extcap: restyle the help function.
Change-Id: Ia742dffb1fd4cd5780b8ba44f7064d1874e473da
Reviewed-on: https://code.wireshark.org/review/16842
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 14:13:53 +00:00
AndersBroman 7e08f15885 [BTLE-Nordic] Set pinfo->p2p_dir as seen from "Master".
Change-Id: I12ad3a9b092e35a3418a11ec4d17cce157f320b6
Reviewed-on: https://code.wireshark.org/review/16882
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-04 13:59:07 +00:00
Dario Lombardo 41e659d91e extcap: prevent registration of wrong version.
This prevents the user to run

extcap_base_set_util_info(extcap, "1", NULL, "0", NULL);

that would result in version = 1.0.

Change-Id: I67532459c852bdceb16693553e90da88a1043435
Reviewed-on: https://code.wireshark.org/review/16858
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 11:28:40 +00:00
Pascal Quantin 0bf1288607 extcap: preference name must only contain lower case ASCII, numbers, dots or underscores
This chage set restores the normalization that was done before g485bc45.
Without it, USBPcap extacp utility triggers a crash.

Change-Id: Id960db186888452ec3d04df1ee48dcc3899e8951
Reviewed-on: https://code.wireshark.org/review/16871
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 11:27:19 +00:00
Dario Lombardo 5adde36520 extcap: restyle the output subsystem.
Change-Id: I3e0674751eb97bf30ae6d70c4e51f347d63b1697
Reviewed-on: https://code.wireshark.org/review/16849
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-04 11:26:26 +00:00
Yurii Lysyi 06464b7db1 [GSM A RR] Some updates from rel 13,
Change-Id: Ib847ec3d019b3a8ba0f8e5502fcbe80aa47c266b
Reviewed-on: https://code.wireshark.org/review/16873
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>
2016-08-04 09:57:37 +00:00
Balint Reczey d04be0149d Ply parser updated to 3.8 from http://www.dabeaz.com/ply/
The Ubuntu packaged Ply 3.7 with Ubuntu 16.04's Python makes
ASN.1 based dissector generation fail.

Ply's API changed after 3.5 and the small change to asn2wrs.py
adapts to that.
The commit breaking the API in Ply's repository is the following:

 commit af651673ba6117a0a5405055a92170fffd028106
 Author: David Beazley <dave@dabeaz.com>
 Date:   Tue Apr 21 16:31:32 2015 -0500

    Added optional support for defaulted states

Change-Id: I1db33fdcccf7c39ecdb0e435a5ea9183362471ad
Bug: 12621
Reviewed-on: https://code.wireshark.org/review/16864
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
2016-08-04 08:20:24 +00:00
Yann Diorcet 92eecfd255 Add ISO15765 dissector
Bug: 12657
Change-Id: Ib0d9e18b31c1252f63025b10f7a67de6a5e4462c
Reviewed-on: https://code.wireshark.org/review/16491
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>
2016-08-04 04:19:49 +00:00
Guy Harris d430ba3014 Report the pathname of the color filter file in "Could not compile" messages.
This also fixes some cases where we wouldn't report the path in a read
error message, as we'd already freed the path up and set the path string
pointer to null.

Change-Id: Ia0e1ca0bf4880075bfa1957b0778a177de1a824f
Reviewed-on: https://code.wireshark.org/review/16868
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-04 02:04:34 +00:00
Jaap Keuter 9affd2656c SSL utils: Add proper check while getting bag type
Implementing proper return value check, as done for other gnutls function
calls, catches (unlikely) errors and allows C++ compatible build.

Change-Id: Idf5bd3fe6e68d006a469fe72663dea1c7e2d17f7
Reviewed-on: https://code.wireshark.org/review/16865
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-03 22:26:52 +00:00
Graham Bloice 86cf94ffee Text2Pcap doc update
Minor docs update

Change-Id: Iea44e4963aab75db1d875d27af41e4f38ff74e2d
Reviewed-on: https://code.wireshark.org/review/16859
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-03 22:11:43 +00:00
Pascal Quantin a723a30ad4 Update USBPcap installer packaged in our Windows installer
This new version contains kernel drivers with an EV certificate that is cross-signed
by Microsoft as it will become mandatory.
See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/
for details.

Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625
Reviewed-on: https://code.wireshark.org/review/16862
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>
2016-08-03 21:17:24 +00:00
Yurii Lysyi 4be341b23a [BSSGP] Update messages and IEs.
Change-Id: Ida8c59b19213f2a2ab3448d1cbeddd98f06ba4b9
Reviewed-on: https://code.wireshark.org/review/16857
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>
2016-08-03 15:54:37 +00:00
Graham Bloice 472f789b73 Text2Pcap docs update
Minor update to docs

Change-Id: If9464f00d69bb9a8bb5638f3bb0d0f73a56aad50
Reviewed-on: https://code.wireshark.org/review/16856
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-08-03 12:50:51 +00:00
Irene Ruengeler 0d5cf54483 Set correct length for Req_Seq_Nr field
Change-Id: Iec228708423743e0268305da6ed606d464d1e1ea
Reviewed-on: https://code.wireshark.org/review/16854
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-03 11:15:51 +00:00
Roland Knall e631e1156d openSAFETY: Add two checks for scm udid validity
This is being done, to prevent false-positives which can
not be filtered out using the heuristics, but have to be
caught using additional check measurements

Change-Id: I2ff2c97decf8a93d43f8f5b54e4d147552970b3f
Reviewed-on: https://code.wireshark.org/review/16843
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-03 09:35:50 +00:00
Guy Harris 6d8261994b Don't snprintf() into a string with one of the arguments being the same string.
That doesn't work - you could be writing into the string from which
you're reading.

Bug: 12700
Change-Id: I70f3ce6048dea582ec5e08c24c99e9a553b352df
Reviewed-on: https://code.wireshark.org/review/16850
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-03 03:29:51 +00:00
Dario Lombardo 64ec47e826 Qt: remove dead code.
Fix CID: 1362828, 1362829, 1362889.
Change-Id: I15045c32e96896323ae4d788b7891b2608a0c102
Reviewed-on: https://code.wireshark.org/review/16833
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-08-02 21:08:59 +00:00
AndersBroman 3c1db69189 [BTLE] Change address from unknown_0x... to master or slave.
Change-Id: I571a2f6f96c37e608201092e7ea7f53862b8d2ad
Reviewed-on: https://code.wireshark.org/review/16844
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>
2016-08-02 18:51:19 +00:00
AndersBroman b6e0335d0f [BLE] Make the Nordic BLE dissector fill in the btle_context_t struct.
Change-Id: I14e62126d022dde10dcce2d7e974def0dc664b20
Reviewed-on: https://code.wireshark.org/review/16840
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>
2016-08-02 13:40:12 +00:00
Michael Tuexen 18f775af55 Fix compilation on FreeBSD.
Includes are needed for using macros like WIFEXITED.

Change-Id: Ia09ca58eeab2d151a756d285b0aeb55141c4d24a
Reviewed-on: https://code.wireshark.org/review/16841
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2016-08-02 12:33:52 +00:00
David McKay 6343e1dc67 Bugfix endian issues with 802.11 FCS
Rather than trying to swap fields to be big-endian, just make everything
little-endian.

Bug: 12697
Change-Id: I07e7fd651c4a32dba764d111b34acdf32958c195
Reviewed-on: https://code.wireshark.org/review/16836
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>
2016-08-02 11:58:30 +00:00
Adrien Aubry cec2946460 CANopen: Added some improvements to CANopen emergency dissector
-Added description to Emergency error code
-Added bitmask dissector to Emergency register
-Added descriptions to object dictionary SDO related index
All these changes were found inside the CiA CANopen norm, and were useful
in my work while debugging CANopen frames

Change-Id: I76bc1eab9f75fc242eaf3200af81593f65570658
Reviewed-on: https://code.wireshark.org/review/16823
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 11:58:03 +00:00
Roland Knall d62ad9dd47 extcap: Remove g_spawn_check_exit_status
This function is not supported in the min GLIB version, therefore
the code is to be removed

Change-Id: Ie39170bfc0662e5a477cbc45d7eadebcf2c70d4e
Reviewed-on: https://code.wireshark.org/review/16827
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-02 11:16:16 +00:00
Gerald Combs c84af8d8c6 RPM: Download from https://www.wireshark.org/.
Download from https://www.wireshark.org/ instead of
https://wireshark.org/. This conforms to README.packaging and avoids a
redirect.

Change-Id: I0ed63f446bc16cbd501444c8743809672c4a084b
Reviewed-on: https://code.wireshark.org/review/16829
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 04:21:14 +00:00
Dario Lombardo 867d7ca399 extcap: add null check (CID 1364683).
Change-Id: I1d81d6f043fa695ed507cf733fffa832922a708c
Reviewed-on: https://code.wireshark.org/review/16832
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 04:16:45 +00:00
Dario Lombardo abe8e51dbf extcap: extend buffer (CID 1364684).
Change-Id: I4ed6965fa1173b69d9e325bc814e382b5368d40c
Reviewed-on: https://code.wireshark.org/review/16831
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-02 04:15:19 +00:00
João Valverde 0dcda99b50 autotools: Fix make dist without Qt
Change-Id: I62b1d73eede471535b4ccc7ca68c9f94f25b7417
Reviewed-on: https://code.wireshark.org/review/16826
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>
2016-08-02 04:12:42 +00:00
Michael Mann 573171934f Fix checkAPI warning for printf.
Another legitimate use, so use ws_debug_printf.

Change-Id: I9bebe01e80987caf8e18a59b93a48f9a2d6ee397
Reviewed-on: https://code.wireshark.org/review/16835
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-02 01:54:37 +00:00
Guy Harris a52793aec1 Remove trailing "." from OID strings.
The previous change removed code that did that.

Change-Id: If297018f5902af7a2d9cacb0cc9a5f1ffe1e1d00
Reviewed-on: https://code.wireshark.org/review/16834
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-02 00:36:06 +00:00
Dario Lombardo a98b55f4f8 Fix compilation without extcap.
Change-Id: I627dd6c514066ba67cd501925ff95e9cf819c0e9
Reviewed-on: https://code.wireshark.org/review/16828
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-08-01 20:11:03 +00:00
Michael Mann edcc2f019e Add OSI Layer 4 to exported PDU to handle TCP and UDP payloads.
This allows for much easier anonymized captures for protocols running
atop TCP/UDP.

Added support for "TCP dissector data" tag within export PDU (34) so that
the tcpinfo struct that TCP dissector normally passes to its subdissectors
can be saved.

Change-Id: Icd63c049162332e5bcb2720159e5cf8aac893788
Reviewed-on: https://code.wireshark.org/review/16285
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-01 15:19:59 +00:00
Michael Mann c992edc222 Reorder ns_dir_vals into numerical order
Change-Id: I21a50015dd382c62aa2dc84d90bbb4b86ea8b1dc
Reviewed-on: https://code.wireshark.org/review/16825
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-01 14:35:14 +00:00
AndersBroman 8166ab7c82 Make dumpcap build without extcap
Change-Id: I70c7bc270946d104218afc4d9c8ac888471f6524
Reviewed-on: https://code.wireshark.org/review/16821
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>
2016-08-01 13:27:36 +00:00
João Valverde 50b56c8cde IPv6: Display reassembly information under root_tree
Change-Id: Ibfa934dba59f96b8820d2616d4d3d3990af00918
Reviewed-on: https://code.wireshark.org/review/16822
Reviewed-by: João Valverde <j@v6e.pt>
2016-08-01 09:27:21 +00:00
Michael Mann e302d9fe4d Remove checkAPI warnings from wmem.
printf and g_warning are not allowed in epan or its subdirectories

Change-Id: I4c07a7258f4c9566384bef93af35c350b5c88758
Reviewed-on: https://code.wireshark.org/review/16801
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>
2016-08-01 04:21:22 +00:00
Michael Mann 09efa5fb8b Remove proto_help.[ch]
The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14).  It's also causing unnecessary checkAPI warnings.

Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca
Reviewed-on: https://code.wireshark.org/review/16813
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>
2016-08-01 04:19:56 +00:00