aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-07-02NDPS dissector is the poster child for proto_tree_add_subtree[_format].Michael Mann1-831/+558
NDPS dissector is also the poster child for not being considered "that naughty" by checkAPIs because most of its proto_tree_add_text calls don't have printf-style arguments (which is what checkAPIs really keys off of) Fixed both cases and removed about 370 proto_tree_add_text calls from the dissector. Change-Id: I721678c39d4a0544e5e7212e622c0c2eebfd04f7 Reviewed-on: https://code.wireshark.org/review/2775 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-02kafka: fully dissect offset request/response messagesEvan Huus1-0/+120
Change-Id: I641a3dbece6f822144f6740dde6801b1be202db5 Reviewed-on: https://code.wireshark.org/review/2777 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-02RSVP checksum is not required if integrity object is presentEvan Huus1-22/+24
Bug: 10219 Change-Id: I2da62ee184327b2bc42a264e1782db927460f5cf Reviewed-on: https://code.wireshark.org/review/2773 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-02Optimize sip dissector: avoid calling tvb_get_string_enc()Jakub Zawadzki1-56/+90
Fetch header value, only when we need to parse it. Change-Id: I3c170ef8ab03985c8111a1b84ac1afc87bc8b5ca Reviewed-on: https://code.wireshark.org/review/2767 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Bump (again) the amount of work we do for wmem's timing testEvan Huus1-1/+1
Apparently the new win8 vm has a *very* low-resolution timer, and the allocators are indistinguishable at the previous amount of work. Change-Id: If4e5bb8f85b1f0d39658f54001c88f42ffddfc47 Reviewed-on: https://code.wireshark.org/review/2768 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-01Fix for Bug 10240.Malcolm Walters1-1/+3
Include padding length in calculation of correct attribute length Change-Id: I569c6a9e1be39e3bb997e797a094b80cdcba6b07 Reviewed-on: https://code.wireshark.org/review/2747 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-07-01Remove executable bit, from not executable files.Jakub Zawadzki2-0/+0
Change-Id: I36b303b9c2bf4d6bb717261cdbf39ea16532fe06 Reviewed-on: https://code.wireshark.org/review/2757 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-07-01Remove debugging info from protocol tree for frameGraham Bloice1-16/+0
Change-Id: Id7f02087e536964bfa6d01a3646c20035a3ab6cb Reviewed-on: https://code.wireshark.org/review/2746 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Optimize epan_new/init_dissectionEvan Huus3-43/+41
As Anders correctly pointed out in I7d8f84b2e, constantly resetting state will turn init_dissection into a bit of a hot path. Especially as we will already bear the overhead of switching files, we don't want to fall any further behind than we have to. This change includes three unrelated optimizations that reduce the cost of init_dissection by about 40% as measured by callgrind: - only initialize ares/ADNS if that preference is enabled (this of course only applies if you specify -n to tshark or otherwise disable the preference) - use memcpy instead of a loop in sigcomp UDVM init - use memcpy instead of a loop in bootp dissector The only remaining obvious hot spot in this path is reassembly_table_init since it is called by so many dissectors. Suggestions (perhaps to get rid of the GPtrArray) welcome. Oh, and one other change to use g_strerror instead of strerror as insisted upon by the API pre-commit hook. Change-Id: I18a74f2b64b25498116079bd4e7fc2b335c7703a Reviewed-on: https://code.wireshark.org/review/2738 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01sip optimization: avoid calling tvb_get_guint8.Jakub Zawadzki1-56/+83
Use tvb_pbrk_guint8, tvb_find_guint8 when possible. Change-Id: If8090d9b9b92146e9c216f139c056130d6b04e78 Reviewed-on: https://code.wireshark.org/review/2569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-07-01Init session id to avoid warning using GCC 4.9Balint Reczey1-0/+1
Change-Id: I2091f7eb86c64fd086f44a7cf15e7c5483f9b44c Reviewed-on: https://code.wireshark.org/review/2716 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30Move stat_menu.h to libui.Guy Harris5-7/+7
Change-Id: I7bed7f7931845bc41035535cc62e1fe17c71047d Reviewed-on: https://code.wireshark.org/review/2726 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-30Warn about unencrypted HTTP traffic over port 443Evan Huus2-9/+36
At the suggestion of Toralf Förster. This includes an expert info, as well as making SSL a new-style dissector and rejecting traffic that looks like unencrypted text. Change-Id: Ib09ea0d97952330f092590ff3fc6488807cdbb81 Reviewed-on: https://code.wireshark.org/review/2693 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-30From Johan Whahl:AndersBroman1-0/+49
Added dissection of the SIP Service-Route header. Change-Id: Ic4523edb374ae03492af5853863dde501a0c30e0 Reviewed-on: https://code.wireshark.org/review/2721 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-30Fix the display of AVP:s that are not fully dissectedAndersBroman1-15/+16
fixes Bug #10237 Change-Id: I3c38bb4af4440f1e5087f21ef022bf2cd3a66002 Reviewed-on: https://code.wireshark.org/review/2720 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-30Bluetooth: Add missing connection_handleMichal Labedzki1-0/+1
This initialize previously uninitialized variable (and nice fixing everything) Change-Id: I943102510fc45735f40db7899884d2c0fe6ffb40 Reviewed-on: https://code.wireshark.org/review/2717 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-06-30Fix Bug #10238: Display filter expression dialog items do not expand/display ↵Bill Meier1-3/+10
properly. Unfortunately, certain proto_hier_tree_model.c functions assume/require that a cookie generated by proto_(first|next)_protocol_field() will never have a NULL value. Bug introduced in gd47ae54. Change-Id: I42763d02f700e15ca9b3ab9980943d4f8d933ca9 Reviewed-on: https://code.wireshark.org/review/2712 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-29proto_tree_add_subtree[_format]Michael Mann18-625/+367
Change-Id: Id00f456479415adf0a219af6c9a2108d4b3642d0 Reviewed-on: https://code.wireshark.org/review/2702 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-29GSM MAP: ensure that p2p_dir is always initialized before calling GSM SMS ↵Pascal Quantin1-29/+54
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-29[Automatic manuf, services and enterprise-numbers update for 2014-06-29]Gerald Combs3-20/+214
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 Ameiss5-15/+26
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-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-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 Huus1-2/+2
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 Morriss2-0/+27
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 Bloice1-0/+5
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 Burman3-0/+458
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-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-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-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-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-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 Huus1-2/+2
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-24Fix two bugs in kafka dissectionEvan Huus1-17/+24
- 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>