TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Not showing port 9987 as port in connect message

Browse source
This commit is contained in:
WolverinDEV 2019-04-29 19:48:05 +02:00
parent 1720897f82
commit 364e276c65
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shared/html/templates.html
View file

@ -2463,6 +2463,12 @@
<td>{{tr "Address:" /}}</td> <td>{{tr "Address:" /}}</td>
<td>{{>server_address}}</td> <td>{{>server_address}}</td>
</tr> </tr>
{{if server_peer_address != server_address}}
<tr>
<td>{{tr "Peer address:" /}}</td>
<td>{{>server_peer_address}}</td>
</tr>
{{/if}}
<!-- <!--
<tr> <tr>
<td>{{tr "Type:"/}}</td> <td>{{tr "Type:"/}}</td>

4
shared/js/ConnectionHandler.ts
View file

@ -167,14 +167,14 @@ class ConnectionHandler {
console.log(tr("Start connection to %s:%d"), host, port); console.log(tr("Start connection to %s:%d"), host, port);
this.channelTree.initialiseHead(addr, {host, port}); this.channelTree.initialiseHead(addr, {host, port});
this.chat.serverChat().appendMessage(tr("Initializing connection to {0}:{1}"), true, host, port); this.chat.serverChat().appendMessage(tr("Initializing connection to {0}{1}"), true, host, port == 9987 ? "" : ":" + port);
const do_connect = (address: string, port: number) => { const do_connect = (address: string, port: number) => {
const remote_address = { const remote_address = {
host: address, host: address,
port: port port: port
}; };
this.chat.serverChat().appendMessage(tr("Connecting to {0}:{1}"), true, address, port); this.chat.serverChat().appendMessage(tr("Connecting to {0}{1}"), true, address, port == 9987 ? "" : ":" + port);
if(password && !password.hashed) { if(password && !password.hashed) {
helpers.hashPassword(password.password).then(password => { helpers.hashPassword(password.password).then(password => {
/* errors will be already handled via the handle disconnect thing */ /* errors will be already handled via the handle disconnect thing */

4
shared/js/ui/frames/SelectedItemInfo.ts
View file

@ -397,7 +397,9 @@ class ServerInfoManager extends InfoManager<ServerEntry> {
properties["server_name"] = $.spawn("a").text(server.properties.virtualserver_name); properties["server_name"] = $.spawn("a").text(server.properties.virtualserver_name);
properties["server_onlinetime"] = formatDate(server.calculateUptime()); properties["server_onlinetime"] = formatDate(server.calculateUptime());
properties["server_address"] = server.remote_address.host + ":" + server.remote_address.port; properties["server_address"] = server.remote_address.host + (server.remote_address.port == 9987 ? "" : ":" + server.remote_address.port);
const peer_address = server.channelTree.client.serverConnection.remote_address();
properties["server_peer_address"] = peer_address.host + (peer_address.port == 9987 ? "" : ":" + server.remote_address.port);
properties["hidden_clients"] = Math.max(0, server.properties.virtualserver_clientsonline - server.channelTree.clients.length); properties["hidden_clients"] = Math.max(0, server.properties.virtualserver_clientsonline - server.channelTree.clients.length);
for(let key in server.properties) for(let key in server.properties)