aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-12-06Autotools: Disable Qt4 on macOS.Gerald Combs1-7/+8
Add a check for macOS+Qt4 to configure.ac in order to roughly match the CMake behavior in ge858829. Change-Id: I37de95d5db515d28dd88f13d818531bf6e94d07e Reviewed-on: https://code.wireshark.org/review/19036 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-06SDP: Fix compiler warningMichael Mann1-2/+2
Change-Id: I5d415ba9ce7ae62eff43d47ceaa96e6282eaad1a Reviewed-on: https://code.wireshark.org/review/19113 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: Peter Wu <peter@lekensteyn.nl>
2016-12-06DOF: fix UAT update callbacksPascal Quantin1-69/+72
- update callback must return a boolean to indicate success / failure - error message must be allcoated in glib memory as GUI will g_free it Bug: 13209 Change-Id: Ibb9690034d66dae85e775d0010aadeb192c76b4a Reviewed-on: https://code.wireshark.org/review/19111 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06Bluetooth: Sync "Classic" color rulesMichal Labedzki1-19/+19
Change-Id: Ic64f9b71eba4ba8c79c28e10fe4eac983ca98f22 Reviewed-on: https://code.wireshark.org/review/19085 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-12-06sdp: refactor session/media level handling of attributesPeter Wu1-404/+404
The media_count meaning is horrendous. -1 means "none", a count of "0" actually means "1". This led to various bugs in the past, so just rip it out and use a (wmem) array from which the length can be determined. That also means that a hard-coded limit on the media can now easily be lifted without affecting the size of the transport_info_t structure. (This limit, SDP_MAX_RTP_CHANNELS, is unchanged in this patch though.) Refactor the SDP dissector such that: - Media and related attributes are no longer a bunch of fixed array fields, but grouped in one structure. This results in the largest changes all over the place since "transport_info->media[n]" is now transformed into "media_desc->media" where "media_desc" is an element of the "transport_info->media_descriptions" wmem array. - Simplify protocol (in "m=") parsing (lots of ifs -> array + loop). - Remove convert_disposable_media and disposable_media_info_t, parse fields (media protocol from "m=", connection address from "c=", etc.) while parsing the SDP instead of parsing it at the end. - Have two distinct structures for keeping the info for the session and media level. Emphasize that new media descriptions are inherited from session level attributes (via sdp_new_media_description). - Delay creation of dynamic payload type information table until we actually create the media description. Create function clean_unused_media_descriptions to handle the common of freeing unused dynamic pt. - Remove SDP_IPv4/SDP_IPv6, these are replaced by checking the type member of the address structure. Changes to MSRP part: - Move MSRP attributes to the media-level attributes. - Remove msrp_transport_address_set attribute, rely on the AT_NONE address type for detecting bad addresses. - Remove SDP_MSRP_IPv4 check, this never worked as the flag was never set. Now it relies on the address family from the host in a=path:. Tested with these capture files with no change in PDML output nor improvements/regressions with memleaks (as reported by ASAN): capture sip call wireshark 1.8.2.pcap NOringback.pcapng rtp_not_parsed_by_1_10_1.pcap rtsp_interleaved_coreplayer.cap SIP_CALL_RTP_G711.pcapng srtpincorrectlyselected.pcap tdnwifitontwifi_withnatting_clientAbhopati_03082015.pcapng Change-Id: Ia0dbc63f8bd78cc84dad2e18174540e31b78a80d Reviewed-on: https://code.wireshark.org/review/19072 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-06rtp: add function to duplicate rtp_dyn_payload_tPeter Wu2-0/+24
There is no way to iterate through the contents. For a future patch to the SDP dissector (where the session-level info is copied to the media-level), it would be nice to duplicate the dynamic payload info. Change-Id: I79b8349e5e157298a28fc608e20c2c2e03e76400 Reviewed-on: https://code.wireshark.org/review/19106 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-06DTLS: add support for use_srtp extension (RFC 5764)Peter Wu5-9/+114
Decryption support will be added later. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: Ida1a2da754ef9aef16ad15ff64455b6f8e703ffd Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18996 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-12-06ssh: add dissection for ECDSA host keysРоман Донченко1-0/+29
Change-Id: Ic9851976bfa25fc61c708ee08e5a26ad01769f06 Reviewed-on: https://code.wireshark.org/review/19097 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-06SDP: reduce code duplicationPeter Wu1-230/+140
Observe that some code in setup_sdp_transport is effectively the same code as a part from dissect_sdp with these differences: - Removal of these two conditions (setup_sdp_transport already returns early when a packet is visited): (!pinfo->fd->flags.visited) && (transport_info == &local_transport_info) - "establish_frame" in setup_sdp_transport is replaced by "pinfo->num" in dissect_sdp. dissect_sdp further has two additional blocks that add information to the VoIP calls dialog. This is preserved. Freeing of the RTP payload information has also been simplified. Instead of checking it inside the main loop that adds addresses (now moved to a new function, "apply_sdp_transport"), let the caller do it outside the loop. The transformation in this patch is rather mechanical: 0. Add a comment on what the new function is supposed to do. 1. Move code from setup_sdp_transport into a new function, apply_sdp_transport and reduce indentation level. 2. Copy all variables to the new function and populate the parameter list. 3. Compile result, remove unused variables that the compiler warns for. 4. Move freeing of unused media outside the loop to the caller. 5. Create a new conditional statement before the duplicated loop, which checks whether setup_sdp_transport has been used before. (SIP first calls setup_sdp_transport, then it invokes the media type dissector which calls dissect_sdp to populate the tree.) 6. Remove the duplicated code from the dissect_sdp loop until only the VoIP Calls dialog info remains. There is no functional change intended. Change-Id: I928379466af56ef1729cccbf4a5b60895ddb3227 Reviewed-on: https://code.wireshark.org/review/19047 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06SDP: add basic ICE candidate attribute dissection (RFC 5245)Peter Wu1-2/+151
Dissect the first, fixed part of a=candidate. The candidate type is also unabbreviated for easier understanding. Tested with dtls-srtp-ws-sip.pcapng from the linked bug. Change-Id: I9950c8f066becea86f1fe8e9ffab2dc07ae0f425 Ping-Bug: 13193 Reviewed-on: https://code.wireshark.org/review/18997 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06CIP: Minor enhancementsD. Ulis3-52/+92
1. ENIP: Display the CIP Forward Open Request packet number for connected data 2. CIP: Extended Network: Display expert info when the expected bytes does not match actual bytes 3. CIP: Look up more data fields as CIP service or Device Type 4. CIP: Display data as Dec/Hex, depending on how the spec shows things 5. Minor: Pull out common code into load_cip_request_data() 6. Minor: Text corrections Change-Id: I184ac3899786f650e4d4643a5dfe68bba785d6e0 Reviewed-on: https://code.wireshark.org/review/19092 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>
2016-12-06packet-rpcrdma: Clean up Reply chunk dissectionChuck Lever1-35/+29
Display the Reply chunk as a tree, using the same code that the Write list dissector now uses. Fix up the selection size of the Reply chunk. Bug: 13197 Change-Id: Ie861b7721b2c2dd9a5839986488ee22f39f81d1e Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19101 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06packet-rpcrdma: Fix Write list dissectionChuck Lever1-10/+109
The current mechanism of dissecting RPC-over-RDMA chunk lists is not working. It treats the Write list as a list of RDMA segments (it's a list of counted arrays). Bug: 13197 Change-Id: I6f8e788d66eefd17d6c1995e238a9ff9fa1e81f2 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19100 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-06packet-rpcrdma: Fix Read list dissectionChuck Lever1-1/+77
The current mechanism of dissecting RPC-over-RDMA chunk lists is not working. It treats the Read list as a counted array (it's a list). Part of this confusion arises because RFC 5666 uses the term "chunk" to mean "chunk", "read segment", and "rdma segment". Re-organize the dissector logic to make this distinction properly. Bug: 13197 Change-Id: Iad517804dbcf8b30de795af03af7a71a6f231231 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19099 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05RTPS: Cleanup endian handlingMichael Mann2-747/+619
1. Rather than pass a boolean that has to be continually evaluated, just pass the necessary encoding (ENC_LITTLE_ENDIAN or ENC_BIG_ENDIAN) 2. Incorporate more use of proto_tree_add_item_ret_[u]int 3. Remove NEXT_guint16 and NEXT_guint32 because we now have tvb_get_guint16 and tvb_get_guint32 Change-Id: Ib1c3488450b4e727d2c1943ba4e577faf2350dcc Reviewed-on: https://code.wireshark.org/review/19103 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>
2016-12-05kafka: add dissection for rest of api keysDmitry Lazurkin1-129/+2061
- support rest of api keys - dissect kafka.required_acks with constants - dissect kafka.message_timestamp_type - add expert info about missing request Change-Id: I3d18936adac6702a61f545385bdec1b75b564bd9 Reviewed-on: https://code.wireshark.org/review/18954 Petri-Dish: 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>
2016-12-05packet-rpcrdma: Display length fields in decimalChuck Lever1-2/+2
Change-Id: I3a3a51de76286800992b1445c332c50059112c54 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19098 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05packet-rpcrdma: Remove if (tree) preventing dissectors being called.Chuck Lever1-58/+55
When tshark displays each frame in default mode (without -V): - NFS on TCP is dissected and displayed - NFS on RPC/RDMA is displayed as only an RPC/RDMA frame NFS on RPC/RDMA should be dissected and displayed just like NFS on TCP. Make passing along the RPC payload to the RPC dissector unconditional. Bug: 13198 Change-Id: Ia86f3abcfcbc65a860d4ff7bac19a5f3af44a0b0 Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Reviewed-on: https://code.wireshark.org/review/19027 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05CMake: Update FindWiX.Gerald Combs1-4/+16
The WiX Toolset installer sets the WIX environment variable. Search for our WiX executables there first. Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3 Reviewed-on: https://code.wireshark.org/review/19096 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-05RTPS: Added submessages and fixed minor issues for Secure DDSJuanjo Martin2-49/+229
Bug: 13204 Change-Id: Iaad562aafe3a4f0300398fc45927ac810814ee75 Reviewed-on: https://code.wireshark.org/review/18990 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05Bluetooth: SMP: Dissect remaining AuthReq bitsMichal Labedzki1-12/+43
Dissect SC, Keypress and Reserved bits. Up to Bluetooth Core 4 specification. Change-Id: Id7ac75bd917786abe9aada433a1343887a32234d Reviewed-on: https://code.wireshark.org/review/19079 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05Bluetooth: SMP: Implement 3 more commandsMichal Labedzki1-6/+65
0x0C: /* Pairing Public Key */ 0x0D: /* Pairing DHKey Check" */ 0x0E: /* Pairing Keypress Notification */ Change-Id: I18dc88d2cb7a96412b230a9b414ce053bfde09fa Reviewed-on: https://code.wireshark.org/review/19080 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>
2016-12-05Bluetooth: SMP: Add coloring rule for SMPMichal Labedzki1-0/+1
SMP occurs very rare, because of it nature - it is just pairing procedure. It is better to distinguish it from L2CAP by assigned to it another yellow colour. Change-Id: I71e8641b717581253cd86cc867fa71241e7650b7 Reviewed-on: https://code.wireshark.org/review/19082 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05Bluetooth: BTLE*: Initialize what initialized was notMichal Labedzki1-0/+1
Fix unexpected Direction flag pass to BTLE dissector what caused reassemble of L2CAP not working correctly (it based on Source/Destination addresses/columns). Change-Id: I10fb17c29b020f6ca746f7bbccb7527e0ba04624 Reviewed-on: https://code.wireshark.org/review/19084 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05Bluetooth: Assigned Numbers: Update Member UUIDsMichal Labedzki1-1/+26
Update manually from time to time based on: https://www.bluetooth.com/specifications/assigned-numbers Change-Id: I506e58c16322862c9fe517b71ab12806818331b5 Reviewed-on: https://code.wireshark.org/review/19086 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-05androiddump: Add support for Bluetooth on Android 7.0Michal Labedzki1-2/+9
Now "ps" command does not support process name as parameter, use grep instead. Change-Id: I0c35bc7d560e237e4140000e67af097744cb2c1b Reviewed-on: https://code.wireshark.org/review/19087 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-12-05SMB: Limit Export object files to 32 bits.Michael Mann1-4/+4
Most of the file offset fields are 32-bit, but the algorithms use gsize variables, which can vary between 32 and 64 bit builds. The 64-bit builds are the ones with the problem with "garbage" data comes from (effectively) invalid 32-bit offsets. Bug: 11133 Change-Id: I20b8cafb75fc021594159ab092c18c24f3e257e3 Reviewed-on: https://code.wireshark.org/review/19073 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: Anders Broman <a.broman58@gmail.com>
2016-12-05Honor protocols.display_hidden_proto_items preferences when outputting ↵Michael Mann1-2/+3
fields in TShark Bug: 13192 Change-Id: Ibb2b3913716d31a3d5f600e1b6400fdf14a69ca4 Reviewed-on: https://code.wireshark.org/review/19075 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: Anders Broman <a.broman58@gmail.com>
2016-12-05Clean up initialization code for programs.Guy Harris13-126/+168
Make the init_progfile_dir() call unconditionally, even if plugins aren't supported, as that doesn't necessarily mean nobody uses the directory containing the executable. Report the error the same way in all programs, and free the error string after we're finished with it. Make the error - and the comment before the code - reflect what init_progfile_dir() is actually doing (the goal is to get the full pathname of the directory *containing* the executable; that's generally done by getting the pathname of the executable and stripping off the name of the executable, but that's won't necessarily always be the case). Also note for TShark that we won't be able to capture traffic, just as we do for Wireshark (if we don't have the pathname of the program file, we don't have a pathname to use to find dumpcap). Have the plugin scanner just fail silently if we weren't able to get the plugin directory path, so we don't have to worry about calling it if init_progfile_dir() fails. Clean up white space while we're at it. Change-Id: I8e580c719aab6fbf74a764bf6629962394fff7c8 Reviewed-on: https://code.wireshark.org/review/19076 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-05Update a comment to reflect current reality.Guy Harris1-11/+15
Change-Id: Ied84e0363161ebc42c8cf24e7ade4b1b4e536448 Reviewed-on: https://code.wireshark.org/review/19074 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-05cmake: Fix building with plugins disabledPeter Wu1-6/+8
When Lua is enabled, scripts can still be loaded from the plugin dir (filesystem.c uses PLUGIN_INSTALL_DIR), so be sure to set it or the cmake build fails. Change-Id: I87d2d705434052220f9619438c90905c24b2a3a6 Reviewed-on: https://code.wireshark.org/review/18976 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-04Reflect API changes.Guy Harris1-1/+1
Change-Id: I6a8d50cb697bcd4a5232dc01107c7d9618258d87 Reviewed-on: https://code.wireshark.org/review/19071 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Rawshark uses libwiretap, so it has to call wtap_init().Guy Harris1-0/+2
Change-Id: I4b87227e4828ebad98b22e5e5d1f3896e636582a Reviewed-on: https://code.wireshark.org/review/19070 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Have a routine to do all the work of initializing libwiretap.Guy Harris15-49/+37
Have programs that use libwiretap call that routine rather than separately calling some or all of init_open_routines(), wtap_register_plugin_types(), and wtap_opttypes_initialize(). Also don't have routines internal to libwiretap call those. Yes, this means doing some initialization work when it isn't necessary, but scattering on-demand calls throughout the code is a great way to forget to make those calls. Change-Id: I5828e1c5591c9d94fbb3eb0a0e54591e8fc61710 Reviewed-on: https://code.wireshark.org/review/19069 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Show codec information in About dialogPeter Wu5-0/+30
Show codec libraries in About dialog, this should give the user a clue of what codecs are available. SBC is already supported, Spandsp (for G.722/G.726) is work in progress. Change-Id: Iebc4d9c9fae619a442e06c8afc780a420aa3971b Reviewed-on: https://code.wireshark.org/review/18978 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04codecs: allow it to be used without pluginsPeter Wu4-6/+11
Not all codecs require the plugin infrastructure. For example, G.711U/A is a built-in codec. Allow such functionality to be registered even if plugin support is disabled. Change-Id: I2505cc9955e7953268ec0739531278921f70a771 Reviewed-on: https://code.wireshark.org/review/18977 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04[Automatic update for 2016-12-04]Gerald Combs12-3821/+3907
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icad3ffb6cbd570b0b8a2c650d3c11a3c9bed536f Reviewed-on: https://code.wireshark.org/review/19066 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-12-04Qt: clear Export Objects list on retappingPeter Wu1-0/+3
The tap reset callback should not just invoke the reset callback of the dissector, but also clear the previous list of objects in the dialog. Otherwise duplicate entries will be created every time retapping occurs (e.g. on changing the display filter). Bug: 12230 Change-Id: I75f25db0652dcc9c0ac59ab0e536c06874aedb9c Reviewed-on: https://code.wireshark.org/review/19055 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: Peter Wu <peter@lekensteyn.nl>
2016-12-04ssh: fix the heuristic for MAC size determinationРоман Донченко1-2/+1
size_str points to a dash, so the result of calling ws_strtoi32 on it is a negative number, which becomes a huge positive number, because size is a guint32. Parse the number after the dash instead, and use ws_strtou32. Also, check that size is divisible by 8, since otherwise it's unlikely to be a bit length. Change-Id: I531f67d45e9e914574d36a9ffceed9239fd46d64 Reviewed-on: https://code.wireshark.org/review/19006 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-12-04Have separate merge APIs for regular file/temporary file/standard output.Guy Harris9-161/+399
This is similar to what we have for opening a dump file - one API that uses the file name as specified, one that creates a temporary file and provides the file name, and one that uses the standard output. All of those APIs handle closing the output file. Change-Id: I56beea7be347402773460b9148ab31a8f8bc51e1 Reviewed-on: https://code.wireshark.org/review/19059 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Squelch a casting-away-constness warning.Guy Harris1-2/+2
Change-Id: I77ca8ffd38baf812ef20b9611f59cd70ae37d392 Reviewed-on: https://code.wireshark.org/review/19062 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Remove unnecessary cast (gchar = char) that removes const.Guy Harris1-1/+1
Change-Id: I3924c2b4a525c0ae5ab57b7f9867296586d78509 Reviewed-on: https://code.wireshark.org/review/19061 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-04Update list of symbols.Guy Harris1-55/+6
Remove symbols from plugins; they're not part of libwireshark. Put all the get_rtd_ symbols together. Add some new symbols. Change-Id: I724ca7fd19ad083b7e05526a30974c23fa321e0b Reviewed-on: https://code.wireshark.org/review/19060 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03Use ws_close(), rather than the UN*X-only close().Guy Harris1-3/+3
Change-Id: Iae29db90273191c10455e172bdd2aac00b12143c Reviewed-on: https://code.wireshark.org/review/19058 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03Get rid of test printout.Guy Harris1-1/+0
Change-Id: I0db268b0f7010d23c938ae56674cc5cd6c0bd998 Reviewed-on: https://code.wireshark.org/review/19057 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03When opening the standard output for writing, dup it.Guy Harris4-56/+31
That way, we can close the resulting wtap_dumper the same way we close any other wtap_dumper, including closing the FD, rather than trying to do everything *except* closing the FD (which is tricky for a FILE *). Change-Id: I8cb66e32784d73e598b2e8720a12f9bdab1c6205 Reviewed-on: https://code.wireshark.org/review/19054 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-12-03ssh: dissect the host key when the connection uses DH group exchangeРоман Донченко1-7/+1
After this, hf_ssh_kexdh_host_key is no longer used, so remove it. Change-Id: Ie56a086481bbe087b7ba3b17aea394c05986f63d Reviewed-on: https://code.wireshark.org/review/19052 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>
2016-12-03install_rpms_for_devel: add optional packages.Dario Lombardo1-2/+20
Install all optional dependencies as reported by cmake. Tested on Centos7, openSUSE Leap 41.1, Fedora 24. Fedora 24 is shipped with lua5.3, that is not compatible with the current master, then it is not enabled. Change-Id: Ie4de7ff2849d66371e94d5d7960aab8146337dea Reviewed-on: https://code.wireshark.org/review/18968 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2016-12-03packet-infiniband: Fixed duplicate conversation entriesParav Pandit3-67/+123
1. Fixed find_conversation for PT_IBQP to not lookup in reverse direction when all searches fail. This is required, because there could be valid different connection in reverse direction which mistakenly gets updated for non template cases. 2. Added support for having MAD data for upper level dissectors to process during RC packet processing. This is required because connection options are negotiated out of band using this CM exchanges (unlike in band TCP options). 3. Moved creating unidirectional connections when actually MAD packets are processed. Previously client-to-server unidirectional conversation was created when CM_RSP stage, where MAD Data of CM_REQ packet is inaccessible. 4. Fixed creating multiple conversations with same address property by eliminating create_conv_and_add_proto_data during RTU stage, which was incorrect. Now they are created during REQ and RSP frame processing. (Instead of RSP and RTU processing). 5. Added support for creating bidirectional connection that ULP can refer. This is required to keep track of oustanding transactions on a connection (requests and responses). Bug: 11363 Change-Id: I32ea084a581a58efbc16dbb7a3e267c82622c50c Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/18982 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-03tshark: Add -G folders reportJim Young2-0/+105
Add a new tshark feature to generate a folders report. The folders report is essentially the information presented by Wireshark's About / Folders page in a TAB delimited format. Change-Id: Ic4b3d332b4bdaa7e6b7aad1e9cc5dd18413aada6 Reviewed-on: https://code.wireshark.org/review/19002 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 07:09:22 +0000