summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-29GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS ↵Pascal Quantin2-29/+79
dissector Bug: 10234 Change-Id: Ie340b849015febe46f91836440d44d4cfde005a4 Reviewed-on: https://code.wireshark.org/review/2695 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-29Fix compile error when building w/o GNUTLSBill Meier1-1/+1
Specifically: <wsutil/file_util.h> is aleays needed (for create_app_running_mutex()) Change-Id: I78e5a767f62bc2af67b6407539742dc245259f56 Reviewed-on: https://code.wireshark.org/review/2699 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-29[Automatic manuf, services and enterprise-numbers update for 2014-06-29]Gerald Combs5-22/+254
Change-Id: Ife61b2e2c53f1faba34940035ac84a2b5ced3b71 Reviewed-on: https://code.wireshark.org/review/2696 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-29proto_tree_add_subtree[_format]Michael Mann40-825/+505
Change-Id: I7e016f10fcfdc0523bf2fe8c11295c0334f7c332 Reviewed-on: https://code.wireshark.org/review/2694 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29convert to proto_tree_add_subtree[_format]Michael Mann23-1130/+812
Change-Id: If110de1e0555637264f86f1508858d569871a9c7 Reviewed-on: https://code.wireshark.org/review/2675 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29Standardize the names of, and document, the taps and heuristic dissector ↵David Ameiss7-17/+28
tables made avaialble by these dissectors. Change-Id: If3a143eb9546c9de63cd32b2347000b09e0e3c93 Reviewed-on: https://code.wireshark.org/review/2688 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28Fix missing g_list_next() with GLib < 2.32Balint Reczey1-0/+1
Change-Id: I825e74de378acc9d35e4b620a3eeb4807fe7accd Reviewed-on: https://code.wireshark.org/review/2690 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-28Remove unused variables post commit 7bf6862ecf0d0a508bf097f3b52d07bd19128272Graham Bloice2-5/+0
Change-Id: Id583ab1742241deb9325dcb1dbba8a8cb3df3b90 Reviewed-on: https://code.wireshark.org/review/2691 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-28convert to proto_tree_add_subtree[_format]Michael Mann26-399/+223
Change-Id: Ia7014003a3cff5181295172978d6c613c3b83b0b Reviewed-on: https://code.wireshark.org/review/2676 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-28Fix several GTK warnings in Windows.Irene Ruengeler2-32/+24
Change-Id: I300137319129c3e188884e1240c025d92e34e410 Reviewed-on: https://code.wireshark.org/review/2687 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27Have the makefile run windepoyqt if it exists to copy the required dlls to ↵AndersBroman2-1/+15
the install dir. Change-Id: If87c2670e1ffef116d4497241f070fa41a70015b Reviewed-on: https://code.wireshark.org/review/2644 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27Use g_queue_free_full() only on GLib > 2.32Balint Reczey1-2/+12
Change-Id: I7a72fe8243fc809b444f1b026ed872cd2aa92245 Reviewed-on: https://code.wireshark.org/review/2686 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-27Use GQueue for generating statisticsBalint Reczey12-210/+198
This makes reversing the list back and forth to keep adding data at O(n) complexity obsolete. Bug: 9696 Change-Id: Ice77328b8f6c5bf72bbfcfd82e08d09d4f986d3f Reviewed-on: https://code.wireshark.org/review/2571 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-27Report more information on a sync_xxx_open() call failure.Guy Harris1-2/+6
Trying to get more information for http://ask.wireshark.org/questions/34057/waitpid-error-starting Change-Id: Ifc0eb58f5b69c2c4a4638aa95f6b5f8f628bef02 Reviewed-on: https://code.wireshark.org/review/2685 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-27We're not currently using dissect_rtcp_psfb_remb(); #if 0 it out.Guy Harris1-5/+28
Also, note that we need to determine how to handle Application Layer Feedback messages based on the SDP setup traffic for the session; recent changes disabled dissection of REMB Application Layer Feedback messages in favor of MS-RTP Application Layer Feedback messages. (This is why we shouldn't remove dissect_rtcp_psfb_remb() unless REMB isn't being used any more.) Change-Id: Ib320bdf4a64263fdef29fc4ea2583eaae1cc4bee Reviewed-on: https://code.wireshark.org/review/2684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-27In function 'dissect_rtcp_psfb':AndersBroman1-1/+1
packet-rtcp.c:1232: warning: unused parameter 'top_item' Change-Id: I76522a9c6094473ce0eeeb7cc929a66e6da21909 Reviewed-on: https://code.wireshark.org/review/2683 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27RTCP: Add support for MS-RTPBritt McKinley1-15/+1245
Support for Profile Specific Extensions from MS-RTP Support for RTCP Feedback Messages Support for Application Layer Feedback Messages. MS-RTP: Real-time Transport Protocol (RTP) Extensions http://msdn.microsoft.com/en-us/library/office/cc431492.aspx Change-Id: I1f1e6e60b5f9d09b1dffd7e308426c0b67914441 Reviewed-on: https://code.wireshark.org/review/2586 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-27Tighten the dump-glossary test.Evan Huus2-3/+6
1. The only indication we get of an out-of-order value string is a message on STDERR, so check that and fail the test if STDERR wasn't empty. 2. This exposes an out-of-order value string in packet-stun.c; fix it. 3. This triggered the pre-commit hook on packet-stun.c, which noticed an API error (ENC_ASCII -> ENC_ASCII|ENC_NA); fix that too. Change-Id: I36f87a2a87b40537119562f22a7e3012716ff239 Lesson: automated testing/tooling is both wonderful and scary. Reviewed-on: https://code.wireshark.org/review/2682 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-27If we have no fields, don't try to iterate through them.Evan Huus1-0/+4
Otherwise glib throws an assertion since the array we pass it is NULL. Change-Id: I9159c1f5ad99b280c040cd790df3cf352738601f Reviewed-on: https://code.wireshark.org/review/2680 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-27show an expert info if a non-control urb contains a setup packetMartin Kaiser1-4/+5
Change-Id: I9339869defa47a862b6174d8821cdd8e6186f5c5 Reviewed-on: https://code.wireshark.org/review/2678 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-27a USB urb of an unknown transfer type does not contain a setup packetMartin Kaiser1-30/+7
Change-Id: Iac6a259a1081b907149c49023614a5053440e560 Reviewed-on: https://code.wireshark.org/review/2677 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-27Check the validity of fields given to tshark with "-e": complain and exit ifJeff Morriss3-0/+35
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-26Fixed linker flags for MSVC to not attempt to make and link a manifestGraham Bloice2-2/+7
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-26add a cast, the mask makes it safe (stupid compiler)Evan Huus1-1/+1
Change-Id: Iaf24c62295a93a1abd4fe3daf7e4c9587c3ef76b Reviewed-on: https://code.wireshark.org/review/2670 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-26iSER: Add iSER dissector supportYan Burman4-2/+459
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-26Fix Function call argument is an uninitialized valueMichael Mann1-4/+4
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-26Fix several compilation warningsPascal Quantin3-5/+2
Followup of gf798709 Change-Id: I0afddfe2e9b9ac454377f2358a29b4ecdd011b91 Reviewed-on: https://code.wireshark.org/review/2668 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-26convert to proto_tree_add_subtree[_format]Michael Mann34-1249/+642
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-26STUN: Add support of MS-ICE2 (Used by Lync)Britt McKinley1-0/+15
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-26New HP DTD dictionary fileBasil4-0/+53
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-26Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Icec39c64d952ccc9739df95135ed79b3196a427a Reviewed-on: https://code.wireshark.org/review/2652 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-26Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I5c66a456b7986e3fd7672deaf7ce773467873324 Reviewed-on: https://code.wireshark.org/review/2653 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-25Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.Gerald Combs1-1/+1
Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9 Reviewed-on: https://code.wireshark.org/review/2664 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-25Update a comment.Guy Harris1-13/+16
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-25Boost the maximum snapshot length to 262144, for USBPcap.Guy Harris1-2/+2
Change-Id: I104bd9d1519298a0e4ff818f1cf821df594b3491 Reviewed-on: https://code.wireshark.org/review/2658 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25Boost the maximum packet size to 131072.Guy Harris1-2/+2
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-25DLSw: better fix, as suggested by EvanPascal Quantin1-2/+1
Change-Id: I82556c40cc4f0618e9e1c927beafa19ea4659683 Reviewed-on: https://code.wireshark.org/review/2650 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-25Indicate tshark can read (-r) from stdin and named pipes now.Jeff Morriss2-3/+4
(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-25DLSw: ett2 proto_item variable is an input parameter for dissect_dlsw_capex()Pascal Quantin1-1/+2
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-25ssl-utils: add missing ett registrationPeter Wu1-8/+22
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-25DTPT: remove unused variablesPascal Quantin1-2/+0
Change-Id: I9c8e26af6e0d71012b010dee24a0d0d7220b49f7 Reviewed-on: https://code.wireshark.org/review/2648 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-25convert to proto_tree_add_subtree[_format]Michael Mann26-536/+288
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-25fix_bug_10199: enhancement Telephony VoIP Call add ability to show all SIP ↵James Coleman5-13/+91
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-25Remove wiretap/AUTHORS (after ensuring all names are present in the ↵Jeff Morriss2-34/+1
top-level AUTHORS file). Change-Id: Ic3aa46c770f373541572e8507ec08b3439f3077f Reviewed-on: https://code.wireshark.org/review/2645 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-25List elided_label.h only once.Irene Ruengeler1-1/+0
Change-Id: Ibd00e55fb31d571b0b1f6f1c4595a35835e22d4d Reviewed-on: https://code.wireshark.org/review/2641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-25Get rid of an unused variable.Guy Harris1-1/+0
Change-Id: I8e436b7e4724c85943200087783d3cf7dd7c1535 Reviewed-on: https://code.wireshark.org/review/2639 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-25Update my email address in a couple more spots.Jeff Morriss3-3/+3
Change-Id: I787ae2651a8083bc3082e5cb85dbd849823a16ca Reviewed-on: https://code.wireshark.org/review/2638 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-24Reduce maximum permitted leakage to 100KBEvan Huus1-1/+1
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-24convert to proto_tree_add_subtree[_format]Michael Mann20-736/+443
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-24Add back initializers dropped in g9356d5c689faEvan Huus2-4/+4
They were actually necessary. Bug:10224 Change-Id: I9973bf7bab670d12e5b90bb2a57e99f9125d6a07 Reviewed-on: https://code.wireshark.org/review/2632 Reviewed-by: Evan Huus <eapache@gmail.com>