diff options
author | Michael Mann <mmann78@netscape.net> | 2015-01-07 16:24:17 -0500 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-01-08 05:32:32 +0000 |
commit | 22096781499c7159ff504f7baa743d295aad06bc (patch) | |
tree | db03b06970119f83d9b33c2920236d398e3a9ca1 /ui/qt/conversation_dialog.cpp | |
parent | 907d145f86dd4fb219dcb5b2efcac106bc708de7 (diff) |
ep_<protocol>_port_to_display -> <protocol>_port_to_display
Adjust any other ep_ related APIs related to the transition.
Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c
Reviewed-on: https://code.wireshark.org/review/6388
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/conversation_dialog.cpp')
-rw-r--r-- | ui/qt/conversation_dialog.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 319e9ffc57..b96db0819c 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -339,7 +339,7 @@ public: conv_item_t *conv_item = data(ci_col_, Qt::UserRole).value<conv_item_t *>(); bool ok; quint64 cur_packets = data(pkts_col_, Qt::UserRole).toULongLong(&ok); - char *src_addr, *dst_addr; + char *src_addr, *dst_addr, *src_port, *dst_port; if (!conv_item) { return; @@ -352,12 +352,16 @@ public: src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, resolve_names); dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, resolve_names); + src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); setText(CONV_COLUMN_SRC_ADDR, src_addr); - setText(CONV_COLUMN_SRC_PORT, get_conversation_port(conv_item->src_port, conv_item->ptype, resolve_names)); + setText(CONV_COLUMN_SRC_PORT, src_port); setText(CONV_COLUMN_DST_ADDR, dst_addr); - setText(CONV_COLUMN_DST_PORT, get_conversation_port(conv_item->dst_port, conv_item->ptype, resolve_names)); + setText(CONV_COLUMN_DST_PORT, dst_port); wmem_free(NULL, src_addr); wmem_free(NULL, dst_addr); + wmem_free(NULL, src_port); + wmem_free(NULL, dst_port); double duration = nstime_to_sec(&conv_item->stop_time) - nstime_to_sec(&conv_item->start_time); QString col_str, bps_ab = bps_na_, bps_ba = bps_na_; @@ -410,7 +414,10 @@ public: } case CONV_COLUMN_SRC_PORT: if (resolve_names) { - return get_conversation_port(conv_item->src_port, conv_item->ptype, resolve_names); + char* port_str = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + QString q_port_str(port_str); + wmem_free(NULL, port_str); + return q_port_str; } else { return quint32(conv_item->src_port); } @@ -423,7 +430,10 @@ public: } case CONV_COLUMN_DST_PORT: if (resolve_names) { - return get_conversation_port(conv_item->dst_port, conv_item->ptype, resolve_names); + char* port_str = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); + QString q_port_str(port_str); + wmem_free(NULL, port_str); + return q_port_str; } else { return quint32(conv_item->dst_port); } |