webui: add peer port and server ip/port to the connections tab

diff --git a/src/tcp.c b/src/tcp.c
index bc336b4337fae2c2c4aa41dbe1743e477d988f27..8085a5edee99394d6e60c93afadc58f93aa5800d 100644 (file)
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -1074,9 +1074,13 @@ tcp_server_connections ( void )
     if (!tsl->status) continue;
     c++;
     e = htsmsg_create_map();
-    tcp_get_str_from_ip(&tsl->peer, buf, sizeof(buf));
     htsmsg_add_u32(e, "id", tsl->id);
+    tcp_get_str_from_ip(&tsl->self, buf, sizeof(buf));
+    htsmsg_add_str(e, "server", buf);
+    htsmsg_add_u32(e, "server_port", ntohs(IP_PORT(tsl->self)));
+    tcp_get_str_from_ip(&tsl->peer, buf, sizeof(buf));
     htsmsg_add_str(e, "peer", buf);
+    htsmsg_add_u32(e, "peer_port", ntohs(IP_PORT(tsl->peer)));
     htsmsg_add_s64(e, "started", tsl->started);
     tsl->status(tsl->opaque, e);
     htsmsg_add_msg(l, NULL, e);

diff --git a/src/webui/static/app/status.js b/src/webui/static/app/status.js
index c35d4641178ec16b2efd2888fe9359ac8e89b22a..f6ae7d83509ff44601375d101d9d6d52a084617c 100644 (file)
--- a/src/webui/static/app/status.js
+++ b/src/webui/static/app/status.js
@@ -581,7 +581,10 @@ tvheadend.status_conns = function(panel, index) {
             fields: [
                 { name: 'id', sortType: stype },
                 { name: 'type', sortType: stype },
+                { name: 'server', sortType: stype },
+                { name: 'server_port' },
                 { name: 'peer', sortType: stype },
+                { name: 'peer_port' },
                 { name: 'user', sortType: stype },
                 {
                     name: 'started',
@@ -616,6 +619,12 @@ tvheadend.status_conns = function(panel, index) {
                 header: _("IP Address"),
                 dataIndex: 'peer',
                 sortable: true
+            }, {
+                width: 50,
+                id: 'peer_port',
+                header: _("IP Port"),
+                dataIndex: 'peer_port',
+                sortable: true
             }, {
                 width: 50,
                 id: 'user',
@@ -629,6 +638,18 @@ tvheadend.status_conns = function(panel, index) {
                 dataIndex: 'started',
                 renderer: renderDate,
                 sortable: true
+            }, {
+                width: 50,
+                id: 'server',
+                header: _("Server Address"),
+                dataIndex: 'server',
+                sortable: true
+            }, {
+                width: 50,
+                id: 'server_port',
+                header: _("Server Port"),
+                dataIndex: 'server_port',
+                sortable: true
             }]);
 
         grid = new Ext.grid.GridPanel({