summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-25VoIP Calls: Missing break in switch (CID 1155515)Alexis La Goutte1-0/+1
Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b Reviewed-on: https://code.wireshark.org/review/6001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-25Only include <wsutil/os_version_info.h> if we need it.Guy Harris8-8/+2
Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6 Reviewed-on: https://code.wireshark.org/review/6051 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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 Kaplan3-35/+172
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-25Use getopt_long().Guy Harris1-1/+9
Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10 Reviewed-on: https://code.wireshark.org/review/6048 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-25Check for getopt_long(), not getopt().Guy Harris17-22/+24
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 NBAP: fix ddi missed for non first macdflow_id in E-DCH channelIlya Gavrilov2-8/+6
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-25Include some files based on whether the functions they define are present.Guy Harris1-3/+12
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-24Don't use extra variables for ws_mempbrk_sse42.c and popcount.cGuy Harris1-14/+8
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-24Add -msse4.2 to the compiler flags if it's supported.Guy Harris1-0/+3
Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce Reviewed-on: https://code.wireshark.org/review/6042 Reviewed-by: Guy Harris <guy@alum.mit.edu>
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 Mann7-24/+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-24test suite: (Minor) fix some double spaceAlexis La Goutte2-4/+4
Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3 Reviewed-on: https://code.wireshark.org/review/6031 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203)Alexis La Goutte1-0/+2
Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60 Reviewed-on: https://code.wireshark.org/review/5996 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, ↵Alexis La Goutte4-0/+7
1159209) Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d Reviewed-on: https://code.wireshark.org/review/5995 Reviewed-by: Anders Broman <a.broman58@gmail.com>
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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 21:45:33 +0000