Commit Graph

56405 Commits

Author SHA1 Message Date
Bill Meier b68fb9b659 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>
2014-12-26 20:55:25 +00:00
Michael Mann 4cf6583b9e 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>
2014-12-26 20:41:49 +00:00
Pascal Quantin a442a1c0e8 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>
2014-12-26 18:58:07 +00:00
Bill Meier f2224bc578 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>
2014-12-26 07:26:33 +00:00
Martin Mathieson adb81f335d 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>
2014-12-25 22:43:20 +00:00
Alexis La Goutte 9c7c72d5f2 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>
2014-12-25 21:11:22 +00:00
Guy Harris e08eba9b9e 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>
2014-12-25 21:03:45 +00:00
Hadriel Kaplan ceeeea089a 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>
2014-12-25 15:14:36 +00:00
Hadriel Kaplan 2391a436e6 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>
2014-12-25 15:13:56 +00:00
Guy Harris de8c81cd92 Use getopt_long().
Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10
Reviewed-on: https://code.wireshark.org/review/6048
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-25 09:14:47 +00:00
Guy Harris 20503c7047 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>
2014-12-25 01:11:10 +00:00
Ilya Gavrilov b6f70ed3f8 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>
2014-12-25 00:28:50 +00:00
Guy Harris 2233ef59c9 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>
2014-12-25 00:13:55 +00:00
Guy Harris 153c63d3ff 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>
2014-12-24 23:55:15 +00:00
Guy Harris c01bad2c90 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>
2014-12-24 23:38:24 +00:00
Alexis La Goutte 499a7d0f0a 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>
2014-12-24 23:02:58 +00:00
Stephen Fisher 59bdad31ad 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>
2014-12-24 23:02:29 +00:00
Alexis La Goutte 1bbe6e6411 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>
2014-12-24 22:59:54 +00:00
Hadriel Kaplan 4b6141bf22 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>
2014-12-24 21:26:55 +00:00
Michael Mann e03ffe2583 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>
2014-12-24 18:59:14 +00:00
Alexis La Goutte d3888ff69f 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>
2014-12-24 17:44:08 +00:00
Alexis La Goutte 762bb18b9d 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>
2014-12-24 17:42:37 +00:00
Alexis La Goutte 04a1f332b1 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>
2014-12-24 17:39:49 +00:00
Alexis La Goutte bfa9ddfa6c 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>
2014-12-24 17:03:11 +00:00
Alexis La Goutte 4876016bda Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209)
Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d
Reviewed-on: https://code.wireshark.org/review/5995
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24 17:02:05 +00:00
Stephen Fisher 2d8ec49ffa 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>
2014-12-24 16:51:45 +00:00
Stephen Fisher 45daef629d 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>
2014-12-24 16:41:00 +00:00
Enrico Jorns 29d02a3134 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>
2014-12-24 14:57:49 +00:00
Alexis La Goutte a0e9fe5f43 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>
2014-12-24 13:16:20 +00:00
Stephen Fisher 37773b7226 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>
2014-12-24 00:31:14 +00:00
Stephen Fisher bcbfe79a64 Update README.bsd, mainly to put just the primary dependencies that
Wireshark needs and remove the others since GTK2/GTK3/Qt require
different things and those may change over time so let those programs
tell the user what they need.

Change-Id: I64d038564f6151d4a46d986e677f2cdc13ff87f2
Reviewed-on: https://code.wireshark.org/review/6028
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 23:13:04 +00:00
Stephen Fisher afbdf1043f Change version info string "without locale" to "with default locale" so
it doesn't sound as though something is missing.

Change-Id: Ifa584357c4613fd898824db011329971c9561c41
Reviewed-on: https://code.wireshark.org/review/6027
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 22:26:14 +00:00
Stephen Fisher 7d87adf5cd packet-reload needs conversation.h still
Change-Id: I75415dfcfa1c63bd9c43b7bedab2ac3873a60326
Reviewed-on: https://code.wireshark.org/review/6024
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 20:43:54 +00:00
Alexis La Goutte 0b6adfc7d0 Add .mailmap: fix duplicate/wrong e-mail or name in commit log
It will be reused form generate AUTHORS file

Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc
Reviewed-on: https://code.wireshark.org/review/5841
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-23 19:11:28 +00:00
Martin Mathieson 7e8a4b0927 Deleting unnecessary #includes from dissectors.
Fourth batch (packet-mac-lte.c -> packet-rtp.c).

Will look at cleaning up and committing script afterwards.

Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644
Reviewed-on: https://code.wireshark.org/review/6023
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 17:16:40 +00:00
Martin Mathieson 9d7709e7b7 Restore prefs.h for ipv6 too
Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089
Reviewed-on: https://code.wireshark.org/review/6020
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 15:16:04 +00:00
Martin Mathieson 78edcffdd0 Adding back epan/prefs.h to try to fix build
Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239
Reviewed-on: https://code.wireshark.org/review/6019
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 15:03:39 +00:00
Martin Mathieson 86ed26f0b8 Deleting unnecessary #includes from dissectors.
Third batch (packet-icmpv6.c -> packet-mac-lte.c).

Will look at cleaning up and committing script afterwards.

Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640
Reviewed-on: https://code.wireshark.org/review/6018
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 14:44:28 +00:00
Alexis La Goutte 377555e5cb [column utils] fix warning: unknown command tag name [-Wdocumentation-unknown-command]
Change-Id: I5a14875b4b61ae7635095bdf9f2ab18dd9dbfc09
Reviewed-on: https://code.wireshark.org/review/6012
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23 13:59:52 +00:00
Alexis La Goutte c670adc677 DOCSIS: missing break in switch (CID 280485 & 280486)
Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd
Reviewed-on: https://code.wireshark.org/review/5994
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23 13:58:37 +00:00
Alexis La Goutte 91cc34343f Qt (emitAppSignal): Missing break in switch (CID 1159204)
Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3
Reviewed-on: https://code.wireshark.org/review/6000
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23 13:55:50 +00:00
Martin Mathieson 35949f3c89 Restore stdlib.h (should not have been deleted - mispelt in script)
Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182
Reviewed-on: https://code.wireshark.org/review/6015
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:57:33 +00:00
Martin Mathieson 28e24adadd epan/llcsaps.h was needed, so restore include
Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0
Reviewed-on: https://code.wireshark.org/review/6014
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:39:06 +00:00
Martin Mathieson 48db2548a9 Deleting unneccessary #includes from dissectors.
Second batch (packet-eth.c -> packet-icmpv6.d).

Will look at cleaning up and committing script afterwards.

Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594
Reviewed-on: https://code.wireshark.org/review/6013
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23 12:22:54 +00:00
Alexis La Goutte 0e78f7eb0e RTPS: Missing break in switch (CID 996922)
Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e
Reviewed-on: https://code.wireshark.org/review/5992
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:54:07 +00:00
Alexis La Goutte b87b3db7b4 NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060)
Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d
Reviewed-on: https://code.wireshark.org/review/5991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:52:54 +00:00
Alexis La Goutte 216cc12ff4 NASDAQ ITCH: Missing break in switch (CID 280465)
Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e
Reviewed-on: https://code.wireshark.org/review/5990
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:51:02 +00:00
Alexis La Goutte 4df23062b6 ISNS: Missing break in switch (CID 280460)
Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1
Reviewed-on: https://code.wireshark.org/review/5989
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:49:29 +00:00
Alexis La Goutte f1038652c6 RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding
The Flags field within RSVP RECORD_ROUTE IPv4_Subobject is decoded incorrectly.
Wireshark thinks that 0x10 bit represents Node-ID, but actually the Node-ID is encoded by bit 0x20 (per RFC 4561)

Issue reported by  Alexander Okonnikov

Bug:10799
Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948
Reviewed-on: https://code.wireshark.org/review/5944
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 11:44:58 +00:00
Alexis La Goutte f1562e283c NDPS: Missing break in switch (CID 281286)
Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3
Reviewed-on: https://code.wireshark.org/review/5988
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:29:59 +00:00