aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-12-31Do the full string in get_{compiled,runtime}_version_info().Guy Harris15-108/+102
Have them start the string with "Compiled" or "Running on", and return the string when done. Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 Reviewed-on: https://code.wireshark.org/review/6155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31tshark: endpoints statistics are not supported for now, do not list them in -zPascal Quantin2-24/+27
Move statistics registration to "GUI" callback registration Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc Reviewed-on: https://code.wireshark.org/review/6151 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris24-279/+148
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31Remove proto_tree_add_text from packet-dcerpc-pn-io.cMichael Mann1-3/+7
Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d Reviewed-on: https://code.wireshark.org/review/6152 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Test suite: Start testing our output for valid UTF-8.Gerald Combs5-99/+131
Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a couple of the Bluetooth dissectors and X11 keysyms accordingly. Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd Reviewed-on: https://code.wireshark.org/review/6146 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30Qt: More WiresharkDialog conversions.Gerald Combs7-80/+73
Convert the Follow Stream and Export Objects dialogs. Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50 Reviewed-on: https://code.wireshark.org/review/6126 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw()Martin Kaiser1-1/+5
Bug: 10740 Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0 Reviewed-on: https://code.wireshark.org/review/6145 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30Fix IPv6/IPX statistics generationPascal Quantin1-6/+6
Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first Bug: 10813 Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906 Reviewed-on: https://code.wireshark.org/review/6140 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Websocket: use pinfo pool and not packet one for the unmasked data tvbPascal Quantin1-3/+3
As indicated in README.wmem, pinfo pool must be used for anything that might end up being passed to add_new_data_source Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a Reviewed-on: https://code.wireshark.org/review/6144 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-30clean up the part where dissect_websocket() is called recursivelyMartin Kaiser1-2/+5
Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283 Reviewed-on: https://code.wireshark.org/review/6143 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30use packet-scoped memory for the unmasked data tvbMartin Kaiser1-5/+2
Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4 Reviewed-on: https://code.wireshark.org/review/6142 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30skip the payload if it's emptyMartin Kaiser1-2/+4
Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2 Reviewed-on: https://code.wireshark.org/review/6141 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30Qt: Continue using the new window title format.Gerald Combs10-20/+16
Update several dialog titles to "Wireshark · <subtile...>". Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9 Reviewed-on: https://code.wireshark.org/review/6127 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30no need for if(tree)Martin Kaiser1-5/+3
Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267 Reviewed-on: https://code.wireshark.org/review/6138 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-30.mailmap: Add Hadriel KaplanAlexis La Goutte1-0/+1
Change-Id: Iddab5a98e47d90fe4a7e6fbf6b55bbb16e528415 Reviewed-on: https://code.wireshark.org/review/6136 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2014-12-30stats_tree: Make sure some structs are fully initialized.Gerald Combs1-36/+4
Get rid of a strcpy. Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4 Reviewed-on: https://code.wireshark.org/review/6130 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Qt: Convert more dialogs to WiresharkDialog.Gerald Combs14-134/+86
Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs subclasses of WiresharkDialog. Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain if the user opens more than one instance of the dialog. Use the applicationName property in WiresharkApplication instead of a separate variable. Add a preexisting item to the IO Graph bug list (hovering when the file is closed clears the graph). Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239 Reviewed-on: https://code.wireshark.org/review/6125 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30Tabs are not necessarily set every 4 spaces.Guy Harris1-121/+121
Use spaces, not tabs, for indentation; that makes the code's layout indepencent of tab settings, which might be every *8* spaces. Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e Reviewed-on: https://code.wireshark.org/review/6132 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-29Remove some proto_tree_add_text outside the dissector directory.Michael Mann2-7/+5
Change-Id: I890846a0cede755a603243b4048fb5c917b2826b Reviewed-on: https://code.wireshark.org/review/6112 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Add ability to follow UDP stream by indexPascal Quantin10-96/+194
-z "follow,udp" tshark cli command now supports a stream index It is now possible to select the UDP stream displayed in Qt GUI (like for TCP) Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d Reviewed-on: https://code.wireshark.org/review/6083 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-29TN5250: Missing break in switch (CID 280477)Alexis La Goutte1-1/+3
fix also indent typo Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab Reviewed-on: https://code.wireshark.org/review/6118 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-2/+0
by Clang Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510 Reviewed-on: https://code.wireshark.org/review/6120 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Windows build improvements:Graham Bloice2-20/+17
Added /Zo flag for VS2013 builds to add more debugging info Removed obsolete comment on unused /GS flag and obsolete /FR flag. Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related (which specified the obsolete /FR flag). Added /RELEASE flag to linker to set checksum in PE header Fixed an old typo. CMake added /INCREMENTAL:NO flag to linker to overide default and prevent warning messages. Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d Reviewed-on: https://code.wireshark.org/review/6110 Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29rtsp: Fix (what I think may be) a minor bug.Bill Meier1-14/+15
(Also fixes a compiler 'Shadow' warning in a different way than the now reverted previous fix). Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c Reviewed-on: https://code.wireshark.org/review/6123 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29rtsp: Fix compiler 'Shadow' warning ...Bill Meier1-8/+8
Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90 Reviewed-on: https://code.wireshark.org/review/6122 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio).Bill Meier1-12/+36
Also: Add an expert...() in rtsp_create_conversation() for "Unknown transport type". Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96 Reviewed-on: https://code.wireshark.org/review/6121 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29Wireshark Dialog (Qt): Add Modelines infoAlexis La Goutte2-0/+26
Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f Reviewed-on: https://code.wireshark.org/review/6116 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29capture_file.h (Qt): missing ]Alexis La Goutte1-1/+1
Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0 Reviewed-on: https://code.wireshark.org/review/6115 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Zebra: Fix some indent typoAlexis La Goutte1-2/+2
Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8 Reviewed-on: https://code.wireshark.org/review/6114 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29OpenFlow: Capatilize O and F of OpenFlow (when use Decode as)Alexis La Goutte1-2/+2
Remove also a trailing whitespace in OpenFlow TCP port preference Change-Id: I5c3f42e634e0fee4fecf1a7f2dd1c75a68165b45 Reviewed-on: https://code.wireshark.org/review/6113 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio).Bill Meier1-12/+20
Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068 Also: Replace (one of many) proto_tree_add_text() instances. Reviewed-on: https://code.wireshark.org/review/6117 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-29Eliminate proto_tree_add_text from packet-spice.cMichael Mann1-237/+291
Also do some cleanup in dissect_spice() and replace g_warning calls. Change-Id: I4dc6f6496bb5ae54157aa6f7f27f21c396da623c Reviewed-on: https://code.wireshark.org/review/6106 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-29Minor doc updates, added Windows debugging infoGraham Bloice2-34/+66
Change-Id: I7ddd6f8dead5db725c4e5f35778ce4b6f792bda9 Reviewed-on: https://code.wireshark.org/review/6096 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-29Qt: Add a WiresharkDialog convenience class.Gerald Combs20-94/+212
Add WiresharkDialog, a common base class for dialogs centered around capture files. Make it a parent of Capture File Properties, Traffic Table, Conversations, and Endpoints. Rename CaptureFile::read_only_ to file_closed_. Add methods to WiresharkApplication for generating consistent window titles. Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257 Reviewed-on: https://code.wireshark.org/review/6097 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-29Restore string.h to os_version.cMartin Mathieson1-0/+1
Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52 Reviewed-on: https://code.wireshark.org/review/6108 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-29Add back string.h to sha1.c and sober128.cMartin Mathieson2-0/+2
Change-Id: Idd8963717eab804f7d76652d1baf029be8b5997f Reviewed-on: https://code.wireshark.org/review/6105 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-29Restore string.h to md4.cMartin Mathieson1-0/+1
Change-Id: I1a2c57ea20bcb1fd22c0379f3f43d3589e497c1b Reviewed-on: https://code.wireshark.org/review/6104 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-29Add string.h back to rc4.cMartin Mathieson1-0/+1
Change-Id: Idea9369742373e4a50edb3f391bdabfeeb3a2ca7 Reviewed-on: https://code.wireshark.org/review/6103 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-29Add back string.hMartin Mathieson1-0/+1
Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365 Reviewed-on: https://code.wireshark.org/review/6102 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-28Add a couple of more needed includesMartin Mathieson2-1/+2
Change-Id: Ie160f81544c6c9b381078b555e91602617cb2700 Reviewed-on: https://code.wireshark.org/review/6101 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-28Restore string.h as OS X misses it for strlen()Martin Mathieson1-0/+1
Change-Id: If1a968d54eed97fae915b8546d8d7a65a56b82db Reviewed-on: https://code.wireshark.org/review/6100 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-28Deleting unnecessary #includes from wsutil.Martin Mathieson23-34/+1
Will look at cleaning up and committing script afterwards. Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527 Reviewed-on: https://code.wireshark.org/review/6086 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-28Expose dissector_add_for_decode_as() to LuaHadriel Kaplan1-0/+24
Allow Lua scripts to add their Protocol's dissector for "Decode as...". Bug: 10696 Change-Id: Ic270cc85eff62ccfc29d8e5fcbb48247cfcd14bd Reviewed-on: https://code.wireshark.org/review/6050 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28p_mul: Added checksum from ACP 142(A)Stig Bjørlykke1-10/+17
Bug: 10807 Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc Reviewed-on: https://code.wireshark.org/review/6076 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-12-28Create FT_FCWWN field type.Michael Mann24-311/+382
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type. Change-Id: I4ca77870499fd8239584a70874998b5d194a7167 Reviewed-on: https://code.wireshark.org/review/6036 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28Qt Follow window: keep data representation when switching between streamsPascal Quantin1-3/+3
Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61 Reviewed-on: https://code.wireshark.org/review/6091 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-28The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/sMartin Kaiser1-1/+1
Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731 Reviewed-on: https://code.wireshark.org/review/6095 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-28Move Windows build to be VS2013 based using the Community EditionGraham Bloice8-585/+295
Drop references to long obsolete compilers. Added Chocolatey installer instructions for some packages. Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646 Reviewed-on: https://code.wireshark.org/review/5986 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28[Automatic manuf, services and enterprise-numbers update for 2014-12-28]Gerald Combs4-22/+226
Change-Id: Ie1876a971a25a4c8f063ae0fce0c970a4c9efdf2 Reviewed-on: https://code.wireshark.org/review/6092 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-28Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.Michael Mann38-247/+183
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b Reviewed-on: https://code.wireshark.org/review/6060 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:13:12 +0000