summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-28Don't use ctime().Guy Harris1-15/+16
The API checks warn about it being deprecated - that doesn't seem to cause a problem with the buildbot, but does result in failures from the Petri dish. Format the first and last packet time in an ISO 8601-style format. Call them "First packet time" and "Last packet time", rather than "Start time" and "End time", as they're not necessarily the times when the capture started or ended. (Both make the output a bit more like the Statistics -> Summary window.) Change-Id: Ibf02999851f49c7951c6f6152c70efa271414bd9 Reviewed-on: https://code.wireshark.org/review/7442 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris10-43/+6
Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d Reviewed-on: https://code.wireshark.org/review/7441 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-28Don't use struct timeval if we only care about seconds.Guy Harris1-8/+5
time_t suffices in that case. Change-Id: Ica7a79fb6f8c7cc7fb6decd5fcd391dccfdb3fc6 Reviewed-on: https://code.wireshark.org/review/7440 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-28openSAFETY: Add support for openSAFETY 1.5Roland Knall1-113/+231
openSAFETY 1.5 will be the next version of the openSAFETY protocol. This will include all renditions necessary for future versions of the IEC 61784-3 specifications. - SNMT service for CT preseeding - 40 bit counter value flag support - Adapt CRC calculation for 40bit counter - Display 40bit counter value Change-Id: Ia9f8e11de813d27bc14437d32ee3d0486810c634 Reviewed-on: https://code.wireshark.org/review/5728 Reviewed-by: Roland Knall <rknall@gmail.com> 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-28Get rid of unused variable.Guy Harris1-1/+0
Change-Id: I4141f00285cbb6080a782ea2837ea87b7100e081 Reviewed-on: https://code.wireshark.org/review/7439 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-28Clean up timestamp handling.Guy Harris1-75/+59
Use nstime_t rather than struct timeval when we want seconds-and-fractions, so that, when writing the file, we can handle nanosecond-resolution time stamps. Calculate the relative time stamp as a 64-bit integer rather than using floating-point. Use time_t rather than struct timeval if we only want seconds. Have the routines that write out 16-bit and 32-bit numbers convert them to little-endian themselves, rather than having to be passed a little-endian number. Have a routine that writes out 48-bit values in little-endian order, and use that to write out packet time stamps. Change-Id: Ia6e047079e48915647502178e0a1c61177010c62 Reviewed-on: https://code.wireshark.org/review/7438 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27We don't need to check for strings.h.Guy Harris1-1/+0
We never use it; the autoconf script does, but that's as a result of some macros that checks for various standard and non-standard-but-common headers. It's been ages since strings.h was anything other than a BSD source-compatibility hack, not even needed these days when writing code for *BSD-flavored OSes, as they have <string.h>. Change-Id: Iad2dc6e55207b52fc8af494ddfca4089c2eb426b Reviewed-on: https://code.wireshark.org/review/7434 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27<string.h>, not <memory.h>, is the header file for memcpy().Guy Harris4-4/+6
Don't include <memory.h> when using memcpy(), include <string.h>. We don't need to check for memory.h, so don't do it in CMake (we don't explicitly check for it in autoconf, but it's checked for by some macro we do use). Change-Id: I7aa93d4ea93bab9beff597939d3c24aecda3d52e Reviewed-on: https://code.wireshark.org/review/7433 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks.Guy Harris2-3/+1
Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f Reviewed-on: https://code.wireshark.org/review/7432 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27We don't use gethostbyname2(), don't check for it.Guy Harris1-1/+1
Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63 Reviewed-on: https://code.wireshark.org/review/7431 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27Remove a couple useless variables.Jeff Morriss1-7/+6
This may fix a compile warning-turned-error on an old version of SLES that Anders reported. Change-Id: I72e5dec00bc0088cd77a206284221cb43ae89547 Reviewed-on: https://code.wireshark.org/review/7429 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-27Use getnameinfo() instead of gethostbyaddr().Jeff Morriss1-89/+90
Also fix up some formatting. Change-Id: I3348179626e97daaddfbc89e3ed21e39915e3de4 Reviewed-on: https://code.wireshark.org/review/7423 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-27Restore synchronous name resolution (revert SVN rev52115).Jeff Morriss1-0/+28
These gethostbyaddr() calls should be changed to getaddrinfo() but only in master. Change-Id: I7e2d31ceb0e072beb7f324336d7b145c3adbe3a0 Reviewed-on: https://code.wireshark.org/review/7402 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-27Qt: Automatically scroll the packet list.Michal Labedzki17-48/+177
Add an "Auto Scroll in Live Capture" action to the Go menu. It's in the View menu in the GTK+ UI but it seems to make more sense as a navigation item. Use a timeout interval for automatic scrolling. I haven't run any tests to see if this makes a difference but it would seem that the less drawing we do during a high speed capture the better, particularly for remote displays. Update the x-stay-last icons. Note that we might want to make prefs.capture_auto_scroll a "recent" setting. Mark auto_scroll_live and packet_list_check_end GTK+ only. Bug: 10601 Co-authored-by: Gerald Combs <gerald@wireshark.org> Change-Id: I645d27c0814f0e4a0d5b01ae68be366847e2522d Reviewed-on: https://code.wireshark.org/review/7292 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-27Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL.Dmitry Bazhenov1-5/+6
This fixes Windows build in cases when MSVS is installed in non-default directory. Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e Reviewed-on: https://code.wireshark.org/review/7426 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-02-27Fixed MAUSB Flags subfield dissectionSean O. Stalley1-8/+8
Previously, the version field was being dissected as flags. Change-Id: Ic7d5fd6262e844c9e578dbc29cd5b6e40078ae9f Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7398 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-27Added basic MA USB isochronous packet supportSean O. Stalley1-18/+255
Iso fields in a MA USB header are now dissected, instead of treating them as non-iso fields. Change-Id: I13c9ba5b0c54ef0b5130c2e87c7de3de9dbe9e22 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7397 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Added Dissection of CancelTransfer MA packetsSean O. Stalley1-0/+122
Type-specific subfields of CancelTransferReq/Resp are now dissected. Change-Id: I0f03e14df936409125b263409de605dde96d53c0 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7396 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Updated MAUSB Packet Type valuesSean O. Stalley1-127/+129
Packet type values are now consistant with spec. Also, values in enum mausb_pkt_type are now consistant with mausb_type_string array. Change-Id: I515332bdbc1d1f06bd03e3da314c44d7e842f2f9 Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/7395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-27Remove most of the tvb_get_ptr calls in the packet-batadv.c dissector.Michael Mann1-181/+113
These calls were all getting ether addresses which can be gotten by other means. Change-Id: I9a3d564483c9ee9b8e5183bb9086da8a315c41fc Reviewed-on: https://code.wireshark.org/review/7421 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-27Pass tvb and offset into print_nsap_net() and print_area() to "hide" the ↵Michael Mann7-23/+19
tvb_get_ptr call that dissectors are using. Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db Reviewed-on: https://code.wireshark.org/review/7422 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>
2015-02-27Again, we need a separate pointer to advance through the buffer.Guy Harris1-4/+5
In this case, sometimes we step through the buffer and sometimes we don't, so we always use strlen(); use a separate pointer when we're stepping through the buffer. Change-Id: Id69898760b4c255146c6eae0ab44c1d358c9ccbd Reviewed-on: https://code.wireshark.org/review/7425 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27address_to_string routines need to remember the beginning of the buffer.Guy Harris1-25/+30
Either they don't have a pointer into the buffer that they advance, in which case strlen(buf)+1 works just fine, or they do, in which case 1) they'd better save the pointer to the beginning of the buffer, so they can figure out how long the string is when they're done and 2) they don't need to use strlen(), they can just subtract the pointers. Bug: 11016 Change-Id: I81ce9d517336a15bd81f0c6225756ce5178ec6cf Reviewed-on: https://code.wireshark.org/review/7424 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-27Add dissector for "Bad Password Threshold" IPMI LAN configuration parameter.Dmitry Bazhenov1-2/+635
Add dissectors for IPv6-related IPMI LAN configuration parameters. Bug:11012 Change-Id: I9b7380d2451acb6d68a03361e26dc3a6ebc129a0 Reviewed-on: https://code.wireshark.org/review/7404 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-26isis: bugfix in csnp source id length.Dario Lombardo1-1/+1
Change-Id: Ib9f8507ed0a5a0788970b5fa150917f7c1b10de3 Reviewed-on: https://code.wireshark.org/review/7418 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-26Remove a dead assignment found by Clang.Gerald Combs1-1/+0
The code in question was copied from ui/gtk/capture_file_dlg.c. The dead assignment there was removed in 68ceffe. Change-Id: I605f181b623fbd87ab41505d30a79d7a4fe649df Reviewed-on: https://code.wireshark.org/review/7419 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-26Qt: Fix packet detail and byte view scrollingGerald Combs1-0/+2
Make sure we call scrollToByte ByteViewText::setFieldHighlight. Explicitly scroll to our selected QTreeWidgetItem in ByteViewText::mousePressEvent. Bug: 11013 Change-Id: I0a6381f6760ed48a4f496be8a06b1e56faa5a05b Reviewed-on: https://code.wireshark.org/review/7416 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-26ANSI IS-637 A: ensure that num_fields is not null before calling text_decoderPascal Quantin1-4/+8
Bug: 11014 Change-Id: Id2c7913d96743424380bd75c4005ec747ee7dd50 Reviewed-on: https://code.wireshark.org/review/7412 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-26[GTP CDR] Add support for CDR data record format version 12.6.0AndersBroman5-81/+103
Bug: 11015 Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499 Reviewed-on: https://code.wireshark.org/review/7413 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-26Translations : fix trailing whitespace when generate translations fileAlexis La Goutte1-1/+1
Change-Id: I4142912c7a139f57f0ac5291bf3ed6762abec35c Reviewed-on: https://code.wireshark.org/review/7410 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-26Qt: Update translationAlexis La Goutte13-6433/+24333
lupdate/lrelease ui/qt/Wireshark.pro Change-Id: Ic77adf7ff48d528553ac57bdf04d1ff6e036efdd Reviewed-on: https://code.wireshark.org/review/7312 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-26rsync: improved info for protocol.Dario Lombardo1-1/+7
Change-Id: I9d1ae0bf1d6df0b9da0220aeff2dd73b5f18f38a Reviewed-on: https://code.wireshark.org/review/7407 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-02-26SMPP: AT_STRINGZ address allocation must use the pinfo poolPascal Quantin1-5/+4
Fixes an ASAN failure reported by Alexis Change-Id: I33b21d148e631e8a554882283a1c7284d701af1a Reviewed-on: https://code.wireshark.org/review/7409 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-26Use tcp_dissect_pdus() in the SSTP dissector.Jeff Morriss2-18/+24
I happened across the discussion in Ia44e0791b6ee78ad594de342c4f2401bad9beb4e which indicates that protocols running over SSL can use tcp_dissect_pdus() too. So do it in the SSTP dissector. Change-Id: I3de14c1b2af5e4e5fe3630121366b71a5ad223cf Reviewed-on: https://code.wireshark.org/review/7333 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-26chdlc: Added "control" to proto tree.Dario Lombardo1-4/+7
Change-Id: I027b6cd274673a5ae78a23f7a3d484ff83791eae Reviewed-on: https://code.wireshark.org/review/7388 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-26Fix a couple of bugs in IPMI dissector:Dmitry Bazhenov1-2/+2
* Fix incorrect offset for Block Selector field in Get LAN Configuration Parameter request. * Expect 0x83 completion code ("Attempt to read write-only parameter") for Get LAN Configuration Parameter command instead of Set LAN Configuration Parameter command. Change-Id: I5be37c5f96db91b70329bfce906ce76f7b8b6958 Reviewed-on: https://code.wireshark.org/review/7403 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-02-26Actually define HAVE_GETADDRINFO if we find it.Jeff Morriss1-17/+7
AC_CHECK_FUNC() doesn't define HAVE_XXX but AC_CHECK_FUNCS() does. And AC_CHECK_LIBS() certainly doesn't define HAVE_<function>. Also remove some ancient comments. Change-Id: I49d701bb96d3bd3c55c4beb99d532e397ec554ad Reviewed-on: https://code.wireshark.org/review/7400 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-26Check whether we HAVE_GETADDRINFO before using it.Jeff Morriss1-4/+4
One spot was missing the check. Change-Id: I72d1d3d2dec2cc71b02861ace59dc9e189721cfb Reviewed-on: https://code.wireshark.org/review/7401 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-25Make the V10 path a bit more like the other paths.Guy Harris1-13/+17
Provide {FULL,PART}SIZEDEFV10 macros, similar to what's provided for the other versions, containing the code to set the packet length and captured data length, and use the TRACE_V10_REC_LEN_OFF() macro directly after that to set the various length and offset values in the pseudo-header. Change-Id: I3513371057601b44821d89ebaa7565ab370a67f5 Reviewed-on: https://code.wireshark.org/review/7393 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25ATN-CPDLC: never put a break in a TRY blockPascal Quantin2-18/+22
It will skip the execution of ENDTRY block Bug: 9952 Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820 Reviewed-on: https://code.wireshark.org/review/7391 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-25delete_includes.py: add target for ui/qtMartin Mathieson1-2/+8
Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4 Reviewed-on: https://code.wireshark.org/review/7389 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-02-25[Diameter] Add some AVPs and AVP values fromTibensky1-1/+11
3GPP TS 32.299 version 12.7.0 (2015-01) Ping-Bug:11008 Change-Id: Ib7f52c743f43d8a1c70c9fb100663292d7c4a87e Reviewed-on: https://code.wireshark.org/review/7387 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-25Add the ATN dissectors to the CMake build.Jeff Morriss1-0/+3
Change-Id: Ic4963994ed9d1996c74c5ba3db723e93073f4649 Ping-bug: 9952 Reviewed-on: https://code.wireshark.org/review/7386 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-02-25Make the _offset values static constants.Guy Harris1-5/+5
No need to export them outside this file, and making them constants might convince the compiler not to bother fetching their values from memory when referring to them. Change-Id: Ib8605bf0bb9091721a51827c45fe75d19a15ba26 Reviewed-on: https://code.wireshark.org/review/7378 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Have a PACKET_DESCRIBE() for V30's seek-read routine.Guy Harris1-4/+13
That way it'll set the captured length and reported length the same way it's done in the read routine. Change-Id: I8b1f2d0d8fa688f44b6f61f16dc2e21b5648fc12 Reviewed-on: https://code.wireshark.org/review/7376 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Make the V10 PACKET_DESCRIBE() macro a little more like the others.Guy Harris1-20/+18
Rename the V10 PACKET_DESCRIBE()'s "fpp" argument to "type", and have it declare the pointer variable. Change-Id: I3ac52ebdef0aec7bc95052277537185132886b57 Reviewed-on: https://code.wireshark.org/review/7374 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Rename the "type" argument to V10's PACKET_DESCRIBE() to "ver".Guy Harris1-10/+10
Move it in the argument list, and use it instead of a hard-coded 10 (even though it's always passed as 10), to match the other PACKET_DESCRIBE() macros. Change-Id: Idd0a23a58cc6bb0d2de799b039db776d279cc03e Reviewed-on: https://code.wireshark.org/review/7372 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Call the version-number argument to GENERATE_CASE_xxx() "ver".Guy Harris1-73/+73
The name "type" is thrown around to mean both a version number and a part of a structure member, and some other macros use "ver" for the version number; try to make things a little less inconsistent. Change-Id: I61405cf41cca43fe607154af7498944c5ec0ef11 Reviewed-on: https://code.wireshark.org/review/7370 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Use FULL/PART as an argument to all PACKET_DESCRIBE() macros.Guy Harris1-30/+30
Makes the various flavors of that macro more similar. Change-Id: Ie95ee8db0b226458146b055b54b7d61835f1e508 Reviewed-on: https://code.wireshark.org/review/7368 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-25Get rid of an unused argument to PACKET_DESCRIBE().Guy Harris1-12/+12
Change-Id: Ic2037f5bf7eb43f93ba39f91bca3fc267c8fb850 Reviewed-on: https://code.wireshark.org/review/7366 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 18:52:30 +0000