Commit Graph

56405 Commits

Author SHA1 Message Date
Alexis La Goutte 0fb4cdb36a 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>
2014-12-29 20:14:27 +00:00
Graham Bloice 621dbdd28a 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>
2014-12-29 20:11:58 +00:00
Bill Meier 71fe1344d5 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>
2014-12-29 19:25:04 +00:00
Bill Meier 7ca5ad926d rtsp: Fix compiler 'Shadow' warning ...
Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90
Reviewed-on: https://code.wireshark.org/review/6122
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29 18:56:05 +00:00
Bill Meier 72dedabc44 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>
2014-12-29 18:10:08 +00:00
Alexis La Goutte ea080724ba Wireshark Dialog (Qt): Add Modelines info
Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f
Reviewed-on: https://code.wireshark.org/review/6116
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29 16:36:40 +00:00
Alexis La Goutte 90ba1668b3 capture_file.h (Qt): missing ]
Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0
Reviewed-on: https://code.wireshark.org/review/6115
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29 16:35:36 +00:00
Alexis La Goutte fce9da32be Zebra: Fix some indent typo
Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8
Reviewed-on: https://code.wireshark.org/review/6114
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29 16:34:34 +00:00
Alexis La Goutte 211789cfe0 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>
2014-12-29 16:33:39 +00:00
Bill Meier 10bfe2c43f 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>
2014-12-29 16:18:57 +00:00
Michael Mann 5b088af31f 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>
2014-12-29 13:57:30 +00:00
Graham Bloice 5f2b99819b 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>
2014-12-29 11:32:57 +00:00
Gerald Combs e8ec11fb7e 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>
2014-12-29 01:42:13 +00:00
Martin Mathieson c1d9d93efb 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>
2014-12-29 01:05:20 +00:00
Martin Mathieson 85781bb78d 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>
2014-12-29 00:34:56 +00:00
Martin Mathieson 8ae669c59f 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>
2014-12-29 00:18:17 +00:00
Martin Mathieson 30edb919e7 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>
2014-12-29 00:12:45 +00:00
Martin Mathieson 518e48defe Add back string.h
Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365
Reviewed-on: https://code.wireshark.org/review/6102
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-29 00:09:07 +00:00
Martin Mathieson f21557520c 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>
2014-12-28 23:57:37 +00:00
Martin Mathieson 5efc18e3f1 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>
2014-12-28 23:47:16 +00:00
Martin Mathieson e3efb80b45 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>
2014-12-28 23:33:54 +00:00
Hadriel Kaplan 016769d7e2 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>
2014-12-28 21:26:34 +00:00
Stig Bjørlykke 5e16157de5 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>
2014-12-28 21:00:26 +00:00
Michael Mann 71c02b20eb 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>
2014-12-28 20:05:29 +00:00
Pascal Quantin 8965e90a25 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>
2014-12-28 18:17:43 +00:00
Martin Kaiser f3fd6b5528 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>
2014-12-28 17:46:07 +00:00
Graham Bloice 15a9f5dd70 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>
2014-12-28 17:08:31 +00:00
Gerald Combs 1b6da9ed92 [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>
2014-12-28 16:05:20 +00:00
Michael Mann 1d598bbff7 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>
2014-12-28 14:09:27 +00:00
Guy Harris 9fce4dd4cb 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>
2014-12-28 10:28:56 +00:00
Guy Harris 120628e5f4 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>
2014-12-28 10:19:27 +00:00
Dario Lombardo 63ebe918d9 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>
2014-12-28 00:02:39 +00:00
Guy Harris d094fca460 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>
2014-12-27 23:17:38 +00:00
Guy Harris 73af2d63ae 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>
2014-12-27 23:03:56 +00:00
Guy Harris 51e58698d2 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>
2014-12-27 20:56:42 +00:00
Hadriel Kaplan ea6f5a3c7e 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>
2014-12-27 19:40:46 +00:00
Pascal Quantin 25c7e0d9df 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>
2014-12-27 17:03:24 +00:00
Pascal Quantin 1ae0c4a643 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>
2014-12-27 16:00:53 +00:00
Pascal Quantin 0ea310dd2f 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>
2014-12-27 15:36:30 +00:00
Michael Mann a1c634180e 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>
2014-12-27 14:46:22 +00:00
Guy Harris c04aebd761 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>
2014-12-27 10:58:11 +00:00
Pascal Quantin ca6f84916f 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>
2014-12-27 10:44:45 +00:00
Guy Harris 4536271c0a 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>
2014-12-27 02:47:04 +00:00
Guy Harris 0a0ce2b78f 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>
2014-12-27 02:21:35 +00:00
Pascal Quantin eff91ed57f 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>
2014-12-26 22:43:35 +00:00
Guy Harris c2c9a09880 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>
2014-12-26 22:39:46 +00:00
Pascal Quantin 2c6d2bb1e5 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>
2014-12-26 22:37:33 +00:00
Pascal Quantin a2beef95db 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>
2014-12-26 22:18:09 +00:00
Pascal Quantin ea6a5780c5 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>
2014-12-26 21:50:24 +00:00
Michael Mann 3d3f97320b 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>
2014-12-26 21:17:10 +00:00