Add getConnectionInfo() (Mudlet#3105)

* Add getConnectionInfo() * Add link to wiki
jessenee · Sep 20, 2019 · 1bf0a95 · 1bf0a95
1 parent 38cf328
commit 1bf0a95
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/src/TLuaInterpreter.cpp b/src/TLuaInterpreter.cpp
@@ -14968,6 +14968,18 @@ int TLuaInterpreter::deleteHTTP(lua_State *L)
     return 2;
 }
 
+
+// Documentation: https://wiki.mudlet.org/w/Manual:Lua_Functions#getConnectionInfo
+int TLuaInterpreter::getConnectionInfo(lua_State *L)
+{
+    Host& host = getHostFromLua(L);
+
+    auto [hostName, hostPort] = host.mTelnet.getConnectionInfo();
+    lua_pushstring(L, hostName.toUtf8().constData());
+    lua_pushnumber(L, hostPort);
+    return 2;
+}
+
 // No documentation available in wiki - internal function
 void TLuaInterpreter::set_lua_table(const QString& tableName, QStringList& variableList)
 {
@@ -15494,6 +15506,7 @@ void TLuaInterpreter::initLuaGlobals()
     lua_register(pGlobalLua, "putHTTP", TLuaInterpreter::putHTTP);
     lua_register(pGlobalLua, "postHTTP", TLuaInterpreter::postHTTP);
     lua_register(pGlobalLua, "deleteHTTP", TLuaInterpreter::deleteHTTP);
+    lua_register(pGlobalLua, "getConnectionInfo", TLuaInterpreter::getConnectionInfo);
     // PLACEMARKER: End of main Lua interpreter functions registration
 
     // prepend profile path to package.path and package.cpath

diff --git a/src/TLuaInterpreter.h b/src/TLuaInterpreter.h
@@ -512,6 +512,7 @@ class TLuaInterpreter : public QThread
     static int putHTTP(lua_State* L);
     static int postHTTP(lua_State* L);
     static int deleteHTTP(lua_State* L);
+    static int getConnectionInfo(lua_State* L);
     // PLACEMARKER: End of Lua functions declarations
 
 

diff --git a/src/ctelnet.cpp b/src/ctelnet.cpp
@@ -870,6 +870,15 @@ QString cTelnet::decodeOption(const unsigned char ch) const
     }
 }
 
+std::pair<QString, int> cTelnet::getConnectionInfo() const
+{
+    if (hostName.isEmpty() && hostPort == 0) {
+        return {mpHost->getUrl(), mpHost->getPort()};
+    } else {
+        return {hostName, hostPort};
+    }
+}
+
 void cTelnet::processTelnetCommand(const std::string& command)
 {
     char ch = command[1];

diff --git a/src/ctelnet.h b/src/ctelnet.h
@@ -175,6 +175,7 @@ class cTelnet : public QObject
     void requestDiscordInfo();
     QString decodeOption(const unsigned char) const;
     QAbstractSocket::SocketState getConnectionState() const { return socket.state(); }
+    std::pair<QString, int> getConnectionInfo() const;
 
 
     QMap<int, bool> supportedTelnetOptions;