Commit Graph

53613 Commits

Author SHA1 Message Date
Jeff Morriss 9d4af5fccd Check the validity of fields given to tshark with "-e": complain and exit if
they aren't valid.

Should help avoid confusion like that in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10201

Bug: 10201
Change-Id: Iff7f51ae042ca1a92d1c803b6cb61aa5d81ce205
Reviewed-on: https://code.wireshark.org/review/2654
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-27 00:48:51 +00:00
Graham Bloice 4742fc8ed2 Fixed linker flags for MSVC to not attempt to make and link a manifest
Added solution "folder" for tests.

Change-Id: I96dfb4a28fb7aaf3e84cea026e1f5d15afe6c0c6
Reviewed-on: https://code.wireshark.org/review/2635
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-26 21:34:38 +00:00
Evan Huus c9b03b424f add a cast, the mask makes it safe (stupid compiler)
Change-Id: Iaf24c62295a93a1abd4fe3daf7e4c9587c3ef76b
Reviewed-on: https://code.wireshark.org/review/2670
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 15:38:11 +00:00
Yan Burman 1f724bc891 iSER: Add iSER dissector support
Bug: 10189
Change-Id: Ie99d99a1736b3c6446d5a00edf201a49dfcd4780
Reviewed-on: https://code.wireshark.org/review/2247
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 15:26:18 +00:00
Michael Mann a09de615b4 Fix Function call argument is an uninitialized value
Change-Id: I716e80e53477edd419164c61937800795a550869
Reviewed-on: https://code.wireshark.org/review/2651
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 14:07:31 +00:00
Pascal Quantin 7c1b5e9b7e Fix several compilation warnings
Followup of gf798709

Change-Id: I0afddfe2e9b9ac454377f2358a29b4ecdd011b91
Reviewed-on: https://code.wireshark.org/review/2668
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-26 13:08:59 +00:00
Michael Mann f7987091ba convert to proto_tree_add_subtree[_format]
Change-Id: I525ac2aae2bdbfd5f3a2f3b35f1bf10dde053f66
Reviewed-on: https://code.wireshark.org/review/2667
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-26 11:41:10 +00:00
Britt McKinley 732656c6f3 STUN: Add support of MS-ICE2 (Used by Lync)
Interactive Connectivity Establishment ICE Extensions 2.0
http://msdn.microsoft.com/en-us/library/office/cc431504.aspx

Change from review:
1) Change encoding for foundation to ASCII
2) Move case for MS_IMPLEMENTATION_VER.

Change-Id: Ic524a2fe811695478aba81af9cbb3dbd031bbce3
Reviewed-on: https://code.wireshark.org/review/2579
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-26 05:15:00 +00:00
Basil c63cd9f869 New HP DTD dictionary file
Bug: 10206
Change-Id: Ibe056ed37d3619aabfb17d3c2c5e85e67deae4e5
Reviewed-on: https://code.wireshark.org/review/2617
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26 02:59:50 +00:00
Alexis La Goutte 06cf499eaf Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Icec39c64d952ccc9739df95135ed79b3196a427a
Reviewed-on: https://code.wireshark.org/review/2652
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-26 02:43:12 +00:00
Alexis La Goutte b632c23a3b Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5c66a456b7986e3fd7672deaf7ce773467873324
Reviewed-on: https://code.wireshark.org/review/2653
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-26 02:41:48 +00:00
Gerald Combs 81963e7f1a Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.
Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9
Reviewed-on: https://code.wireshark.org/review/2664
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-25 23:02:55 +00:00
Guy Harris 765405da3e Update a comment.
Also, make the block of code containing that comment intended
consistently with spaces.

Change-Id: I8e8eb346833662f15c53ece5869b12cc430bad11
Reviewed-on: https://code.wireshark.org/review/2661
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25 21:06:03 +00:00
Guy Harris 474b90e358 Boost the maximum snapshot length to 262144, for USBPcap.
Change-Id: I104bd9d1519298a0e4ff818f1cf821df594b3491
Reviewed-on: https://code.wireshark.org/review/2658
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25 20:43:04 +00:00
Guy Harris 8cde7a72d6 Boost the maximum packet size to 131072.
Libpcap 1.6/tcpdump 4.6 will support up to 131072, as the MTU on the
Linux loopback device is 65536 on at least some versions of the kernel,
and that doesn't count the fake Ethernet header, so the maximum packet
size is 65549; they went to the next power of 2 up.

Change-Id: Ibfc66d01ef8ef7387887a75c2b567159bb78ac0f
Reviewed-on: https://code.wireshark.org/review/2655
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25 20:27:11 +00:00
Pascal Quantin fd5b0777bb DLSw: better fix, as suggested by Evan
Change-Id: I82556c40cc4f0618e9e1c927beafa19ea4659683
Reviewed-on: https://code.wireshark.org/review/2650
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-25 18:53:56 +00:00
Jeff Morriss e0461ecd43 Indicate tshark can read (-r) from stdin and named pipes now.
(Though it works only with certain formats.)  As requested in:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2874#c4

Change-Id: I2ce0509d8750b21ae0167d12459074ba0f9506f8
Reviewed-on: https://code.wireshark.org/review/2646
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-25 18:01:28 +00:00
Pascal Quantin a8652ea529 DLSw: ett2 proto_item variable is an input parameter for dissect_dlsw_capex()
Regression introduced in g888f22d

Change-Id: I6ae451ef31b188540db4e4687c9fa492e8aa195e
Reviewed-on: https://code.wireshark.org/review/2649
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-25 17:58:31 +00:00
Peter Wu 4224e353f9 ssl-utils: add missing ett registration
Fixes the dissector bug warning:
"epan/proto.c:4657: failed assertion "idx >= 0 && idx < num_tree_types"

Add some comments to avoid future mistakes, add folding markers and fix
alignment of curves hf.

Change-Id: Ibcb57bfeb09a9777324682704a86f1ce260d345e
Reviewed-on: https://code.wireshark.org/review/2642
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-25 17:16:26 +00:00
Pascal Quantin 13a972bac4 DTPT: remove unused variables
Change-Id: I9c8e26af6e0d71012b010dee24a0d0d7220b49f7
Reviewed-on: https://code.wireshark.org/review/2648
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-25 17:05:05 +00:00
Michael Mann 888f22de16 convert to proto_tree_add_subtree[_format]
Change-Id: I2ea1892b5963cc5578cbdd2b03029ca8424f2267
Reviewed-on: https://code.wireshark.org/review/2640
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-25 16:35:14 +00:00
James Coleman 8ac87dccde fix_bug_10199: enhancement Telephony VoIP Call add ability to show all SIP Flows.
Add SIP Flows menu option beside VoIP Calls.
Flow for all SIP message types (which have a call-id) is shown in SIP Flow.
Add useful info(original flow method, response code, cseq) to comment field in conversation and flow dialogs.

Change-Id: I4801a633ed9b6594b2d89629c9d6fec6352da150
Reviewed-on: https://code.wireshark.org/review/2479
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: James Coleman <gaoithe@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-25 16:14:58 +00:00
Jeff Morriss 03f7a4bedc Remove wiretap/AUTHORS (after ensuring all names are present in the top-level AUTHORS file).
Change-Id: Ic3aa46c770f373541572e8507ec08b3439f3077f
Reviewed-on: https://code.wireshark.org/review/2645
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-25 14:43:16 +00:00
Irene Ruengeler 3f43688eb3 List elided_label.h only once.
Change-Id: Ibd00e55fb31d571b0b1f6f1c4595a35835e22d4d
Reviewed-on: https://code.wireshark.org/review/2641
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-25 08:20:20 +00:00
Guy Harris a11879e218 Get rid of an unused variable.
Change-Id: I8e436b7e4724c85943200087783d3cf7dd7c1535
Reviewed-on: https://code.wireshark.org/review/2639
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25 02:38:24 +00:00
Jeff Morriss 5aa6cf9dd5 Update my email address in a couple more spots.
Change-Id: I787ae2651a8083bc3082e5cb85dbd849823a16ca
Reviewed-on: https://code.wireshark.org/review/2638
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-25 02:15:55 +00:00
Evan Huus 3a943e9254 Reduce maximum permitted leakage to 100KB
Down from 500KB. The old value only triggered once that I can recall, and the
"average" leakage I'm seeing on most captures is only a few KB now, so this
shouldn't flood us with issues (which was the original concern leaving it so
high).

Change-Id: Ie4c98696b3fb7a533a7dc4f83c7ac8c458b499c8
Reviewed-on: https://code.wireshark.org/review/2633
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 23:43:28 +00:00
Michael Mann 29ecd114bf convert to proto_tree_add_subtree[_format]
Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6
Reviewed-on: https://code.wireshark.org/review/2601
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 23:42:13 +00:00
Evan Huus 83da877fff Add back initializers dropped in g9356d5c689fa
They were actually necessary.

Bug:10224
Change-Id: I9973bf7bab670d12e5b90bb2a57e99f9125d6a07
Reviewed-on: https://code.wireshark.org/review/2632
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24 22:28:11 +00:00
Balint Reczey 09b86bdb0c GTK3: Fix changing filter expression's bg color based on validity
Bug: 8598
Change-Id: Id5a52c05cab25df9e228b1b4d2caf07335c1f4c8
Reviewed-on: https://code.wireshark.org/review/2614
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24 22:01:22 +00:00
Evan Huus 2a1e3d16aa Fix two bugs in kafka dissection
- Respect the length field when dissecting message sets
 - Don't "wrap around" in capture when doing request/response matches

Also convert one instance to proto_tree_add_subtree, as an experiment.

Change-Id: Id161687865afa7ca83e6943a643bc54582f65554
Reviewed-on: https://code.wireshark.org/review/2624
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24 21:59:41 +00:00
Guy Harris 0fb9369a5e Support -w even if we're not built with pcap.
You can, for example, do

	tshark -r file1 -Y filter -w file2

to read a file, apply a read filter, and write the packets that match
the filter to another file even if you can't capture traffic.

Change-Id: Ifd5e1d5c0e745edef5e98ec4babc720bfbcee6d9
Reviewed-on: https://code.wireshark.org/review/2627
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 20:49:06 +00:00
Guy Harris deda668e4c Add the capchild directory to some lists of rules.
Change-Id: Ic06cf8005a16cc61c8e3ae506dba4c4916ab6471
Reviewed-on: https://code.wireshark.org/review/2626
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 20:11:21 +00:00
Guy Harris 5a3632ef40 Load WinPcap before we get the run-time information string.
That way, we can include the WinPcap version in that string.

Change-Id: I01fa0defce158e122d1c602fdfbc81916a9e80ef
Reviewed-on: https://code.wireshark.org/review/2625
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 20:05:28 +00:00
Anish Bhatt b4d4218a18 OSPF Cleanup. Remove unnecessary TFS declarations
Change-Id: I9b4205f6d579ea9e707d83baf81f77393e3098b4
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2478
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-24 19:56:52 +00:00
Balint Reczey 00212e5f98 Fix sorting RTP Streams by jitter
Bug: 9460
Change-Id: I80d991053eb47b8650561e8af4cc8dec512e2c9c
Reviewed-on: https://code.wireshark.org/review/2619
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 19:36:54 +00:00
Ben Burwell 830d1b1ce9 Add quotes around MAKEDIR.
Bug: 7870
Change-Id: I6cea057c4953f5ecc0a146a24570d089e79f8352
Reviewed-on: https://code.wireshark.org/review/2620
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 19:35:27 +00:00
Роман Донченко 2a9cc7a2b5 Correct indentation in make-dissector-reg
The indented portions are inside an if.

Change-Id: I3343a7aa7e777466ec9f40e8a02a8218bef62017
Reviewed-on: https://code.wireshark.org/review/2622
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 19:34:45 +00:00
Michael Mann 65b75212e1 Ensure proto_item from subtree is initialized
bug:10223
Change-Id: I40ed92bcf436723ad3927a93181f7c732cf4690f
Reviewed-on: https://code.wireshark.org/review/2623
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-24 19:26:17 +00:00
Pascal Quantin eaf6bf3ec0 MBIM: add an option to force SMS PDU decoding format if MBIM_DEVICE_CAPS_INFO message was not captured
Change-Id: Iff78a00b463a7a33e1705c76ea49618af532f3aa
Reviewed-on: https://code.wireshark.org/review/2621
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-24 17:25:30 +00:00
Guy Harris dbd409d041 Fix OS X CMake build.
I have ***NO*** idea why this makes a difference, but, without this
change, APPLE_CORE_FOUNDATION_LIBRARY is apparently *not* set correctly
for wsutil/CMakeLists.txt, and, with this change, it is.  I guess
there's something magic involved here with "global" CMake variables or
something crazy such as that.

Change-Id: I7a0046b9c249568cd666720838104f48e854e203
Reviewed-on: https://code.wireshark.org/review/2612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 07:10:12 +00:00
Guy Harris 4f1d20abae proto_tree_add_uint() takes a value, not an encoding, as an argument.
Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e
Reviewed-on: https://code.wireshark.org/review/2611
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 06:57:32 +00:00
Guy Harris 4105c48df8 Another capchild.lib -> libcapchild.lib.
Change-Id: I4c7750f05c831f12d0d34e2edf0d982d501d90d8
Reviewed-on: https://code.wireshark.org/review/2610
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 03:54:20 +00:00
Guy Harris b671551625 Another file to generate in the configure script.
Change-Id: I6dafc9ab9fafd465cb2ad83e5e56e4d22b36d41b
Reviewed-on: https://code.wireshark.org/review/2609
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 03:35:47 +00:00
Joerg Mayer e978cad6a1 Create capchild/doxygen.cfg
Change-Id: I215a9d9849c752f9e8e3216c0f6479d1ba1cfafd
Reviewed-on: https://code.wireshark.org/review/2608
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 03:28:19 +00:00
Martin Kaiser e68638fe6b usb iso urbs on linux can't possibly contain a setup packet
see mon_bin_event() in the linux kernel where the setup_flag is set only
for control urbs

clean up various things related to this assertion:
remove type_2 parameter
show the iso descriptors in any case
calculate the end offset correctly, the end offset is the byte after the
iso data

Change-Id: Iebfbe6443c224a958a1697563aa8fb853d7aa8c2
Reviewed-on: https://code.wireshark.org/review/2541
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-24 03:11:56 +00:00
Joerg Mayer 0f76609237 Remove unneeded include <sys/stat.h>
Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5
Reviewed-on: https://code.wireshark.org/review/2607
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 02:32:26 +00:00
Guy Harris 243fc405d9 Add libcapchild, remove the files that are now in it.
Change-Id: I79c16bbea47e507859c904e4142fc06fa6bfc127
Reviewed-on: https://code.wireshark.org/review/2606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 02:13:03 +00:00
Guy Harris baf3e81358 Get rid of trailing blanks.
Change-Id: Idee9c273a74d37f1e754fcada0a06dcd67f306c3
Reviewed-on: https://code.wireshark.org/review/2605
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 02:08:37 +00:00
Joerg Mayer 836feeb559 Remove unneeded sys/types.h
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516
Reviewed-on: https://code.wireshark.org/review/2604
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24 02:08:07 +00:00