diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-10 18:15:25 +0200 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-11 16:53:01 +0000 |
commit | 4af23b0d7f1386a57c5812b4c88069638e8f20c8 (patch) | |
tree | 19f06b06cc16efc49058d0826097f9068636a553 /ui/gtk | |
parent | df2dc9222b2e7d05367e3ef5d125100e8a2cb903 (diff) |
Fix display of unidirectional follow TCP/UDP streams
It was broken since 48285bb16b0a5655a47a8a59c34bc98e6bf4cb75
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>
Diffstat (limited to 'ui/gtk')
-rw-r--r-- | ui/gtk/follow_ssl.c | 10 | ||||
-rw-r--r-- | ui/gtk/follow_stream.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c index 0993dfacdb..f12de83bca 100644 --- a/ui/gtk/follow_ssl.c +++ b/ui/gtk/follow_ssl.c @@ -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)"; diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index 4d5170c32a..16a8898530 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -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 */ |