osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix display of unidirectional follow TCP/UDP streams 

It was broken since 48285bb16b
While we are at it, display the streams in the same order as Qt version

Change-Id: I12df1c033dd51b7a162adca3fd36b31af5c074a1
Reviewed-on: https://code.wireshark.org/review/1587
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-05-10 18:15:25 +02:00
parent df2dc9222b
commit 4af23b0d7f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/gtk/follow_ssl.c
View File

@ -252,15 +252,15 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
/* ...and then the server-to-client and client-to-server directions. */
if (follow_info->client_port == stats.port[0]) {
server_hostname = hostname1;
server_port = port1;
client_hostname = hostname0;
client_port = port0;
} else {
server_hostname = hostname0;
server_port = port0;
client_hostname = hostname1;
client_port = port1;
} else {
server_hostname = hostname1;
server_port = port1;
client_hostname = hostname0;
client_port = port0;
}
single_direction_format = "%s:%s " UTF8_RIGHTWARDS_ARROW " %s:%s (%u bytes)";

4
ui/gtk/follow_stream.c
View File

@ -720,10 +720,10 @@ follow_stream(const gchar *title, follow_info_t *follow_info,
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(stream_cmb), both_directions_string);
follow_info->show_stream = BOTH_HOSTS;
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(stream_cmb), server_to_client_string);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(stream_cmb), client_to_server_string);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(stream_cmb), server_to_client_string);
gtk_combo_box_set_active(GTK_COMBO_BOX(stream_cmb), 0); /* Do this before signal_connect */
/* so callback not triggered */