summaryrefslogtreecommitdiff
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2015-02-17[zvt] dissect some more fieldsMartin Kaiser1-1/+28
Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c Reviewed-on: https://code.wireshark.org/review/7208 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-17STUN : fix indent (use 4spaces)Alexis La Goutte1-45/+45
Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435 Reviewed-on: https://code.wireshark.org/review/7202 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-17802.11: fix no previous prototype for 'wlan_col_filter_str' & ↵Alexis La Goutte1-9/+9
'wlan_bssid_col_filter_str' [-Wmissing-prototypes] Fix also some indent typo (3spaces -> 2spaces) Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19 Reviewed-on: https://code.wireshark.org/review/7199 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-17CMIP: get rid of some evil global variablesPascal Quantin1-69/+47
Fixes an ASAN failure reported by Alexis Note that some global variables remain as I do not know enough on this protocol to safely remove them Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c Reviewed-on: https://code.wireshark.org/review/7099 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-17PCP: updated protocol dissection for new PDU typesRyan Doyle1-124/+278
Introduce basic dissection for AUTH PDU type as well as detecting if a conversation is about to initiate a secure sockets connection (kind of like STARTTLS) and then pass all packets through the SSL dissector if that is the case. Also clean up some duplication with constants. Change-Id: I66f663ca6ab4291f8d0321430e3e126a0be77a93 Reviewed-on: https://code.wireshark.org/review/7109 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-17Give users a more helpful error message if they enter an SSL protocol we don'tJeff Morriss1-3/+9
know. First, if we know the protocol (by filter name) tell them that the dissector just isn't set up to run over SSL but it could be--if they contact the Wireshark developers. Second, don't tell them that the dissectors which have called ssl_dissector_add() are the only ones that are valid; those are just commonly used ones. Change-Id: I1b72bccd4c96c21c73a19fa2d87fe2c0b875a0fa Reviewed-on: https://code.wireshark.org/review/7185 Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-17Don't send an effectively empty message (no TVBs) to the SCTP tap.Jeff Morriss1-1/+1
This prevents the tap from crashing (asserting out) because there's no (initialized) TVB to look at. Bug: 9849 Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca Reviewed-on: https://code.wireshark.org/review/7190 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-17Added JSON native file support.Dario Lombardo1-11/+21
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-16Whitespace fix (space before tab)Joerg Mayer1-4/+4
Change-Id: Iccbac2ff5d95639d478437eefa16d1dd2757128b Reviewed-on: https://code.wireshark.org/review/7186 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-02-16We now get that from common libwireshark code.Guy Harris1-8/+0
Change-Id: If3b15d01689c6bbfad6422c4a30f9ece5e2b3b83 Reviewed-on: https://code.wireshark.org/review/7183 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16Put the 64-bit hash routines into a common file.Guy Harris3-26/+3
Some or all are used by the Infiniband, MBIM, and RSVD dissectors; put them into a common source file, with a header for them, and just include the header in the dissectors. Change-Id: I724f0c2232ba751ccbd491222af6f03bafd6d63c Reviewed-on: https://code.wireshark.org/review/7182 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-16RSVD: fix compilation with GLib < 2.22.0Pascal Quantin1-0/+8
Change-Id: Ia82d42faa766f68e167b1c1affa5307980909fb8 Reviewed-on: https://code.wireshark.org/review/7181 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-16Fix a portability problem raised by Guy Harris. My first implementation wouldRichard Sharpe1-4/+7
not work on 32-bit platforms because I assumed that pointers were 64-bit items. I have now moved to a slightly different scheme suggested by Evan Huus. Change-Id: I34f4dceea9952d5633603e71a8e8ae8f4b9154cc Signed-of-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7179 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
2015-02-16[80211ac] Change VHT MIMO Control to use add_bitmaskAnish Bhatt1-27/+18
Change-Id: If3d597dd6dbf746e0f971e52073f9790b6a0ceda Reviewed-on: https://code.wireshark.org/review/7128 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-16[80211ac] Add partial beamforming supportAnish Bhatt1-5/+260
Adds support to decode beamforming report, but actual beamforming matrices are not decoded. Requires bit level manipulation of varying lengths of data which is not currently supported, and section spec only seems to mention size and contents, not representation Bug 10169 Change-Id: Icc2188b79f95b5e38b64ded348b7a0696b5504ed Reviewed-on: https://code.wireshark.org/review/7111 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-16[Diameter] Use proto_tree_add_bitmask() to add the diameter flags.AndersBroman1-16/+14
Change-Id: I9cb6e46551b0a25a458311a53365469552d5c195 Reviewed-on: https://code.wireshark.org/review/7177 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-16Make get_manuf_name return a const string.Michael Mann1-2/+2
Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator. Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6 Reviewed-on: https://code.wireshark.org/review/7081 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-16[STUN] Avoid fetching stuff twice from the tvb.Anders1-33/+55
Change-Id: I923818ea41791b2f41c5bce3c5927014580eb2b7 Reviewed-on: https://code.wireshark.org/review/7174 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-16Complete the RSVD Dissector further by handling SCSI requests.Richard Sharpe1-23/+243
Still have to handle response, but this points the way, I think. Handle responses. Still have to handle sense info. Change-Id: Ic692de15b8178fbe274791ffbc000e8f35b40653 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7127 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-16Suppress more pedantic warnings.Gerald Combs1-0/+29
Suppress warning: initialization of a flexible array member [-Wpedantic] Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a Reviewed-on: https://code.wireshark.org/review/7155 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-15Handle DLT_LOOP differently from DLT_NULL.Guy Harris2-14/+85
That's a little cleaner, and lets us preserve the LINKTYPE_ value for DLT_LOOP captures. ("Preserve" here doesn't mean "write files with a link-layer header type of 12", as that's ambiguous; we write it with a link-layer header type of LINKTYPE_LOOP, i.e. 108. If programs on OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's libpcap or in the program.) Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15 Reviewed-on: https://code.wireshark.org/review/7143 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-15Only call tvb_get_ptr() once to set src and dst addresses-Anders1-4/+4
Change-Id: I206b25ec512b3665b36307276ab3748e0a5ff73b Reviewed-on: https://code.wireshark.org/review/7135 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-15IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-3/+3
by Clang Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97 Reviewed-on: https://code.wireshark.org/review/7129 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14MIP6: Local Mobility Anchor Address mobility option code is treated incorrectlyAlexis La Goutte1-4/+5
The first packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=1. Wireshark parses its address as IPv4 address. The second packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=2. Wireshark parses its address as IPv6 address. According to RFC 5949 (https://tools.ietf.org/html/rfc5949#section-6.2.2), Option-Code=1 means IPv6 and Option-Code=2 means IPv4, exactly the opposite to what Wireshark does. Bug: 10961 Change-Id: I03b76dda8beae211e67e6c9e1f40d122e851b1b5 Reviewed-on: https://code.wireshark.org/review/7113 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14MIP6: AUTH mobility option parses Mobility SPI and Authentication Data ↵Alexis La Goutte1-1/+1
incorrectly The authentication data in the AUTH option in attached IPv6 packet contains one byte too much. This byte is read beyond the option data. In Wireshark, clicking on the AUTH shows that the option ends at 0xCE while clicking on the Authentication Data shows that it ends at 0xCF. Reported by Boaz Bug:10626 Change-Id: I0bcfd6331bc1de30f25d16590487c0e3bf5c002f Reviewed-on: https://code.wireshark.org/review/7112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-14Don't check for C89 headers.Guy Harris2-8/+3
1988 called, they want their lack of a C standard back. We don't need to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as they're specified by C89 and I don't think there are any platforms we care about that don't have a C89 environment in which we could be built. Change-Id: I447551181284fab7722354b62774625ed8ee94bc Reviewed-on: https://code.wireshark.org/review/7110 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-14We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>.Guy Harris1-4/+0
Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d Reviewed-on: https://code.wireshark.org/review/7108 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-13Replace tabs by spaces when editor modelines has "expandtab"Bill Meier17-3840/+3840
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-13A dissector for the RSVD Protocol (see [MS-RSVD].pdf).Richard Sharpe3-0/+653
There is still a little more work to do here, especially we should call the SCSI dissector for handling SCSI CDBs etc ... This is a potential fix for bug 10913. Ping-Bug: 10913. Change-Id: Ia8ff1a8207bb5b1cd18079086ff8c472ae3f8736 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7022 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-13Register the Mongo dissector by name so it can be used with TLS.Jeff Morriss1-0/+6
Change-Id: Ic9d688603747312aa29e5af038363f70c3cbae33 Reviewed-on: https://code.wireshark.org/review/7097 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-13Micro optimization, only do tvb_get_ptr() once for dst and srcAndersBroman1-9/+9
respectivly. Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14 Reviewed-on: https://code.wireshark.org/review/7096 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-12Fix crash at startup in SSE4.2 code when running a 32 bits Windows buildPascal Quantin5-15/+15
There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h) Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b Reviewed-on: https://code.wireshark.org/review/7070 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-12BT ATT: memory given to add_new_data_source() must be allocated in pinfo scopePascal Quantin1-1/+1
Bug: 10952 Change-Id: I0eb8e6891c35c70c9d405db87824c442caaa2f30 Reviewed-on: https://code.wireshark.org/review/7085 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-12[IS-IS-LSP] Add support for Prefix-SID subTLVAnish Bhatt1-24/+123
Bug: 10679 Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e Reviewed-on: https://code.wireshark.org/review/7048 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-12Support for looking for incomplete dissectors.Dario Lombardo1-0/+29
Change-Id: I03e592dd3d54fc0e1c4af09d5d5336dda93f950e Reviewed-on: https://code.wireshark.org/review/6978 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-12Little tuning of proto_tree_add_bytes_with_lengthMichal Labedzki1-1/+1
Change name from proto_tree_add_new_bytes to proto_tree_add_bytes_with_length and other tweaks pointed by Peter Wu. Change-Id: I6058c28a74a154e2882e4eb04558bedcede6f508 Reviewed-on: https://code.wireshark.org/review/7039 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-12Revert "Make get_manuf_name return a const string."Anders Broman1-2/+2
This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac. Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4 Reviewed-on: https://code.wireshark.org/review/7076 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-12Make get_manuf_name return a const string.Michael Mann1-2/+2
Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator. Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e Reviewed-on: https://code.wireshark.org/review/7075 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>
2015-02-11packet-iec104: fix packet information textJiří Engelthaler1-9/+11
Change I6abc157368a78e1abfde672728b88a36ba6e76cc adds break in "switch case" but there was missing break deliberately. Code modified to let break on his place - copied code from the following condition. Change-Id: Id008955fbc122c0f8cfe06af2b96f0b643e9417f Reviewed-on: https://code.wireshark.org/review/7066 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-11Prevent two false positive MSVC2013 Code Analysis warningsBill Meier2-3/+3
Message: "Using uninitialized memory" Change-Id: Ib7d381beb9f9c1f3ec19a376c0c8c0d5ef85f373 Reviewed-on: https://code.wireshark.org/review/7069 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-11Remove address_to_str_buf from hsrp dissector "heuristics" as its much ↵Michael Mann1-7/+6
faster to just compare the IPv4 address as a 32-bit value. Change-Id: If5a819b74112e92636d036509cb30ea15b2d5e3d Reviewed-on: https://code.wireshark.org/review/7067 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-11Combine SSE and pre-compiled patterns for faster pbrkHadriel Kaplan5-40/+83
This combines the SSE4.2 instructions usage, with pre-compiled pattern searching usage, for a faster pbrk search method. Testing against large files of HTTP and SIP, there is about a 5% performance improvement by using pre-"compiled" patterns for guint8_pbrk() instead of passing it the search string and having it build the match array every time. Similar to regular expressions, "compiling" the pattern match array in advance only once and using the "compiled" patterns for the searches is faster than compiling it every time. Change-Id: Ifcbc14a6c93f32d15663a10d974bacdca5119a8e Ping-Bug: 10798 Reviewed-on: https://code.wireshark.org/review/6990 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-10USB: put back interface class when dissecting URB_CONTROLPascal Quantin2-25/+29
Also ensure that USB COM dissection is done with the parent tree and not setup one Change-Id: Iae9f933ff29b3854879375df320a23e623ea785f Reviewed-on: https://code.wireshark.org/review/7051 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2015-02-10Do not iterate over reported length when using tvb_find_line_endPascal Quantin16-29/+27
if captured length < reported length, this will trigger an infinite loop Change-Id: I6557b455e7bbff12658a934e5bb13a42c023e133 Reviewed-on: https://code.wireshark.org/review/7053 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-10IMAP: do not iterate over reported length when using tvb_find_line_endPascal Quantin1-1/+1
This function can only search in captured length buffer This fixes an ASAN failure reported by Alexis Change-Id: Ib936f918e057423d63ff34a5fc79fed602e56dfc Reviewed-on: https://code.wireshark.org/review/7052 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-10FTAM: get rid of an evil global variablePascal Quantin1-20/+25
Fixes an ASAN failure reported by Alexis Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b Reviewed-on: https://code.wireshark.org/review/7049 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-09pgsql,imap: add STARTTLS supportPeter Wu2-20/+86
The PGSQL "STARTTLS" protocol is documented at http://www.postgresql.org/docs/9.4/static/protocol-flow.html While at it, convert some tvb_length[_remaining] users. Tested against pgsql-ssl.pcapng, Tested against imap-ssl.pcapng, http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys Change-Id: I1a00a6daa7f03de93339c2c13b07b4cfb8cdbd86 Reviewed-on: https://code.wireshark.org/review/6821 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-09file-jpeg: Allow 'Exif' as identification in first App block, but flag as ↵Martin Mathieson1-5/+33
expert info warning if seen Change-Id: Id16e0b4fbca3b29b01138a9aea758b8beb8d9ed8 Reviewed-on: https://code.wireshark.org/review/7042 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-09Netflow: rework how transport (port) resolution is done, adding support for SCTPMartin Mathieson1-24/+30
Change-Id: I09b2cc3739628b5de706659731e37fa345804254 Reviewed-on: https://code.wireshark.org/review/7043 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-09ldap: simplify Start TLS handlingPeter Wu1-109/+75
RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 14:57:55 +0000