diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-08-03 15:03:50 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-03 15:32:22 +0000 |
| commit | 7a7a72e15508d5927ced7189e50d17a16a016dad (patch) | |
| tree | bd90be3a9054e7b44411113c67642ed11a1f5a6b /epan/dissectors/packet-tcp.c | |
| parent | 50b6e16a8e8d2d078eb80c784d4f833c262faaab (diff) | |
Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5
Bug: 10336
Change-Id: Ia0dbe3abfade59a1c9714eacd8a854eafa6cf879
Reviewed-on: https://code.wireshark.org/review/3379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 19668e98e4..a614e79c29 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -536,6 +536,27 @@ static const char* tcp_conv_get_filter_type(conv_item_t* conv _U_, conv_filter_t if (filter == CONV_FT_ANY_PORT) return "tcp.port"; + if (filter == CONV_FT_SRC_ADDRESS) { + if (conv->src_address.type == AT_IPv4) + return "ip.src"; + if (conv->src_address.type == AT_IPv6) + return "ipv6.src"; + } + + if (filter == CONV_FT_DST_ADDRESS) { + if (conv->dst_address.type == AT_IPv4) + return "ip.dst"; + if (conv->dst_address.type == AT_IPv6) + return "ipv6.dst"; + } + + if (filter == CONV_FT_ANY_ADDRESS) { + if (conv->src_address.type == AT_IPv4) + return "ip.addr"; + if (conv->src_address.type == AT_IPv6) + return "ipv6.addr"; + } + return CONV_FILTER_INVALID; } |