aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-12-24Move twelve show_version() functions from the varoius programs andStephen Fisher14-190/+32
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-24Put a C comment in dummy.cpp so the user knows where dummy.cpp came fromStephen Fisher1-1/+1
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-24canopen: Verbosity for INFO columnEnrico Jorns1-152/+176
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-24TDS: Missing break in switch (CID 280475 & 281377)Alexis La Goutte1-0/+2
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-24Insert URLs for finding Wireshark's dependencies in README.bsdStephen Fisher1-7/+23
Change-Id: Idb49181672b83eb4c074409f5b7487cce054833f Reviewed-on: https://code.wireshark.org/review/6029 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23Update README.bsd, mainly to put just the primary dependencies thatStephen Fisher1-12/+11
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-23Change version info string "without locale" to "with default locale" soStephen Fisher1-1/+1
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-23packet-reload needs conversation.h stillStephen Fisher1-0/+1
Change-Id: I75415dfcfa1c63bd9c43b7bedab2ac3873a60326 Reviewed-on: https://code.wireshark.org/review/6024 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23Add .mailmap: fix duplicate/wrong e-mail or name in commit logAlexis La Goutte2-0/+47
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-23Deleting unnecessary #includes from dissectors.Martin Mathieson102-167/+0
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-23Restore prefs.h for ipv6 tooMartin Mathieson1-0/+1
Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089 Reviewed-on: https://code.wireshark.org/review/6020 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23Adding back epan/prefs.h to try to fix buildMartin Mathieson1-0/+1
Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239 Reviewed-on: https://code.wireshark.org/review/6019 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23Deleting unnecessary #includes from dissectors.Martin Mathieson57-82/+0
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[column utils] fix warning: unknown command tag name ↵Alexis La Goutte1-1/+1
[-Wdocumentation-unknown-command] Change-Id: I5a14875b4b61ae7635095bdf9f2ab18dd9dbfc09 Reviewed-on: https://code.wireshark.org/review/6012 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23DOCSIS: missing break in switch (CID 280485 & 280486)Alexis La Goutte2-0/+2
Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd Reviewed-on: https://code.wireshark.org/review/5994 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23Qt (emitAppSignal): Missing break in switch (CID 1159204)Alexis La Goutte1-0/+1
Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3 Reviewed-on: https://code.wireshark.org/review/6000 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23Restore stdlib.h (should not have been deleted - mispelt in script)Martin Mathieson1-0/+1
Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182 Reviewed-on: https://code.wireshark.org/review/6015 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23epan/llcsaps.h was needed, so restore includeMartin Mathieson1-0/+1
Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0 Reviewed-on: https://code.wireshark.org/review/6014 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-23Deleting unneccessary #includes from dissectors.Martin Mathieson72-129/+0
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-23RTPS: Missing break in switch (CID 996922)Alexis La Goutte1-1/+1
Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e Reviewed-on: https://code.wireshark.org/review/5992 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060)Alexis La Goutte1-1/+3
Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d Reviewed-on: https://code.wireshark.org/review/5991 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23NASDAQ ITCH: Missing break in switch (CID 280465)Alexis La Goutte1-0/+1
Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e Reviewed-on: https://code.wireshark.org/review/5990 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23ISNS: Missing break in switch (CID 280460)Alexis La Goutte1-0/+1
Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1 Reviewed-on: https://code.wireshark.org/review/5989 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decodingAlexis La Goutte1-3/+3
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-23NDPS: Missing break in switch (CID 281286)Alexis La Goutte1-0/+1
Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3 Reviewed-on: https://code.wireshark.org/review/5988 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23test suite: fix indent (use tabs) and add modelinesAlexis La Goutte3-50/+61
Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0 Reviewed-on: https://code.wireshark.org/review/5985 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23Makefile (epan/dissectors): fix indent (use tabs)Alexis La Goutte1-1/+1
Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b Reviewed-on: https://code.wireshark.org/review/5984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23CMake (epan/CMakeList.txt): fix indent (use tabs)Alexis La Goutte1-72/+72
Change-Id: I40e05f1e4430eadc480134cd62dd01f978353b67 Reviewed-on: https://code.wireshark.org/review/5983 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23UseLemon (CMake): Fix indent (use space)Alexis La Goutte1-1/+1
Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540 Reviewed-on: https://code.wireshark.org/review/5982 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23kerberos: Re-add needed #include <stdio.h>Bill Meier2-6/+10
Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa Reviewed-on: https://code.wireshark.org/review/6011 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier198-1143/+745
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmakeBill Meier1-4/+5
Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7 Reviewed-on: https://code.wireshark.org/review/6007 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23Cmake: check for popcount, and build it from wsutil/popcount.c if missing.Guy Harris3-0/+11
Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170 Reviewed-on: https://code.wireshark.org/review/6006 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-23Try to fix Windows build for popcount() unresolved external symbolStephen Fisher1-0/+1
Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68 Reviewed-on: https://code.wireshark.org/review/6005 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23packet-dtls.c still needs conversation.hStephen Fisher1-0/+1
Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276 Reviewed-on: https://code.wireshark.org/review/6004 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23Move popcount() to an optionally built part of wsutil for systems thatStephen Fisher5-15/+89
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-22Include <math.h> or <stdlib.h> as necessary to declare functions.Guy Harris1-0/+1
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-22Include <math.h> or <stdlib.h> as necessary to declare functions.Guy Harris4-1/+4
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-22First batch of unincludes. Last attempt...Martin Mathieson112-167/+0
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-22Cast a parameter in the kerberos dissector so it compiles withoutStephen Fisher2-2/+2
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-22Qt: Add methods to CaptureFile and WiresharkApplication.Gerald Combs11-87/+137
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-22Revert "Move packet-kerberos.c to the dirty dissectors because it generates ↵Alexis La Goutte1-1/+1
warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:" This reverts commit d4ff430b4dc5cf0e3efaabd2ef53778070def558. Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b Reviewed-on: https://code.wireshark.org/review/5975 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22packet-couchbase.c: remove field which does not existsSergey Avseyev1-2/+0
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-22Fix unknown command tag name [-Wdocumentation-unknown-command]Alexis La Goutte11-17/+16
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 Reviewed-on: https://code.wireshark.org/review/5979 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22fix warning: parameter 'list' not found in the function declaration ↵Alexis La Goutte1-1/+0
[-Wdocumentation] Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079 Reviewed-on: https://code.wireshark.org/review/5978 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22ANSI MAP: Remove from Dirty ASN1 listAlexis La Goutte2-2/+2
Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf Reviewed-on: https://code.wireshark.org/review/5977 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22ANSI_MAP: Fix unused function (by add to .OMIT list)Alexis La Goutte2-236/+48
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-22PTP: Fix ptp_tree may be used uninitialized in this function ↵Alexis La Goutte1-1/+1
[-Werror=maybe-uninitialized] Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545 Reviewed-on: https://code.wireshark.org/review/5974 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22remove unnecessary integer overflow checksMartin Kaiser1-23/+4
... 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-22Fix The left operand of '!=' is a garbage value issue found by Clang AnalyzerAlexis La Goutte2-2/+2
Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2 Reviewed-on: https://code.wireshark.org/review/5952 Reviewed-by: Anders Broman <a.broman58@gmail.com>