metze/wireshark/wip.git
4 years agotshark: endpoints statistics are not supported for now, do not list them in -z
Pascal Quantin [Tue, 30 Dec 2014 22:46:24 +0000 (23:46 +0100)]
tshark: endpoints statistics are not supported for now, do not list them in -z

Move statistics registration to "GUI" callback registration

Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc
Reviewed-on: https://code.wireshark.org/review/6151
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoMove the version_info.c stuff to wsutil/ws_version_info.c.
Guy Harris [Wed, 31 Dec 2014 03:36:26 +0000 (19:36 -0800)]
Move the version_info.c stuff to wsutil/ws_version_info.c.

Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde
Reviewed-on: https://code.wireshark.org/review/6153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRemove proto_tree_add_text from packet-dcerpc-pn-io.c
Michael Mann [Wed, 31 Dec 2014 00:25:35 +0000 (19:25 -0500)]
Remove proto_tree_add_text from packet-dcerpc-pn-io.c

Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d
Reviewed-on: https://code.wireshark.org/review/6152
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoTest suite: Start testing our output for valid UTF-8.
Gerald Combs [Tue, 30 Dec 2014 20:38:52 +0000 (12:38 -0800)]
Test suite: Start testing our output for valid UTF-8.

Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a
couple of the Bluetooth dissectors and X11 keysyms accordingly.

Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd
Reviewed-on: https://code.wireshark.org/review/6146
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: More WiresharkDialog conversions.
Gerald Combs [Mon, 29 Dec 2014 22:12:43 +0000 (14:12 -0800)]
Qt: More WiresharkDialog conversions.

Convert the Follow Stream and Export Objects dialogs.

Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50
Reviewed-on: https://code.wireshark.org/review/6126
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agofree the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()
Martin Kaiser [Tue, 30 Dec 2014 18:33:16 +0000 (19:33 +0100)]
free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()

Bug: 10740
Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0
Reviewed-on: https://code.wireshark.org/review/6145
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoFix IPv6/IPX statistics generation
Pascal Quantin [Tue, 30 Dec 2014 15:23:07 +0000 (16:23 +0100)]
Fix IPv6/IPX statistics generation

Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first

Bug: 10813
Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906
Reviewed-on: https://code.wireshark.org/review/6140
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoWebsocket: use pinfo pool and not packet one for the unmasked data tvb
Pascal Quantin [Tue, 30 Dec 2014 17:07:32 +0000 (18:07 +0100)]
Websocket: use pinfo pool and not packet one for the unmasked data tvb

As indicated in README.wmem, pinfo pool must be used for anything that might
end up being passed to add_new_data_source

Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a
Reviewed-on: https://code.wireshark.org/review/6144
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoclean up the part where dissect_websocket() is called recursively
Martin Kaiser [Tue, 30 Dec 2014 16:57:44 +0000 (17:57 +0100)]
clean up the part where dissect_websocket() is called recursively

Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283
Reviewed-on: https://code.wireshark.org/review/6143
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agouse packet-scoped memory for the unmasked data tvb
Martin Kaiser [Tue, 30 Dec 2014 16:50:30 +0000 (17:50 +0100)]
use packet-scoped memory for the unmasked data tvb

Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4
Reviewed-on: https://code.wireshark.org/review/6142
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoskip the payload if it's empty
Martin Kaiser [Tue, 30 Dec 2014 16:44:45 +0000 (17:44 +0100)]
skip the payload if it's empty

Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2
Reviewed-on: https://code.wireshark.org/review/6141
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoQt: Continue using the new window title format.
Gerald Combs [Mon, 29 Dec 2014 23:15:59 +0000 (15:15 -0800)]
Qt: Continue using the new window title format.

Update several dialog titles to "Wireshark · <subtile...>".

Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9
Reviewed-on: https://code.wireshark.org/review/6127
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 agono need for if(tree)
Martin Kaiser [Tue, 30 Dec 2014 15:47:30 +0000 (16:47 +0100)]
no need for if(tree)

Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267
Reviewed-on: https://code.wireshark.org/review/6138
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago.mailmap: Add Hadriel Kaplan
Alexis La Goutte [Tue, 30 Dec 2014 09:48:44 +0000 (10:48 +0100)]
.mailmap: Add Hadriel Kaplan

Change-Id: Iddab5a98e47d90fe4a7e6fbf6b55bbb16e528415
Reviewed-on: https://code.wireshark.org/review/6136
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
4 years agostats_tree: Make sure some structs are fully initialized.
Gerald Combs [Tue, 30 Dec 2014 01:24:44 +0000 (17:24 -0800)]
stats_tree: Make sure some structs are fully initialized.

Get rid of a strcpy.

Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4
Reviewed-on: https://code.wireshark.org/review/6130
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt: Convert more dialogs to WiresharkDialog.
Gerald Combs [Mon, 29 Dec 2014 19:42:01 +0000 (11:42 -0800)]
Qt: Convert more dialogs to WiresharkDialog.

Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs
subclasses of WiresharkDialog.

Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain
if the user opens more than one instance of the dialog.

Use the applicationName property in WiresharkApplication instead of a
separate variable.

Add a preexisting item to the IO Graph bug list (hovering when the file
is closed clears the graph).

Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239
Reviewed-on: https://code.wireshark.org/review/6125
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoTabs are not necessarily set every 4 spaces.
Guy Harris [Tue, 30 Dec 2014 02:57:31 +0000 (18:57 -0800)]
Tabs are not necessarily set every 4 spaces.

Use spaces, not tabs, for indentation; that makes the code's layout
indepencent of tab settings, which might be every *8* spaces.

Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e
Reviewed-on: https://code.wireshark.org/review/6132
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRemove some proto_tree_add_text outside the dissector directory.
Michael Mann [Mon, 29 Dec 2014 02:43:51 +0000 (21:43 -0500)]
Remove some proto_tree_add_text outside the dissector directory.

Change-Id: I890846a0cede755a603243b4048fb5c917b2826b
Reviewed-on: https://code.wireshark.org/review/6112
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoAdd ability to follow UDP stream by index
Pascal Quantin [Sat, 27 Dec 2014 22:15:41 +0000 (23:15 +0100)]
Add ability to follow UDP stream by index

-z "follow,udp" tshark cli command now supports a stream index
It is now possible to select the UDP stream displayed in Qt GUI (like for TCP)

Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d
Reviewed-on: https://code.wireshark.org/review/6083
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoTN5250: Missing break in switch (CID 280477)
Alexis La Goutte [Mon, 29 Dec 2014 17:03:59 +0000 (18:03 +0100)]
TN5250: Missing break in switch (CID 280477)

fix also indent typo

Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab
Reviewed-on: https://code.wireshark.org/review/6118
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoWimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Mon, 29 Dec 2014 17:12:43 +0000 (18:12 +0100)]
Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510
Reviewed-on: https://code.wireshark.org/review/6120
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoWindows build improvements:
Graham Bloice [Sat, 27 Sep 2014 08:37:11 +0000 (09:37 +0100)]
Windows build improvements:

  Added /Zo flag for VS2013 builds to add more debugging info
  Removed obsolete comment on unused /GS flag and obsolete
   /FR flag.
  Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related
   (which specified the obsolete /FR flag).
  Added /RELEASE flag to linker to set checksum in PE header
  Fixed an old typo.
  CMake added /INCREMENTAL:NO flag to linker to overide default
  and prevent warning messages.

Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d
Reviewed-on: https://code.wireshark.org/review/6110
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agortsp: Fix (what I think may be) a minor bug.
Bill Meier [Mon, 29 Dec 2014 19:20:44 +0000 (14:20 -0500)]
rtsp: Fix (what I think may be) a minor bug.

      (Also fixes a compiler 'Shadow' warning in a different way
       than the now reverted previous fix).

Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c
Reviewed-on: https://code.wireshark.org/review/6123
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agortsp: Fix compiler 'Shadow' warning ...
Bill Meier [Mon, 29 Dec 2014 18:52:09 +0000 (13:52 -0500)]
rtsp: Fix  compiler 'Shadow' warning ...

Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90
Reviewed-on: https://code.wireshark.org/review/6122
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agortsp: Replace g_warning() by expert...() (dissectors shouldn't do termio).
Bill Meier [Mon, 29 Dec 2014 18:05:26 +0000 (13:05 -0500)]
rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio).

Also: Add an expert...() in rtsp_create_conversation() for
      "Unknown transport type".

Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96
Reviewed-on: https://code.wireshark.org/review/6121
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoWireshark Dialog (Qt): Add Modelines info
Alexis La Goutte [Mon, 29 Dec 2014 16:11:01 +0000 (17:11 +0100)]
Wireshark Dialog (Qt): Add Modelines info

Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f
Reviewed-on: https://code.wireshark.org/review/6116
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agocapture_file.h (Qt): missing ]
Alexis La Goutte [Mon, 29 Dec 2014 15:33:21 +0000 (16:33 +0100)]
capture_file.h (Qt): missing ]

Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0
Reviewed-on: https://code.wireshark.org/review/6115
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoZebra: Fix some indent typo
Alexis La Goutte [Mon, 29 Dec 2014 09:18:21 +0000 (10:18 +0100)]
Zebra: Fix some indent typo

Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8
Reviewed-on: https://code.wireshark.org/review/6114
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoOpenFlow: Capatilize O and F of OpenFlow (when use Decode as)
Alexis La Goutte [Mon, 29 Dec 2014 09:17:04 +0000 (10:17 +0100)]
OpenFlow: Capatilize O and F of OpenFlow (when use Decode as)

Remove also a trailing whitespace in OpenFlow TCP port preference

Change-Id: I5c3f42e634e0fee4fecf1a7f2dd1c75a68165b45
Reviewed-on: https://code.wireshark.org/review/6113
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agodcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio).
Bill Meier [Mon, 29 Dec 2014 16:07:54 +0000 (11:07 -0500)]
dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio).

Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068
Also: Replace (one of many) proto_tree_add_text() instances.
Reviewed-on: https://code.wireshark.org/review/6117
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoEliminate proto_tree_add_text from packet-spice.c
Michael Mann [Sat, 27 Dec 2014 15:49:26 +0000 (10:49 -0500)]
Eliminate proto_tree_add_text from packet-spice.c

Also do some cleanup in dissect_spice() and replace g_warning calls.

Change-Id: I4dc6f6496bb5ae54157aa6f7f27f21c396da623c
Reviewed-on: https://code.wireshark.org/review/6106
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 agoMinor doc updates, added Windows debugging info
Graham Bloice [Sun, 28 Dec 2014 18:03:49 +0000 (18:03 +0000)]
Minor doc updates, added Windows debugging info

Change-Id: I7ddd6f8dead5db725c4e5f35778ce4b6f792bda9
Reviewed-on: https://code.wireshark.org/review/6096
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>
4 years agoQt: Add a WiresharkDialog convenience class.
Gerald Combs [Mon, 22 Dec 2014 23:51:36 +0000 (15:51 -0800)]
Qt: Add a WiresharkDialog convenience class.

Add WiresharkDialog, a common base class for dialogs centered around
capture files. Make it a parent of Capture File Properties, Traffic
Table, Conversations, and Endpoints.

Rename CaptureFile::read_only_ to file_closed_. Add methods to
WiresharkApplication for generating consistent window titles.

Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257
Reviewed-on: https://code.wireshark.org/review/6097
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoRestore string.h to os_version.c
Martin Mathieson [Mon, 29 Dec 2014 01:03:54 +0000 (01:03 +0000)]
Restore string.h to os_version.c

Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52
Reviewed-on: https://code.wireshark.org/review/6108
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoAdd back string.h to sha1.c and sober128.c
Martin Mathieson [Mon, 29 Dec 2014 00:28:26 +0000 (00:28 +0000)]
Add back string.h to sha1.c and sober128.c

Change-Id: Idd8963717eab804f7d76652d1baf029be8b5997f
Reviewed-on: https://code.wireshark.org/review/6105
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoRestore string.h to md4.c
Martin Mathieson [Mon, 29 Dec 2014 00:16:03 +0000 (00:16 +0000)]
Restore string.h to md4.c

Change-Id: I1a2c57ea20bcb1fd22c0379f3f43d3589e497c1b
Reviewed-on: https://code.wireshark.org/review/6104
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoAdd string.h back to rc4.c
Martin Mathieson [Mon, 29 Dec 2014 00:11:36 +0000 (00:11 +0000)]
Add string.h back to rc4.c

Change-Id: Idea9369742373e4a50edb3f391bdabfeeb3a2ca7
Reviewed-on: https://code.wireshark.org/review/6103
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoAdd back string.h
Martin Mathieson [Mon, 29 Dec 2014 00:08:12 +0000 (00:08 +0000)]
Add back string.h

Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365
Reviewed-on: https://code.wireshark.org/review/6102
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoAdd a couple of more needed includes
Martin Mathieson [Sun, 28 Dec 2014 23:56:13 +0000 (23:56 +0000)]
Add a couple of more needed includes

Change-Id: Ie160f81544c6c9b381078b555e91602617cb2700
Reviewed-on: https://code.wireshark.org/review/6101
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoRestore string.h as OS X misses it for strlen()
Martin Mathieson [Sun, 28 Dec 2014 23:45:56 +0000 (23:45 +0000)]
Restore string.h as OS X misses it for strlen()

Change-Id: If1a968d54eed97fae915b8546d8d7a65a56b82db
Reviewed-on: https://code.wireshark.org/review/6100
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoDeleting unnecessary #includes from wsutil.
Martin Mathieson [Sun, 28 Dec 2014 00:25:44 +0000 (00:25 +0000)]
Deleting unnecessary #includes from wsutil.

Will look at cleaning up and committing script afterwards.

Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527
Reviewed-on: https://code.wireshark.org/review/6086
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoExpose dissector_add_for_decode_as() to Lua
Hadriel Kaplan [Thu, 25 Dec 2014 15:17:11 +0000 (10:17 -0500)]
Expose dissector_add_for_decode_as() to Lua

Allow Lua scripts to add their Protocol's dissector for "Decode as...".

Bug: 10696
Change-Id: Ic270cc85eff62ccfc29d8e5fcbb48247cfcd14bd
Reviewed-on: https://code.wireshark.org/review/6050
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agop_mul: Added checksum from ACP 142(A)
Stig Bjørlykke [Sat, 27 Dec 2014 14:39:40 +0000 (15:39 +0100)]
p_mul: Added checksum from ACP 142(A)

Bug: 10807
Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc
Reviewed-on: https://code.wireshark.org/review/6076
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
4 years agoCreate FT_FCWWN field type.
Michael Mann [Wed, 24 Dec 2014 05:06:35 +0000 (00:06 -0500)]
Create FT_FCWWN field type.

Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type.

Change-Id: I4ca77870499fd8239584a70874998b5d194a7167
Reviewed-on: https://code.wireshark.org/review/6036
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt Follow window: keep data representation when switching between streams
Pascal Quantin [Sun, 28 Dec 2014 15:35:57 +0000 (16:35 +0100)]
Qt Follow window: keep data representation when switching between streams

Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61
Reviewed-on: https://code.wireshark.org/review/6091
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoThe symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s
Martin Kaiser [Sun, 28 Dec 2014 17:39:30 +0000 (18:39 +0100)]
The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s

Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731
Reviewed-on: https://code.wireshark.org/review/6095
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoMove Windows build to be VS2013 based using the Community Edition
Graham Bloice [Fri, 22 Aug 2014 23:21:45 +0000 (00:21 +0100)]
Move Windows build to be VS2013 based using the Community Edition
Drop references to long obsolete compilers.
Added Chocolatey installer instructions for some packages.

Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646
Reviewed-on: https://code.wireshark.org/review/5986
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>
4 years ago[Automatic manuf, services and enterprise-numbers update for 2014-12-28]
Gerald Combs [Sun, 28 Dec 2014 16:05:15 +0000 (08:05 -0800)]
[Automatic manuf, services and enterprise-numbers update for 2014-12-28]

Change-Id: Ie1876a971a25a4c8f063ae0fce0c970a4c9efdf2
Reviewed-on: https://code.wireshark.org/review/6092
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoReplace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Michael Mann [Sun, 21 Dec 2014 17:38:13 +0000 (12:38 -0500)]
Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.

Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoIf we can't open the GeoIP database, close and unlink the map file.
Guy Harris [Sun, 28 Dec 2014 10:28:27 +0000 (02:28 -0800)]
If we can't open the GeoIP database, close and unlink the map file.

We can't write out the full map file, and we return an error, so just
get rid of the file.

Fixes Coverity CID 1256521.

Change-Id: Ieee078f760c035d65b2fce199ea472ba915be9c6
Reviewed-on: https://code.wireshark.org/review/6090
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't check the same character twice in a row, check it and the next character.
Guy Harris [Sun, 28 Dec 2014 10:18:05 +0000 (02:18 -0800)]
Don't check the same character twice in a row, check it and the next character.

Fixes Coverity CID 1260460.

Change-Id: Ic9ed109a863bcf20a5e67e4f52d628011f5e9ba5
Reviewed-on: https://code.wireshark.org/review/6087
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRemoved duplicated #include lines
Dario Lombardo [Fri, 26 Dec 2014 22:48:39 +0000 (23:48 +0100)]
Removed duplicated #include lines

Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c
Reviewed-on: https://code.wireshark.org/review/6065
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoCheck for pkg-config.
Guy Harris [Sat, 27 Dec 2014 23:17:07 +0000 (15:17 -0800)]
Check for pkg-config.

The configure script uses pkg-config unconditionally, so you need it if
you're going to build Wireshark with the autotools.

Change-Id: Ibb0e5e37651256c7134303c8176f30a9150af699
Reviewed-on: https://code.wireshark.org/review/6085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoWe require pkg-config to check for, for example, GLib.
Guy Harris [Sat, 27 Dec 2014 23:02:56 +0000 (15:02 -0800)]
We require pkg-config to check for, for example, GLib.

If the check for pkg-config fails, quit immediately; don't leave the
failure message for later, as the error message in question might not be
as blunt.

Change-Id: I530e8b62f5adff228ae8ff6f9798ac538c2ad684
Reviewed-on: https://code.wireshark.org/review/6084
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoGet rid of packet data members of header structures.
Guy Harris [Sat, 27 Dec 2014 20:56:07 +0000 (12:56 -0800)]
Get rid of packet data members of header structures.

Instead, have a special macro using the size of the header structure to
find the offset of the packet data.

This means that:

1) you don't have to throw "-{size of data member}" into the
   macros that calculate the sizes of the header structures;

2) you don't have a bunch of randomly-chosen data field sizes;

3) you don't have sizes of 0, which cause problems with
   compilers that don't support zero-length arrays;

4) you don't have some apparently-incorrect "-{size of data
   member}" values (if they're correct, please fix the structure
   definitions).

Change-Id: Iea368b83fa2d184bd6df453d51756e4749714e2c
Reviewed-on: https://code.wireshark.org/review/6082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoZebra dissector highlights wrong byte for version and is missing some fields
Hadriel Kaplan [Sat, 27 Dec 2014 18:29:06 +0000 (13:29 -0500)]
Zebra dissector highlights wrong byte for version and is missing some fields

Bug: 10809
Change-Id: I916d3ee0644570b689b35575e7277fc7d5ee3396
Reviewed-on: https://code.wireshark.org/review/6081
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
4 years agoOpenFlow: fix dissection of async_config_prop structure
Pascal Quantin [Sat, 27 Dec 2014 15:46:32 +0000 (16:46 +0100)]
OpenFlow: fix dissection of async_config_prop structure

Bug: 10808
Change-Id: I5ef46cd6b85c415e23dfdbe7a56c8b332eaae5a3
Reviewed-on: https://code.wireshark.org/review/6078
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 agoFix -z statistics command line parsing
Pascal Quantin [Sat, 27 Dec 2014 14:42:53 +0000 (15:42 +0100)]
Fix -z statistics command line parsing

The string comparison must be done against the length of the registered command, not against the length or the string given as an argument.
Otherwise optional parameters are taken into account.

Change-Id: Iec4032fc10b00e606770533c5a567d7b49663593
Reviewed-on: https://code.wireshark.org/review/6075
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoSRVLOC: fix some fields registration (regression introduced in ga1c6341)
Pascal Quantin [Sat, 27 Dec 2014 15:34:54 +0000 (16:34 +0100)]
SRVLOC: fix some fields registration (regression introduced in ga1c6341)

Change-Id: I318f4889b94021ece1e61ae080b77b1fb21eae7b
Reviewed-on: https://code.wireshark.org/review/6077
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoEliminate proto_tree_add_text from packet-srvloc.c
Michael Mann [Sat, 27 Dec 2014 02:13:48 +0000 (21:13 -0500)]
Eliminate proto_tree_add_text from packet-srvloc.c

Change-Id: I73a2270e259414f21a695d2b279df5b3cac27bb8
Reviewed-on: https://code.wireshark.org/review/6067
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 agoDeclare cur_rt in the narrowest possible scope.
Guy Harris [Sat, 27 Dec 2014 10:57:22 +0000 (02:57 -0800)]
Declare cur_rt in the narrowest possible scope.

Change-Id: I0604d6f9f4bb2c58bb74a9b375f644474b68c28f
Reviewed-on: https://code.wireshark.org/review/6074
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoIP: try to fix OSX 10.5 x86 compilation
Pascal Quantin [Sat, 27 Dec 2014 08:17:36 +0000 (09:17 +0100)]
IP: try to fix OSX 10.5 x86 compilation

packet-ip.c: In function 'dissect_ip':
packet-ip.c:2297: warning: 'cur_rt' may be used uninitialized in this function
packet-ip.c:2297: note: 'cur_rt' was declared here

Change-Id: I97fe33d2a01e982f057cce6d68f64378727be2da
Reviewed-on: https://code.wireshark.org/review/6073
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 agoDon't use a leading - in getopt_long() option strings.
Guy Harris [Sat, 27 Dec 2014 02:46:10 +0000 (18:46 -0800)]
Don't use a leading - in getopt_long() option strings.

The behavior of a leading - is platform-dependent.  It also means that
non-option arguments are treated in a fashion that we're not handling,
so capture filters given as non-option arguments at the end of the
command line don't work.  (The Linux getopt() man page says that a
leading - "is used by programs that were written to expect options and
other argv-elements in any order and that care about the ordering of the
two."  We are not such a program.)

Change-Id: I5610cf90a8218d48f7516abacc367e0affa3b549
Based-On-A-Change-From: Peter Hatina <phatina@redhat.com>
Reviewed-on: https://code.wireshark.org/review/6071
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoCheck for optreset in CMake as well.
Guy Harris [Sat, 27 Dec 2014 02:21:05 +0000 (18:21 -0800)]
Check for optreset in CMake as well.

Change-Id: I74aae1d68f48702b0cd1289cdafdfff8d817b5f4
Reviewed-on: https://code.wireshark.org/review/6068
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoFix building of color conversation filter
Pascal Quantin [Fri, 26 Dec 2014 22:39:48 +0000 (23:39 +0100)]
Fix building of color conversation filter

Right now eth filter (the last one tried) is always applied

Change-Id: Ibe5d3c30033bd2d385bd1e68b20388114673cb5c
Reviewed-on: https://code.wireshark.org/review/6064
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoUse getopt_long() for the first pass through the argument list.
Guy Harris [Fri, 26 Dec 2014 22:37:31 +0000 (14:37 -0800)]
Use getopt_long() for the first pass through the argument list.

That way:

1) we don't have to worry about the system getopt() and our
   getopt_long(), on platforms that have getopt() but not
   getopt_long() (Solaris prior to Solaris 10, HP-UX, AIX), not
   working well together;

2) if necessary, we can handle long options in the first pass.

Switch to using getopt_long() for the *second* pass for the GTK+ version
of Wireshark.

Use the documented mechanism for resetting the argument parser for the
glibc version of getopt_long(); use the mostly-undocumented-but-at-least-
they-documented-optreset mechanism for the *BSD version.

(We should look into doing only one pass, saving away arguments that
can't fully be processed in the first pass for further processing after
initializing libwireshark.)

Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f
Reviewed-on: https://code.wireshark.org/review/6063
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUDP: fix 'Follow Stream' button from conversations tab
Pascal Quantin [Fri, 26 Dec 2014 22:21:35 +0000 (23:21 +0100)]
UDP: fix 'Follow Stream' button from conversations tab

Add stream index to conversation table

Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b
Reviewed-on: https://code.wireshark.org/review/6062
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoFix assertion when applying conversation color
Pascal Quantin [Fri, 26 Dec 2014 22:09:04 +0000 (23:09 +0100)]
Fix assertion when applying conversation color

Packet scoped memory cannot be used here; let's use the pinfo pool

Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f
Reviewed-on: https://code.wireshark.org/review/6061
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoTry to fix compilation broken by g3d3f973
Pascal Quantin [Fri, 26 Dec 2014 21:43:55 +0000 (22:43 +0100)]
Try to fix compilation broken by g3d3f973

Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772
Reviewed-on: https://code.wireshark.org/review/6059
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoReplace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Michael Mann [Sun, 21 Dec 2014 13:02:26 +0000 (08:02 -0500)]
Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.

Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoFix some dissectors doing termio (fprintf(stderr,..), g_warning()).
Bill Meier [Wed, 24 Dec 2014 15:44:03 +0000 (10:44 -0500)]
Fix some dissectors doing termio (fprintf(stderr,..), g_warning()).

- Use report_...failure() (in most cases).
- Also: Do some misc fixes in certain disectors
  - re-arrange order of #includes
  - Fixup preferences help text

Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9
Reviewed-on: https://code.wireshark.org/review/6039
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoRemove proto_tree_add_text from ZigBee dissectors.
Michael Mann [Fri, 26 Dec 2014 14:44:30 +0000 (09:44 -0500)]
Remove proto_tree_add_text from ZigBee dissectors.

Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190
Reviewed-on: https://code.wireshark.org/review/6055
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 agoWCCP: initialize address table to 0
Pascal Quantin [Fri, 26 Dec 2014 18:52:38 +0000 (19:52 +0100)]
WCCP: initialize address table to 0

It prevents an uninitialized access later on if an exception is triggered before filling the table

Bug: 10806
Change-Id: I8f75fb18cd8d033013c34093f9d6c8762f23452b
Reviewed-on: https://code.wireshark.org/review/6056
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agorpc: Prevent "malformed" for RPC 'NULL proc' packets.
Bill Meier [Wed, 10 Dec 2014 06:52:31 +0000 (01:52 -0500)]
rpc: Prevent "malformed" for RPC 'NULL proc' packets.

Bug: 10646
Change-Id: Ifb96768969a43c59367b73e7bb940ceeb02cf6b0
Reviewed-on: https://code.wireshark.org/review/5700
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoDeleting unnecessary #includes from dissectors.
Martin Mathieson [Thu, 25 Dec 2014 22:34:06 +0000 (22:34 +0000)]
Deleting unnecessary #includes from dissectors.
Fifth batch (packet-rtp.c -> end).

Will look at cleaning up and committing script afterwards.

Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2
Reviewed-on: https://code.wireshark.org/review/6052
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
4 years agoVoIP Calls: Missing break in switch (CID 1155515)
Alexis La Goutte [Mon, 22 Dec 2014 21:50:49 +0000 (22:50 +0100)]
VoIP Calls: Missing break in switch (CID 1155515)

Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b
Reviewed-on: https://code.wireshark.org/review/6001
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoOnly include <wsutil/os_version_info.h> if we need it.
Guy Harris [Thu, 25 Dec 2014 21:03:09 +0000 (13:03 -0800)]
Only include <wsutil/os_version_info.h> if we need it.

Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6
Reviewed-on: https://code.wireshark.org/review/6051
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoLua accessor for Protocol field type gets wrong data
Hadriel Kaplan [Tue, 23 Dec 2014 00:14:49 +0000 (19:14 -0500)]
Lua accessor for Protocol field type gets wrong data

When a Lua dissector/tap accesses the value of a Field of FT_PROTOCOL ftype, the
returned ByteArray contains the wrong data.  Also, calling such a field's
tostring() method returns a string of "(unknown)" instead of the hex of the
data.

Bug: 10801
Change-Id: I8a0642dc0e41af444d211bbe4106cd21207084a6
Reviewed-on: https://code.wireshark.org/review/6003
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
4 years agoBug 10233 - Wireshark crashes if Lua heuristic dissector returns true
Hadriel Kaplan [Wed, 24 Dec 2014 20:04:01 +0000 (15:04 -0500)]
Bug 10233 - Wireshark crashes if Lua heuristic dissector returns true

Because call_heur_dissector_direct() didn't set the pinfo->heur_list_name
before calling the heuristic dissector, heur_dissect_lua() would invoke
report_failure().  Unfortunately, calling report_failure() within a dissector
can cause problems because GTK continues invoking timed callbacks while
it displays the modal dialog created by report_failure()... without yet
returning from report_failure().  In such a case, it's possible for
epan_dissect_run() to be called while still within the execution of a
previous call to epan_dissect_run(), which casues an assert since
epan_dissect_run() is not reentrant.

So this commit both fixes the call_heur_dissector_direct() bug as well
as avoids using report_failure() within heur_dissect_lua().  It also
upadtes the dissector.lua script used in the testsuite to match the one
pubshied on the wiki, since that script's heuristic dissector triggered
the bug.

Bug: 10233
Change-Id: If022604347745fadac01c02d370ca1a5d3f88b5b
Reviewed-on: https://code.wireshark.org/review/6040
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: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
4 years agoUse getopt_long().
Guy Harris [Thu, 25 Dec 2014 09:13:24 +0000 (01:13 -0800)]
Use getopt_long().

Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10
Reviewed-on: https://code.wireshark.org/review/6048
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoCheck for getopt_long(), not getopt().
Guy Harris [Thu, 25 Dec 2014 01:10:40 +0000 (17:10 -0800)]
Check for getopt_long(), not getopt().

We support three types of platforms:

1) UN*Xes that have both getopt() and getopt_long();

2) UN*Xes that have getopt() but not getopt_long();

3) Windows, which has neither.

Checking for getopt_long() lets us distinguish between 1) and 2) and
build getopt_long() for them.

Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45
Reviewed-on: https://code.wireshark.org/review/6045
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years ago NBAP: fix ddi missed for non first macdflow_id in E-DCH channel
Ilya Gavrilov [Tue, 23 Dec 2014 16:48:56 +0000 (19:48 +0300)]
NBAP: fix ddi missed for non first macdflow_id in E-DCH channel

Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644
Reviewed-on: https://code.wireshark.org/review/6022
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoInclude some files based on whether the functions they define are present.
Guy Harris [Thu, 25 Dec 2014 00:13:11 +0000 (16:13 -0800)]
Include some files based on whether the functions they define are present.

Rather than including wsgetopt.c, inet_aton.c, and strptime.c iff we're
building for Windows:

include wsgetopt.c iff we don't have getopt();

include inet_aton.c iff we don't have inet_aton();

include strptime.c iff we don't have strptime().

Change-Id: Ibd68306ac372a4ae102c3220a94cdf6ecb04e58c
Reviewed-on: https://code.wireshark.org/review/6044
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't use extra variables for ws_mempbrk_sse42.c and popcount.c
Guy Harris [Wed, 24 Dec 2014 23:54:47 +0000 (15:54 -0800)]
Don't use extra variables for ws_mempbrk_sse42.c and popcount.c

Instead, just add to WSUTIL_FILES as necessary.

Change-Id: Iecadbd9a66ec54ee5d90aecfbfe5e636ae56e27e
Reviewed-on: https://code.wireshark.org/review/6043
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd -msse4.2 to the compiler flags if it's supported.
Guy Harris [Wed, 24 Dec 2014 23:36:55 +0000 (15:36 -0800)]
Add -msse4.2 to the compiler flags if it's supported.

Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce
Reviewed-on: https://code.wireshark.org/review/6042
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoTCP: TCP Fast Open Cookie is now standardised
Alexis La Goutte [Wed, 24 Dec 2014 09:46:41 +0000 (10:46 +0100)]
TCP: TCP Fast Open Cookie is now standardised

The kind for TFO is 34

Split dissect TFO option in dedicated function (Using also in TCP Option Experimental with Magic 0xf989)

Change-Id: I18ff9ba110fba708a955f448f272ec7c4a7e264e
Reviewed-on: https://code.wireshark.org/review/6033
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agopacket-git.c says it was copied from packet-pop, but that doesn't mean
Stephen Fisher [Wed, 24 Dec 2014 22:59:59 +0000 (15:59 -0700)]
packet-git.c says it was copied from packet-pop, but that doesn't mean
packet-git is for "RFC 1939" (POP3), so remove that comment.

Change-Id: Ia78ea18beb1a13ab0ad1ad5a87f7b5a887fad918
Reviewed-on: https://code.wireshark.org/review/6041
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoTCP: fix indent and reorder Multipath TCP
Alexis La Goutte [Wed, 24 Dec 2014 09:49:58 +0000 (10:49 +0100)]
TCP: fix indent and reorder Multipath TCP

Change-Id: I4ebe474f2a2787c350fe8c4a2de5c35d94d9b064
Reviewed-on: https://code.wireshark.org/review/6032
Reviewed-by: Matthieu Coudron <mattator@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoGIOP dissector doesn't handle two packets in a row
Hadriel Kaplan [Tue, 23 Dec 2014 21:34:01 +0000 (16:34 -0500)]
GIOP dissector doesn't handle two packets in a row

Make the GIOP TCP-based dissector correctly handle multiple GIOP
messages in a TCP segment, and when the second is malformed.

Bug: 10760
Change-Id: Ie82a1d72a43218e50c6856028a5ef25ad1f0c340
Reviewed-on: https://code.wireshark.org/review/6025
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoReplace fc_to_str with address_to_str or tvb_fc_to_str.
Michael Mann [Sun, 21 Dec 2014 18:51:20 +0000 (13:51 -0500)]
Replace fc_to_str with address_to_str or tvb_fc_to_str.

Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea
Reviewed-on: https://code.wireshark.org/review/6035
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 agoRSVP: fix display of unknown Juniper Attribut
Alexis La Goutte [Wed, 24 Dec 2014 15:42:23 +0000 (16:42 +0100)]
RSVP: fix display of unknown Juniper Attribut

Get "Trying to fetch an unsigned integer with length" when length > 4

Change-Id: If5e53b826d98f2c30253ea852754f856e1d29088
Reviewed-on: https://code.wireshark.org/review/6038
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoRSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpo...
Alexis La Goutte [Wed, 24 Dec 2014 15:16:26 +0000 (16:16 +0100)]
RSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpoint (INVALID == a.x.y.z ...)

Change-Id: I70f6afd41eefddb42829c3d5f890ea67dcd65537
Reviewed-on: https://code.wireshark.org/review/6037
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agotest suite: (Minor) fix some double space
Alexis La Goutte [Wed, 24 Dec 2014 09:25:32 +0000 (10:25 +0100)]
test suite: (Minor) fix some double space

Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3
Reviewed-on: https://code.wireshark.org/review/6031
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203)
Alexis La Goutte [Mon, 22 Dec 2014 19:56:15 +0000 (20:56 +0100)]
Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203)

Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60
Reviewed-on: https://code.wireshark.org/review/5996
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoQt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209)
Alexis La Goutte [Mon, 22 Dec 2014 19:54:10 +0000 (20:54 +0100)]
Qt (KeyPressEvent): Missing break in switch (CID 1159205115920611592081159209)

Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d
Reviewed-on: https://code.wireshark.org/review/5995
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoMove twelve show_version() functions from the varoius programs and
Stephen Fisher [Tue, 23 Dec 2014 21:58:38 +0000 (14:58 -0700)]
Move twelve show_version() functions from the varoius programs and
Wireshark UI files into a single one in wsutil.

Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad
Reviewed-on: https://code.wireshark.org/review/6026
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoPut a C comment in dummy.cpp so the user knows where dummy.cpp came from
Stephen Fisher [Wed, 24 Dec 2014 00:55:48 +0000 (17:55 -0700)]
Put a C comment in dummy.cpp so the user knows where dummy.cpp came from
if it is ever created during the build process.

Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360
Reviewed-on: https://code.wireshark.org/review/6030
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agocanopen: Verbosity for INFO column
Enrico Jorns [Tue, 25 Nov 2014 09:34:19 +0000 (10:34 +0100)]
canopen: Verbosity for INFO column

Display basic information about what is going on in the INFO column to
ease protocol debugging.

Change-Id: I2a3aba8008bf65ab9e236a3d81335cf723b2edd0
Reviewed-on: https://code.wireshark.org/review/5521
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 agoTDS: Missing break in switch (CID 280475 & 281377)
Alexis La Goutte [Mon, 22 Dec 2014 19:17:46 +0000 (20:17 +0100)]
TDS: Missing break in switch (CID 280475 & 281377)

Change-Id: I9416e07f497081f7117e8c3ccb741ea601de9cdd
Reviewed-on: https://code.wireshark.org/review/5993
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoInsert URLs for finding Wireshark's dependencies in README.bsd
Stephen Fisher [Wed, 24 Dec 2014 00:30:21 +0000 (17:30 -0700)]
Insert URLs for finding Wireshark's dependencies in README.bsd

Change-Id: Idb49181672b83eb4c074409f5b7487cce054833f
Reviewed-on: https://code.wireshark.org/review/6029
Reviewed-by: Stephen Fisher <sfisher@sdf.org>