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

Fix tshark -z follow,tcp stats regression when TCP stream index is > 0 

With tshark stats are being configured before the file gets loaded and the number of TCP streams are computed

Bug: 9541
Change-Id: I42c2891124f1781b05967d5f071ad40df2d6d9f5
Reviewed-on: https://code.wireshark.org/review/1598
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-05-11 22:49:03 +02:00
parent 9554b2fc62
commit d1d5caaf25
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/follow.c
View File

@ -219,10 +219,6 @@ follow_tcp_index(guint32 indx)
return FALSE;
}
if (indx > get_tcp_stream_count()) {
return FALSE;
}
find_tcp_addr = TRUE;
tcp_stream_to_follow = indx;
memset(ip_address, 0, sizeof ip_address);

4
ui/cli/tap-follow.c
View File

@ -911,7 +911,7 @@ followTcp(
{
followFree(fp);
g_string_free(errp, TRUE);
followExit("Error registering tcp tap listner.");
followExit("Error registering tcp tap listener.");
}
}
@ -981,7 +981,7 @@ followSsl(
{
followFree(fp);
g_string_free(errp, TRUE);
followExit("Error registering ssl tap listner.");
followExit("Error registering ssl tap listener.");
}
}