From 0a85b72549d294b127c3224610870be4f9382f9a Mon Sep 17 00:00:00 2001 From: "martin.holst@gmail.com" Date: Fri, 4 Oct 2013 19:29:46 +0000 Subject: [PATCH 1/1] Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser --- client/cmdscript.c | 94 ---------------------------------------------- client/scripting.c | 13 +++++++ 2 files changed, 13 insertions(+), 94 deletions(-) diff --git a/client/cmdscript.c b/client/cmdscript.c index f57724af..8c1acf27 100644 --- a/client/cmdscript.c +++ b/client/cmdscript.c @@ -103,94 +103,6 @@ int CmdScript(const char *Cmd) CmdsParse(CommandTable, Cmd); return 0; } -/* -static int l_hfmf (lua_State *L) { - return CmdHFMF("wohoo"); - -} -*/ -//static int l_CmdHelp(lua_State *L){ return CmdHelp(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfDbg(lua_State *L){ return CmdHF14AMfDbg(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfRdBl(lua_State *L){ return CmdHF14AMfRdBl(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfRdSc(lua_State *L){ return CmdHF14AMfRdSc(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfDump(lua_State *L){ return CmdHF14AMfDump(luaL_checkstring(L, 1));} -static int l_CmdHF14AMifare(lua_State *L){ return CmdHF14AMifare(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfWrBl(lua_State *L){ return CmdHF14AMfWrBl(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfChk(lua_State *L){ return CmdHF14AMfChk(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfNested(lua_State *L){ return CmdHF14AMfNested(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfRestore(lua_State *L){ return CmdHF14AMfRestore(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfSniff(lua_State *L){ return CmdHF14AMfSniff(luaL_checkstring(L, 1));} -static int l_CmdHF14AMf1kSim(lua_State *L){ return CmdHF14AMf1kSim(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfEClear(lua_State *L){ return CmdHF14AMfEClear(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfEGet(lua_State *L){ return CmdHF14AMfEGet(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfESet(lua_State *L){ return CmdHF14AMfESet(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfELoad(lua_State *L){ return CmdHF14AMfELoad(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfESave(lua_State *L){ return CmdHF14AMfESave(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfECFill(lua_State *L){ return CmdHF14AMfECFill(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfEKeyPrn(lua_State *L){ return CmdHF14AMfEKeyPrn(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCSetUID(lua_State *L){ return CmdHF14AMfCSetUID(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCSetBlk(lua_State *L){ return CmdHF14AMfCSetBlk(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCGetBlk(lua_State *L){ return CmdHF14AMfCGetBlk(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCGetSc(lua_State *L){ return CmdHF14AMfCGetSc(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCLoad(lua_State *L){ return CmdHF14AMfCLoad(luaL_checkstring(L, 1));} -static int l_CmdHF14AMfCSave(lua_State *L){ return CmdHF14AMfCSave(luaL_checkstring(L, 1));} - - - - -static void set_cmdlibraries(lua_State *L) -{ - static const luaL_Reg hfmf_lib[] = { - {"dbg", l_CmdHF14AMfDbg}, - {"rdbl", l_CmdHF14AMfRdBl}, - {"rdsc", l_CmdHF14AMfRdSc}, - {"dump", l_CmdHF14AMfDump}, - {"restore", l_CmdHF14AMfRestore}, - {"wrbl", l_CmdHF14AMfWrBl}, - {"chk", l_CmdHF14AMfChk}, - {"mifare", l_CmdHF14AMifare}, - {"nested", l_CmdHF14AMfNested}, - {"sniff", l_CmdHF14AMfSniff}, - {"sim", l_CmdHF14AMf1kSim}, - {"eclr", l_CmdHF14AMfEClear}, - {"eget", l_CmdHF14AMfEGet}, - {"eset", l_CmdHF14AMfESet}, - {"eload", l_CmdHF14AMfELoad}, - {"esave", l_CmdHF14AMfESave}, - {"ecfill", l_CmdHF14AMfECFill}, - {"ekeyprn", l_CmdHF14AMfEKeyPrn}, - {"csetuid", l_CmdHF14AMfCSetUID}, - {"csetblk", l_CmdHF14AMfCSetBlk}, - {"cgetblk", l_CmdHF14AMfCGetBlk}, - {"cgetsc", l_CmdHF14AMfCGetSc}, - {"cload", l_CmdHF14AMfCLoad}, - {"csave", l_CmdHF14AMfCSave}, - {NULL, NULL} - }; - - lua_pushglobaltable(L); - // Core library is in this table. Contains 'hf' - - //this is 'hf' table - lua_newtable(L); - - //this is the mf table - lua_newtable(L); - - //Put the function into the hash table. - for (int i = 0; hfmf_lib[i].name; i++) { - lua_pushcfunction(L, hfmf_lib[i].func); - lua_setfield(L, -2, hfmf_lib[i].name);//set the name, pop stack - } - //Name of 'mf' - lua_setfield(L, -2, "mf"); - - //Name of 'hf' - lua_setfield(L, -2, "hf"); - - //-- remove the global environment table from the stack - lua_pop(L, 1); -} /** * Utility to check the ending of a string (used to check file suffix) */ @@ -218,15 +130,9 @@ int CmdRun(const char *Cmd) //Sets the pm3 core libraries, that go a bit 'under the hood' set_pm3_libraries(lua_state); - //Sets the 'command line' libraries, basically just the commandline stuff - set_cmdlibraries(lua_state); - //Add the 'bin' library set_bin_library(lua_state); -// char cmd_name[32]; -// memset(cmd_name, 0, 32); -// sscanf(Cmd, "%31s%n", cmd_name, &len); char script_name[128] = {0}; char arguments[256] = {0}; diff --git a/client/scripting.c b/client/scripting.c index ae11d7ca..9e3ff4e3 100644 --- a/client/scripting.c +++ b/client/scripting.c @@ -136,6 +136,18 @@ static int l_ukbhit(lua_State *L) lua_pushboolean(L,ukbhit() ? true : false); return 1; } +/** + * @brief Calls the command line parser to deal with the command. This enables + * lua-scripts to do stuff like "core.console('hf mf mifare')" + * @param L + * @return + */ +static int l_CmdConsole(lua_State *L) +{ + CommandReceived((char *)luaL_checkstring(L, 1)); + return 0; +} + /** * @brief Sets the lua path to include "./lualibs/?.lua", in order for a script to be @@ -172,6 +184,7 @@ int set_pm3_libraries(lua_State *L) {"foobar", l_foobar}, {"ukbhit", l_ukbhit}, {"clearCommandBuffer", l_clearCommandBuffer}, + {"console", l_CmdConsole}, {NULL, NULL} }; -- 2.39.5