Commit Graph

56162 Commits

Author SHA1 Message Date
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
Alexis La Goutte cd558218f7 test suite: fix indent (use tabs) and add modelines
Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0
Reviewed-on: https://code.wireshark.org/review/5985
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:27:48 +00:00
Alexis La Goutte c3d7080485 Makefile (epan/dissectors): fix indent (use tabs)
Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b
Reviewed-on: https://code.wireshark.org/review/5984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:09:44 +00:00
Alexis La Goutte 72085918fb CMake (epan/CMakeList.txt): fix indent (use tabs)
Change-Id: I40e05f1e4430eadc480134cd62dd01f978353b67
Reviewed-on: https://code.wireshark.org/review/5983
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:08:59 +00:00
Alexis La Goutte b5ff13ab61 UseLemon (CMake): Fix indent (use space)
Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540
Reviewed-on: https://code.wireshark.org/review/5982
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23 07:08:10 +00:00
Bill Meier 3d05935f74 kerberos: Re-add needed #include <stdio.h>
Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa
Reviewed-on: https://code.wireshark.org/review/6011
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 06:03:04 +00:00
Bill Meier dd859eada4 asn1 generated dissectors: cleanup #include usage
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:39:00 +00:00
Bill Meier 17582d345d asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmake
Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7
Reviewed-on: https://code.wireshark.org/review/6007
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:38:22 +00:00
Guy Harris 1b37f4c5ef Cmake: check for popcount, and build it from wsutil/popcount.c if missing.
Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170
Reviewed-on: https://code.wireshark.org/review/6006
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-23 05:04:17 +00:00
Stephen Fisher 4009231b2c Try to fix Windows build for popcount() unresolved external symbol
Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68
Reviewed-on: https://code.wireshark.org/review/6005
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:45:08 +00:00
Stephen Fisher ae6df38436 packet-dtls.c still needs conversation.h
Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276
Reviewed-on: https://code.wireshark.org/review/6004
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:23:31 +00:00
Stephen Fisher 3d62d2c396 Move popcount() to an optionally built part of wsutil for systems that
provide their own popcount().

Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33
Reviewed-on: https://code.wireshark.org/review/5998
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:22:23 +00:00
Guy Harris 59b4ab53fc Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28
Reviewed-on: https://code.wireshark.org/review/6002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:52:08 +00:00
Guy Harris d541774a61 Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742
Reviewed-on: https://code.wireshark.org/review/5999
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:24:15 +00:00
Martin Mathieson 596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Stephen Fisher b0181288e2 Cast a parameter in the kerberos dissector so it compiles without
warnings on NetBSD.

Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb
Reviewed-on: https://code.wireshark.org/review/5987
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-22 19:43:30 +00:00
Gerald Combs 5cdad9fe42 Qt: Add methods to CaptureFile and WiresharkApplication.
Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add
application name and title separator convenience methods to
WiresharkApplication.

Convert traffic tables, conversations, and endpoints to use CaptureFile
directly and to let the user know when the capture file is closed. Set
the file dialog titles while we're here.

Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13
Reviewed-on: https://code.wireshark.org/review/5957
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-22 18:12:31 +00:00
Alexis La Goutte 30c3d394ad Revert "Move packet-kerberos.c to the dirty dissectors because it generates warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:"
This reverts commit d4ff430b4d.

Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b
Reviewed-on: https://code.wireshark.org/review/5975
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22 17:11:28 +00:00
Sergey Avseyev 352bd87486 packet-couchbase.c: remove field which does not exists
Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966
Reviewed-on: https://code.wireshark.org/review/5981
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 16:17:25 +00:00
Alexis La Goutte 5248c0df21 Fix unknown command tag name [-Wdocumentation-unknown-command]
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976
Reviewed-on: https://code.wireshark.org/review/5979
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:24:28 +00:00
Alexis La Goutte ed2df3beaf fix warning: parameter 'list' not found in the function declaration [-Wdocumentation]
Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079
Reviewed-on: https://code.wireshark.org/review/5978
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:52 +00:00
Alexis La Goutte f8720a6e44 ANSI MAP: Remove from Dirty ASN1 list
Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf
Reviewed-on: https://code.wireshark.org/review/5977
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:25 +00:00
Alexis La Goutte 414701dfcb ANSI_MAP: Fix unused function (by add to .OMIT list)
Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30
warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function]
warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function]
Reviewed-on: https://code.wireshark.org/review/5976
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:17 +00:00
Alexis La Goutte 3cb816ccb7 PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized]
Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545
Reviewed-on: https://code.wireshark.org/review/5974
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:22:36 +00:00
Martin Kaiser 67cbafaa46 remove unnecessary integer overflow checks
... and don't call THROW() from a dissector

If we have a guint32 a and interpret 2*a as gint, we'll always end up
with a negative value if 2*a overflows. Both tvb_get_string_enc() and
proto_tree_add_item() handle this case and throw an exception.

Change-Id: Ibb142328837b6a583057531c76d08631fc731848
Reviewed-on: https://code.wireshark.org/review/5948
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 08:17:40 +00:00
Alexis La Goutte 9b3f9b711a Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer
Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2
Reviewed-on: https://code.wireshark.org/review/5952
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-22 07:38:57 +00:00
Doug Brown 37940ee5ad Fix AARP AppleTalk address parsing
AppleTalk addresses are 3 bytes long and stored in AARP packets as 4 bytes.
The high byte should be 0, followed by 2-byte network number, followed by
1-byte node number.

The previous code was assuming that the high two bytes were the network number,
followed by the 1-byte node number, followed by 0.

Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3
Reviewed-on: https://code.wireshark.org/review/5968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 06:57:42 +00:00
Guy Harris 7b721a1c0e Squelch a compiler warning.
("Can't happen", but that requires more dataflow analysis than some
compilers do.)

Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac
Reviewed-on: https://code.wireshark.org/review/5972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 06:42:59 +00:00
Bill Meier 998a84774b plugins: Cleanup #includes
Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c
Mostly: remove '#include <glib/glib.h>' and certain
         other #includes already included in packet.h
Reviewed-on: https://code.wireshark.org/review/5971
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-22 05:00:20 +00:00
Bill Meier 971d4e4ad1 stats_tree: g_sprintf()-->g_snprintf(); cleanup #includes.
Change-Id: I862fed818cd1f14584b082f87b1d4d305cf78687
Reviewed-on: https://code.wireshark.org/review/5970
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-22 04:59:47 +00:00
Bill Meier 94eeaf10f2 print.c: clean up #includes
Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4
Reviewed-on: https://code.wireshark.org/review/5969
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-22 04:59:19 +00:00
Guy Harris 4cb19d48f5 Use the messageLength field to indicate the message length.
Check it for sanity (and report errors), and use it to set the length of
the PTP packet tvbuff and the PTP top-level protocol item.

Bug: 10611
Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb
Reviewed-on: https://code.wireshark.org/review/5967
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 03:33:42 +00:00
Ebben Aries 859360a6c4 BGP : Update BGP-LS Attribute + Display NEXT_HOP
From IANA page: http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml

Change-Id: Ibc85dccee94aa69306c88b48d680e48fede08f2e
Reviewed-on: https://code.wireshark.org/review/5965
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-22 02:58:55 +00:00
sfd a5a25658ed Removing ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is properly handled by the Ethernet dissector.
Bug: 10611
Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4
Reviewed-on: https://code.wireshark.org/review/5964
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 02:31:15 +00:00
Gerald Combs 8076f29fdb Qt: Fix status bar signal.
Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35
Reviewed-on: https://code.wireshark.org/review/5963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-22 00:42:15 +00:00
Guy Harris 8228bcfeec Wrong array.
Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162
Reviewed-on: https://code.wireshark.org/review/5962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 00:16:06 +00:00
Guy Harris 147ca45683 Improve the message for "this field has an integral type" assertions.
(Along the lines of provious changes.)

Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039
Reviewed-on: https://code.wireshark.org/review/5961
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 00:09:36 +00:00
Guy Harris c30aa115fe Register the ORFEntry IP address as an IPv4 address.
We're adding it with proto_tree_add_ipv4(), so that it's displayed as,
and can be tested as, an IPv4 address.  That means that the field for it
must be of type FT_IPv4, *even though it's calculated from an 8-bit
prefix value* - you can't make it an FT_UINT8.

Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b
Reviewed-on: https://code.wireshark.org/review/5960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 23:36:04 +00:00
Guy Harris 48419fc2b7 Improve the message for "this field doesn't have the right type" assertions.
Give the field name in the message.

Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8
Reviewed-on: https://code.wireshark.org/review/5959
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 23:17:39 +00:00
Guy Harris 0be413e270 Move another helper macro.
Change-Id: Id3801373526af57146a87abe9698b192074a0fa0
Reviewed-on: https://code.wireshark.org/review/5958
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 22:10:08 +00:00
Guy Harris 5d30a3cb41 Define helper macros before they're used.
The code works if they're defined afterwards, but defining them earlier
makes it a bit clearer that they're helper macros used as components of
the macros we're exporting.

Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004
Reviewed-on: https://code.wireshark.org/review/5956
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 21:45:09 +00:00
Guy Harris c96858b5fe Use the "netbios" heuristic dissector list elsewhere.
Use find_heur_dissector_list() to find the "netbios" heuristic dissector
list, rather than using code from packet-netbios.c.

Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb
Reviewed-on: https://code.wireshark.org/review/5955
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 21:07:17 +00:00
Pascal Quantin 9407160e05 Do not use packet scoped memory in GUI
It will trigger an assertion

Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b
Reviewed-on: https://code.wireshark.org/review/5953
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21 20:47:48 +00:00
Pascal Quantin ccf0573fcd Qt: rename SummaryDialog class to CaptureFilePropertiesDialog
Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2
Reviewed-on: https://code.wireshark.org/review/5929
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>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21 18:52:46 +00:00