metze/wireshark/wip.git
4 years ago[docsis->type29ucd] Remove Type 4 Burst from Type 29 UCD
AdrianSimionov [Sun, 15 Nov 2015 16:19:44 +0000 (17:19 +0100)]
[docsis->type29ucd] Remove Type 4 Burst from Type 29 UCD

Most probably this was a copy/paste from packet-ucd.c
Type 4 and Type 5 bursts exist only in Type 2 UCD message.
Type 29, 35 and 51 UCD messages have only type 5 bursts.

Change-Id: I016e6b47c28f2cf69befa495848058c038603b46
Reviewed-on: https://code.wireshark.org/review/11841
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
4 years agoLua: Fixed some argument # in argument errors.
Stig Bjørlykke [Sun, 15 Nov 2015 22:00:04 +0000 (23:00 +0100)]
Lua: Fixed some argument # in argument errors.

Change-Id: I1dba41c9f129d368096dd69a0f40fa2164311124
Reviewed-on: https://code.wireshark.org/review/11852
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoTry retroactively applying the Qt folks' fix for QTBUG-47942.
Guy Harris [Sun, 15 Nov 2015 20:21:41 +0000 (12:21 -0800)]
Try retroactively applying the Qt folks' fix for QTBUG-47942.

The current version of the fix only adds -fPIC under certain
circumstances; we check whether it was added and, if it was, and those
circumstances are *not* in effect, we remove it.

Bug: 11643
Change-Id: I75d0ff9b4781d7d4cd884a29bbce7d392939315c
Reviewed-on: https://code.wireshark.org/review/11849
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoFindLUA.cmake: reject version 5.3
Peter Wu [Sat, 14 Nov 2015 23:27:53 +0000 (00:27 +0100)]
FindLUA.cmake: reject version 5.3

Lua 5.3 could still be used when located at /usr/include/lua.h. Detect
and reject it in that case.

Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with
pkg-config (which uses a different version format). Ensure that the
regex matches a number only.

Bug: 11706
Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e
Reviewed-on: https://code.wireshark.org/review/11836
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoLua: Check for nil valuestring for integer fields.
Stig Bjørlykke [Sun, 15 Nov 2015 19:53:28 +0000 (20:53 +0100)]
Lua: Check for nil valuestring for integer fields.

Added a check for nil valuestring for all ProtoField integer types
to avoid lookup when argument is not set.

Change-Id: Ib4c016b69ee77dbea4bb83ac93c0d9ae9f48f236
Reviewed-on: https://code.wireshark.org/review/11845
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agogtk: Fixed out-of-source autotools build.
Stig Bjørlykke [Sun, 15 Nov 2015 17:15:42 +0000 (18:15 +0100)]
gtk: Fixed out-of-source autotools build.

Change-Id: Ic9b93aee15b015d51d666a1c6f4f358f689e8843
Ping-Bug: 10750
Reviewed-on: https://code.wireshark.org/review/11842
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoLua: Added support for ProtoField framenum type.
Stig Bjørlykke [Sat, 14 Nov 2015 21:29:32 +0000 (22:29 +0100)]
Lua: Added support for ProtoField framenum type.

Change-Id: I1d4cddd4026f08416005f2b3212536b3984d1a8d
Reviewed-on: https://code.wireshark.org/review/11834
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoudp: Don't mark zero checksum illegal when in_error_pkt.
Stig Bjørlykke [Fri, 13 Nov 2015 14:34:56 +0000 (15:34 +0100)]
udp: Don't mark zero checksum illegal when in_error_pkt.

A zero checksum is not illegal in IPv6/UDP when in a ICMPv6 packet.

Change-Id: I07acc874d2385992089ef3ebc7a82e853904ecfc
Ping-Bug: 6232
Reviewed-on: https://code.wireshark.org/review/11808
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years ago[Automatic update for 2015-11-15]
Gerald Combs [Sun, 15 Nov 2015 16:09:35 +0000 (08:09 -0800)]
[Automatic update for 2015-11-15]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I7a2eaecb6f24992cb3023919c8bd8af2c15192c3
Reviewed-on: https://code.wireshark.org/review/11838
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years ago[docsis->ucd] Add support for 6 new TLVs
AdrianSimionov [Sat, 14 Nov 2015 19:18:36 +0000 (20:18 +0100)]
[docsis->ucd] Add support for 6 new TLVs

Change-Id: I65a40b1765f8433c47acbc34452d5336d7df84c1
Reviewed-on: https://code.wireshark.org/review/11788
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years ago[docsis->packet-tlv.c] Updated Confirmation Code list per MULPIv3.1-I07 Annex C.4
AdrianSimionov [Sat, 14 Nov 2015 19:01:27 +0000 (20:01 +0100)]
[docsis->packet-tlv.c] Updated Confirmation Code list per MULPIv3.1-I07 Annex C.4

Change-Id: Id6ec9776545c79a4f8e21fd212b87ddcd9fd376f
Reviewed-on: https://code.wireshark.org/review/11829
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoregister_dissector -> new_register_dissector for plugins.
Michael Mann [Sat, 14 Nov 2015 20:11:44 +0000 (15:11 -0500)]
register_dissector -> new_register_dissector for plugins.

Picking off "easy" dissectors that only have one or two exit points at most.

Change-Id: Ie98e071a7cb568c13c8958de56b1fc25a4ce2ce9
Reviewed-on: https://code.wireshark.org/review/11831
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoregister_dissector -> new_register_dissector
Michael Mann [Sat, 14 Nov 2015 14:23:33 +0000 (09:23 -0500)]
register_dissector -> new_register_dissector

Picking off "easy" dissectors that only have one or two exit points at most.
This concludes a "first pass" over the dissector directory.

Change-Id: If5ce5484214be50fe541cba478da1de62e354297
Reviewed-on: https://code.wireshark.org/review/11830
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoLua: Disallow ProtoField FRAMENUM to fetch from Tvb.
Stig Bjørlykke [Sat, 14 Nov 2015 21:15:21 +0000 (22:15 +0100)]
Lua: Disallow ProtoField FRAMENUM to fetch from Tvb.

A ProtField type FRAMENUM cannot fetch value from a Tvb.

Change-Id: Iff0f6df8b00445855c9030dcfa753daa62262171
Reviewed-on: https://code.wireshark.org/review/11832
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoQt: Fixed use-of-deallocated-memory when removing a profile.
Stig Bjørlykke [Sat, 14 Nov 2015 18:03:03 +0000 (19:03 +0100)]
Qt: Fixed use-of-deallocated-memory when removing a profile.

The memory used for profile item data is accessed in updateWidgets() which
is called when setting the Default profile as selected.  Ensure we free
this memory after this has happened.

Bug: 11705
Change-Id: I79e12d918289e1fcf25331c39439e9c6f3b774d5
Reviewed-on: https://code.wireshark.org/review/11827
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoregister_dissector -> new_register_dissector
Michael Mann [Sat, 14 Nov 2015 01:18:34 +0000 (20:18 -0500)]
register_dissector -> new_register_dissector

Picking off "easy" dissectors that only have one or two exit points at most.

Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoUDP Multicast Stats: Fixed typo
Uli Heilmeier [Sat, 14 Nov 2015 16:58:44 +0000 (17:58 +0100)]
UDP Multicast Stats: Fixed typo

Change-Id: I98d6ef48448b32f57349facb2bbef538319c5da4
Reviewed-on: https://code.wireshark.org/review/11825
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agop_mul: Fixed ack framenum links.
Stig Bjørlykke [Sat, 14 Nov 2015 12:24:29 +0000 (13:24 +0100)]
p_mul: Fixed ack framenum links.

The ack symbol is for the Address PDU beeing acked.
Also use the DUP_ACK symbol for P_Mul's Ack-Ack.

Change-Id: I3da616e95e9c2cf889b1e4e4c0570ab0c276a2d2
Reviewed-on: https://code.wireshark.org/review/11819
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agodmp: Fixed ack framenum links.
Stig Bjørlykke [Sat, 14 Nov 2015 12:22:34 +0000 (13:22 +0100)]
dmp: Fixed ack framenum links.

The ack symbol is for the Message, Report or Notification beeing acked.

Change-Id: I5ef99b9e7830f437278af18e681f8200fab6c3d4
Reviewed-on: https://code.wireshark.org/review/11818
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoairpdcap_system.(h) fix parameter 'mngHandshake/mngDecrypt' not found in the function...
Alexis La Goutte [Thu, 12 Nov 2015 17:59:11 +0000 (18:59 +0100)]
airpdcap_system.(h) fix parameter 'mngHandshake/mngDecrypt' not found in the function declaration [-Wdocumentation]

Change-Id: I0d0c1a3dde14d9817aef28352081dfbfbac6c9fb
Reviewed-on: https://code.wireshark.org/review/11774
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>
4 years agoMakefile.nmake: add randpkt-core.obj to the list of cleaned objects
Pascal Quantin [Fri, 13 Nov 2015 19:01:00 +0000 (20:01 +0100)]
Makefile.nmake: add randpkt-core.obj to the list of cleaned objects

Change-Id: I36ecc9830ead2a0f6a470b4e62440fe9555df363
Reviewed-on: https://code.wireshark.org/review/11813
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoregister_dissector -> new_register_dissector
Michael Mann [Tue, 10 Nov 2015 04:01:28 +0000 (23:01 -0500)]
register_dissector -> new_register_dissector

Picking off "easy" dissectors that only have one or two exit points at most.

Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8
Reviewed-on: https://code.wireshark.org/review/11805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoDiameter: fix typo in dictionary
Pascal Quantin [Fri, 13 Nov 2015 15:41:36 +0000 (16:41 +0100)]
Diameter: fix typo in dictionary

Change-Id: I164ce634536ec1a3de650d815e23cdd6102e2fde
Reviewed-on: https://code.wireshark.org/review/11809
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoCMake: add our own FindCygwin module
Pascal Quantin [Thu, 12 Nov 2015 16:50:18 +0000 (17:50 +0100)]
CMake: add our own FindCygwin module

The one from official CMake (3.3.2) does not look for the default 64bits installation path. Let's add it.
Also add a WIRESHARK_CYGWIN_INSTALL_PATH environment variable allowing to force it.
For reference, registry based detection fails to detect a 64bits installation because it gets redirected to the Wow6432 node.

Change-Id: If3172494e3ab232e094389b493e6b67023662ae5
Reviewed-on: https://code.wireshark.org/review/11769
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
4 years agoepan: Free cf->edt before free cf->epan when redissecting.
Stig Bjørlykke [Fri, 13 Nov 2015 12:01:19 +0000 (13:01 +0100)]
epan: Free cf->edt before free cf->epan when redissecting.

This because cf->edt->pi is pointing to data allocated in
wmem_file_scope and epan_free() will free all data in wmem_file_scope.

In Qt packet_list_clear() we check and use cf->edt, which will give a
heap-use-after-free error.

Change-Id: I97d532ba976b7bc5fe2995a224ca168edf3da38b
Reviewed-on: https://code.wireshark.org/review/11803
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoDiameter dictionary updated.
Branislav Makan [Fri, 13 Nov 2015 09:44:02 +0000 (10:44 +0100)]
Diameter dictionary updated.

Added values for diameter AVP codes:
1085 Redirect-Information Grouped
1086 Redirect- Support Enumerated
1087 TDF-Information Grouped
1088 TDF-Application-Identifier OctetString
1089 TDF-Destination-Host DiameterIdentity
1090 TDF-Destination-Realm DiameterIdentity

Change-Id: I8ba7a56a5a51b32a21a602751275e9ab254adbae
Reviewed-on: https://code.wireshark.org/review/11801
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt: Add go to next + previous packet in conversation.
Gerald Combs [Thu, 12 Nov 2015 16:35:34 +0000 (08:35 -0800)]
Qt: Add go to next + previous packet in conversation.

Add "Go→Next Packet in Conversation" and "Go→Previous Packet in
Conversation" menu items. Make sure the shortucts ("Ctrl+." and
"Ctrl+,") don't get switched to "Cmd+." and "Cmd+," on OS X. "Cmd+," is
already taken by the preferences dialog.

Change-Id: Iab9c7f60fdcf55f12c055b4d0948019bf667ebc9
Reviewed-on: https://code.wireshark.org/review/11771
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>
4 years agop_mul: Enhance ack framenum links.
Stig Bjørlykke [Fri, 13 Nov 2015 08:28:21 +0000 (09:28 +0100)]
p_mul: Enhance ack framenum links.

Change-Id: I084b43fcd8419741c2de007bd03fc04532346813
Reviewed-on: https://code.wireshark.org/review/11797
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agodmp: Enhance ack framenum links.
Stig Bjørlykke [Fri, 13 Nov 2015 08:27:17 +0000 (09:27 +0100)]
dmp: Enhance ack framenum links.

Change-Id: Iade2d06512bacbeff3e7446487a03d4f73dba721
Reviewed-on: https://code.wireshark.org/review/11796
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoFix compilation when _DEBUG is defined.
Gerald Combs [Thu, 12 Nov 2015 21:57:11 +0000 (13:57 -0800)]
Fix compilation when _DEBUG is defined.

CMake's Visual C++ generator creates projects that compile with the
Debug configuration by default, which defines _DEBUG. Fix DEBUG_DUMP's
declaration so that we compile in that case.

While we're here note that the "airpd" prefix isn't limited to AirPcap,
so we might want to change it accordingly.

Change-Id: I5476f28c63020f0f66ee9128731bc4b3dc720765
Reviewed-on: https://code.wireshark.org/review/11787
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>
4 years ago[docsis] Support for Queue Depth-based Request Frame
AdrianSimionov [Thu, 12 Nov 2015 19:58:10 +0000 (20:58 +0100)]
[docsis] Support for Queue Depth-based Request Frame

Change-Id: Ieeb79e4e248bdd8ee239c003e41ede0955e1cf86
Reviewed-on: https://code.wireshark.org/review/11766
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoDiameter: Expand an error message.
Gerald Combs [Fri, 13 Nov 2015 01:39:39 +0000 (17:39 -0800)]
Diameter: Expand an error message.

If we encounter the wrong ftype, print its name.

Change-Id: I7405ccdd3e099f533c6a8aaf81b60faf4093741a
Reviewed-on: https://code.wireshark.org/review/11790
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt: fix creation of a new profile broken by g328fbc0
Pascal Quantin [Thu, 12 Nov 2015 20:41:10 +0000 (21:41 +0100)]
Qt: fix creation of a new profile broken by g328fbc0

Change-Id: Icbe8dbf6f0c4267d7ed4704f78e589a1a48e1424
Reviewed-on: https://code.wireshark.org/review/11783
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>
4 years agoQt: Fixed signal name to avoid a warning.
Stig Bjørlykke [Thu, 12 Nov 2015 18:48:05 +0000 (19:48 +0100)]
Qt: Fixed signal name to avoid a warning.

Also terminate stream lines with endl.

Change-Id: Icbbe5b47695506888c03607ff0af66c59306faae
Reviewed-on: https://code.wireshark.org/review/11778
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoMEGACO: fix indent (remove tab)
Alexis La Goutte [Thu, 12 Nov 2015 18:50:42 +0000 (19:50 +0100)]
MEGACO: fix indent (remove tab)

Change-Id: I58c5ffc377d268cfb3d245e5bd2165a38dda0457
Reviewed-on: https://code.wireshark.org/review/11779
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt: Coloring Rules dialog fixups.
Gerald Combs [Thu, 12 Nov 2015 19:50:01 +0000 (11:50 -0800)]
Qt: Coloring Rules dialog fixups.

Insert new rules at the top. This matches the GTK+ UI behavior. Recolor
the packet list when we press "OK". Add a "to do" item about setting the
filter column width.

Change-Id: I2a9e58fe8642a89f12e1c34622b96613f3ec4c05
Reviewed-on: https://code.wireshark.org/review/11781
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoQt: fix UI artifacts seen in UAT window on Linux or OSX
Pascal Quantin [Thu, 12 Nov 2015 22:53:55 +0000 (23:53 +0100)]
Qt: fix UI artifacts seen in UAT window on Linux or OSX

The QLabel::clear() method call does not seem to repaint the area on those platforms.
Let's force an update of the widget.

Bug: 11695
Change-Id: I9c708c8537140b26582e4365ceee3271eac23259
Reviewed-on: https://code.wireshark.org/review/11782
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoDeveloper guide: add docbook-xml45 to the list of required Cygwin packages
Pascal Quantin [Thu, 12 Nov 2015 20:48:00 +0000 (21:48 +0100)]
Developer guide: add docbook-xml45 to the list of required Cygwin packages

Change-Id: Id0a241361160b03c16a6a9152c8f1a86f87b9db1
Reviewed-on: https://code.wireshark.org/review/11784
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoFix installation of desktop files.
Guy Harris [Thu, 12 Nov 2015 17:44:47 +0000 (09:44 -0800)]
Fix installation of desktop files.

Change-Id: I33ed9741db9a50098b8c7c85409f3e6a0c2e2f15
Reviewed-on: https://code.wireshark.org/review/11772
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years ago[configure.ac] Update gtk+ and glib release date lists
Bill Meier [Thu, 12 Nov 2015 17:11:52 +0000 (12:11 -0500)]
[configure.ac] Update gtk+ and glib release date lists

Change-Id: I79f063fece531ae5e75b0c2a96682827f74489bf
Reviewed-on: https://code.wireshark.org/review/11770
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoQt: initialize all remote interface options
Pascal Quantin [Thu, 12 Nov 2015 14:40:57 +0000 (15:40 +0100)]
Qt: initialize all remote interface options

Bug: 11699
Bug: 11701
Change-Id: Ib470e69bba015a006f9360cfdb429a816b80e37c
Reviewed-on: https://code.wireshark.org/review/11767
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>
4 years ago[IMF] Add bounds checks to avoid buffer overruns,
DiablosOffens [Wed, 11 Nov 2015 13:09:43 +0000 (14:09 +0100)]
[IMF] Add bounds checks to avoid buffer overruns,
also sets the last_field flag to true if it's the end of the buffer.

Change-Id: I135d052fce04807ce61b5feb9af121ff4528f595
Reviewed-on: https://code.wireshark.org/review/11731
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>
4 years agoPut back ' in user guide name
Pascal Quantin [Thu, 12 Nov 2015 09:40:26 +0000 (10:40 +0100)]
Put back ' in user guide name

CMake generated CHM supports it properly, contrary to NMake. As this is the future, let's put it back!

Change-Id: Ifc5ea84942043c04808546df75ae956effa16747
Reviewed-on: https://code.wireshark.org/review/11763
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoSquelch a compiler warning.
Guy Harris [Thu, 12 Nov 2015 08:38:03 +0000 (00:38 -0800)]
Squelch a compiler warning.

Change-Id: I9e9746dc5f17daea7830ddc37f5df0ba16def397
Reviewed-on: https://code.wireshark.org/review/11762
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years ago[GTK] Replace deprecated gdk_pixbuf_new_from_inline()
João Valverde [Sat, 17 Oct 2015 12:47:17 +0000 (13:47 +0100)]
[GTK] Replace deprecated gdk_pixbuf_new_from_inline()

Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).

Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.

Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).

Add missing 'expert_ok.png' file to distribution (GTK only).

Minor improvements to style/structure of ui/gtk/Makefile.am.

Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@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>
4 years agoFix up documentation of RPM packages.
Jeff Morriss [Wed, 11 Nov 2015 17:49:17 +0000 (12:49 -0500)]
Fix up documentation of RPM packages.

Specify which ./configure options are passed into the RPM.

Describe the 3 package RPM package names and their contents.

Describe how to enable parallel builds when making RPMs.

RPM now stands for "RPM Package Manager."

Fix some markup problems.

Change-Id: I1664aa0956719e872d302a4af2c092318f5eea6d
Reviewed-on: https://code.wireshark.org/review/11737
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt: save preferences after creating a filter from expression frame
Pascal Quantin [Wed, 11 Nov 2015 22:24:28 +0000 (23:24 +0100)]
Qt: save preferences after creating a filter from expression frame

Bug: 11690
Change-Id: Ice6a2341d3f39c107a3c9d6a0e23fd98312b48a8
Reviewed-on: https://code.wireshark.org/review/11748
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>
4 years agoQt: Added IO Graph save to clipboard button.
Stig Bjørlykke [Wed, 11 Nov 2015 14:05:33 +0000 (15:05 +0100)]
Qt: Added IO Graph save to clipboard button.

Also added save as CSV file.
Do not add double quotes for values as we do in GTK.

Change-Id: I8576a73e10b71cdba0c8c80db8b21927d19528da
Reviewed-on: https://code.wireshark.org/review/11732
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-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>
4 years agodissector for ISO14443 protocols
Martin Kaiser [Sun, 1 Nov 2015 16:52:37 +0000 (17:52 +0100)]
dissector for ISO14443 protocols

This is a dissector for the ISO14443 protocols between a contactless
smartcard and a card reader.

The overall approach is similar to DVB-CI. We have a pseudo-header in
front of the captured data that has information about the type of the
captured data and the direction.

For now, the dissector registers itself by name so it can be linked to a
user-DLT. I am applying for an official DLT.

Change-Id: I9c4a28ef5b220f205baf58381bf1962996887a9d
Reviewed-on: https://code.wireshark.org/review/11663
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
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>
4 years agoUse format_text() when displaying, not when handing to AirPDcap.
Guy Harris [Thu, 12 Nov 2015 06:29:20 +0000 (22:29 -0800)]
Use format_text() when displaying, not when handing to AirPDcap.

format_text() is specifically intended to handle strings when displaying
them to the user; code such as AirPDCap, which doesn't display strings
to the user, should be handed the raw SSID.

Put in a comment indicating what we probably *should* be doing here.

Bug: 11685

Change-Id: Ic30114c35d1d8f3d791ae904e33a4d81ddc215ec
Reviewed-on: https://code.wireshark.org/review/11757
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoIPv6: Register extension header fields under the appropriate protocol
João Valverde [Sat, 31 Oct 2015 21:11:39 +0000 (21:11 +0000)]
IPv6: Register extension header fields under the appropriate protocol

Fixes Qt GUI supported protocols display.

Change-Id: If51aae0f6cb2a7d182aa1c40bd827e09bbddbb09
Reviewed-on: https://code.wireshark.org/review/11536
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@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>
4 years ago802.11: avoid multi return on SSID or MESHID
Alexis La Goutte [Mon, 9 Nov 2015 11:18:20 +0000 (12:18 +0100)]
802.11: avoid multi return on SSID or MESHID

Bug:11685
Change-Id: Ibe7a2909f0aed33fa35685ac5c8e0e1a8a626742
Reviewed-on: https://code.wireshark.org/review/11652
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoMake it possible to set an environment variable to do debug builds.
DiablosOffens [Wed, 11 Nov 2015 12:57:49 +0000 (13:57 +0100)]
Make it possible to set an environment variable to do debug builds.

Change-Id: I236db01194803474d63fa3d5869f7e80585bce0e
Reviewed-on: https://code.wireshark.org/review/11730
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@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>
4 years agoExport functions str_to_ip() and str_to_ip6() to plugins
Jo Rueschel [Wed, 11 Nov 2015 12:15:16 +0000 (13:15 +0100)]
Export functions str_to_ip() and str_to_ip6() to plugins

The functions str_to_ip() and str_to_ip6() are not yet exposed to plugins so
they cannot be used there.
Now they are added to the plugin API.

Change-Id: I9df267934ad43887a6326c8c9a1a666f263c08a2
Reviewed-on: https://code.wireshark.org/review/11728
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>
4 years agoPlug file descriptor leak.
Guy Harris [Thu, 12 Nov 2015 01:48:14 +0000 (17:48 -0800)]
Plug file descriptor leak.

Change-Id: I882cc5c264fdf97452c84bd5cea0e5d56bd6eb45
Reviewed-on: https://code.wireshark.org/review/11753
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd wtap_dump_open_tempfile routines, to write to a temporary file.
Guy Harris [Thu, 12 Nov 2015 00:59:10 +0000 (16:59 -0800)]
Add wtap_dump_open_tempfile routines, to write to a temporary file.

It includes the temporary-file generation, so you don't have to do it
yourself.

Change-Id: I0798df95a5c5646224ec49612f50b423ed78547a
Reviewed-on: https://code.wireshark.org/review/11751
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd $(randpkt_INCLUDES) to $(noinst_HEADERS) so they're distributed.
Guy Harris [Wed, 11 Nov 2015 22:34:33 +0000 (14:34 -0800)]
Add $(randpkt_INCLUDES) to $(noinst_HEADERS) so they're distributed.

Change-Id: Ib81233c5292d5a81bca7fa6a382d4dad20997330
Reviewed-on: https://code.wireshark.org/review/11749
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: fix cursor position when editing coloring rules names or filters
Pascal Quantin [Wed, 11 Nov 2015 10:21:11 +0000 (11:21 +0100)]
Qt: fix cursor position when editing coloring rules names or filters

A call to setText will set the cursor to the end of the box.
As far as I can tell, this call is useless so let's remove it.

Bug: 11689
Change-Id: I40aee48745a9107331a017070a715a075106974a
Reviewed-on: https://code.wireshark.org/review/11727
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoPut wtap_dump_open() right before wtap_dump_open_ng().
Guy Harris [Wed, 11 Nov 2015 19:54:21 +0000 (11:54 -0800)]
Put wtap_dump_open() right before wtap_dump_open_ng().

That matches what we do with the other two pairs of dump opening
routines.

Change-Id: I0e6e475573c3a8d4ab6cf991d0aadc14150af233
Reviewed-on: https://code.wireshark.org/review/11744
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoFixup a couple of stdout checks.
Gerald Combs [Wed, 11 Nov 2015 18:12:34 +0000 (10:12 -0800)]
Fixup a couple of stdout checks.

Change-Id: I942cd9010901d7b6c4f5b390fb23f79d72fb05d0
Reviewed-on: https://code.wireshark.org/review/11740
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUpdate user guide for upcoming 2.0 release
Pascal Quantin [Wed, 11 Nov 2015 17:58:17 +0000 (18:58 +0100)]
Update user guide for upcoming 2.0 release

Change-Id: Id27365d6bd7085f498edd78111d85de0fbd0abd3
Reviewed-on: https://code.wireshark.org/review/11738
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoCMake: set WinPcap version in top CMakeLists.txt file like for NMake
Pascal Quantin [Wed, 11 Nov 2015 09:05:02 +0000 (10:05 +0100)]
CMake: set WinPcap version in top CMakeLists.txt file like for NMake

This allows displaying the WinPcap version in about dialog

Change-Id: Ic3f4256d81db68314a158fc55682dfd9dbf799a0
Reviewed-on: https://code.wireshark.org/review/11726
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
4 years agoPut randpkt-core.h into the release tarball.
Guy Harris [Wed, 11 Nov 2015 17:46:16 +0000 (09:46 -0800)]
Put randpkt-core.h into the release tarball.

Change-Id: I9c887b3e683ecd035fb3d16d64c5ce1285b97865
Reviewed-on: https://code.wireshark.org/review/11736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRename the wireshark-gnome RPM package wireshark-gtk.
Jeff Morriss [Tue, 10 Nov 2015 22:04:08 +0000 (17:04 -0500)]
Rename the wireshark-gnome RPM package wireshark-gtk.

This was mentioned a while ago in another change but I forgot about it until
seeing Gerald's recent release-notes change (which indicates that the RPM and
Debian package names for the old GUI are wireshark-gtk).

Change-Id: I2a39fce38086d3716c8ef2a07eb8f23bb91a25fa
Reviewed-on: https://code.wireshark.org/review/11709
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoUpdate user guide for development release
Pascal Quantin [Wed, 11 Nov 2015 17:19:50 +0000 (18:19 +0100)]
Update user guide for development release

Change-Id: I9b4c5ab2e98ad6daa618bcda20b53a23467e16e0
Reviewed-on: https://code.wireshark.org/review/11734
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agorandpkt: split into a core and an app.
Dario Lombardo [Tue, 10 Nov 2015 14:41:52 +0000 (15:41 +0100)]
randpkt: split into a core and an app.

This will allow other apps to use the random packet generation
features.

Change-Id: I7e9af58cbe39da4908242b5fbb292f473e03b4f2
Reviewed-on: https://code.wireshark.org/review/11579
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt: fix profile rename
Pascal Quantin [Tue, 10 Nov 2015 22:03:34 +0000 (23:03 +0100)]
Qt: fix profile rename

Bug: 11658
Change-Id: I271863557d13137d168e12d3c393de49823f288a
Reviewed-on: https://code.wireshark.org/review/11708
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoQt: fixes to 'Edit Column' dialog
Pascal Quantin [Tue, 10 Nov 2015 21:19:27 +0000 (22:19 +0100)]
Qt: fixes to 'Edit Column' dialog

- set field name and occurrence when editing a custom column
- convert occurrence number to a QString
- disable OK button when syntax is incorrect or empty for a custom column
- update syntax state when opening the edit dialog or when switching between custom and normal column

Bug: 11433
Change-Id: Ia8424474dd250c78a0b503e0e9d89c322f4f86a9
Reviewed-on: https://code.wireshark.org/review/11705
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoMake routines used only within wiretap/merge.c static.
Guy Harris [Tue, 10 Nov 2015 18:23:10 +0000 (10:23 -0800)]
Make routines used only within wiretap/merge.c static.

We just export some UI helpers and the Big Merge Engine.

Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda
Reviewed-on: https://code.wireshark.org/review/11689
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>
4 years agoQt: Freeze+thaw the main window during nested operations.
Gerald Combs [Tue, 10 Nov 2015 18:12:56 +0000 (10:12 -0800)]
Qt: Freeze+thaw the main window during nested operations.

As noted in main_window.cpp:

// Our event loop becomes nested whenever we call update_progress_dlg, which
// includes several places in file.c. The GTK+ UI stays out of trouble by
// showing a modal progress dialog. We attempt to do the equivalent below by
// disabling parts of the main window. At a minumum the ProgressFrame in the
// main status bar must remain accessible.

Move the freeze+thaw code from captureFileRetapStarted and
captureFileRetapFinished to its own set of member functions. Call them
when we {,un}mark and {,un}ignore packets and note that we should
probably call them elsewhere. Disable mark and ignore actions when we
freeze and restore their states when we thaw.

Bug: 11681
Change-Id: I6f015f7f5f6c98cd48ace2c87f43f48efe51a88b
Reviewed-on: https://code.wireshark.org/review/11690
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agodebian: Make make dist know about moving wireshark.1 to wireshark-qt and removal...
Balint Reczey [Wed, 11 Nov 2015 05:08:27 +0000 (09:08 +0400)]
debian: Make make dist know about moving wireshark.1 to wireshark-qt and removal of wireshark.menu

Change-Id: I81b95e43beae7ca85bff9b2d5b4a6f498252f2b3
Reviewed-on: https://code.wireshark.org/review/11720
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Move icon and mime info file to wireshark-common
Balint Reczey [Tue, 10 Nov 2015 18:28:47 +0000 (22:28 +0400)]
debian: Move icon and mime info file to wireshark-common

Change-Id: I4d8660b36810baa95f8b300af9790778dcba83a8
Reviewed-on: https://code.wireshark.org/review/11697
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: Balint Reczey <balint@balintreczey.hu>
4 years agoGTK: Add separate working desktop file for GTK+ Wireshark GUI
Balint Reczey [Sun, 8 Nov 2015 18:38:50 +0000 (22:38 +0400)]
GTK: Add separate working desktop file for GTK+ Wireshark GUI

Change-Id: I52a749b7e2b9a4a5cb2968409e140b9d5f2002f6
Reviewed-on: https://code.wireshark.org/review/11696
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Ship wireshark.desktop file in wireshark-qt
Balint Reczey [Sun, 8 Nov 2015 18:26:54 +0000 (22:26 +0400)]
debian: Ship wireshark.desktop file in wireshark-qt

Change-Id: Idbf77e6a613c79e267f41d3e9d3c05617e9c6d99
Reviewed-on: https://code.wireshark.org/review/11695
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Ship wireshark.1 in the package we ship /usr/bin/wireshark
Balint Reczey [Sun, 8 Nov 2015 18:24:20 +0000 (22:24 +0400)]
debian: Ship wireshark.1 in the package we ship /usr/bin/wireshark

Change-Id: I7935f412092d6dbb0f545803d82d9b42dfe5a638
Reviewed-on: https://code.wireshark.org/review/11694
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Finish postinst of wireshark-common even when wireshark group is a user group
Balint Reczey [Sun, 8 Nov 2015 18:14:01 +0000 (22:14 +0400)]
debian: Finish postinst of wireshark-common even when wireshark group is a user group

Failing postinst has been reported several times under LP#1447893

Change-Id: I196f246b34aa3be9d53f02b4e0092c802effc42a
Reviewed-on: https://code.wireshark.org/review/11693
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Add note to README.Debian to log in again to be able to capture packets
Balint Reczey [Sun, 8 Nov 2015 18:11:06 +0000 (22:11 +0400)]
debian: Add note to README.Debian to log in again to be able to capture packets

Change-Id: Ifae1223d34f7ae071484fe47d1c88de166ed84ca
Reviewed-on: https://code.wireshark.org/review/11692
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agodebian: Drop menu support
Balint Reczey [Sun, 8 Nov 2015 18:02:47 +0000 (22:02 +0400)]
debian: Drop menu support

Debian is migrating away from the Debian Menu system to adopt
Freedesktop Desktop Entry Specification instead. (.desktop files)
Packages providing .desktop files should not provide menu files.
https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html

Change-Id: I862deee870e9697c590a8323ba8ae2da892b7bb1
Reviewed-on: https://code.wireshark.org/review/11691
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
4 years agoISI: Add Modelines info
Alexis La Goutte [Tue, 10 Nov 2015 12:18:20 +0000 (13:18 +0100)]
ISI: Add Modelines info

Change-Id: I758c39698847d65447e0a7490104a9369c85f6cd
Reviewed-on: https://code.wireshark.org/review/11684
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoUDP: Don't throw malformed errors for empty UDP payload
João Valverde [Thu, 5 Nov 2015 01:51:50 +0000 (01:51 +0000)]
UDP: Don't throw malformed errors for empty UDP payload

Change-Id: I7f5724e263ab81d42421d0cfcb1fc4b63a55d79e
Reviewed-on: https://code.wireshark.org/review/11590
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoChange prototype of callbacks passed to wmem_tree_foreach so that they
Matthieu Coudron [Tue, 10 Nov 2015 11:30:25 +0000 (12:30 +0100)]
Change prototype of callbacks passed to wmem_tree_foreach so that they
accept the node key as a first parameter.

wmem_tree accepts all sort of keys (strings, integers, soon ranges),
thus it is of interest for various purposes (testing, greedy search) to
know the key of the node.

Change-Id: Ie748b917bef91f0b1ba8cce15bd1b471922641dc
Reviewed-on: https://code.wireshark.org/review/11683
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoISI: fix code will never be executed [-Wunreachable-code]
Alexis La Goutte [Tue, 10 Nov 2015 15:44:15 +0000 (16:44 +0100)]
ISI: fix code will never be executed [-Wunreachable-code]

Change-Id: I24185128e664a0f7cc2b59d5d653582cddd04df1
Reviewed-on: https://code.wireshark.org/review/11686
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>
4 years agoAdditional 2.1 symbols.
Guy Harris [Wed, 11 Nov 2015 00:06:15 +0000 (16:06 -0800)]
Additional 2.1 symbols.

Change-Id: Icf5d218e3e0a3336c80e04ed51a1ef5262cc9f28
Reviewed-on: https://code.wireshark.org/review/11711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoNew 2.0 symbols.
Guy Harris [Tue, 10 Nov 2015 21:52:38 +0000 (13:52 -0800)]
New 2.0 symbols.

Change-Id: Ie85ac43891c5587b0998e26da683ef275b631657
Reviewed-on: https://code.wireshark.org/review/11706
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd CMakeLists.txt.user* to .gitignore.
Gerald Combs [Tue, 10 Nov 2015 20:00:11 +0000 (12:00 -0800)]
Add CMakeLists.txt.user* to .gitignore.

Qt Creator uses CMakeLists.txt.user to store CMake build settings.

Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e
Reviewed-on: https://code.wireshark.org/review/11700
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoApple calls it just "OS X" these days.
Guy Harris [Tue, 10 Nov 2015 21:07:54 +0000 (13:07 -0800)]
Apple calls it just "OS X" these days.

Change-Id: I98905988ceb394d27307d1cbe883d8fe95ac23e4
Reviewed-on: https://code.wireshark.org/review/11703
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoInitial Sysdig syscall (event) support.
Gerald Combs [Tue, 2 Jun 2015 02:48:23 +0000 (19:48 -0700)]
Initial Sysdig syscall (event) support.

Add a dissector for reading Sysdig event blocks. It only handles plain
events but it's usable for reading trace files on hand here.

Use a script to generate various parts of the dissector. As an experiment,
update parts in-place instead of using a template.

Ultimately there should probably be a top-level "Syscall" or "Event"
dissector alongside the "Frame" dissector, which could then call this.
You could then directly compare an executable's system calls alongside
its network traffic.

For now leverage the pcapng_block dissector and keep everything under
"Frame".

Next steps:
- Items listed at the top of packet-sysdig-event.c.

Change-Id: I17077e8d7f40d10a946d61189ebc077d81c4da37
Reviewed-on: https://code.wireshark.org/review/11103
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>
4 years ago[docsis->packet-tlv.c] Update for modem capabilities TLV 5, subTLV 2 and subTLV 33
AdrianSimionov [Tue, 10 Nov 2015 13:11:07 +0000 (14:11 +0100)]
[docsis->packet-tlv.c] Update for modem capabilities TLV 5, subTLV 2 and subTLV 33

Change-Id: I63410d90e65a46aaeb534cca56e8797ebe00bf6f
Reviewed-on: https://code.wireshark.org/review/11685
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoFix typo.
Guy Harris [Tue, 10 Nov 2015 18:01:49 +0000 (10:01 -0800)]
Fix typo.

Change-Id: I417de6124925dbfd9599ec7e90e287eb971457a3
Reviewed-on: https://code.wireshark.org/review/11687
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoCall wtap_dump_open_check() in wtap_dump_init_dumper().
Guy Harris [Tue, 10 Nov 2015 11:28:18 +0000 (03:28 -0800)]
Call wtap_dump_open_check() in wtap_dump_init_dumper().

The callers of wtap_dump_init_dumper() always call
wtap_dump_open_check() first, with the same arguments in all cases; pull
the latter call into wtap_dump_init_dumper() itself.

Change-Id: I2b44dc3a018745e175b5c74ff1a346749fec2b71
Reviewed-on: https://code.wireshark.org/review/11681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd a comment for is_stdout.
Guy Harris [Tue, 10 Nov 2015 10:47:15 +0000 (02:47 -0800)]
Add a comment for is_stdout.

Change-Id: I88abb5a37a00ebc1a2a742ff36c8d6be75420dbe
Reviewed-on: https://code.wireshark.org/review/11677
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoSkip only the actual file descriptor close when writing to stdout.
Guy Harris [Tue, 10 Nov 2015 10:01:43 +0000 (02:01 -0800)]
Skip only the actual file descriptor close when writing to stdout.

Have a "this is stdout" flag for a wtap_dumper, and have "open the
standard output for dumping" routines that set that flag.  When closing
a wtap_dumper, do most of the work regardless of whether we're writing
to the standard output or not (so that everything gets written out) and
only skip the closing of the underlying file descriptor.

Change-Id: I9f7e4d142b3bd598055d806b7ded1cb4c378de8e
Reviewed-on: https://code.wireshark.org/review/11673
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoMake the dfilter time tests work regardless of what time zone the tests are
Jeff Morriss [Thu, 29 Oct 2015 02:07:30 +0000 (22:07 -0400)]
Make the dfilter time tests work regardless of what time zone the tests are
being run in.

Do this by forcing the time zone to be UTC (by modifying the environment).

Change-Id: I13c47deada82b55a464006f9c3cc60115b2e4f20
Reviewed-on: https://code.wireshark.org/review/11378
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoGIOP dissector: Replies are not correctly associated with requests
AndyL [Fri, 6 Nov 2015 14:45:56 +0000 (14:45 +0000)]
GIOP dissector: Replies are not correctly associated with requests

Added IP address and port number to the comp_req_list_entry so
get_mfn_from_fn_and_reqid can check for matching IP and port number
when searching for the reply to a request.

Change-Id: Iad00bca5c1104cf8c335001f84264fe55d2e45fc
Reviewed-on: https://code.wireshark.org/review/11599
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>
4 years agoRPC: call REPORT_DISSECTOR_BUG() rather than abort().
Jeff Morriss [Mon, 26 Oct 2015 01:15:21 +0000 (21:15 -0400)]
RPC: call REPORT_DISSECTOR_BUG() rather than abort().

Checking WIRESHARK_ABORT_ON_DISSECTOR_BUG here looks somewhat redundant but it's not:
it's needed to prevent REPORT_DISSECTOR_BUG() from throwing an exception when
we're not dissecting (when nobody's going to catch the exception).

Change-Id: I4dfc484bdf13bca236bfff1388d4399e26880ad7
Reviewed-on: https://code.wireshark.org/review/11272
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>
4 years agoZCL (zbee): Use hf_zbee_zcl_attr_uint40 for ZBEE_ZCL_40_BIT_UINT
Alexis La Goutte [Wed, 4 Nov 2015 20:58:58 +0000 (21:58 +0100)]
ZCL (zbee): Use hf_zbee_zcl_attr_uint40 for ZBEE_ZCL_40_BIT_UINT

Change-Id: Ib9719ac893288b9f26acabb81158ed42b2351fb5
Reviewed-on: https://code.wireshark.org/review/11572
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agofile.c: do not try to close a file descriptor that was previously already closed
Pascal Quantin [Mon, 9 Nov 2015 14:25:40 +0000 (15:25 +0100)]
file.c: do not try to close a file descriptor that was previously already closed

Bug: 11684
Change-Id: Iaaa5958ea6192ef52b669c687082469b8c7c0219
Reviewed-on: https://code.wireshark.org/review/11656
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: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoTreat "-" as "standard input" in the CLI, not in libwiretap.
Guy Harris [Tue, 10 Nov 2015 01:21:46 +0000 (17:21 -0800)]
Treat "-" as "standard input" in the CLI, not in libwiretap.

That's a UI convention, and the GUI shouldn't honor that convention - a
user might get confused if they try to save to "-" and end up with
nothing (and with a ton of crap in a log file if programs launched from
the GUI end up with their standard output and error logged).

While we're at it, make randcap report write and close errors.

Change-Id: I9c450f0ca0320ce4c36d13d209b56d72edb43012
Reviewed-on: https://code.wireshark.org/review/11666
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agopacket-smb2: provide reassembling support for Named Pipe subdissectors (e.g. DCERPC)
Stefan Metzmacher [Mon, 4 May 2015 14:52:32 +0000 (16:52 +0200)]
packet-smb2: provide reassembling support for Named Pipe subdissectors (e.g. DCERPC)

Change-Id: Ie6f28fd749219ddadc53820f94866e91cca297cb
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11596
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>
4 years agoFix Developers Guide link to source snapshots
Graham Bloice [Mon, 9 Nov 2015 16:36:37 +0000 (16:36 +0000)]
Fix Developers Guide link to source snapshots

Change-Id: I16280d3fd4023c5a16026e8e10f1d12dfca45641
Reviewed-on: https://code.wireshark.org/review/11657
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: Michael Mann <mmann78@netscape.net>