Commit Graph

202 Commits

Author SHA1 Message Date
Kovarththanan Rajaratnam 8d909ba79e Rename new_packet_list_set_time_width() -> new_packet_list_resize_column() because it contains no time format specific code. Further this change also ensures that new_packet_list_resize_columns() uses the newly introduced new_packet_list_resize_column()
svn path=/trunk/; revision=29782
2009-09-07 20:45:32 +00:00
Kovarththanan Rajaratnam 4662b8c326 Rename packet_list_dissect_and_cache => packet_list_dissect_and_cache_iter
svn path=/trunk/; revision=29781
2009-09-07 19:50:19 +00:00
Kovarththanan Rajaratnam 1ce02f035d Add progress bar while constructing columns (which is time consuming)
svn path=/trunk/; revision=29777
2009-09-07 17:45:37 +00:00
Kovarththanan Rajaratnam 4fbc99e411 Auto resize non frame_data based columns
svn path=/trunk/; revision=29766
2009-09-07 13:10:59 +00:00
Kovarththanan Rajaratnam 0a09528611 Add initial implementation of new_packet_list_resize_columns() which just sets the column width according to the column format (work in progress)
svn path=/trunk/; revision=29762
2009-09-07 12:04:59 +00:00
Anders Broman 5cc8d3e71d col_fmt not needed.
svn path=/trunk/; revision=29760
2009-09-07 11:50:08 +00:00
Anders Broman 7473e1e04c Automatically adjust the time column width when time format changes.
svn path=/trunk/; revision=29758
2009-09-07 10:03:55 +00:00
Kovarththanan Rajaratnam 2ab0685d8a Make sure that we can enable/disable color filtering.
Fixes http://wiki.wireshark.org/Development/OptimizePacketList?action=diff&rev1=11&rev2=12

svn path=/trunk/; revision=29728
2009-09-06 05:49:00 +00:00
Kovarththanan Rajaratnam e1eaab161d Move new_packet_list_dissect() to packet_list_store.c. We need to have it there in order to dissect columns on the fly when we have to sort
svn path=/trunk/; revision=29717
2009-09-05 15:46:47 +00:00
Kovarththanan Rajaratnam 583d41904c Inline cache_columns()
svn path=/trunk/; revision=29716
2009-09-05 15:30:34 +00:00
Kovarththanan Rajaratnam 4aa6c8baef Remove dead code. We dont construct columns while reading the file. We do that when we have to display the frame
svn path=/trunk/; revision=29715
2009-09-05 15:25:53 +00:00
Stig Bjørlykke 5a7d9922c1 Fetch old column width values if we have not initialized the packet list,
so we don't write zero width values if closing before loading a capture.

svn path=/trunk/; revision=29714
2009-09-05 14:37:02 +00:00
Kovarththanan Rajaratnam fcf25fe42b Get rid of row_data_t
svn path=/trunk/; revision=29711
2009-09-05 13:27:34 +00:00
Kovarththanan Rajaratnam a71f9bbde3 Sort out some of the confusion r29706 introduced (visible vs. physical rows). We choose the wrong packet in the packet view because we used the physical row instead of the visible. I suspect there a couple more of these lurking.
svn path=/trunk/; revision=29708
2009-09-05 12:42:44 +00:00
Kovarththanan Rajaratnam 95ddec4d07 Get rid off GtkTreeModelFilter because the time to sort becomes unbearable when combined with GtkTreeSortable. This means that we now track which frames are visible in the our own packet list store. To do so, we now distinguish between physical and visible rows. All frames are added as physical rows. Only those that passes the display filter are marked as visible.
svn path=/trunk/; revision=29705
2009-09-05 10:36:29 +00:00
Kovarththanan Rajaratnam 314b693828 Rename new_packet_list_reset_dissected to packet_list_reset_dissected
svn path=/trunk/; revision=29699
2009-09-04 17:42:03 +00:00
Kovarththanan Rajaratnam 4930802fa1 Only store the last column as G_TYPE_POINTER. Hopefully this will soon make us able to sort again
svn path=/trunk/; revision=29690
2009-09-03 17:56:57 +00:00
Kovarththanan Rajaratnam 5a8df08491 Add packet_list_visible_record() to avoid poking PacketListRecord in new_packet_list.c
svn path=/trunk/; revision=29689
2009-09-03 17:39:42 +00:00
Kovarththanan Rajaratnam 8a33ec23bb Allocate and use an extra column at the end of the column list to indicate the 'magic' column which contains the _entire_ PacketListRecord
svn path=/trunk/; revision=29688
2009-09-03 17:00:17 +00:00
Kovarththanan Rajaratnam bd69669e1d Make sure that we stop auto scroll if we start scrolling manually.
Caveat: we jump to first frame when auto scroll is stopped

svn path=/trunk/; revision=29685
2009-09-03 14:32:11 +00:00
Stig Bjørlykke 7d2c55dc47 Adjusted int/uint check and fixed a comment in right justify check.
svn path=/trunk/; revision=29683
2009-09-03 10:50:30 +00:00
Stig Bjørlykke b462cace92 Right justify "Packet length", "Cumulative bytes" and custom columns
displaying numerical values.

svn path=/trunk/; revision=29682
2009-09-03 10:40:06 +00:00
Anders Broman 865d14c43f Right align COL_NUMBER.
svn path=/trunk/; revision=29681
2009-09-03 05:35:21 +00:00
Anders Broman 7b916257bd Don't set the minimum column width to the computed or stored value,
use a fixed minimum value and use the other as the size used to display the column.

svn path=/trunk/; revision=29680
2009-09-03 05:03:57 +00:00
Kovarththanan Rajaratnam 47b766a998 Only try and select the last row if not already selected. This fix doesn't seem to work. Any suggestions?
svn path=/trunk/; revision=29677
2009-09-02 19:31:56 +00:00
Michael Tüxen 283a4997ba Mark unused parameter as such.
svn path=/trunk/; revision=29675
2009-09-02 19:15:02 +00:00
Anders Broman d96beaaecb Trying to fix:
packets without color are randomly colorized.

svn path=/trunk/; revision=29673
2009-09-02 17:59:56 +00:00
Anders Broman cdd2959aa5 Adding new color rules should work now.
svn path=/trunk/; revision=29671
2009-09-02 17:51:48 +00:00
Kovarththanan Rajaratnam bc36849a9e Add seperate new_packet_list_moveto_end() which scrolls to the end _without_ selecting the last packet.
svn path=/trunk/; revision=29670
2009-09-02 17:29:52 +00:00
Kovarththanan Rajaratnam 6149d4be35 Make sure that we select the last row if autoscroll is enabled. The scrolling is still very jumpy. It seems that we always select the first packet before moving to the end.
svn path=/trunk/; revision=29668
2009-09-02 17:15:20 +00:00
Anders Broman 1858d86612 Prepare abillity to add color filters with new packet list.
(Packets not recolored yet).

svn path=/trunk/; revision=29664
2009-09-02 15:07:03 +00:00
Anders Broman c5c569597b In new_packet_list_append() all we need is in fdata.
svn path=/trunk/; revision=29657
2009-09-01 18:29:11 +00:00
Kovarththanan Rajaratnam 5b3f74f9d5 We no longer store the column text in our record, so don't ever dereference the record column text pointer. In fact, remove it completely. This could cause a crash.
While there, throw in a few g_assert()'s.

svn path=/trunk/; revision=29653
2009-09-01 16:00:56 +00:00
Bill Meier 1bc9f19f05 Add #include <stdio.h> in a few more places for Solaris.
svn path=/trunk/; revision=29577
2009-08-27 03:54:57 +00:00
Anders Broman 2dd60e1b66 Custom columnfication:
* Deprecate COL_BSSGP_TLLI (GPRS BSSGP IE TLLI). Use bssgp.tlli

svn path=/trunk/; revision=29546
2009-08-25 05:42:14 +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 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
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 bbaf419559 Fix a memmory leak.
svn path=/trunk/; revision=29470
2009-08-19 06:04:30 +00:00
Anders Broman a47a4a5242 Add new_packet_list_recent_write_all().
svn path=/trunk/; revision=29469
2009-08-18 23:00:42 +00:00
Anders Broman 3208870317 Make copy summary work for new_packet_list.
XXX The enum in .h file does not seem to work???

svn path=/trunk/; revision=29467
2009-08-18 14:40:51 +00:00
Anders Broman a1772b0197 Remove #if 0
svn path=/trunk/; revision=29455
2009-08-17 15:13:58 +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
Kovarththanan Rajaratnam 5b88477401 Add missing call to packets_bar_update() after thaw'ing
svn path=/trunk/; revision=29450
2009-08-16 15:33:05 +00:00
Kovarththanan Rajaratnam c28b654f20 Switch over to using GPtrArray instead of manually g_renew'ing. This switch has some benefits:
1) We don't have to manually resize
2) GPtrArray uses a sligtly more efficient allocation scheme. It increases the size of the array exponentially which reduces the amount of memcpy's we have to do when we resize the array

svn path=/trunk/; revision=29439
2009-08-16 04:08:00 +00:00
Stephen Fisher 8b00ed7674 Mark function paramter as unused with _U_ to please gcc.
svn path=/trunk/; revision=29438
2009-08-16 02:35:44 +00:00
Anders Broman 408b658647 Try to please build bot
svn path=/trunk/; revision=29437
2009-08-15 21:59:03 +00:00
Anders Broman 23dc20f6bf Prepare for storing column data in packet list store.
svn path=/trunk/; revision=29436
2009-08-15 21:12:56 +00:00
Kovarththanan Rajaratnam 68e07573bf Avoid superfluous g_strdup()
svn path=/trunk/; revision=29425
2009-08-15 05:06:27 +00:00
Kovarththanan Rajaratnam 6b556d4039 Add support for mark/unmark all frames in our new packet list
svn path=/trunk/; revision=29423
2009-08-15 04:19:45 +00:00
Kovarththanan Rajaratnam af00c3e6da Make 'Apply as filter'/'Prepare filter' work for new packet list.
svn path=/trunk/; revision=29419
2009-08-14 19:35:01 +00:00
Kovarththanan Rajaratnam 4d5d306372 Remove the hacky row_from_iter() function and use new_packet_list_get_record() instead. Alas, new_packet_list_get_record() is also somewhat hacky in its nature, but hey at least we're using one less hacky thing.
svn path=/trunk/; revision=29418
2009-08-14 18:59:15 +00:00
Kovarththanan Rajaratnam b266cb731e Make mark/unmark frame work with the new filter model
svn path=/trunk/; revision=29417
2009-08-14 18:49:48 +00:00
Kovarththanan Rajaratnam b43f8f5e5a Remove unused functions/prototypes
svn path=/trunk/; revision=29416
2009-08-14 18:32:44 +00:00
Kovarththanan Rajaratnam e9004b22b1 New packet list: right clicking on a row now selects the given row.
svn path=/trunk/; revision=29415
2009-08-14 18:29:32 +00:00
Kovarththanan Rajaratnam 0e710239dc Make first/last frame work again with the new filter model.
svn path=/trunk/; revision=29414
2009-08-14 15:56:23 +00:00
Kovarththanan Rajaratnam 2c07d7ad80 Make next/previous frame work again with the new filter model.
svn path=/trunk/; revision=29413
2009-08-14 15:44:57 +00:00
Kovarththanan Rajaratnam 9efecb181a Don't attach our original packet list model in new_packet_list_thaw(). It's pointless because we override it in filter_function().
svn path=/trunk/; revision=29411
2009-08-14 13:33:17 +00:00
Anders Broman df97e60d27 Start to implement display filtering.
svn path=/trunk/; revision=29407
2009-08-13 21:46:00 +00:00
Anders Broman 96907a7180 Get the pointer to the packet list record and use the data directly.
svn path=/trunk/; revision=29406
2009-08-13 21:36:01 +00:00
Kovarththanan Rajaratnam 71291d0d17 Add needed header due to stack allocated 'edt' structure
svn path=/trunk/; revision=29405
2009-08-13 20:00:36 +00:00
Kovarththanan Rajaratnam 80a6d3fbcf Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic.
svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +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
Stig Bjørlykke 0776b9c0a1 Added new_packet_list_set_font() and initialize fonts when using
new packet list.

svn path=/trunk/; revision=29316
2009-08-06 22:06:37 +00:00
Anders Broman 26d1dfcf4c Add pinfo to new_packet_list_append() this should give us the abillity
to store (most) of the underlying data rather than the strings in the store and render it when we need it, thuss saving storage space and loading time.

Idealy we should not store the complete fdata or pinfo structures
but rather just the data relevant to the currently selected/used columns. I'm not entierly sure how to accomplish that however.

Dynamically allocated array to hold pointers to the actual data?

svn path=/trunk/; revision=29237
2009-07-29 20:58:47 +00:00
Stig Bjørlykke 0660822311 Mark an unused argument.
svn path=/trunk/; revision=29233
2009-07-29 15:31:25 +00:00
Anders Broman b95335b76f Make mark frame work.
svn path=/trunk/; revision=29225
2009-07-28 22:18:19 +00:00
Anders Broman 94e0026e19 From Kovarththanan Rajaratnam:
Enable popup menu in packet list view.

svn path=/trunk/; revision=29223
2009-07-28 20:46:23 +00:00
Anders Broman 09c6b577f9 Set reftime without recreating the packet list.
svn path=/trunk/; revision=29220
2009-07-28 16:20:05 +00:00
Anders Broman e464a9bef9 Fix setting of new time format.
svn path=/trunk/; revision=29212
2009-07-28 10:53:57 +00:00
Anders Broman 9ca4ac2bed From Kovarththanan Rajaratnam:
Use frame_data values .

svn path=/trunk/; revision=29202
2009-07-27 03:34:57 +00:00
Anders Broman f79c2aaeb7 "Create" the time cols when we render them making change of time format fast.
svn path=/trunk/; revision=29200
2009-07-26 22:16:36 +00:00
Anders Broman 3bbe2106c5 From Kovarththanan Rajaratnam:
- Don't issue a row_inserted signal. Rely on our caller to have  
disconnected the model from the view.

-  Removing col_fmt from row_data. It wasn't being used. If we need to store
the column format in the future that should probably be placed in the
PacketList instead of the PacketListRecord
2) Remove double allocation of col_text. Now we allocate it in
new_packet_list_append() and pass it on to packet_list_append_record()
3) Use se_alloc instead of se_alloc0 because we explictly set all the
parameters we use.

svn path=/trunk/; revision=29199
2009-07-26 22:11:46 +00:00
Anders Broman 5fbc5d6f58 From Kovarththanan Rajaratnam:
Only clear packet list store if we need to redissect.

svn path=/trunk/; revision=29195
2009-07-26 10:34:07 +00:00
Stephen Fisher 53ded7dae6 Remove two unused variables and mark a function paramter as unused
svn path=/trunk/; revision=29193
2009-07-25 20:13:46 +00:00
Anders Broman 10e3b340ba From Kovarththanan Rajaratnam:
packet_goto_next_previous_frame

svn path=/trunk/; revision=29191
2009-07-25 09:45:35 +00:00
Anders Broman be084ae799 From Kovarththanan Rajaratnam:
New packet list: enable goto first/last packet (Optimized)

svn path=/trunk/; revision=29190
2009-07-25 07:50:53 +00:00
Stephen Fisher 14852c1384 Update my e-mail address with a reference to the AUTHORS file
svn path=/trunk/; revision=29189
2009-07-25 03:23:37 +00:00
Anders Broman 9feddc7ef4 From Kovarththanan Rajaratnam:
New packet list: enable packet history
Me: Add a comment.

svn path=/trunk/; revision=29188
2009-07-24 21:25:21 +00:00
Anders Broman 9bf46cd286 When using the new packet list select the first packet when the file read is complete. This should take care of the crash when closing WS.
svn path=/trunk/; revision=29186
2009-07-24 08:10:33 +00:00
Anders Broman 213a926bd9 From kovarththanan Rajaratnam:
Pass column_info as a pointer (new packet list).

svn path=/trunk/; revision=29169
2009-07-22 17:35:28 +00:00
Anders Broman 69e79617ef From Jakub Zawadzki:
This patch fix return value in new_packet_list_find_row_from_data when !select

From Me: Change back the cell coloring and remove the horizontal-separator making the colorinjg look the same as in the old packet list.

svn path=/trunk/; revision=29168
2009-07-22 15:23:08 +00:00
Anders Broman 45c1df205f From Jakub Zawadzki:
This patch makes row coloring alike GtkCList version
 (remove white space between cells/columns)

svn path=/trunk/; revision=29166
2009-07-22 08:54:38 +00:00
Anders Broman 7c0fb707a5 Implement new_packet_list_find_row_from_data()
Goto frame should work now.

svn path=/trunk/; revision=29147
2009-07-20 16:09:50 +00:00
Anders Broman 9de6f58cff Redraw the list when color filters are enabled/disabled.
svn path=/trunk/; revision=29144
2009-07-20 11:33:02 +00:00
Anders Broman 30c88f818c Avoid a crash if no color filter exists (SCTP trace).
svn path=/trunk/; revision=29143
2009-07-20 09:06:47 +00:00
Stephen Fisher edc8ae64f1 Introduce packet list coloring for the NEW_PACKET_LIST. One caveat: when
enabling/disabling the coloring of the packet list from the menus, the user
has to drag the mouse cursor over each displayed row to take away/add the
coloring.  Dragging the scroll bar up or down will also take care of this as
only the displayed rows are colored.


svn path=/trunk/; revision=29142
2009-07-20 06:21:35 +00:00
Stephen Fisher 163c8f7761 Change the new packet list to use a cell data function for displaying
values in each column's rows.  This is the first step in adding coloring
rule support and other features.


svn path=/trunk/; revision=29076
2009-07-13 05:27:25 +00:00
Anders Broman 828989fd7b Column index now corresponds to the column in the tree view.
svn path=/trunk/; revision=29075
2009-07-12 19:38:55 +00:00
Anders Broman 052a2b965a Some small fixes from Jakub Zawadzki joined with my efforts
to only store the used columns.

svn path=/trunk/; revision=29065
2009-07-12 09:05:03 +00:00
Anders Broman 0df04dc0fc We are only handling one row at a time(right?).
Shouldn't the row_data_t structures col_text and col_filter just hold the number of columns (cfile.cinfo.num_cols) rather than [NUM_COL_FMTS] with an adittional col_fmt[] all beeing dynamically allocated?

svn path=/trunk/; revision=29025
2009-07-08 16:16:13 +00:00
Anders Broman 4a69751414 gtk_tree_view_set_fixed_height_mode() is GTK 2.6
svn path=/trunk/; revision=28944
2009-07-05 16:22:20 +00:00
Stephen Fisher 5a241cb6ad Allow the new packet list's columns to be moved back
and forth while the packet list is open without having
to go into the preferences.  The new column ordering is
not saved for next time though.  Perhaps it should be.

svn path=/trunk/; revision=28928
2009-07-02 21:06:24 +00:00
Anders Broman f0fbf120f2 Realy make the new packet list compile under Windows...
svn path=/trunk/; revision=28909
2009-07-01 17:39:19 +00:00
Anders Broman 3fe0c34110 Make the new packet list compile on Windows.
svn path=/trunk/; revision=28907
2009-07-01 14:37:02 +00:00
Stephen Fisher e6d0686f7b Introduce experimental new feature: GTK2 tree view based packet list
To use the GTK2 based packet list, define NEW_PACKET_LIST when compiling.
To do this with gcc, set the environment variable CPPFLAGS to
"-DNEW_PACKET_LIST" and re-run configure.

Many features do not yet work.  This work began with prototypes by Ulf
quite a while back.  I've put quite a bit of work into this so far and
as discussed with a few of the core team members at Sharkfest09 and it was
decided that it would be best to commit what I have so far to allow others to
help work on this.


svn path=/trunk/; revision=28892
2009-06-30 18:05:04 +00:00