From 90de0dec04920b514e11dff26a6b8987ac50acb8 Mon Sep 17 00:00:00 2001 From: Jerzy Skalski Date: Fri, 12 May 2017 15:47:44 +0200 Subject: [PATCH 1/2] Fix iptostring Fix iptostring bug that blocks access to half of OTSes --- src/framework/luafunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp index 8df6f9f1..df2a40c6 100644 --- a/src/framework/luafunctions.cpp +++ b/src/framework/luafunctions.cpp @@ -72,7 +72,7 @@ void Application::registerLuaFunctions() g_lua.bindGlobalFunction("pointtostring", [](const Point& v) { return stdext::to_string(v); }); g_lua.bindGlobalFunction("colortostring", [](const Color& v) { return stdext::to_string(v); }); g_lua.bindGlobalFunction("sizetostring", [](const Size& v) { return stdext::to_string(v); }); - g_lua.bindGlobalFunction("iptostring", [](int v) { return stdext::ip_to_string(v); }); + g_lua.bindGlobalFunction("iptostring", [](uint v) { return stdext::ip_to_string(v); }); g_lua.bindGlobalFunction("stringtoip", [](const std::string& v) { return stdext::string_to_ip(v); }); g_lua.bindGlobalFunction("listSubnetAddresses", [](uint32 a, uint8 b) { return stdext::listSubnetAddresses(a, b); }); g_lua.bindGlobalFunction("ucwords", [](std::string s) { return stdext::ucwords(s); }); From 1d77d202e6630f2c077334a1fe2bf0a5c63049a1 Mon Sep 17 00:00:00 2001 From: Jerzy Skalski Date: Sat, 13 May 2017 13:14:25 +0200 Subject: [PATCH 2/2] Change uint to uint32 --- src/framework/luafunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp index df2a40c6..881efdb6 100644 --- a/src/framework/luafunctions.cpp +++ b/src/framework/luafunctions.cpp @@ -72,7 +72,7 @@ void Application::registerLuaFunctions() g_lua.bindGlobalFunction("pointtostring", [](const Point& v) { return stdext::to_string(v); }); g_lua.bindGlobalFunction("colortostring", [](const Color& v) { return stdext::to_string(v); }); g_lua.bindGlobalFunction("sizetostring", [](const Size& v) { return stdext::to_string(v); }); - g_lua.bindGlobalFunction("iptostring", [](uint v) { return stdext::ip_to_string(v); }); + g_lua.bindGlobalFunction("iptostring", [](uint32 v) { return stdext::ip_to_string(v); }); g_lua.bindGlobalFunction("stringtoip", [](const std::string& v) { return stdext::string_to_ip(v); }); g_lua.bindGlobalFunction("listSubnetAddresses", [](uint32 a, uint8 b) { return stdext::listSubnetAddresses(a, b); }); g_lua.bindGlobalFunction("ucwords", [](std::string s) { return stdext::ucwords(s); });