aboutsummaryrefslogtreecommitdiffstats
path: root/epan/column-utils.h
AgeCommit message (Collapse)AuthorFilesLines
2016-06-15Allow control of individual columns to be (un)writable.Michael Mann1-2/+4
Most protocols just want to limit COL_INFO or COL_PROTOCOL so give that level of granularity. Bug: 12144 Bug: 5117 Bug: 11144 Change-Id: I8de9b7d2c69e90d3fbfc0a52c2bd78c3de58e2f8 Reviewed-on: https://code.wireshark.org/review/15894 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> 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>
2016-02-05Qt: Add check for field extractorsStig Bjørlykke1-0/+5
The proto tree is needed in several cases when using Lua field extractors, because they fetch values from the tree. Without a valid field extractor a Lua plugin may misbehave and display wrong column info. This fixes column issues when: - Calling resetColumns() in Qt. This involves adding a display filter, change time display format, change name resolution and other changes in UI which requires column updates. - Print summary lines. - Export as CSV and PSML. Change-Id: Ieed6f8578cdf2759f1f836cd8413a4529b7bbd80 Reviewed-on: https://code.wireshark.org/review/13708 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-27Remove the deprecated column types so users don't think they still exist.Michael Mann1-62/+48
Bug: 11559 Change-Id: I51836dc9a4fa399835c7bdabcba577ebd40327ad Reviewed-on: https://code.wireshark.org/review/13538 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>
2015-11-07column-utils: Refactor col_append_port() to col_append_ports()João Valverde1-5/+5
Having a single function call to format source-destination port column info serves the current (and presently only) use case better by having a single place to manage the display format. This commit does not introduce any actual formatting changes. Change-Id: I1d479d0fd5690d12afb47e538057fdc2dd369ca2 Reviewed-on: https://code.wireshark.org/review/11539 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-11Remove duplicate transport ports from proto tree summaryJoão Valverde1-2/+12
Don't display duplicate ports if transport name resolution is not enabled (for UDP/TCP/DCCP). Also introduce col_append_port() to handle info column port display with name resolution in a uniform format. Change-Id: Icb8ac45f726b7c539b4534c62061473e9b582753 Reviewed-on: https://code.wireshark.org/review/10804 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-05UDP: Make port column info similar to TCP, add length informationJoão Valverde1-0/+10
Change-Id: I3f7a35db53a1ecc9d543b80f143eb6082616e458 Reviewed-on: https://code.wireshark.org/review/10702 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-09-03Declare col_get_text() as WS_DLL_PUBLICPascal Quantin1-1/+1
Bug: 11498 Change-Id: I5204bd27cee044a57913e48c4da00628f3f58bf8 Reviewed-on: https://code.wireshark.org/review/10374 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>
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-06-23Add col_append_lstr(), speedup column generation for TCP.Jakub Zawadzki1-0/+6
When dissecting with columns TCP dissector spends around 1/4 time in col_append_fstr(), add col_append_lstr() and do formatting by ourselves. Change-Id: If90bc26242761884b4991e8db0db62c8f9e32690 Reviewed-on: https://code.wireshark.org/review/2527 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-17Introduce col_add_lstr(), use it instead of slower col_add_fstr.Jakub Zawadzki1-0/+4
We have callgrind benchmarks which shows that col_add_fstr() takes 5% of Ir count cause of formatting done in g_vsnprintf(). New col_add_lstr() can be used in few dissectors without much ugliness, and it should be a little faster. Change-Id: Ifddd951063dfd3a27c2a7da4dafce9b242c0472c Reviewed-on: https://code.wireshark.org/review/1629 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-22Avoid including definition of column_info structure in dissectors.Jakub Zawadzki1-1/+79
Move COL_* enum to <epan/column-utils.h> XXX Later we can rename epan/column-info.h to column-int.h (or smth like this) svn path=/trunk/; revision=54352
2013-12-18Added col_clear_fence().Stig Bjørlykke1-0/+10
svn path=/trunk/; revision=54220
2013-12-03Avoid including <epan/epan.h> in dissectors.Jakub Zawadzki1-3/+4
svn path=/trunk/; revision=53774
2013-10-18After looking for something in the column-*.h files andJörg Mayer1-1/+1
not finding it, I finally found it in column_info.h Renamed column_info.h to column-info.h to have consistency with the column*h files. svn path=/trunk/; revision=52667
2013-10-01FINALLY remove the check_col API so that reviewers won't have to mention ↵Michael Mann1-11/+0
that it's deprecated. Now it just won't compile if its included in a dissector. svn path=/trunk/; revision=52317
2013-07-21Add helper function to epan_session which can be used to get absolute ↵Jakub Zawadzki1-2/+2
timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-21/+26
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-25LUA API improvementsMichael Mann1-0/+9
1. Add col_set_fence() equivalent 2. Update __tostring function to actually return column text From Hadriel Kaplan, bug 8295 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8295) svn path=/trunk/; revision=47882
2012-12-26Fix a bunch of warnings.Guy Harris1-1/+1
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-10-08col_cleanup() is undoing the allocations that col_init() does, so it'sGuy Harris1-5/+6
freeing the allocated array of pointers, not what the pointers ported to, so it should free col_data. Note that it does that, and put it after col_init() in the source file and header file. Put in a comment explaining the MSVC bug that we're working around with the casts. svn path=/trunk/; revision=45393
2012-10-08Don't leak all of our column data in packet_list_recreate (I think we still leakEvan Huus1-0/+6
some of it?). Maybe part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775 svn path=/trunk/; revision=45388
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-01-28Well, we *did* go to a widget that invokes callback to get the text forGuy Harris1-6/+0
the columns, so we *can* clean up the exporting of col_set_fmt_time() by not exporting it any more. svn path=/trunk/; revision=40743
2011-09-19Make it possiblwe to creare a trime string from frame data.Anders Broman1-0/+2
svn path=/trunk/; revision=39036
2011-04-09In packet_list_dissect_and_cache_record(), set the columns toGuy Harris1-0/+8
*something* if we get an error reading the packet from the capture file, rather than leaving them as null (which will cause a crash). svn path=/trunk/; revision=36527
2010-08-30Doxygen related changes.Anders Broman1-4/+14
svn path=/trunk/; revision=34009
2010-08-21Remove duplicate definition of COL_MAX_LEN and COL_MAX_INFO_LEN: apparently ↵Jeff Morriss1-11/+0
no one needs them in this file (probably because they're marked as "don't use"). Now they are only defined in column_info.h . svn path=/trunk/; revision=33871
2010-04-03 From Yaniv Kaul: constify parametersBill Meier1-21/+21
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 From me: Fix a number of instances where the function prototype or the function definition wasn't changed so there was a mismatch thus causing Windows (but not gcc) compilation errors. svn path=/trunk/; revision=32365
2010-04-02Revert SVN #32360 until Windows compilation errors corrected.Bill Meier1-21/+21
svn path=/trunk/; revision=32361
2010-04-02From Yaniv Kaul: constify parametersBill Meier1-21/+21
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422 svn path=/trunk/; revision=32360
2010-01-25Changed from using own defined GNUC_FORMAT_CHECK to G_GNUC_PRINTFStig Bjørlykke1-6/+5
defined in GLib. Removed epan/gnuc_format_check.h. svn path=/trunk/; revision=31657
2009-09-08Add an option to col_fill_in() to allow us to disable column expression ↵Kovarththanan Rajaratnam1-7/+7
processing. This is rarely needed. It's only needed when the user right clicks on the packet list view to generate a display filter. svn path=/trunk/; revision=29806
2009-09-05col_custom_set_fstr() is unused. Remove itKovarththanan Rajaratnam1-4/+0
svn path=/trunk/; revision=29722
2009-08-26Add missing prototype ....Bill Meier1-0/+3
svn path=/trunk/; revision=29555
2009-08-23Custom columnfication:Kovarththanan Rajaratnam1-2/+2
* Deprecate COL_REL_CONV_TIME (Relative time (conversation)). Use tcp.time_relative svn path=/trunk/; revision=29523
2009-07-27From Kovarththanan Rajaratnam:Anders Broman1-1/+1
Only fill in frame_data vals when needed. svn path=/trunk/; revision=29203
2009-07-27From Kovarththanan Rajaratnam:Anders Broman1-0/+7
Use frame_data values . svn path=/trunk/; revision=29202
2009-02-15Fixed a typo.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=27452
2008-06-14Update all time columns when changing the time precision.Stig Bjørlykke1-1/+2
Not implemented for conversation relative and delta time yet, because this will need a reload as they are set by the dissectors and does not exist in the frame data. svn path=/trunk/; revision=25452
2008-03-01Custom column updates:Stephen Fisher1-1/+1
- Change apply / prepare / ... as filter to use the field's value, which is now stored in fdata as well as cinfo. Now we don't have to reprocess the entire packet list when using these features. This also prevents the use of these features from overwriting custom column information. (custom columns can now be used in apply / prepare ... as filter) - Break col_expr and col_expr_val out into a struct that is included not only in cinfo, but now also fdata. - Have col_custom_set_fstr() quote FT_STRING & FT_STRINGZ when storing the col_expr_val value (for filter creation). svn path=/trunk/; revision=24511
2008-02-13Check in changes originally checked in as SVN revision 24308 (new columnStephen Fisher1-0/+11
type: Custom) that were backed out in SVN revision 24309. Changes since that revision include a reworking of the handling of the cfile/cinfo variables in epan/column-utils.c, addition of three new functions to libwireshark.def and a bug fix to prevent a crash when no custom columns were not in use. Compilation verified locally on MacOS X, Linux and Windows. svn path=/trunk/; revision=24317
2008-02-12Revert commit 24308 until I can get it to compile on Windows/Linux/SolarisStephen Fisher1-10/+0
(strangely, it compiled fine on my MacOS X machine). svn path=/trunk/; revision=24309
2008-02-12Introduce a new column type called custom, which lets you put any displayStephen Fisher1-0/+10
filter name in the description field and it will display that field in the packet list if it occurs in that packet. Note that the more common fields are implemented, but a number of them remain to be implemented in epan/proto.c. I will work on these other fields as I have time. svn path=/trunk/; revision=24308
2007-10-03This patch adds two new column types:Sake Blok1-0/+14
- COL_REL_CONV_TIME which is used to display the time relative to the first frame that was seen in the conversation - COL_DELTA_CONV_TIME which is used to display the delta time from the previous frame of the conversation It also adds the function "col_set_time()" to "epan/column-utils.[ch]" which can be called from within a dissector to set either of these two columns to the appropiate time. Last but not least, it lets the tcp-dissector make use of these two columns. svn path=/trunk/; revision=23058
2007-01-18PutGuy Harris1-0/+7
#ifdef __cplusplus extern "C" { #endif /* __cplusplus */ ... #ifdef __cplusplus } #endif /* __cplusplus */ wrappers into some header files, for the benefit of C++ plugins. Also, add multiple-include protections. svn path=/trunk/; revision=20485
2006-05-21name changeRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18197
2005-10-04in svn 15335 the tcp analysis was changed to do its stuff and to populate ↵Ronnie Sahlberg1-0/+11
(prepend to) COL_INFO before callking the subdissectors instead of calling the tcp analysis (and prepend colingo) eitehr after the subdissector returned normally or if an exception caused by a subdissector was rised. this as a sideffect caused tcp analysis data to be overwritten if the subdissector caused any output to the info column. (and made tcp analysis suboptimal) this change adds a new function col_prepend_fence_fstr() that will prepend the info column with the string and also, if there was no fence already defined, create a fence and set it after the prepended col info text. This way, even if the subdissectors generate and rewrite col info, the tcp analysis data will still be displayed on the info column. svn path=/trunk/; revision=16116
2005-10-02add doxygen comments to column-utils.h and do a slight code cleanupUlf Lamping1-25/+155
svn path=/trunk/; revision=16066
2005-09-13Move the definition of GNUC_FORMAT_CHECK() to its own header, use it inGuy Harris1-12/+5
column-utils.h, and add it to expert.h, so we check the arguments to "expert_add_info_format()", at least if the format argument is a constant string. Fix some more calls to "expert_add_info_format()" to pass it a format string. Don't record BoundsError exceptions as expert events - they merely reflect a capture done with a snapshot length too short to capture all of the packet (any case where it's caused by something else is a bug). svn path=/trunk/; revision=15776
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 05:33:24 +0000