aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-12-26Fix some dissectors doing termio (fprintf(stderr,..), g_warning()).Bill Meier10-48/+54
- 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-26Remove proto_tree_add_text from ZigBee dissectors.Michael Mann7-482/+638
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-26WCCP: initialize address table to 0Pascal Quantin1-2/+2
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-26rpc: Prevent "malformed" for RPC 'NULL proc' packets.Bill Meier1-1/+1
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-25Deleting unnecessary #includes from dissectors.Martin Mathieson116-204/+0
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-25Lua accessor for Protocol field type gets wrong dataHadriel Kaplan1-2/+21
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-25Bug 10233 - Wireshark crashes if Lua heuristic dissector returns trueHadriel Kaplan2-7/+17
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 NBAP: fix ddi missed for non first macdflow_id in E-DCH channelIlya Gavrilov1-4/+3
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-24TCP: TCP Fast Open Cookie is now standardisedAlexis La Goutte1-17/+55
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-24packet-git.c says it was copied from packet-pop, but that doesn't meanStephen Fisher1-1/+0
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-24TCP: fix indent and reorder Multipath TCPAlexis La Goutte1-21/+21
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-24GIOP dissector doesn't handle two packets in a rowHadriel Kaplan1-6/+9
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-24Replace fc_to_str with address_to_str or tvb_fc_to_str.Michael Mann6-23/+12
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-24RSVP: fix display of unknown Juniper AttributAlexis La Goutte1-2/+2
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-24RSVP: Conversations / Endpoint: wrong filter when select a RSVP ↵Alexis La Goutte1-3/+14
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-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-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-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-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-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-23kerberos: Re-add needed #include <stdio.h>Bill Meier1-6/+8
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 Meier99-874/+675
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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 Fisher1-15/+4
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 Fisher1-1/+1
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-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 Goutte7-11/+9
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 Goutte1-236/+45
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>