1989aa700d
Bring frame_data_init() and add_packet_to_packet_list() more in sync by adding 'ref_time' handling to frame_data_init(). For tshark/rawshark this is unused because they only do a single pass through the capture file
...
svn path=/trunk/; revision=30055
2009-09-21 20:17:59 +00:00
aa4af67e1b
Only set cumulative bytes after passing the display filter test
...
svn path=/trunk/; revision=30053
2009-09-21 19:48:53 +00:00
c3647b4e3b
Move 'Delta timestamp to previous captured frame' calculation inside add_packet_to_packet_list(). This is done in order to streamline add_packet_to_packet_list() with frame_data_init(). Hopefully we can switch to frame_data_init() soon
...
svn path=/trunk/; revision=30052
2009-09-21 19:30:06 +00:00
7ca137e294
Rename capture_file.plist to capture_file.plist_start to make it consistent with capture_file.plist_end
...
svn path=/trunk/; revision=30047
2009-09-21 18:09:19 +00:00
109875c775
Remove second (redundant) assignment to fdata->cum_bytes
...
svn path=/trunk/; revision=30046
2009-09-21 17:38:10 +00:00
9831d4c4e1
Reverse order of NEW_PACKET_LIST guard, i.e. #ifdef NEW_PACKET_LIST instead of #ifndef NEW_PACKET_LIST
...
svn path=/trunk/; revision=30045
2009-09-21 17:32:35 +00:00
d923139789
Fix typo in comment
...
svn path=/trunk/; revision=30043
2009-09-21 17:09:15 +00:00
3c9afabfe0
(cosmetic change) - reset cumulative bytes together with 'first_ts' and 'prev_dis_ts'
...
svn path=/trunk/; revision=30042
2009-09-21 15:50:15 +00:00
8527133db0
cf->dfilter is only set if it's valid so assert if that's not the case
...
svn path=/trunk/; revision=30041
2009-09-21 15:38:40 +00:00
112a677484
Reset cumulative bytes when we open the file
...
svn path=/trunk/; revision=30040
2009-09-21 15:29:32 +00:00
8dc906da00
Set fdata->num up front and roll back if necessary
...
svn path=/trunk/; revision=30039
2009-09-21 15:23:33 +00:00
03a9cfe84c
Shuffle NEW_PACKET_LIST guard
...
svn path=/trunk/; revision=30038
2009-09-21 14:13:46 +00:00
d86635a3d8
Introduce a NEW_PACKET_LIST specialized version of add_packet_to_packet_list(). The old one contained too many #ifdef NEW_PACKET_LIST which reduced readability
...
svn path=/trunk/; revision=30036
2009-09-21 12:14:11 +00:00
546014cdaf
cf_change_time_formats() is not needed with new packet list.
...
svn path=/trunk/; revision=30034
2009-09-21 11:58:36 +00:00
3b7a12dda0
Add NEW_PACKET_LIST guard wrt fdata->col_text
...
svn path=/trunk/; revision=30030
2009-09-21 04:29:25 +00:00
2e282e7567
Introduce frame_data_cleanup() and start using it
...
svn path=/trunk/; revision=30023
2009-09-20 18:18:29 +00:00
ad7f82f9ce
From Jakub Zawadzki:
...
Fix copy/paste error wrt. fdata->col_text_len
svn path=/trunk/; revision=29921
2009-09-15 14:01:40 +00:00
b0c3abfa79
Fix:
...
cleanup_dissection() calls se_free_all(); And after that fdata->col_text (which is allocated using se_alloc0()) no longer points to valid memory.
svn path=/trunk/; revision=29920
2009-09-15 13:18:13 +00:00
5dfeb86fb7
Fix warning that variable may be unused and then declare volatile so it
...
survives the TRY/CATCH code.
svn path=/trunk/; revision=29863
2009-09-11 15:38:33 +00:00
6edeb87ad7
Only move to last row if it's vissible.
...
svn path=/trunk/; revision=29861
2009-09-11 14:58:49 +00:00
0772dd06b4
New_packet_list
...
Select the correct frame in packet details when filtering.
svn path=/trunk/; revision=29857
2009-09-11 11:58:00 +00:00
a65f72e8f0
Allocate col_text and col_text_len when the fdata struct is allocated.
...
(complete the checkin).
svn path=/trunk/; revision=29818
2009-09-09 08:51:33 +00:00
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
c6f96e4ec9
Make sure that reset the elapsed time to load a file before we reload/rescan the file
...
svn path=/trunk/; revision=29783
2009-09-07 21:07:51 +00:00
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
a65d590002
Store the packet encapsulation type as gint8. Saves 3 bytes per packet
...
svn path=/trunk/; revision=29767
2009-09-07 13:54:46 +00:00
e55129063b
Fixed arguments to new_packet_list_set_time_width().
...
svn path=/trunk/; revision=29761
2009-09-07 12:01:19 +00:00
5cc8d3e71d
col_fmt not needed.
...
svn path=/trunk/; revision=29760
2009-09-07 11:50:08 +00:00
cd8831c72d
Track length of columns strings. We'll need this in order to resize columns quickly
...
svn path=/trunk/; revision=29759
2009-09-07 11:33:38 +00:00
7473e1e04c
Automatically adjust the time column width when time format changes.
...
svn path=/trunk/; revision=29758
2009-09-07 10:03:55 +00:00
0e5cef61be
Split a bunch of init routines into init() and cleanup(). This allows us to free memory properly on shutdown.
...
This is an initial step. There's still some work to do.
svn path=/trunk/; revision=29754
2009-09-06 18:25:23 +00:00
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
6be0e11906
Remove superfluous assignment
...
svn path=/trunk/; revision=29686
2009-09-03 14:41:09 +00:00
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
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
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
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
e256fed975
Add volatile to avoid clobbered by longjmp warning.
...
svn path=/trunk/; revision=29651
2009-09-01 11:15:24 +00:00
2d001ec762
- Read a min number if packets before checking if the progress bar should be updated.
...
- Calculate the progess before checking if progress bar should be
created or not.
- Dont update the progress to often on small files.
- Use data_offset rather than reading file_pos.
svn path=/trunk/; revision=29648
2009-09-01 08:51:41 +00:00
2cd2eecd0a
Compute the loading time and show it in the main status bar.
...
(Modified code from Didier Gautheron).
svn path=/trunk/; revision=29592
2009-08-28 05:19:52 +00:00
27f7d88c84
Also fake empty field_info's by gracefully handling NULL field_info pointer elsewhere.
...
svn path=/trunk/; revision=29490
2009-08-21 11:03:30 +00:00
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
82adb33a48
We shouldn't conditionalise on _filtering_ tap listerners to determine whether tapping should be performed or not. We also need to handle _normal_ tap listerners. This change backs out the regression introduced in r29435.
...
Thanks to Didier: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3916
svn path=/trunk/; revision=29475
2009-08-19 13:52:15 +00:00
d4ba2208ec
Inline a few checks in the add_packet_to_packet_list() function since it's called in tight loop. This will help us to avoid calling functions that simply returns. This is especially the case when we're dealing with the new packet list due to its dissect-on-demand nature where colour/column construction is delayed until the row becomes visible.
...
svn path=/trunk/; revision=29435
2009-08-15 14:13:36 +00:00
81c7e34905
Make display filtering work for NEW_PACKET_LIST. This didn't work previously because we would simply append the new filtered packets onto the existing ones.
...
svn path=/trunk/; revision=29409
2009-08-14 05:49:57 +00:00
68e75a961b
Always add packet to the new packet list regardless of whether the packet passed the display filter test or not. We do this because we do the filtering inside the new packet list.
...
svn path=/trunk/; revision=29408
2009-08-14 05:22:12 +00:00
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
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
3512e485ca
Add PNODE_FINFO. We've been using PITEM_FINFO on proto_node's. This works because proto_item is typedefed to proto_node. We shouldn't rely on this since this is an implementation detail.
...
svn path=/trunk/; revision=29354
2009-08-09 17:33:23 +00:00
d2b61c0297
Free frame data slice on file reset
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3813
svn path=/trunk/; revision=29322
2009-08-07 12:15:46 +00:00
3ec8398f16
From Kovarththanan Rajaratnam:
...
This patch fixes the "Decode as" crash. We now freeze the packetlist before
attempting to clear it. This way we don't have to issue a row deleted signal
either.
svn path=/trunk/; revision=29238
2009-07-29 21:32:49 +00:00
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
d4caa4ec50
Pacify the build bot.
...
svn path=/trunk/; revision=29222
2009-07-28 18:29:15 +00:00
09c6b577f9
Set reftime without recreating the packet list.
...
svn path=/trunk/; revision=29220
2009-07-28 16:20:05 +00:00
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
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
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
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
2e29868357
Use g_slice if glib >=2.10
...
svn path=/trunk/; revision=29187
2009-07-24 13:50:57 +00:00
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
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
203fb3f25f
Minor indentation fixes.
...
svn path=/trunk/; revision=29163
2009-07-22 06:00:53 +00:00
8c4abdfb47
From didier gautheron via bug 3762:
...
This patch removes col_expr in frame_data structure,
it can be recomputed when needed.
svn path=/trunk/; revision=29159
2009-07-21 16:48:16 +00:00
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
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
5afe405717
Removed an incorrect optimalization for invalidating packet in row 0.
...
svn path=/trunk/; revision=28950
2009-07-06 13:53:01 +00:00
e0ebc32195
Updates to create_tempfile:
...
- Use g_get_tmp_dir, just like get_tempfile_path.
- Don't make the caller worry about the path buffer length.
svn path=/trunk/; revision=28915
2009-07-01 23:36:51 +00:00
f0fbf120f2
Realy make the new packet list compile under Windows...
...
svn path=/trunk/; revision=28909
2009-07-01 17:39:19 +00:00
3fe0c34110
Make the new packet list compile on Windows.
...
svn path=/trunk/; revision=28907
2009-07-01 14:37:02 +00:00
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
3f281d1280
Optimized criteria for invalidate packet in row 0.
...
svn path=/trunk/; revision=28698
2009-06-11 11:50:05 +00:00
23a4f326b7
Clean up white space.
...
svn path=/trunk/; revision=28646
2009-06-06 00:12:43 +00:00
cf91fdf16b
Have tap listeners specify whether the "packet" routine requires
...
a protocol tree;
the column values.
This includes stats-tree listeners.
Have the routines to build the packet list, and to retap packets, honor
those requirements. This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.
This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.
While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.
Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.
Clean up some indentation and some gboolean vs. gint items.
svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
09d8911d4a
Popup a dialog in case we match a row outside the loaded frame area.
...
This adds some information for bug 3429.
svn path=/trunk/; revision=28556
2009-06-01 15:26:15 +00:00
60dfa22754
From Kovarththanan Rajaratnam via bug 3429:
...
This patch downgrades the g_assert() to a proper if statement. This is needed
because we can end up with a match but _without_ any valid row attached to it.
This is the case when the user has aborted while dissecting.
svn path=/trunk/; revision=28555
2009-06-01 14:51:09 +00:00
7f3d33513a
Fix bug 3489:
...
Array overrun at copy of filter expression on GTK1 build.
svn path=/trunk/; revision=28538
2009-05-31 11:31:40 +00:00
cde5843a5d
Fix the build.
...
svn path=/trunk/; revision=28476
2009-05-26 00:30:08 +00:00
ea115662fd
From Didier Gautheron via bug 3391:
...
when loading files > 50 MB wireshark redraws the first pane on each
update_progress_dlg(). If auto_scroll_live is not set that's mean it redraws
the same rows again and again.
The patch attached only redraws it once or if cf->displayed_count < 1000, in
case you have a very big screen.
svn path=/trunk/; revision=28475
2009-05-25 23:48:29 +00:00
54c159cb41
Turn on -Wshorten-64-to-32 by default, and fix some issues that turned
...
up (99 44/100% of which were assignments of double-precision
floating-point constants to floats). Hopefully this will catch at least
some P64 issues on UN*X.
svn path=/trunk/; revision=28108
2009-04-21 16:57:52 +00:00
e648060f0f
Fix the last(?) of the Win64 compilation problems.
...
svn path=/trunk/; revision=28065
2009-04-16 04:05:39 +00:00
63d7a7d712
Use wireshark (instead of ether) for temp file name prefix.
...
svn path=/trunk/; revision=27993
2009-04-08 12:43:51 +00:00
1321c9981b
sprintf --> g_snprintf
...
svn path=/trunk/; revision=27751
2009-03-17 01:47:20 +00:00
0258be0b05
From Jakub Zawadzki:
...
More remove checking for NULL before g_free().
svn path=/trunk/; revision=27728
2009-03-15 18:08:46 +00:00
ace4af44fc
Add a routine to report write errors to the list of failure-reporting
...
routines handled by epan/report_err.c.
Move copy_binary_file() in file.c to epan/filesystem.c, and rename it to
copy_file_binary_mode() (to clarify that it *can* copy text files;
arguably, *all* files are "binary" unless you're on, say, an IBM 1401
:-)). Have it use the report_err.c routines, so it works in
console-mode programs.
Clean up some comments while we're at it.
svn path=/trunk/; revision=27456
2009-02-15 21:47:57 +00:00
acdf91e263
Make "Copy as Filter" on the packet list actually work.
...
Up till now every packet in the packet list got a copy of the pointer to the filter expressions for
the last packets' columns. Hence any 'Copy as Filter" on a column got the expression of the last
packet in the packet list. Instead every packet needs to get a pointer to the filter expressions
for its own columns. This requires making a copy of the filter expressions themselves.
Since this is a bug in 1.0 as well the GLIB1 code is provided for backporting, which can later be dropped from the development tree.
svn path=/trunk/; revision=27396
2009-02-09 07:10:46 +00:00
ee908a7abd
#include <epan/conversation.h> not req'd ...
...
svn path=/trunk/; revision=27392
2009-02-07 16:01:26 +00:00
82fd44f303
Moved invalidation of cf->current_row when rescan packet to catch more cases
...
where packet list and packet details should be updated for row 0.
svn path=/trunk/; revision=26959
2008-12-10 11:05:45 +00:00
076349374b
Invalidate cf->current_row when rescan packet and the new selected row 0
...
has changed, to force update of packet list and packet details.
This fixes bug 3099.
svn path=/trunk/; revision=26937
2008-12-08 21:30:21 +00:00
5498ec1dce
Optimized finding current row from cfile.current_frame.
...
svn path=/trunk/; revision=26804
2008-11-18 14:50:51 +00:00
58e2d7a0d6
Fix some "format not a string literal and no format arguments" warnings.
...
svn path=/trunk/; revision=26649
2008-10-31 15:47:47 +00:00
ee2b7fd393
Fix some "format not a string literal and no format arguments" warnings.
...
svn path=/trunk/; revision=26642
2008-10-31 10:30:17 +00:00
2ce22e6bca
From jmmikkel@mit.edu (Bug 2895):
...
We might receive new packets while redissecting and don't want to
dissect those before the packet-list is fully rebuilt.
svn path=/trunk/; revision=26309
2008-09-30 15:45:20 +00:00
224b638586
#include <emem.h> not req'd
...
svn path=/trunk/; revision=26093
2008-08-26 02:38:57 +00:00
341fba51c5
Remove a few warnings.
...
svn path=/trunk/; revision=25899
2008-08-01 16:49:12 +00:00
c4932893e3
Have separate callback mechanisms in file.c and capture.c; pass the
...
capture callbacks the capture_options * as its second argument in all
cases. This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.
Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.
svn path=/trunk/; revision=25576
2008-06-24 08:05:45 +00:00
c64847fe16
Update all time columns when changing the time precision.
...
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-06-14 16:51:11 +00:00
fa2b419e60
Return the appropriate "everything OK" types.
...
svn path=/trunk/; revision=25405
2008-05-30 07:15:05 +00:00
ffcb641149
Again, the err_info returned from wtap_read() and wtap_seek_read() is a
...
g_mallocated string, so it's not const.
Fix a comment to reflect reality (err_info is some additional
information about the error returned by Wiretap, e.g. some gory details
about the error, mainly useful to developers and support people).
svn path=/trunk/; revision=25401
2008-05-30 04:03:32 +00:00
be161ba460
Free up the err_info string returned by wtap_read() and
...
wtap_seek_read().
Clean up indentation.
svn path=/trunk/; revision=25400
2008-05-30 02:44:02 +00:00
a5cee04fad
Move the file utility functions from wiretap to libwsutil so that
...
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.
While doing that, rename the eth_* functions to ws_*.
svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Kovarththanan Rajaratnam