aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-24Update several AVPs according to latest 3GPP TSJan Spevak1-11/+152
Change-Id: Iada3166c93801d3f693714ad8c08bd4f68a70d3e Reviewed-on: https://code.wireshark.org/review/18425 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-24Qt: use ws_strtou function in sctp_chunk_statistics_dialog.Dario Lombardo1-1/+4
Change-Id: Iffa2d633ef7a0f636c595fb05ad1790d1ea61df0 Reviewed-on: https://code.wireshark.org/review/18402 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-24ajp13: use ws_strtoi function.Dario Lombardo1-2/+3
Change-Id: Ibe85cbb993eba8e76ed6c645609e9cea114a6c9d Reviewed-on: https://code.wireshark.org/review/18399 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-24catapult: use ws_strtou function.Dario Lombardo1-3/+9
Change-Id: Iceaa2e0240a86dd6aed087617c0a3200b3170d38 Reviewed-on: https://code.wireshark.org/review/18398 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2016-10-24Move --fullscreen out of LONGOPT_CAPTURE_COMMON.Guy Harris2-2/+15
It's not a capture option, so it doesn't belong there. Change-Id: I8aa6719a5a8e90c734c7acfc01b1ba2818498de3 Reviewed-on: https://code.wireshark.org/review/18427 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-24ICMPv6: Add support for LLN Routing Metrics (RFC 6551)franciscojavier.sanchezroselly1-3/+367
Bug: 12951 Change-Id: I0b1985699ae853a295c1ddbe38d2861ed9cac21d Reviewed-on: https://code.wireshark.org/review/17889 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-24Fix a copy-and-pasteo.Guy Harris1-4/+4
Fix the handling of the case of a "matches" operator with a field and a character constant as operands. Change-Id: I6451cee907d8486db96937173d0098de91ce7956 Reviewed-on: https://code.wireshark.org/review/18424 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-24Qt: Make horizontal spacer size to be fixedMichal Labedzki1-0/+3
The Search Frame can be used to find frames by a display filter expression that can be very long, so stretch a text field instead of free space. Example of a display filter expression that can be used in the "search bar": bthci_cmd.opcode == 0x200d || bthci_evt.le_meta_subevent == 0x0a Change-Id: I52b30386e96a726824c25a926742a24d653dfcfe Reviewed-on: https://code.wireshark.org/review/18234 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-24Qt: fix possible crash on sorting custom columnsPeter Wu1-2/+4
The sorting function must maintain a strict weak ordering, otherwise it may result in crashes. In the case of custom columns, this was violated when exactly one of the two rows had a non-numeric value. Bug: 13023 Change-Id: Ie338b1cce5156eeb313dd33491ee3d3f2eaddf1c Reviewed-on: https://code.wireshark.org/review/18406 Reviewed-by: Jim Young <jim.young.ws@gmail.com> Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-24Add some Diameter AVPs referenced by (recently added) grouped AVPs.Jeff Morriss2-125/+250
... In order to make the Diameter XML valid again. This includes adding T6a/T6b and most of the AVPs of that application. Fix up some white space while at it. Change-Id: Ie39b3e574065628fdba215cc9c045eebcbd3077e Reviewed-on: https://code.wireshark.org/review/18422 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23Qt: add fullscreen feature.Dario Lombardo9-3/+62
The feature activates/deactivates fullscreen mode of Qt UI. A new menu item has been added as well as a shortcut (F11 or Ctrl+Cmd+F) according to browsers common shortcut. Change-Id: I01906b494d0a13ce70d27c00ebbe03e6ec87cbd7 Reviewed-on: https://code.wireshark.org/review/18332 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-23packet-infiniband: Fixed displaying reserved fieldParav Pandit1-220/+306
1. Added Extended transport type field instead of reserved as per latest release 1.3.1 in CM Req msg. 2. Defined reserved bits and bytes for CM messages 3. Minor code refactor to move to smaller functions for CM Req Rsp parsing instead of 200+ lines function which is hard to read and is expected to grow for more features 4. Cleanup around primary and alternate fields which were crossing byte boundary CM request and response messages are tested. Reject message reserved fields change is untested but it a minor change that is expected to work. Change-Id: I94da62614f854218249b4e14c780f4168f44751c Reported-by: Alexis La Goutte Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/18340 Petri-Dish: Michael Mann <mmann78@netscape.net> 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> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-23ZigBee: fix the first parameter of memcpyPascal Quantin1-1/+1
key_record.key is already a pointer on an array Change-Id: I9bcc715be54817f8daa3928fff72d9ef98d586f9 Reviewed-on: https://code.wireshark.org/review/18417 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-23ZigBee Green Power: fix loading of keys during runtimePascal Quantin1-2/+18
Register a post update calback to ensure that the keys are loaded for all entries and not only the ones last edited Bug: 13031 Change-Id: Ib670f9e1c702546631df5fe6094b02484806dd00 Reviewed-on: https://code.wireshark.org/review/18416 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-23[Automatic update for 2016-10-23]Gerald Combs11-864/+1697
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I5127251ce46aa668cd12daacc7c6702564c04c8f Reviewed-on: https://code.wireshark.org/review/18412 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-23interface_sort_filter_model: don't dereference a NULL pointerMartin Kaiser1-0/+3
This fixes a crash in InterfaceSortFilterModel::mapToSource(). sourceModel was set to match the sourceModel of the underlying InterfaceFrame. When Wireshark is closed, InterfaceSortFilterModel::mapToSource() is called after InterfaceFrame was freed, the sourceModel is NULL in this case. #0 0x000000000079a81e in InterfaceSortFilterModel::mapToSource (this=0xe9fab0, proxyIndex=...) /home/martin/src/wireshark.git/ui/qt/interface_sort_filter_model.cpp:250 ... #7 0x0000000000797ed9 in InterfaceTreeModel::~InterfaceTreeModel (this=0xe9ff90, __in_chrg=<optimized out>) at /home/martin/src/wireshark.git/ui/qt/interface_tree_model.cpp:72 #8 0x00000000006c4e20 in InterfaceFrame::~InterfaceFrame (this=0xe643b0, __in_chrg=<optimized out>) at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:109 #9 0x00000000006c4ec9 in InterfaceFrame::~InterfaceFrame (this=0xe643b0, __in_chrg=<optimized out>) at /home/martin/src/wireshark.git/ui/qt/interface_frame.cpp:112 Change-Id: Ibe7f75ccd7a0af5f04febf967c47ada1a05bc3d3 Reviewed-on: https://code.wireshark.org/review/18411 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23diameter: improvement of AVP 1066Joakim Karlsson1-1/+34
Printing ascii value in the same way as AVP 1005 Change-Id: I058be87974bf8197e207fdd61be6354031ed8d35 Reviewed-on: https://code.wireshark.org/review/18409 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23sip: use ws_strtoi functions.Dario Lombardo1-8/+30
Change-Id: I69cdc1118f62ed86661ccfb9fb522ad0bb00596e Reviewed-on: https://code.wireshark.org/review/18397 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23dtls: use ws_strtoi function.Dario Lombardo1-2/+3
Change-Id: I4feacfa8e4739faf555c05e3c4823ad8487a994c Reviewed-on: https://code.wireshark.org/review/18392 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-23fc00: get rid of if(tree)Martin Kaiser1-58/+57
Make sure that the newly added expert info will show up in the expert info window. Expert infos should never be under if (tree). Change-Id: I55daa693d4dc910eab38028340a934062d351e98 Reviewed-on: https://code.wireshark.org/review/18393 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-10-23LSD: avoid dereferencing a null pointerPascal Quantin1-7/+7
Bug: 13038 Change-Id: I701aa8cf89d8c53091974d6329f340316df8a870 Reviewed-on: https://code.wireshark.org/review/18405 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>
2016-10-22diameter: add new standardized QCIJoakim Karlsson1-0/+4
Change-Id: If8c29934515b61081d0cbd44a0356144d5d3c466 Reviewed-on: https://code.wireshark.org/review/18407 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22wsutil: add statements for c++ calls.Dario Lombardo1-0/+8
Change-Id: I082eb462b0a6ce77f9ca82c51d79d65516c92b53 Reviewed-on: https://code.wireshark.org/review/18401 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22GTPv2: add dissection of a few Information ElementsPascal Quantin1-10/+60
This commit adds the following IEs: - CSG ID - CSG Membership Indication (CMI) - Service Indicator - Detach Type - Local Distinguished Name (LDN) Change-Id: I1e3db7ffd217e3644acf6de0ad5002e65c73a9ea Reviewed-on: https://code.wireshark.org/review/18396 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>
2016-10-22AMPQ: Fix malformed packed in session.expected and session.confirmed.boris.bochkarev1-3/+3
Bug: 13037 Change-Id: I935ff68050eb085789d9bd99b5ec833609c6fdca Reviewed-on: https://code.wireshark.org/review/18336 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-10-22tpncp: load hf array in the handoff functionMartin Kaiser1-32/+37
tpncp reads hf entries from a database. There's a boolean preference defining if the database is actually read. We can't access this preference until the preferences are initialized. The code as it is now wil always default to false and never read the database. Check the preference in the handoff function and initialize the hf entries if they are not yet initialized. Change-Id: I545a49a946b78e1a0bc23e9803eb671d8765bba4 Reviewed-on: https://code.wireshark.org/review/18386 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-22fc00: skip sha512 calculations for glib < 2.36Martin Kaiser1-0/+20
Our minimum supported version of glib is 2.22 at the moment. SHA512 support was added in glib 2.36. Bring up an expert info if checksum calculation is not supported by our glib version. Change-Id: I116b32f63a4342a7e4198eaae8a35189fcc92edc Reviewed-on: https://code.wireshark.org/review/18391 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-22cleanup: move extra libs to EPAN_EXTRA_LIBSJakub Zawadzki1-31/+16
Every program linking with epan lib added some extra dependencies. Keep these in EPAN_EXTRA_LIBS. Change-Id: I3fac0974ef6a46675d35ee7b9862674923369b67 Reviewed-on: https://code.wireshark.org/review/18356 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22Add SBC decoding support to WindowsPascal Quantin5-6/+31
Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 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: Anders Broman <a.broman58@gmail.com>
2016-10-22cmake, qt4: check if QT4_FOUNDMartin Kaiser1-1/+1
AFAICS, FindQt4.cmake sets QT4_FOUND, not Qt4_FOUND This fixes compilation on Debian Wheezy (cmake 2.8.9, Qt 4.8.2). Change-Id: I08b3ac6ae4292b8c8d3f9e8752780459e5329e29 Reviewed-on: https://code.wireshark.org/review/18395 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-22main_welcome: include QUrlMartin Kaiser1-0/+1
This fixes compilation with Qt4. .../main_welcome.cpp: In member function ‘void MainWelcome::on_helpLabel_clicked()’: .../main_welcome.cpp:509:69: error: invalid use of incomplete type ‘class QUrl’ Change-Id: Ib31a4e28f67a27d3f644e8a8cfd3e6d848e034c4 Reviewed-on: https://code.wireshark.org/review/18388 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-10-22CMake: Disable Qt4 && (Windows || macOS).Gerald Combs1-1/+4
We haven't built the Windows and macOS installers with Qt4 for quite some time. In the case of macOS+Qt4 it looks like there's a problem with the main screen size (bug 13009) and it's a safe bet that there are other problems. There's not much we can do exept say "don't do that." Do so at build time rather than after the user has installed Wireshark and is trying to use it. Change-Id: I22f47b9705ea044238046676b6336aa5feab3f60 Reviewed-on: https://code.wireshark.org/review/18364 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-22alljoyn: fix signature length adjustmentsPeter Wu1-13/+18
Ensure that the signature pointer and length always matches, otherwise a buffer overrun (read) is possible. Tested with the original captures from bug 12953, the PDML output is still the same while the fuzzed capture does not crash anymore. Bug: 12953 Change-Id: I8843a5daf98a79fb19906e824326cdf619164484 Reviewed-on: https://code.wireshark.org/review/18347 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-10-22Clean up conditional code for getting creation time.Guy Harris1-26/+19
Define a macro to get the creation time from a stat structure, or to return 0 if the creation time is unavailable, and use that in both places where we fetch the creation time. Change-Id: I15354f2d52a40cb1227f30ae274120575eec2055 Reviewed-on: https://code.wireshark.org/review/18387 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22Fix the #defines for the presence of structure names.Guy Harris4-12/+12
AC_CHECK_MEMBER() and AC_CHECK_MEMBERS() use a standard name for the {structurename} being the name of the structure type, complete with "struct" if a typedef wasn't used, and with all letters mapped to upper case, and with {membername} being the name of the structure member, with all letters mapped to upper case. check_struct_has_member() lets you choose the name; choose the same name that the autoconf macros use, and fix the code to check for them. Change-Id: Ifb3cf65e7e94907ad0a2f8aacca0c21a531f0c5b Reviewed-on: https://code.wireshark.org/review/18382 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22Qt/Bluetooth: Add Display Filter Edit field to HCI Summary dialogueMichal Labedzki3-1/+42
Display Filter can be useful for this summary dialogue, for example to reduce number of frame that were analyzed, like: "frame.number >= 100 && frame.number <= 4674" Change-Id: I19587b9d41f3b253d1ca2683d198f7d7af2ad50f Reviewed-on: https://code.wireshark.org/review/18265 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-10-22C1222: update auto generated filePascal Quantin1-3/+3
Change-Id: I9c29ebe0ef24dcf9f5db5f5e767f910644bb9762 Reviewed-on: https://code.wireshark.org/review/18379 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-22Qt: Make "Learn" on the welcome screen clickable.Gerald Combs5-11/+28
Make the "Learn" header a ClickableLabel to match "Open" and "Capture". Link to the docs page for now. Adjust its stylesheet and properties to match ast well. Change-Id: Id9c7c05269de8134af28f0f9c1e2820a60442236 Reviewed-on: https://code.wireshark.org/review/18358 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: Anders Broman <a.broman58@gmail.com>
2016-10-22On UN*X, st_ctime is the last status change time, not the creation time.Guy Harris6-14/+72
That's the time the file's inode last changed, so size changes, permission changes, etc. affect it. It's *not* the time the file was created; most UN*Xes don't provide that. Newer versions of FreeBSD, NetBSD, OpenBSD, and macOS do, but other UN*Xes don't appear to. On Windows, at least according to Microsoft's documentation, st_ctime *is* the creation time. Hopefully that's not the result of confusion on the part of somebody at Microsoft. Change-Id: I20743703f6ef66e40dff9004dc91bed46af6fad0 Reviewed-on: https://code.wireshark.org/review/18378 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22Suppress "discarding const" warning.Guy Harris1-3/+5
Change-Id: I5f97b70d7f423cb5b7792863fb2bd07516aa1951 Reviewed-on: https://code.wireshark.org/review/18375 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22Add T.61 character set supportPascal Quantin16-59/+464
Bug: 13032 Change-Id: I6bf2cc2c43a6262d899a304df6576d9831115966 Reviewed-on: https://code.wireshark.org/review/18350 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-10-22Fix some errors from the previous commit.Guy Harris2-2/+2
Pro tip: if you're modifying GTK+ code, make sure you explicitly configure to build the GTK+ version. Change-Id: Ia24321a5037dff67d9acf1444fa0b74f5aed089e Reviewed-on: https://code.wireshark.org/review/18371 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22More checks for localtime() and gmtime() returning NULL.Guy Harris21-160/+299
And some comments in the case where we're converting the result of time() - if your machine's idea of time predates January 1, 1970, 00:00:00 UTC, it'll crash on Windows, but that's not a case where a *file* can cause the problem due either to a bad file time stamp or bad time stamps in the file. Change-Id: I837a438e4b875dd8c4f3ec2137df7a16ee4e9498 Reviewed-on: https://code.wireshark.org/review/18369 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-22localtime() can return NULL, even if it's unlikely.Guy Harris1-1/+4
ANSI C says it can return NULL - and, at least on Windows with the MSVC library, it *will* return null for dates prior to the Epoch. Check for a null return and handle it. Fixes CID 1374109. Change-Id: Ib18566d1a75e4109adb21834b157e87532fcac10 Reviewed-on: https://code.wireshark.org/review/18365 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-21ISAKMP: update protocol parametersMirko Parthey1-27/+34
Update IKE authentication methods and config attributes. Change-Id: I103beaf79eebaa0704424ad89f4d38a2701ae50b Reviewed-on: https://code.wireshark.org/review/18357 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-10-21gmtime() can return NULL, even if it's unlikely.Guy Harris1-1/+4
ANSI C says it can return NULL - and, at least on Windows with the MSVC library, it *will* return null for dates prior to the Epoch. Check for a null return and handle it. Fixes CID 1374110. Change-Id: I78bf92cfbb94a86544442269cc3b53338eb19778 Reviewed-on: https://code.wireshark.org/review/18361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-21tests: do not invoke missing unit testsPeter Wu1-7/+8
If the "test-programs" target is not built, then it should not try to invoke the last program (wireshark-gtk in my case). Change-Id: Ida60a71d1dc47305ef8abe10e6c96c8a1cb8dcbb Reviewed-on: https://code.wireshark.org/review/18346 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21Clean up file handle management.Guy Harris1-9/+5
The main reason fclose() could fail is if the file is open for writing, not all the buffered data has been written out at the time fclose() was called, and the attempt to write it out fails. In any case, the file handle is no longer valid after fclose() completes, whether the close succeeds or not, so there's no reason to keep it around. There's no reason to check whether it's null in a loop called in code where it's not null to start with and where it's not set to null in the loop. This should fix CID 1374111. Change-Id: Ib8067a17731b41d6b184a5a415addc2ecaa7c00c Reviewed-on: https://code.wireshark.org/review/18359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-21test: make GTK support optionalPeter Wu3-8/+7
Current Ubuntu buildbot is failing because GTK support was removed. Tests should not fail if GTK is not available, so make it optional. Change-Id: I1640c8bcea5208299f6846eb366e105c39a3ebf3 Reviewed-on: https://code.wireshark.org/review/18345 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-21ISAKMP: fix typos and whitespaceMirko Parthey1-22/+22
Change-Id: I8fd34acac2562ffea6f1e726b71d63f9f631bb54 Reviewed-on: https://code.wireshark.org/review/18355 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 11:46:18 +0000