nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 726f02ba9d into 979dd354fa

Browse Source
This commit is contained in:
Martin Weinelt 2023-05-10 07:46:30 -07:00 committed by GitHub
commit 8f56db59db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/gluon-mesh-vpn-fastd/src/respondd.c
View File

@ -217,7 +217,7 @@ static bool get_peer_connection(struct json_object **ret, struct json_object *co
if (!key)
return false;
struct json_object *peer, *connection, *established;
struct json_object *peer, *connection, *established, *method;
if (!json_object_object_get_ex(peers, key, &peer) ||
!json_object_object_get_ex(peer, "connection", &connection))
return false;
@ -229,6 +229,10 @@ static bool get_peer_connection(struct json_object **ret, struct json_object *co
struct json_object *jso = json_object_new_double(established_time/1000.0);
json_object_set_serializer(jso, json_object_double_to_json_string, "%.3f", NULL);
json_object_object_add(*ret, "established", jso);
if (json_object_object_get_ex(connection, "method", &method)) {
json_object_object_add(*ret, "method", json_object_get(method));
}
}
else {
*ret = NULL;

3
package/gluon-status-page/javascript/status-page.js
View File

@ -210,7 +210,8 @@
var td = document.createElement('td');
if (peer[1] && peer[1].established != null)
td.textContent = _['connected'] + ' (' + formats.time(peer[1].established) + ')';
const method = peer[1].method ? ', ' + peer[1].method : '';
td.textContent = _['connected'] + ' (' + formats.time(peer[1].established) + method + ')';
else
td.textContent = _['not connected'];
tr.appendChild(td);