Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2014-03-08 08:27:28 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-03-20 18:35:05 (GMT) |
| commit | a51044193098128f615287308240edd0611a2e4b (patch) | |
| tree | 6c05d97d57259071b21b389573cbedcc92fcb260 /Sluift/sluift.cpp | |
| parent | 2bb017cbe8825d9e4b319ab747e23afe73d106bd (diff) | |
| download | swift-contrib-a51044193098128f615287308240edd0611a2e4b.zip swift-contrib-a51044193098128f615287308240edd0611a2e4b.tar.bz2 | |
Sluift: Initialize client tracing at creation time
This avoids all calls to set_trace_enabled prior to connect()
being ignored.
Change-Id: Ib4f2bc9815aae2bd456f2ececcb2a37ac460eebc
Diffstat (limited to 'Sluift/sluift.cpp')
| -rw-r--r-- | Sluift/sluift.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index 858e634..3908631 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -16,96 +16,106 @@ #include "Watchdog.h" #include <Sluift/Lua/Check.h> #include <Sluift/SluiftClient.h> #include <Sluift/globals.h> #include <Sluift/Lua/Exception.h> #include <Sluift/Lua/LuaUtils.h> #include <Sluift/Lua/FunctionRegistration.h> #include <Swiften/Base/sleep.h> #include <Swiften/Base/foreach.h> #include <Swiften/Base/IDGenerator.h> #include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h> #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> #include <Swiften/Serializer/PayloadSerializer.h> #include <Swiften/TLS/Certificate.h> #include <Swiften/TLS/CertificateFactory.h> #include <Sluift/LuaElementConvertor.h> #include <Sluift/Lua/Debug.h> #include <Swiften/StringCodecs/Base64.h> #include <Swiften/StringCodecs/Hexify.h> #include <Swiften/IDN/IDNConverter.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> #include <Sluift/ITunesInterface.h> using namespace Swift; namespace Swift { namespace Sluift { SluiftGlobals globals; } } extern "C" const char core_lua[]; extern "C" size_t core_lua_size; +static inline bool getGlobalDebug(lua_State* L) { + lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.moduleLibIndex); + lua_getfield(L, -1, "debug"); + int result = lua_toboolean(L, -1); + lua_pop(L, 2); + return result; +} + + /******************************************************************************* * Module functions ******************************************************************************/ SLUIFT_LUA_FUNCTION_WITH_HELP( Sluift, new_client, "Creates a new client.\n\nReturns a @{Client} object.\n", "jid The JID to connect as\n" "passphrase The passphrase to use\n", "" ) { Lua::checkString(L, 1); JID jid(std::string(Lua::checkString(L, 1))); std::string password(Lua::checkString(L, 2)); SluiftClient** client = reinterpret_cast<SluiftClient**>(lua_newuserdata(L, sizeof(SluiftClient*))); lua_rawgeti(L, LUA_REGISTRYINDEX, Sluift::globals.coreLibIndex); lua_getfield(L, -1, "Client"); lua_setmetatable(L, -3); lua_pop(L, 1); *client = new SluiftClient(jid, password, &Sluift::globals.networkFactories, &Sluift::globals.eventLoop); + (*client)->setTraceEnabled(getGlobalDebug(L)); return 1; } SLUIFT_LUA_FUNCTION_WITH_HELP( Sluift, sha1, "Compute the SHA-1 hash of given data", "data the data to hash", "" ) { static boost::shared_ptr<CryptoProvider> crypto(PlatformCryptoProvider::create()); if (!lua_isstring(L, 1)) { throw Lua::Exception("Expected string"); } size_t len; const char* data = lua_tolstring(L, 1, &len); ByteArray result = crypto->getSHA1Hash(createByteArray(data, len)); lua_pushlstring(L, reinterpret_cast<char*>(vecptr(result)), result.size()); return 1; } SLUIFT_LUA_FUNCTION_WITH_HELP( Sluift, sleep, "Sleeps for the given time.", "milliseconds the amount of milliseconds to sleep", "" ) { Sluift::globals.eventLoop.runOnce(); int timeout = Lua::checkIntNumber(L, 1); Watchdog watchdog(timeout, Sluift::globals.networkFactories.getTimerFactory()); while (!watchdog.getTimedOut()) { Swift::sleep(boost::numeric_cast<unsigned int>(std::min(100, timeout))); Sluift::globals.eventLoop.runOnce(); } return 0; } |