osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Another Laura bug: Don't reset the file load time in the status bar when 

we apply a display filter. Display the load time as "Load time:
M:SS.SSS" instead of "Time: HH:MM:SS.SSS".

svn path=/trunk/; revision=31909
This commit is contained in:
Gerald Combs 2010-02-17 23:03:41 +00:00
parent 3e85c03c9d
commit d122243892
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file.c
View File

@ -792,7 +792,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
#ifdef NEW_PACKET_LIST
new_packet_list_check_end();
/* Don't freeze/thaw the list when doing live capture */
/* Don't freeze/thaw the list when doing live capture */
/*new_packet_list_freeze();*/
#else
packet_list_check_end();
@ -839,7 +839,7 @@ cf_continue_tail(capture_file *cf, volatile int to_read, int *err)
/* Sleep(100); */
};
#ifdef NEW_PACKET_LIST
/* Don't freeze/thaw the list when doing live capture */
/* Don't freeze/thaw the list when doing live capture */
/*new_packet_list_thaw();*/
#else
packet_list_thaw();
@ -933,7 +933,7 @@ cf_finish_tail(capture_file *cf, int *err)
#ifdef NEW_PACKET_LIST
new_packet_list_check_end();
/* Don't freeze/thaw the list when doing live capture */
/* Don't freeze/thaw the list when doing live capture */
/*new_packet_list_freeze();*/
#else
packet_list_check_end();
@ -956,7 +956,7 @@ cf_finish_tail(capture_file *cf, int *err)
}
#ifdef NEW_PACKET_LIST
/* Don't freeze/thaw the list when doing live capture */
/* Don't freeze/thaw the list when doing live capture */
/*new_packet_list_thaw();*/
#else
packet_list_thaw();
@ -1777,8 +1777,6 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item,
cf->first_displayed = NULL;
cf->last_displayed = NULL;
reset_elapsed();
/* We currently don't display any packets */
cf->displayed_count = 0;

5
gtk/main_statusbar.c
View File

@ -445,10 +445,9 @@ packets_bar_update(void)
} else {
gulong computed_elapsed = cf_get_computed_elapsed();
packets_str = g_strdup_printf(" Packets: %u Displayed: %u Marked: %u Time: %02lu:%02lu:%02lu.%03lu",
packets_str = g_strdup_printf(" Packets: %u Displayed: %u Marked: %u Load time: %lu:%02lu.%03lu",
cfile.count, cfile.displayed_count, cfile.marked_count,
computed_elapsed/3600000,
computed_elapsed%3600000/60000,
computed_elapsed/60000,
computed_elapsed%60000/1000,
computed_elapsed%1000);
}