aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
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 Huus1-6/+1
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-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-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 Combs1-6/+35
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-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-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 Burman2-0/+457
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>
2014-06-24OSPF Cleanup. Remove unnecessary TFS declarationsAnish Bhatt1-248/+84
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-24MBIM: add an option to force SMS PDU decoding format if ↵Pascal Quantin1-4/+26
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-24proto_tree_add_uint() takes a value, not an encoding, as an argument.Guy Harris1-1/+1
Change-Id: Ie2c0523e32b54cd13506501d98215934a8d1304e Reviewed-on: https://code.wireshark.org/review/2611 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24usb iso urbs on linux can't possibly contain a setup packetMartin Kaiser1-68/+55
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-24Remove unneeded include <sys/stat.h>Joerg Mayer2-4/+0
Change-Id: I3be8f29d2b4fba2cb1d7ee2f29bdb27e42dd40a5 Reviewed-on: https://code.wireshark.org/review/2607 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24Remove unneeded sys/types.hJoerg Mayer2-13/+6
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516 Reviewed-on: https://code.wireshark.org/review/2604 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-24Restore correct tree assignment.Michael Mann1-1/+1
Change-Id: Id06bd486114a80fb899f8dc148d48928e99e775e Reviewed-on: https://code.wireshark.org/review/2602 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-23ssl: fix ClientKeyExchange, fix TLSv1.2 SKE for DHPeter Wu4-1393/+570
Since DTLS and TLS do not differ in handling ClientKeyExchange and ServerKeyExchange, its dissection got moved to ssl-utils. The code is based on the SSL dissector, with header field names adjusted to the DTLS ones (those got capitalized). Besides a version difference (for signatures), the header field and function names, the DTLS and SSL code are equal (this is verified). This patch refactors the dissectors for DHE_RSA and ECDHE to make use of a common function to dissect the signed_params field. All offset tracking is also removed in favor of exception handling by the proto_tree_add_item function. Occurrences of proto_tree_add_uint are also replaced by proto_tree_add_item for simplicity. After those changes, the SKE dissector for DH key exchanges is updated to handle the mandatory signature field in TLSv1.2, using the newly added function. (bug 9208) Another bug occurred after the length check removal, pre-TLS and OpenSSL's old DTLS implemenation do not include a vector length in the CKE. This is now also fixed. (bug 10222) Other minor changes: comments added/corrected, renamed keyex_dh -> keyex_dhe (includes DHE_RSA and DHE_DSS). Bug: 9208 Bug: 10222 Change-Id: I76e835d56a65c91facce46840d79c1c48ce8d5dd Reviewed-on: https://code.wireshark.org/review/2542 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-23Remove some unneeded includesJoerg Mayer1-8/+0
Change-Id: I4327ead0451244daa0d876ae3a770cbbf80760c8 Reviewed-on: https://code.wireshark.org/review/2590 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Initialize whole buffer in GPRS Mobility and Session Management dissectorPascal Quantin1-1/+1
Bug: 10216 Change-Id: I572a7a6ce0f816063f02397b667dd46c990cf73e Reviewed-on: https://code.wireshark.org/review/2583 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-23Replace AF_ values by COMMON_AF_ values.Joerg Mayer1-16/+5
Remove no longer needed system includes Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68 Reviewed-on: https://code.wireshark.org/review/2577 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-23Revert "Optimize sip_is_known_sip_header()"Evan Huus5-787/+294
This reverts commit c9a5fbeb1da9b5566ac9ac36bfdcdee6172ef5c8. Change-Id: Ic2e5d531f719ed1107ef7bb1de12175d4601fd6d Reviewed-on: https://code.wireshark.org/review/2574 Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 13:42:17 +0000