aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd_session.c
AgeCommit message (Collapse)AuthorFilesLines
2017-10-26Add a ws_in6_addr typedef for struct e_in6_addr.Guy Harris1-1/+1
That allows a parallel typedef of ws_in4_addr for guint32. Change-Id: I03b230247065e0e3840eb87635315a8e523ef562 Reviewed-on: https://code.wireshark.org/review/24073 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-05sharkd: export field filter string.Jakub Zawadzki1-5/+19
This extra parameter allows to use wireshark functionality like: prepare as filter, and also apply quick filter in protocol tree (for instance show only TCP protocol fields: tcp.), Change-Id: I1f380b79e3802e6aaf646fdd4770c903ee9f3781 Reviewed-on: https://code.wireshark.org/review/23837 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04sharkd: check if JSON value is string or primitive (true/false/null/number).Jakub Zawadzki1-2/+8
Add extra check for token type, previously it was possible to pass for example: {"columns":["one","two","three"]}. Such format is not supported. Change-Id: I6ac2e3ca9eba868cd72ed886ad40745ebbc43d73 Reviewed-on: https://code.wireshark.org/review/23834 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-04sharkd: support for user column-set in "frames" request.Jakub Zawadzki1-0/+82
Change-Id: If6a10cc252f2ad362ba3a91318cedd15d954db2b Reviewed-on: https://code.wireshark.org/review/23768 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-09-27sharkd: support for frame comments.Jakub Zawadzki1-6/+22
Change-Id: If51cd6a7f4989fee16563809a997dc2f46f67c22 Reviewed-on: https://code.wireshark.org/review/23759 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-23Have sequence analysis properly use filters from taps.Michael Mann1-1/+0
Sequence analysis has its own "filtering" system that required its tap functions to look for some "filter flags". register_tap_listener() already comes with a filter argument, so use that to simplify logic of tap functions in dissectors. Also have Qt GUI for Flow Graph look like other dialogs that have a "Limit to display filter" checkbox. Change-Id: I91d9d9599309786892f5b50c98692e52651e7174 Reviewed-on: https://code.wireshark.org/review/23659 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-19Sequence (flow) analysis: fill timestamp when creating item.Jakub Zawadzki1-9/+1
Change-Id: Ie1b82d016b632162a91e2ed54a964662bc25e9d5 Reviewed-on: https://code.wireshark.org/review/23620 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-19Sequence analysis (flow graph) optimizations for dissectorsMichael Mann1-6/+0
1. Remove protocol member from seq_analysis_item_t. It's not used by any GUI, so don't burden dissectors with populating it. 2. Allow any dissector to change colors display by flow graph 3. Provide helper functions that may be common if other dissectors want to create sequence analysis. Change-Id: I04fa3c9f3cf6879ab9a8d7d6f4896b4979d010d7 Reviewed-on: https://code.wireshark.org/review/23613 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: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-18sharkd: support flows (sequence analysis)Jakub Zawadzki1-0/+151
Change-Id: Ie85295dbcfab3efe7ba05c5c9c7ae22d0c6eedec Reviewed-on: https://code.wireshark.org/review/23572 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-08sharkd: implement proper JSON string unescaping, based on JSON dissector.Jakub Zawadzki1-20/+8
Change-Id: I749b78b759f98c78526840b8bb1cbccfc17a5611 Reviewed-on: https://code.wireshark.org/review/23365 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-08-28sharkd: handle PREF_SAVE_FILENAME, PREF_OPEN_FILENAME, PREF_DIRNAME in dumpconf.Jakub Zawadzki1-4/+7
Change-Id: I17c13c274ebd31da7d7a7ebe02821cf09f77f66c Reviewed-on: https://code.wireshark.org/review/23268 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-08-19sharkd: minor changes in comments, fix style.Jakub Zawadzki1-5/+6
Change-Id: I72d856bf223cea966bd505031417bc2b4dd12f82 Reviewed-on: https://code.wireshark.org/review/23136 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-08sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.xPascal Quantin1-5/+5
Bug: 13424 Change-Id: I20e474180545d89599c346ad2c5994949d213cb0 Reviewed-on: https://code.wireshark.org/review/22045 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> 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>
2017-05-30sharkd: Fix build using system Speex library (autotools)João Valverde1-0/+4
Change-Id: I1798f3dc76704c646d67d11533f8dc32ebab7401 Reviewed-on: https://code.wireshark.org/review/21793 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-05-26Report syntax errors in UAT prefs parsingPeter Wu1-2/+10
Add the cause for a syntax error while parsing UATs. Example output: $ tshark -ouat:ssl_keys:, tshark: Invalid -o flag "uat:ssl_keys:,": ssl_keys:1: No IP address given. $ tshark -ouat:unknown:, tshark: Invalid -o flag "uat:unknown:,": Unknown preference Change-Id: I549406c4e31a81d29f487ef47bdb3c22da084947 Reviewed-on: https://code.wireshark.org/review/21748 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-05-16sharkd: add more information about currently loaded file.Jakub Zawadzki1-1/+23
Change-Id: I59c34a0c92963822f02b16479e1ebb3bca6e64f6 Reviewed-on: https://code.wireshark.org/review/21678 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-05-16sharkd: export uat records.Jakub Zawadzki1-0/+32
Move gtk's fld_tostr() to epan API as uat_fld_tostr. Change-Id: I01e3b66ca9ea3cd1e2e06e2122190ee42b9ad44b Reviewed-on: https://code.wireshark.org/review/21664 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-15sharkd: output JSON for new_stat_ API.Jakub Zawadzki1-0/+158
Change-Id: I5b4b020029f3c1587f96ca1fcf5fbfa2ee78ac31 Reviewed-on: https://code.wireshark.org/review/21628 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-17sharkd: support for "downloading" decoded RTP stream in wave-like format.Jakub Zawadzki1-16/+252
Change-Id: Ic6b241f9b7ed302e7b11644e63230474d5933a85 Reviewed-on: https://code.wireshark.org/review/20963 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-15sharkd: support for limits in sending information about rows (columns).Jakub Zawadzki1-2/+31
Suboptimal, but still much better than sending columns for whole capture file. webshark by defaults requests for 120 rows. Change-Id: I96188e0d2bc4539a57e5061c7784f8c44f318393 Reviewed-on: https://code.wireshark.org/review/20715 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-13sharkd: reduce buffer put on stack from 16K to 2KPascal Quantin1-1/+1
Change-Id: Ie86f68ed48b881f4803377a3e1ad94fcfe1947e3 Reviewed-on: https://code.wireshark.org/review/21079 Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-04-08sharkd: add tap for RTP stream analysis.Jakub Zawadzki1-0/+266
Change-Id: Idf88a891b69e4d89b2d0c62d505059ab073e266e Reviewed-on: https://code.wireshark.org/review/20816 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-03-29Squelch 64-to-32-bit narrowing warnings.Guy Harris1-2/+2
Change-Id: Ifc6938ab8deb62fc8b53c9d68504210b6fcc58f7 Reviewed-on: https://code.wireshark.org/review/20786 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-29sharkd: support exporting ssl secretsJakub Zawadzki1-0/+21
Change-Id: Ie7db733d8aa7189b1ade6ef85d911653ed8c490f Reviewed-on: https://code.wireshark.org/review/20703 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27sharkd_session.c: warning C6031: Return value ignored: 'sscanf'Michael Mann1-1/+2
Change-Id: I32f56b7b351d7096b4e97f7c61db1af8d0b3b6f0 Reviewed-on: https://code.wireshark.org/review/20729 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-27sharkd_session.c: Match printf argument with datatypeMichael Mann1-9/+9
Address complaints from vscodeanalysis. Change-Id: I0943a635eb0904a5ee392f772aa21cc3b56bc3de Reviewed-on: https://code.wireshark.org/review/20728 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-26sharkd: support for SRT and RTD taps.Jakub Zawadzki1-2/+335
Change-Id: I60b9ece77f4795cd5208e53ccd18ab010646050f Reviewed-on: https://code.wireshark.org/review/20614 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-03-19sharkd: support for expert tap.Jakub Zawadzki1-23/+106
Change-Id: I7e5b27b5c25c01f015dd8b33c541cbda2c426726 Reviewed-on: https://code.wireshark.org/review/20578 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-03-12sharkd: fix tap memleaks & support for links to frame, url & cleanupJakub Zawadzki1-25/+73
Change-Id: I08af04c7882802035344d0051055be05967fb089 Reviewed-on: https://code.wireshark.org/review/20502 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-11sharkd: support for export objects, following stream.Jakub Zawadzki1-0/+411
Change-Id: I364cb200e537ae07cbe831d8be1f217c5a15ee09 Reviewed-on: https://code.wireshark.org/review/20492 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-03-06Switch conversations to use wmem_tree_t instead of (sorted) GSList.Michael Mann1-19/+7
Change-Id: Ifaf25ca5a7974f1d398ceebbb4c6733d4d3e001a Reviewed-on: https://code.wireshark.org/review/20006 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: Anders Broman <a.broman58@gmail.com>
2017-02-28sharkd: support for rtp tap.Jakub Zawadzki1-0/+96
Change-Id: I84b542f8ace1e53f41be0b73a24aeb720c3c904a Reviewed-on: https://code.wireshark.org/review/20271 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-25Configuration dump for webshark.Jakub Zawadzki1-1/+66
Change-Id: Ideaedaaa7bf5f1244d7f6845a08e4dc36a2c798f Reviewed-on: https://code.wireshark.org/review/20083 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-24Fix sharkd compilation on some <glibc-2.16 or <gcc-4.8Jakub Zawadzki1-19/+25
- use printf() instead of fwrite(). - don't shadow stat() Bug: 13424 Change-Id: Idc8931bcc5b1387f0ce3a3bfa146ffeb5b4edc82 Reviewed-on: https://code.wireshark.org/review/20234 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: John Thacker <johnthacker@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-20Yell at the user less.Gerald Combs1-2/+2
Our user-facing messages should have a helpful (or at the very least neutral) tone. In English, exclamation points are neither. Replace a bunch of them with periods. Change-Id: I29c3b2f84c25e06aae5b559860224559053a0378 Reviewed-on: https://code.wireshark.org/review/20189 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-02sharkd: make it compile without libGeoIP.Dario Lombardo1-2/+1
Change-Id: Ief867ce8552136298bd6bd6879ec482cc5b38b6f Reviewed-on: https://code.wireshark.org/review/19887 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-01Expand a comment to give more details.Guy Harris1-1/+14
(Dear Microsoft: why did you choose not to support line buffering in the MSVC "standard I/O library" routines?) Change-Id: I5add94d2c83e73e9845fea0f355a1923fddf2deb Reviewed-on: https://code.wireshark.org/review/19890 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-01sharkd: windows supportJakub Zawadzki1-3/+4
Change-Id: I6581bacdea49416cc26431f66b093f36b39c5a67 Reviewed-on: https://code.wireshark.org/review/19829 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-27sharkd(session): Fix Value stored to 'frame' during its initialization is ↵Alexis La Goutte1-1/+1
never read Change-Id: Ia7e351167edc0ca5c48e284bee0c940bba12c6d7 Reviewed-on: https://code.wireshark.org/review/19812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-27sharkd: fix potential division-by-zero issuePeter Wu1-2/+6
The interval parameter is user-supplied and is used as divisor. Change-Id: I9cbbecb71da3991c1712cb87e93de072cc950224 Reviewed-on: https://code.wireshark.org/review/19787 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-01-26Make some variables 64-bit, to avoid overflows.Guy Harris1-9/+8
Assume that the relative milliseconds could be 64-bit, and make the indices calculated from it 64-bit as well. Change-Id: Ie1248c9440172b85ffbb05461ef1ee07c371fc3c Reviewed-on: https://code.wireshark.org/review/19795 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-26Fix sharkd compiling on WindowsMichael Mann1-6/+9
Change-Id: I8c614189159f1263d9452d495cee34d1a2c1bfcb Reviewed-on: https://code.wireshark.org/review/19790 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-25Add sharkd - daemon variantJakub Zawadzki1-0/+1944
sharkd listens on UNIX socket and allows external clients to run commands like: loading file, analysing frames or running TAP(s). Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766 Reviewed-on: https://code.wireshark.org/review/18208 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 03:40:29 +0000