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>

10 files changed, 79 insertions, 40 deletions

diff --git a/ui/cli/tap-endpoints.c b/ui/cli/tap-endpoints.c
index 1a6946d2fa..cbdc110f76 100644
--- a/ui/cli/tap-endpoints.c
+++ b/ui/cli/tap-endpoints.c
@@ -71,7 +71,7 @@ endpoints_draw(void *arg)
 
 		for (i=0; (iu->hash.conv_array && i < iu->hash.conv_array->len); i++) {
 			guint64 tot_frames;
-			gchar*  conversation_str;
+			gchar *conversation_str, *port_str;
 
 			host = &g_array_index(iu->hash.conv_array, hostlist_talker_t, i);
 			tot_frames = host->rx_frames + host->tx_frames;
@@ -80,15 +80,17 @@ endpoints_draw(void *arg)
 				/* XXX - TODO: make name resolution configurable (through gbl_resolv_flags?) */
 				conversation_str = (char*)get_conversation_address(NULL, &host->myaddress, TRUE);
 				if (display_port) {
+					/* XXX - TODO: make port resolution configurable (through gbl_resolv_flags?) */
+					port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, TRUE);
 					printf("%-20s      %5s     %6" G_GINT64_MODIFIER "u     %9" G_GINT64_MODIFIER
 					       "u     %6" G_GINT64_MODIFIER "u       %9" G_GINT64_MODIFIER "u      %6"
 					       G_GINT64_MODIFIER "u       %9" G_GINT64_MODIFIER "u   \n",
 						conversation_str,
-						/* XXX - TODO: make port resolution configurable (through gbl_resolv_flags?) */
-						get_conversation_port(host->port, host->ptype, TRUE),
+						port_str,
 						host->tx_frames+host->rx_frames, host->tx_bytes+host->rx_bytes,
 						host->tx_frames, host->tx_bytes,
 						host->rx_frames, host->rx_bytes);
+					wmem_free(NULL, port_str);
 				} else {
 					printf("%-20s      %6" G_GINT64_MODIFIER "u     %9" G_GINT64_MODIFIER
 					       "u     %6" G_GINT64_MODIFIER "u       %9" G_GINT64_MODIFIER "u      %6"
diff --git a/ui/cli/tap-iousers.c b/ui/cli/tap-iousers.c
index c3bc5320df..79c3924729 100644
--- a/ui/cli/tap-iousers.c
+++ b/ui/cli/tap-iousers.c
@@ -104,11 +104,11 @@ iousers_draw(void *arg)
 				src_addr = (char*)get_conversation_address(NULL, &iui->src_address, TRUE);
 				dst_addr = (char*)get_conversation_address(NULL, &iui->dst_address, TRUE);
 				if (display_ports) {
-					char *src, *dst;
-					src = wmem_strconcat(NULL, src_addr,
-						":", get_conversation_port(iui->src_port, iui->ptype, TRUE), NULL);
-					dst = wmem_strconcat(NULL, dst_addr,
-						":", get_conversation_port(iui->dst_port, iui->ptype, TRUE), NULL);
+					char *src, *dst, *src_port, *dst_port;
+					src_port = (char*)get_conversation_port(NULL, iui->src_port, iui->ptype, TRUE);
+					dst_port = (char*)get_conversation_port(NULL, iui->dst_port, iui->ptype, TRUE);
+					src = wmem_strconcat(NULL, src_addr, ":", src_port, NULL);
+					dst = wmem_strconcat(NULL, dst_addr, ":", dst_port, NULL);
 					printf("%-26s <-> %-26s  %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER
 					       "u  %6" G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER "u  %6"
 					       G_GINT64_MODIFIER "u %9" G_GINT64_MODIFIER "u  ",
@@ -118,6 +118,8 @@ iousers_draw(void *arg)
 						iui->tx_frames+iui->rx_frames,
 						iui->tx_bytes+iui->rx_bytes
 					);
+					wmem_free(NULL, src_port);
+					wmem_free(NULL, dst_port);
 					wmem_free(NULL, src);
 					wmem_free(NULL, dst);
 				} else {
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index db59acbc11..6556f30f8f 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -1593,21 +1593,25 @@ draw_ct_table_addresses(conversations_table *ct)
 
     while (iter_valid) {
         conv_item_t *conv_item;
-		char *src_addr, *dst_addr;
+		char *src_addr, *dst_addr, *src_port, *dst_port;
 
         gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, CONV_INDEX_COLUMN, &idx, -1);
         conv_item = &g_array_index(ct->hash.conv_array, conv_item_t, idx);
         src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names);
         dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names);
+        src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names);
+        dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names);
         gtk_list_store_set (store, &iter,
                   CONV_COLUMN_SRC_ADDR, src_addr,
-                  CONV_COLUMN_SRC_PORT, get_conversation_port(conv_item->src_port, conv_item->ptype, ct->resolve_names),
+                  CONV_COLUMN_SRC_PORT, src_port,
                   CONV_COLUMN_DST_ADDR, dst_addr,
-                  CONV_COLUMN_DST_PORT, get_conversation_port(conv_item->dst_port, conv_item->ptype, ct->resolve_names),
+                  CONV_COLUMN_DST_PORT, dst_port,
                     -1);
         iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
         wmem_free(NULL, src_addr);
         wmem_free(NULL, dst_addr);
+        wmem_free(NULL, src_port);
+        wmem_free(NULL, dst_port);
     }
 
     gtk_tree_view_set_model(GTK_TREE_VIEW(ct->table), GTK_TREE_MODEL(store));
@@ -1712,16 +1716,18 @@ draw_ct_table_data(conversations_table *ct)
                     CONV_COLUMN_BPS_BA,   rx_ptr,
                     -1);
         } else {
-            char *src_addr, *dst_addr;
+            char *src_addr, *dst_addr, *src_port, *dst_port;
 
             src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names);
             dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names);
+            src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names);
+            dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names);
             /* New row. All entries, including fixed ones */
             gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
                     CONV_COLUMN_SRC_ADDR, src_addr,
-                    CONV_COLUMN_SRC_PORT, get_conversation_port(conv_item->src_port, conv_item->ptype, ct->resolve_names),
+                    CONV_COLUMN_SRC_PORT, src_port,
                     CONV_COLUMN_DST_ADDR, dst_addr,
-                    CONV_COLUMN_DST_PORT, get_conversation_port(conv_item->dst_port, conv_item->ptype, ct->resolve_names),
+                    CONV_COLUMN_DST_PORT, dst_port,
                     CONV_COLUMN_PACKETS,  conv_item->tx_frames+conv_item->rx_frames,
                     CONV_COLUMN_BYTES,    conv_item->tx_bytes+conv_item->rx_bytes,
                     CONV_COLUMN_PKT_AB,   conv_item->tx_frames,
@@ -1736,6 +1742,8 @@ draw_ct_table_data(conversations_table *ct)
                     -1);
             wmem_free(NULL, src_addr);
             wmem_free(NULL, dst_addr);
+            wmem_free(NULL, src_port);
+            wmem_free(NULL, dst_port);
         }
 
         iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index a35076556a..562f37a5b5 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -133,8 +133,7 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
     int             previous_filter_len;
     const char *    hostname0;
     const char *    hostname1;
-    const char *    port0;
-    const char *    port1;
+    char           *port0, *port1;
     const char *    client_hostname;
     const char *    server_hostname;
     const char *    client_port;
@@ -237,8 +236,8 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
         hostname1 = get_hostname(ipaddr);
     }
 
-    port0 = ep_tcp_port_to_display(stats.port[0]);
-    port1 = ep_tcp_port_to_display(stats.port[1]);
+    port0 = (char*)tcp_port_to_display(NULL, stats.port[0]);
+    port1 = (char*)tcp_port_to_display(NULL, stats.port[1]);
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
@@ -275,6 +274,8 @@ follow_ssl_stream_cb(GtkWidget * w _U_, gpointer data _U_)
     follow_stream("Follow SSL Stream", follow_info, both_directions_string,
                     server_to_client_string, client_to_server_string);
 
+    wmem_free(NULL, port0);
+    wmem_free(NULL, port1);
     g_free(both_directions_string);
     g_free(server_to_client_string);
     g_free(client_to_server_string);
diff --git a/ui/gtk/follow_tcp.c b/ui/gtk/follow_tcp.c
index 22565036ad..a7f501c8c9 100644
--- a/ui/gtk/follow_tcp.c
+++ b/ui/gtk/follow_tcp.c
@@ -257,8 +257,8 @@ follow_tcp_stream_cb(GtkWidget * w _U_, gpointer data _U_)
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
-    port0 = ep_tcp_port_to_display(stats.port[0]);
-    port1 = ep_tcp_port_to_display(stats.port[1]);
+    port0 = (char*)tcp_port_to_display(NULL, stats.port[0]);
+    port1 = (char*)tcp_port_to_display(NULL, stats.port[1]);
 
     /* Host 0 --> Host 1 */
     if ((sc.src_port == stats.port[0]) &&
@@ -304,6 +304,8 @@ follow_tcp_stream_cb(GtkWidget * w _U_, gpointer data _U_)
     /* Free the filter string, as we're done with it. */
     g_free(follow_filter);
 
+    wmem_free(NULL, port0);
+    wmem_free(NULL, port1);
     g_free(both_directions_string);
     g_free(server_to_client_string);
     g_free(client_to_server_string);
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index 8af7972a37..923e7658e3 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -183,8 +183,8 @@ follow_udp_stream_cb(GtkWidget *w _U_, gpointer data _U_)
         hostname1 = get_hostname(ipaddr);
     }
 
-    port0 = ep_udp_port_to_display(stats.port[0]);
-    port1 = ep_udp_port_to_display(stats.port[1]);
+    port0 = udp_port_to_display(NULL, stats.port[0]);
+    port1 = udp_port_to_display(NULL, stats.port[1]);
 
     follow_info->is_ipv6 = stats.is_ipv6;
 
@@ -222,6 +222,8 @@ follow_udp_stream_cb(GtkWidget *w _U_, gpointer data _U_)
     follow_stream("Follow UDP Stream", follow_info, both_directions_string,
                   server_to_client_string, client_to_server_string);
 
+    wmem_free(NULL, port0);
+    wmem_free(NULL, port1);
     g_free(both_directions_string);
     g_free(server_to_client_string);
     g_free(client_to_server_string);
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 5bdb12fbfc..8db01f30ce 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -476,19 +476,21 @@ draw_hostlist_table_addresses(hostlist_table *hl)
 
     while (iter_valid) {
         hostlist_talker_t *host;
-        char* addr_str;
+        char *addr_str, *port_str;
 
         gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, ENDP_INDEX_COLUMN, &idx, -1);
         host = &g_array_index(hl->hash.conv_array, hostlist_talker_t, idx);
 
         addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names);
+        port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names);
         gtk_list_store_set (store, &iter,
                   ENDP_COLUMN_ADDR, addr_str,
-                  ENDP_COLUMN_PORT, get_conversation_port(host->port, host->ptype, hl->resolve_names),
+                  ENDP_COLUMN_PORT, port_str,
                     -1);
 
         iter_valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
         wmem_free(NULL, addr_str);
+        wmem_free(NULL, port_str);
     }
     gtk_tree_view_set_model(GTK_TREE_VIEW(hl->table), GTK_TREE_MODEL(store));
     g_object_unref(store);
@@ -554,7 +556,7 @@ draw_hostlist_table_data(hostlist_table *hl)
         }
         host->modified = FALSE;
         if (!iter_valid) {
-            char* addr_str;
+            char *addr_str, *port_str;
 #ifdef HAVE_GEOIP
             char *geoip[ENDP_NUM_GEOIP_COLUMNS];
             guint j;
@@ -598,9 +600,10 @@ draw_hostlist_table_data(hostlist_table *hl)
 #endif /* HAVE_GEOIP */
 
             addr_str = (char*)get_conversation_address(NULL, &host->myaddress, hl->resolve_names);
+            port_str = (char*)get_conversation_port(NULL, host->port, host->ptype, hl->resolve_names);
             gtk_list_store_insert_with_values( store, &iter, G_MAXINT,
                   ENDP_COLUMN_ADDR, addr_str,
-                  ENDP_COLUMN_PORT, get_conversation_port(host->port, host->ptype, hl->resolve_names),
+                  ENDP_COLUMN_PORT, port_str,
                   ENDP_COLUMN_PACKETS,  host->tx_frames+host->rx_frames,
                   ENDP_COLUMN_BYTES,    host->tx_bytes+host->rx_bytes,
                   ENDP_COLUMN_PKT_AB,   host->tx_frames,
@@ -625,6 +628,7 @@ draw_hostlist_table_data(hostlist_table *hl)
                   ENDP_INDEX_COLUMN,    idx,
                     -1);
             wmem_free(NULL, addr_str);
+            wmem_free(NULL, port_str);
 #ifdef HAVE_GEOIP
             for (j = 0; j < ENDP_NUM_GEOIP_COLUMNS; j++)
                 g_free(geoip[j]);
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);
             }
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp
index 81672cd2a0..615298dc30 100644
--- a/ui/qt/endpoint_dialog.cpp
+++ b/ui/qt/endpoint_dialog.cpp
@@ -228,7 +228,7 @@ public:
         hostlist_talker_t *endp_item = data(ei_col_, Qt::UserRole).value<hostlist_talker_t *>();
         bool ok;
         quint64 cur_packets = data(pkts_col_, Qt::UserRole).toULongLong(&ok);
-        char* addr_str;
+        char *addr_str, *port_str;
 
         if (!endp_item) {
             return;
@@ -240,9 +240,11 @@ public:
         }
 
         addr_str = (char*)get_conversation_address(NULL, &endp_item->myaddress, resolve_names);
+        port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names);
         setText(ENDP_COLUMN_ADDR, addr_str);
-        setText(ENDP_COLUMN_PORT, get_conversation_port(endp_item->port, endp_item->ptype, resolve_names));
+        setText(ENDP_COLUMN_PORT, port_str);
         wmem_free(NULL, addr_str);
+        wmem_free(NULL, port_str);
 
         QString col_str;
 
@@ -301,7 +303,10 @@ public:
             }
         case ENDP_COLUMN_PORT:
             if (resolve_names) {
-                return get_conversation_port(endp_item->port, endp_item->ptype, resolve_names);
+                char* port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names);
+                QString q_port_str(port_str);
+                wmem_free(NULL, port_str);
+                return q_port_str;
             } else {
                 return quint32(endp_item->port);
             }
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index 06742f4d97..4a4d825bdd 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -1088,16 +1088,16 @@ bool FollowStreamDialog::follow(QString previous_filter, bool use_stream_index)
     switch (follow_type_)
     {
     case FOLLOW_TCP:
-        port0 = ep_tcp_port_to_display(stats.port[0]);
-        port1 = ep_tcp_port_to_display(stats.port[1]);
+        port0 = tcp_port_to_display(NULL, stats.port[0]);
+        port1 = tcp_port_to_display(NULL, stats.port[1]);
         break;
     case FOLLOW_UDP:
-        port0 = ep_udp_port_to_display(stats.port[0]);
-        port1 = ep_udp_port_to_display(stats.port[1]);
+        port0 = udp_port_to_display(NULL, stats.port[0]);
+        port1 = udp_port_to_display(NULL, stats.port[1]);
         break;
     case FOLLOW_SSL:
-        port0 = ep_tcp_port_to_display(stats.port[0]);
-        port1 = ep_tcp_port_to_display(stats.port[1]);
+        port0 = tcp_port_to_display(NULL, stats.port[0]);
+        port1 = tcp_port_to_display(NULL, stats.port[1]);
         break;
     }
 
@@ -1195,6 +1195,9 @@ bool FollowStreamDialog::follow(QString previous_filter, bool use_stream_index)
         }
     }
 
+    wmem_free(NULL, port0);
+    wmem_free(NULL, port1);
+
     /* Both Stream Directions */
     switch (follow_type_)
     {