Cleanup|libcore|libshell: Show local addresses always as "localhost"

skyjake · Nov 8, 2016 · 9d3d5ad · 9d3d5ad
1 parent e9c1f0f
commit 9d3d5ad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/doomsday/sdk/libcore/src/net/address.cpp b/doomsday/sdk/libcore/src/net/address.cpp
@@ -124,7 +124,7 @@ bool Address::matches(Address const &other, duint32 mask)
 
 String Address::asText() const
 {
-    String result = (d->host == QHostAddress::LocalHost? "localhost" : d->host.toString());
+    String result = (isLocal()? String("localhost") : d->host.toString());
     if (d->port)
     {
         result += ":" + QString::number(d->port);

diff --git a/doomsday/sdk/libcore/src/net/beacon.cpp b/doomsday/sdk/libcore/src/net/beacon.cpp
@@ -98,7 +98,7 @@ void Beacon::setMessage(IByteArray const &advertisedMessage)
 
     d->message += Block(advertisedMessage).compressed();
 
-    qDebug() << "Beacon message:" << advertisedMessage.size() << d->message.size();
+    //qDebug() << "Beacon message:" << advertisedMessage.size() << d->message.size();
 }
 
 void Beacon::stop()

diff --git a/doomsday/sdk/libcore/src/net/listensocket.cpp b/doomsday/sdk/libcore/src/net/listensocket.cpp
@@ -75,7 +75,7 @@ Socket *ListenSocket::accept()
     }
 
     QTcpSocket *s = d->incoming.takeFirst();
-    LOG_NET_NOTE("Accepted new connection from %s") << s->peerAddress().toString();
+    LOG_NET_NOTE("Accepted new connection from %s") << Address(s->peerAddress()).asText();
 
     // We can use this constructor because we are Socket's friend.
     return new Socket(s);

diff --git a/doomsday/sdk/libshell/src/serverfinder.cpp b/doomsday/sdk/libshell/src/serverfinder.cpp
@@ -136,7 +136,9 @@ ServerInfo ServerFinder::messageFromServer(Address const &address) const
         throw NotFoundError("ServerFinder::messageFromServer",
                             "No message from server " + address.asText());
     }
-    return ServerInfo(*d->servers[address].message);
+    ServerInfo info(*d->servers[address].message);
+    info.setAddress(address);
+    return info;
 }
 
 void ServerFinder::found(Address host, Block block)
@@ -163,6 +165,8 @@ void ServerFinder::found(Address host, Block block)
         }
         Reader(block).withHeader() >> *found.message;
 
+        //qDebug() << "Server found:\n" << found.message->asText().toLatin1().constData();
+
         emit updated();
     }
     catch (Error const &)

diff --git a/doomsday/tools/shell/src/linkwindow.cpp b/doomsday/tools/shell/src/linkwindow.cpp
@@ -131,7 +131,8 @@ DENG2_PIMPL(LinkWindow)
             if (self.isConnected() && !link->address().isNull())
             {
                 txt = tr("<b>%1</b>:%2")
-                        .arg(link->address().host().toString())
+                        .arg(link->address().isLocal()? "localhost"
+                                                      : link->address().host().toString())
                         .arg(link->address().port());
             }
             else if (self.isConnected() && link->address().isNull())