Commit Graph

159 Commits

Author SHA1 Message Date
Gerasimos Dimitriadis a72447c0da Avoid assertion failure when adding a column of type
IEEE 802.11 TX rate.

svn path=/trunk/; revision=31527
2010-01-14 18:30:57 +00:00
Bill Meier cfca0020c5 From Jakub Zawadzki: remove double NUL termination.
From me: fix a 3rd instance.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3339

svn path=/trunk/; revision=31373
2009-12-28 16:12:25 +00:00
Kovarththanan Rajaratnam e981de7a99 Don't attempt to fill custom columns if we don't have a valid column expression.
svn path=/trunk/; revision=30407
2009-10-08 16:35:58 +00:00
Stig Bjørlykke 9401317238 Removed unused variable 'sep_len' in col_do_append_str().
svn path=/trunk/; revision=30199
2009-09-29 19:19:40 +00:00
Kovarththanan Rajaratnam 99624329fa Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
svn path=/trunk/; revision=30086
2009-09-23 14:30:36 +00:00
Kovarththanan Rajaratnam a05517fd21 (Cosmetic) Reorder functions
svn path=/trunk/; revision=30081
2009-09-22 21:08:48 +00:00
Kovarththanan Rajaratnam afe5b2fe9d Use ep_verify_pointer() in col_set_str() to verify that the caller hasn't passed us something from the ephemeral pool
svn path=/trunk/; revision=30012
2009-09-20 12:09:25 +00:00
Kovarththanan Rajaratnam b50ffb1c6b Assert on null string in col_set_str(). This is reasonable behaviour since the caller is expeceted to pass in a constant string
svn path=/trunk/; revision=30010
2009-09-20 10:19:37 +00:00
Kovarththanan Rajaratnam f4e27f4549 Add a couple of g_asserts
svn path=/trunk/; revision=29992
2009-09-20 07:48:33 +00:00
Bill Meier 38dae2ab74 (Trivial) Fix a typo in a comment
svn path=/trunk/; revision=29899
2009-09-14 16:04:54 +00:00
Kovarththanan Rajaratnam 8d802d414c Make sure that we point the current column to a constant string if we have no address.
Fixes http://wiki.wireshark.org/Development/OptimizePacketList?action=diff&rev1=20&rev2=21

svn path=/trunk/; revision=29860
2009-09-11 14:21:04 +00:00
Kovarththanan Rajaratnam 129f907f0c Move some CHECK_COL to our public functions, allowing us to bail our more quickly
svn path=/trunk/; revision=29859
2009-09-11 14:00:36 +00:00
Kovarththanan Rajaratnam de23d92163 Add an option to col_fill_in() to allow us to disable column expression 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-08 19:00:54 +00:00
Kovarththanan Rajaratnam d713b846e6 Hoist COL_CHECK_REF_TIME in the call hierarchy. Use it in our public functions, not our internal functions
svn path=/trunk/; revision=29798
2009-09-08 15:55:10 +00:00
Kovarththanan Rajaratnam d75778eb4a Custom columnfication:
* Deprecate COL_DCE_CTX ("Context ID). Use dcerpc.cn_ctx_id

svn path=/trunk/; revision=29797
2009-09-08 14:59:26 +00:00
Kovarththanan Rajaratnam bc845e056c Custom column deprecation:
We fill out the COL_DSTIDX column by using 'pinfo->dst_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.dstidx'. So remove COL_DSTIDX and migrate to 'mdshdr.dstidx' custom column.

svn path=/trunk/; revision=29795
2009-09-08 14:29:08 +00:00
Kovarththanan Rajaratnam 62af6eff84 Custom column deprecation:
We fill out the COL_SRCIDX column by using 'pinfo->src_idx'. This member is only set by the MDS Header dissector based on 'mdshdr.srcidx'. So remove COL_SRCIDX and migrate to 'mdshdr.srcidx' custom column.

svn path=/trunk/; revision=29794
2009-09-08 14:26:09 +00:00
Kovarththanan Rajaratnam 2cf14900d2 Custom column deprecation:
We fill out the COL_RXID column by using 'pinfo->rxid'. This member is only set by the Fibre Channel dissector based on 'fc.rx_id'. So remove COL_RXID and migrate to 'fc.rx_id' custom column.

svn path=/trunk/; revision=29793
2009-09-08 14:21:14 +00:00
Kovarththanan Rajaratnam cdfeebdd26 Custom column deprecation:
We fill out the COL_OXID column by using 'pinfo->oxid'. This member is only set by the Fibre Channel dissector based on 'fc.ox_id'. So remove COL_OXID and migrate to 'fc.ox_id' custom column.

svn path=/trunk/; revision=29792
2009-09-08 14:17:36 +00:00
Anders Broman c6d4c80371 From : Didier Gautheron
speed up a little proto_custom_set.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3972

svn path=/trunk/; revision=29789
2009-09-08 10:33:15 +00:00
Anders Broman 65e2d90058 Remove an unused parameter.
svn path=/trunk/; revision=29784
2009-09-08 04:50:48 +00:00
Kovarththanan Rajaratnam 3efea601d4 Make sure that we fill in the frame_data before passing it onto col_fill_in_frame_data
svn path=/trunk/; revision=29780
2009-09-07 19:43:05 +00:00
Kovarththanan Rajaratnam 72c9662da6 ntroduce some seasonal address name lookup functions which we use when NEW_PACKET_LIST is defined. This change partially reverts some parts of r29768, which didn't seem to work because it assumed that get_addr_name() would always return a seasonal string. This wasn't the case if the adddress type was AT_STRINGZ.
svn path=/trunk/; revision=29771
2009-09-07 16:05:37 +00:00
Anders Broman 2fe83ebaed mark unused parameter.
svn path=/trunk/; revision=29769
2009-09-07 15:01:51 +00:00
Anders Broman 3abd049a9b Use constant strings for Addresses saves some memory.
svn path=/trunk/; revision=29768
2009-09-07 14:03:05 +00:00
Kovarththanan Rajaratnam c7eb52b086 Remove already #if 0'ed code that was made redundant due to COL_CIRCUIT_ID custom column deprecation
svn path=/trunk/; revision=29745
2009-09-06 13:35:27 +00:00
Kovarththanan Rajaratnam bfe9f61a7c Remove static custom column variable which is no longer used
svn path=/trunk/; revision=29744
2009-09-06 13:25:31 +00:00
Kovarththanan Rajaratnam 09237c27f9 Inline col_has_time_fmt() into col_based_on_frame_data()
svn path=/trunk/; revision=29739
2009-09-06 10:03:06 +00:00
Kovarththanan Rajaratnam 474f5930db Macrofy have_custom_cols() -> HAVE_CUSTOM_COLS() internally in columns-utils.c
svn path=/trunk/; revision=29737
2009-09-06 09:11:17 +00:00
Kovarththanan Rajaratnam 22077a8eb1 Macrofy check_col() -> CHECK_COL() internally in columns-utils.c
svn path=/trunk/; revision=29736
2009-09-06 09:03:15 +00:00
Kovarththanan Rajaratnam 7d4cf0b966 col_custom_set_fstr() is unused. Remove it
svn path=/trunk/; revision=29722
2009-09-05 18:45:55 +00:00
Kovarththanan Rajaratnam a108023b2a COL_BSSGP_TLLI is deprecated
svn path=/trunk/; revision=29721
2009-09-05 18:39:46 +00:00
Kovarththanan Rajaratnam 7e8455ff63 Reorder col_fill_in()
svn path=/trunk/; revision=29720
2009-09-05 18:28:06 +00:00
Martin Mathieson b076f98b46 Show correct time value for "Time since previous displayed frame".
svn path=/trunk/; revision=29572
2009-08-26 22:31:06 +00:00
Anders Broman 32e7cddf70 From Didier Gautheron:
move custom col set from  proto_tree_set_xxx() to
epan_dissect_fill_in_columns().
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3930

I'v added the new functions to the .h files.

svn path=/trunk/; revision=29551
2009-08-25 21:10:35 +00:00
Kovarththanan Rajaratnam 23d4eba3b1 Custom columnfication:
* Deprecate COL_DELTA_CONV_TIME (Delta time (conversation)). Use tcp.time_delta

svn path=/trunk/; revision=29524
2009-08-23 12:30:48 +00:00
Kovarththanan Rajaratnam b9cbd15469 Custom columnfication:
* Deprecate COL_REL_CONV_TIME (Relative time (conversation)). Use tcp.time_relative

svn path=/trunk/; revision=29523
2009-08-23 12:24:14 +00:00
Kovarththanan Rajaratnam 55cf35e3a0 Custom columnfication:
* Deprecate COL_FR_DLCI (Frame Relay DLCI). Use fr.dlci

svn path=/trunk/; revision=29522
2009-08-23 12:16:10 +00:00
Kovarththanan Rajaratnam 1a7b6733cd #if 0 col_set_circuit_id(). It isn't being used
svn path=/trunk/; revision=29519
2009-08-23 11:13:53 +00:00
Kovarththanan Rajaratnam 51ca1739ae Custom columfication:
* Deprecate COL_DSCP_VALUE (IP DSCP Value). Use ip.dsfield

svn path=/trunk/; revision=29518
2009-08-23 11:12:12 +00:00
Kovarththanan Rajaratnam 00670c55c6 Custom columfication:
* Deprecate COL_HPUX_DEVID (HP-UX Device ID). Use nettl.devid

svn path=/trunk/; revision=29517
2009-08-23 10:25:51 +00:00
Kovarththanan Rajaratnam 205129d25c Custom columfication:
* Deprecate COL_HPUX_SUBSYS (HP-UX Nettl Subsystem). Use nettl.subsys

svn path=/trunk/; revision=29516
2009-08-23 10:20:42 +00:00
Kovarththanan Rajaratnam 56369978ae Custom columfication:
* Deprecate COL_CIRCUIT_ID (Circuit ID). Use iax2.call

svn path=/trunk/; revision=29515
2009-08-23 09:52:57 +00:00
Kovarththanan Rajaratnam 6b89de8393 Custom columfication:
* Deprecate COL_COS_VALUE (L2 COS Value (802.1p)). Use vlan.priority

svn path=/trunk/; revision=29513
2009-08-23 09:07:54 +00:00
Kovarththanan Rajaratnam 3d740a490f We initialize col_expr and col_expr_val in col_init() so there's no need to initialize them again in col_set_xxx()
svn path=/trunk/; revision=29507
2009-08-22 19:29:44 +00:00
Anders Broman 1108352f00 Use col_text in frame data.
- colum-utils needs more work, based on
 Didier Gautherons optimizations patch http://wiki.wireshark.org/Development/Optimization

svn path=/trunk/; revision=29489
2009-08-21 10:12:47 +00:00
Anders Broman 100aeddafe From Didier Gautheron:
Extracted from optimizations patch http://wiki.wireshark.org/Development/Optimization
Make col_expr const gchar.

svn path=/trunk/; revision=29471
2009-08-19 07:55:11 +00:00
Anders Broman a1a129abb5 Prepare to store column data from pinfo.
svn path=/trunk/; revision=29454
2009-08-17 15:05:43 +00:00
Anders Broman ca335d25cb From Kovarththanan Rajaratnam:
- Compute and cache color/custom filters dynamically.
- Delay column construction.

svn path=/trunk/; revision=29370
2009-08-10 20:52:56 +00:00
Anders Broman cb771536df From Kovarththanan Rajaratnam:
Only fill in frame_data vals when needed.

svn path=/trunk/; revision=29203
2009-07-27 08:33:26 +00:00