From f37088095b394124c6a295a071145293a189cd69 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 11 Nov 2020 00:03:58 +0100 Subject: [PATCH] compile with swig files if available --- Makefile.defs | 2 +- client/CMakeLists.txt | 22 + client/Makefile | 55 ++ .../experimental_client_with_swig/.gitignore | 1 - .../00make_swig.sh | 5 +- ...1make_client.sh => 01make_client_cmake.sh} | 2 +- ...nue.sh => 01make_client_cmake_continue.sh} | 1 + .../02a_run_test_lua.sh | 3 - .../02a_run_test_lua_cmake.sh | 3 + ...un_test_py.sh => 02b_run_test_py_cmake.sh} | 2 +- .../02b_run_test_py_grabber_makefile.sh | 8 + .../CMakeLists.txt | 572 ------------------ .../output_grabber.py | 78 +++ .../testembedded_grab.py | 13 + client/src/pm3.i | 8 +- client/src/pm3_luawrap.c | 8 +- client/src/pm3_pywrap.c | 8 +- 17 files changed, 198 insertions(+), 593 deletions(-) delete mode 100644 client/experimental_client_with_swig/.gitignore rename client/experimental_client_with_swig/{01make_client.sh => 01make_client_cmake.sh} (92%) rename client/experimental_client_with_swig/{01make_client_continue.sh => 01make_client_cmake_continue.sh} (86%) delete mode 100755 client/experimental_client_with_swig/02a_run_test_lua.sh create mode 100755 client/experimental_client_with_swig/02a_run_test_lua_cmake.sh rename client/experimental_client_with_swig/{02b_run_test_py.sh => 02b_run_test_py_cmake.sh} (59%) create mode 100755 client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh delete mode 100644 client/experimental_client_with_swig/CMakeLists.txt create mode 100755 client/experimental_client_with_swig/output_grabber.py create mode 100755 client/experimental_client_with_swig/testembedded_grab.py diff --git a/Makefile.defs b/Makefile.defs index 16d5ec9e5..48567214b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -27,7 +27,7 @@ LD = g++ SH = sh BASH = bash PERL = perl -CCC =foo +SWIG = swig CC_VERSION = $(shell $(CC) -dumpversion 2>/dev/null|sed 's/\..*//') CC_VERSION := $(or $(strip $(CC_VERSION)),0) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index be8eaec5b..34ad38d26 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -455,6 +455,28 @@ else (SKIPWHEREAMISYSTEM EQUAL 1) message(STATUS "Whereami library: system library not found, using local library") endif (WHEREAMI_FOUND) endif (SKIPWHEREAMISYSTEM EQUAL 1) + +# Lua SWIG +if (EXISTS ${PM3_ROOT}/client/src/pm3_luawrap.c) + set (TARGET_SOURCES + ${PM3_ROOT}/client/src/pm3_luawrap.c + ${TARGET_SOURCES}) + add_definitions(-DHAVE_LUA_SWIG) + message(STATUS "Lua SWIG: wrapper found") +endif (EXISTS ${PM3_ROOT}/client/src/pm3_luawrap.c) + +# Python SWIG +if (NOT SKIPPYTHON EQUAL 1) + if (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) + if (EXISTS ${PM3_ROOT}/client/src/pm3_pywrap.c) + set (TARGET_SOURCES + ${PM3_ROOT}/client/src/pm3_pywrap.c + ${TARGET_SOURCES}) + add_definitions(-DHAVE_PYTHON_SWIG) + message(STATUS "Python SWIG: wrapper found") + endif (EXISTS ${PM3_ROOT}/client/src/pm3_pywrap.c) + endif (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) +endif (NOT SKIPPYTHON EQUAL 1) message(STATUS "===================================================================") add_executable(proxmark3 diff --git a/client/Makefile b/client/Makefile index 8e7ff3724..b2c372f6f 100644 --- a/client/Makefile +++ b/client/Makefile @@ -285,6 +285,19 @@ ifneq ($(SKIPREADLINE),1) READLINE_FOUND = 1 endif +######## +# SWIG # +######## + +ifneq ("$(wildcard src/pm3_luawrap.c)","") + SWIG_LUA_FOUND = 1 +endif +ifneq ($(SKIPPYTHON),1) + ifneq ("$(wildcard src/pm3_pywrap.c)","") + SWIG_PYTHON_FOUND = 1 + endif +endif + ####################################################################################################### CFLAGS ?= $(DEFCFLAGS) # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: @@ -315,6 +328,12 @@ ifeq ($(PYTHON_FOUND),1) PM3CFLAGS += -DHAVE_PYTHON endif +ifeq ($(SWIG_LUA_FOUND),1) + PM3CFLAGS += -DHAVE_LUA_SWIG +endif +ifeq ($(SWIG_PYTHON_FOUND),1) + PM3CFLAGS += -DHAVE_PYTHON_SWIG +endif CXXFLAGS ?= -Wall -Werror -O3 PM3CXXFLAGS = $(CXXFLAGS) @@ -414,6 +433,13 @@ else endif endif +ifeq ($(SWIG_LUA_FOUND),1) + $(info Lua SWIG: wrapper found) +endif +ifeq ($(SWIG_PYTHON_FOUND),1) + $(info Python SWIG: wrapper found) +endif + $(info compiler version: $(shell $(CC) --version|head -n 1)) $(info ===================================================================) @@ -572,6 +598,15 @@ SRCS += bucketsort.c \ parity.c \ util_posix.c +# swig + +ifeq ($(SWIG_LUA_FOUND),1) + SRCS += pm3_luawrap.c +endif +ifeq ($(SWIG_PYTHON_FOUND),1) + SRCS += pm3_pywrap.c +endif + # gui ifeq ($(QT_FOUND),1) CXXSRCS = proxgui.cpp proxguiqt.cpp proxguiqt.moc.cpp @@ -711,6 +746,18 @@ ifneq ($(WHEREAMI_FOUND),1) $(Q)$(MAKE) --no-print-directory -C $(WHEREAMILIBPATH) all endif +######## +# SWIG # +######## + +src/pm3_luawrap.c: pm3.i + $(info [=] GEN $@) + $(Q)$(SWIG) -lua -o $@ $< + +src/pm3_pywrap.c: pm3.i + $(info [=] GEN $@) + $(Q)$(SWIG) -python -o $@ $< + ######## # misc # ######## @@ -725,6 +772,14 @@ src/version.c: default_version.c # easy printing of MAKE VARIABLES print-%: ; @echo $* = $($*) +# SWIG files emit a number of warnings, we've to ignore them +%wrap.o: %wrap.c +$(OBJDIR)/%wrap.o : %wrap.c $(OBJDIR)/%wrap.d + $(info [-] CC $<) + $(Q)$(MKDIR) $(dir $@) + $(Q)$(CC) $(DEPFLAGS) $(PM3CFLAGS) -Wno-missing-prototypes -Wno-missing-declarations -Wno-missing-field-initializers -c -o $@ $< + $(Q)$(POSTCOMPILE) + %.o: %.c $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d $(info [-] CC $<) diff --git a/client/experimental_client_with_swig/.gitignore b/client/experimental_client_with_swig/.gitignore deleted file mode 100644 index 567609b12..000000000 --- a/client/experimental_client_with_swig/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build/ diff --git a/client/experimental_client_with_swig/00make_swig.sh b/client/experimental_client_with_swig/00make_swig.sh index 6c752d024..626a87986 100755 --- a/client/experimental_client_with_swig/00make_swig.sh +++ b/client/experimental_client_with_swig/00make_swig.sh @@ -1,4 +1,5 @@ #!/bin/bash -swig -lua -o ../src/pm3_luawrap.c ../src/pm3.i -swig -python -o ../src/pm3_pywrap.c ../src/pm3.i +cd .. +make src/pm3_luawrap.c +make src/pm3_pywrap.c diff --git a/client/experimental_client_with_swig/01make_client.sh b/client/experimental_client_with_swig/01make_client_cmake.sh similarity index 92% rename from client/experimental_client_with_swig/01make_client.sh rename to client/experimental_client_with_swig/01make_client_cmake.sh index 667a6351e..48a5bd4f2 100755 --- a/client/experimental_client_with_swig/01make_client.sh +++ b/client/experimental_client_with_swig/01make_client_cmake.sh @@ -1,5 +1,6 @@ #!/bin/bash +cd .. rm -rf build mkdir build ( @@ -7,4 +8,3 @@ mkdir build cmake .. make -j ) - diff --git a/client/experimental_client_with_swig/01make_client_continue.sh b/client/experimental_client_with_swig/01make_client_cmake_continue.sh similarity index 86% rename from client/experimental_client_with_swig/01make_client_continue.sh rename to client/experimental_client_with_swig/01make_client_cmake_continue.sh index 4c85bb9dc..abd022c97 100755 --- a/client/experimental_client_with_swig/01make_client_continue.sh +++ b/client/experimental_client_with_swig/01make_client_cmake_continue.sh @@ -1,5 +1,6 @@ #!/bin/bash +cd .. ( cd build make -j diff --git a/client/experimental_client_with_swig/02a_run_test_lua.sh b/client/experimental_client_with_swig/02a_run_test_lua.sh deleted file mode 100755 index bca993a44..000000000 --- a/client/experimental_client_with_swig/02a_run_test_lua.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -build/proxmark3 /dev/ttyACM0 -c "script run testembedded.lua" diff --git a/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh b/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh new file mode 100755 index 000000000..08ed58b6b --- /dev/null +++ b/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +../build/proxmark3 /dev/ttyACM0 -c "script run testembedded.lua" diff --git a/client/experimental_client_with_swig/02b_run_test_py.sh b/client/experimental_client_with_swig/02b_run_test_py_cmake.sh similarity index 59% rename from client/experimental_client_with_swig/02b_run_test_py.sh rename to client/experimental_client_with_swig/02b_run_test_py_cmake.sh index fcaf4c8f8..4ef059045 100755 --- a/client/experimental_client_with_swig/02b_run_test_py.sh +++ b/client/experimental_client_with_swig/02b_run_test_py_cmake.sh @@ -4,4 +4,4 @@ #/usr/lib/python3/dist-packages/pm3.py # need access to pm3.py -PYTHONPATH=../src build/proxmark3 /dev/ttyACM0 -c "script run testembedded.py" +PYTHONPATH=../src ../build/proxmark3 /dev/ttyACM0 -c "script run testembedded.py" diff --git a/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh b/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh new file mode 100755 index 000000000..59013cc22 --- /dev/null +++ b/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +#/usr/local/lib/python3/dist-packages/pm3.py +#/usr/lib/python3/dist-packages/pm3.py + +# need access to pm3.py +PYTHONPATH=../src ../proxmark3 /dev/ttyACM0 -c "script run testembedded_grab.py" -i + diff --git a/client/experimental_client_with_swig/CMakeLists.txt b/client/experimental_client_with_swig/CMakeLists.txt deleted file mode 100644 index 6d1667072..000000000 --- a/client/experimental_client_with_swig/CMakeLists.txt +++ /dev/null @@ -1,572 +0,0 @@ -# Usage: -# mkdir build -# cd build -# cmake .. (see below for options) -# make (VERBOSE=1 if needed) -# -# MINGW: -# On ProxSpace 3.4: -# cmake -G"MSYS Makefiles" .. -# On Proxspace 3.3 or less, you need to install cmake: -# pacman -S mingw-w64-x86_64-cmake -# /mingw64/bin/cmake -G"MSYS Makefiles" .. -# -# Android cross-compilation: (ANDROID_ABI=arm64-v8a for a 64b version) -# cmake \ -# -DCMAKE_TOOLCHAIN_FILE=/build/cmake/android.toolchain.cmake \ -# -DANDROID_ABI=armeabi-v7a \ -# -DANDROID_NATIVE_API_LEVEL=android-19 \ -# -DSKIPBT=1 -DSKIPPYTHON=1 -DSKIPPTHREAD=1 .. - -message(STATUS "CMake ${CMAKE_VERSION}") -cmake_minimum_required(VERSION 3.10) -project(proxmark3) -SET (PM3_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) - -if(CMAKE_VERSION VERSION_LESS "3.7.0") - set(CMAKE_INCLUDE_CURRENT_DIR ON) -endif() - -find_package(PkgConfig) - -if (NOT SKIPQT EQUAL 1) - if(APPLE AND EXISTS /usr/local/opt/qt5) - # Homebrew installs Qt5 (up to at least 5.11.0) in - # /usr/local/qt5. Ensure that it can be found by CMake - # since it is not in the default /usr/local prefix. - # Add it to PATHS so that it doesn't override the - # CMAKE_PREFIX_PATH environment variable. - # QT_FIND_PACKAGE_OPTIONS should be passed to find_package, - # e.g. find_package(Qt5Core ${QT_FIND_PACKAGE_OPTIONS}) - list(APPEND QT_FIND_PACKAGE_OPTIONS PATHS /usr/local/opt/qt5) - endif(APPLE AND EXISTS /usr/local/opt/qt5) - set(QT_PACKAGELIST - Qt5Core - Qt5Widgets - Qt5Gui - ) - set(Qt5_FOUND ON) - foreach(_qt_package IN LISTS QT_PACKAGELIST) - find_package(${_qt_package} QUIET ${QT_FIND_PACKAGE_OPTIONS}) - set(Qt5_LIBRARIES ${${_qt_package}_LIBRARIES} ${Qt5_LIBRARIES}) - if(NOT ${_qt_package}_FOUND) - set(Qt5_FOUND OFF) - endif(NOT ${_qt_package}_FOUND) - endforeach() -endif (NOT SKIPQT EQUAL 1) - -if (NOT SKIPBT EQUAL 1) - pkg_search_module(BLUEZ QUIET bluez) -endif (NOT SKIPBT EQUAL 1) - -if (NOT SKIPPYTHON EQUAL 1) - pkg_search_module(PYTHON3 QUIET python3) - pkg_search_module(PYTHON3EMBED QUIET python3-embed) -endif (NOT SKIPPYTHON EQUAL 1) - -# If cross-compiled, we need to init source and build. -if (CMAKE_TOOLCHAIN_FILE) - set(CFLAGS_EXTERNAL_LIB "CFLAGS=--target=${CMAKE_C_COMPILER_TARGET} -w") - set(EMBED_READLINE ON) - set(EMBED_BZIP2 ON) -endif (CMAKE_TOOLCHAIN_FILE) - -if (EMBED_READLINE OR EMBED_BZIP2) - include(ExternalProject) -endif (EMBED_READLINE OR EMBED_BZIP2) - -if (NOT SKIPREADLINE EQUAL 1) - if (APPLE) - find_path(READLINE_INCLUDE_DIRS readline/readline.h /usr/local/opt/readline/include /opt/local/include /opt/include /usr/local/include /usr/include NO_DEFAULT_PATH) - find_library(READLINE_LIBRARIES readline /usr/local/opt/readline/lib /opt/local/lib /opt/lib /usr/local/lib /usr/lib NO_DEFAULT_PATH) - endif (APPLE) - if (EMBED_READLINE) - ExternalProject_Add(ncurses - URL http://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.0.tar.gz - PREFIX deps/ncurses - DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/ncurses - CONFIGURE_COMMAND ./configure CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} --host=arm --disable-database --with-fallbacks=ansi-generic,ansi-mini,color_xterm,dtterm,dumb,Eterm,Eterm-256color,Eterm-88color,eterm-color,gnome,gnome-256color,guru,hurd,iTerm.app,konsole,konsole-16color,konsole-256color,konsole-base,konsole-linux,konsole-solaris,konsole-vt100,kterm,kterm-color,linux,linux-16color,linux-basic,mac,mlterm,mlterm-256color,mrxvt,mrxvt-256color,mterm,mterm-ansi,mvterm,nsterm,nsterm-16color,nsterm-256color,pty,putty,putty-256color,putty-vt100,rxvt,rxvt-16color,rxvt-256color,rxvt-88color,rxvt-basic,rxvt-color,screen,screen-16color,screen-256color,simpleterm,st-16color,st-256color,st52,st52-color,stv52,tt,tt52,unknown,vt100,vt102,vte,vte-256color,xterm,xterm-16color,xterm-256color,xterm-88color,xterm-basic,xterm-bold,xterm-color,xterm-utf8,xterm-vt220,xterm-vt52,xterm1,xtermc,xtermm --enable-termcap --without-ada --without-debug --without-dlsym --without-gpm --without-develop --without-tests --without-cxx-binding --with-termlib - BUILD_IN_SOURCE ON - BUILD_COMMAND make libs - INSTALL_COMMAND "" - LOG_DOWNLOAD ON - ) - ExternalProject_Add_StepTargets(ncurses configure build install) - - ExternalProject_Add(readline - URL ftp://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz - PREFIX deps/readline - DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/readline - CONFIGURE_COMMAND ./configure CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} --host=arm --enable-static - BUILD_IN_SOURCE ON - BUILD_COMMAND make - INSTALL_COMMAND "" - LOG_DOWNLOAD ON - ) - ExternalProject_Add_StepTargets(readline configure build install) - set(READLINE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/deps/readline/src/) - set(READLINE_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/deps/readline/src/readline/libreadline.a ${CMAKE_CURRENT_BINARY_DIR}/deps/ncurses/src/ncurses/lib/libtinfo.a) - else (EMBED_READLINE) - find_path(READLINE_INCLUDE_DIRS readline/readline.h) - find_library(READLINE_LIBRARIES readline) - endif (EMBED_READLINE) - if (READLINE_INCLUDE_DIRS AND READLINE_LIBRARIES) - set(READLINE_FOUND ON) - endif (READLINE_INCLUDE_DIRS AND READLINE_LIBRARIES) -endif (NOT SKIPREADLINE EQUAL 1) - -if (NOT SKIPJANSSONSYSTEM EQUAL 1) - pkg_check_modules(PC_JANSSON QUIET jansson) - find_path(JANSSON_INCLUDE_DIRS - NAMES jansson.h - HINTS ${PC_JANSSON_INCLUDEDIR} ${PC_JANSSON_INCLUDE_DIRS}) - find_library(JANSSON_LIBRARIES - NAMES jansson libjansson - HINTS ${PC_JANSSON_LIBDIR} ${PC_JANSSON_LIBRARY_DIRS}) - if (JANSSON_INCLUDE_DIRS AND JANSSON_LIBRARIES) - set(JANSSON_FOUND ON) - endif (JANSSON_INCLUDE_DIRS AND JANSSON_LIBRARIES) -endif (NOT SKIPJANSSONSYSTEM EQUAL 1) - -if(EMBED_BZIP2) - set(BZIP2_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2) - ExternalProject_Add(bzip2 - GIT_REPOSITORY https://android.googlesource.com/platform/external/bzip2 - GIT_TAG platform-tools-30.0.2 - PREFIX deps/bzip2 - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/bzip2 - CONFIGURE_COMMAND mkdir -p ${BZIP2_BUILD_DIR} && git archive --format tar HEAD | tar -C ${BZIP2_BUILD_DIR} -x - BUILD_IN_SOURCE ON - BUILD_COMMAND make -C ${BZIP2_BUILD_DIR} -j4 CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} ${CFLAGS_EXTERNAL_LIB} libbz2.a - INSTALL_COMMAND "" - LOG_DOWNLOAD ON - ) - ExternalProject_Add_StepTargets(bzip2 configure build install) - set(BZIP2_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2) - set(BZIP2_LIBRARIES ${CMAKE_CURRENT_BINARY_DIR}/deps/bzip2/src/bzip2/libbz2.a) - set(BZIP2_FOUND ON) -else(EMBED_BZIP2) - find_package (BZip2 REQUIRED) -endif(EMBED_BZIP2) - -if (NOT SKIPWHEREAMISYSTEM EQUAL 1) - find_path(WHEREAMI_INCLUDE_DIRS whereami.h) - find_library(WHEREAMI_LIBRARIES whereami) - if (WHEREAMI_INCLUDE_DIRS AND WHEREAMI_LIBRARIES) - set(WHEREAMI_FOUND ON) - endif (WHEREAMI_INCLUDE_DIRS AND WHEREAMI_LIBRARIES) -endif (NOT SKIPWHEREAMISYSTEM EQUAL 1) - -add_subdirectory(${PM3_ROOT}/client/deps deps) - -set (TARGET_SOURCES - ${PM3_ROOT}/common/commonutil.c - ${PM3_ROOT}/common/util_posix.c - ${PM3_ROOT}/common/parity.c - ${PM3_ROOT}/common/bucketsort.c - ${PM3_ROOT}/common/crapto1/crapto1.c - ${PM3_ROOT}/common/crapto1/crypto1.c - ${PM3_ROOT}/common/crc.c - ${PM3_ROOT}/common/crc16.c - ${PM3_ROOT}/common/crc32.c - ${PM3_ROOT}/common/crc64.c - ${PM3_ROOT}/common/lfdemod.c - ${PM3_ROOT}/common/legic_prng.c - ${PM3_ROOT}/common/iso15693tools.c - ${PM3_ROOT}/common/cardhelper.c - ${PM3_ROOT}/common/generator.c - ${PM3_ROOT}/client/src/crypto/asn1dump.c - ${PM3_ROOT}/client/src/crypto/asn1utils.c - ${PM3_ROOT}/client/src/crypto/libpcrypto.c - ${PM3_ROOT}/client/src/emv/test/cda_test.c - ${PM3_ROOT}/client/src/emv/test/crypto_test.c - ${PM3_ROOT}/client/src/emv/test/cryptotest.c - ${PM3_ROOT}/client/src/emv/test/dda_test.c - ${PM3_ROOT}/client/src/emv/test/sda_test.c - ${PM3_ROOT}/client/src/emv/apduinfo.c - ${PM3_ROOT}/client/src/emv/cmdemv.c - ${PM3_ROOT}/client/src/emv/crypto.c - ${PM3_ROOT}/client/src/emv/crypto_polarssl.c - ${PM3_ROOT}/client/src/emv/dol.c - ${PM3_ROOT}/client/src/emv/emv_pk.c - ${PM3_ROOT}/client/src/emv/emv_pki.c - ${PM3_ROOT}/client/src/emv/emv_pki_priv.c - ${PM3_ROOT}/client/src/emv/emv_roca.c - ${PM3_ROOT}/client/src/emv/emv_tags.c - ${PM3_ROOT}/client/src/emv/emvcore.c - ${PM3_ROOT}/client/src/emv/emvjson.c - ${PM3_ROOT}/client/src/emv/tlv.c - ${PM3_ROOT}/client/src/fido/additional_ca.c - ${PM3_ROOT}/client/src/fido/cbortools.c - ${PM3_ROOT}/client/src/fido/cose.c - ${PM3_ROOT}/client/src/fido/fidocore.c - ${PM3_ROOT}/client/src/loclass/cipher.c - ${PM3_ROOT}/client/src/loclass/cipherutils.c - ${PM3_ROOT}/client/src/loclass/elite_crack.c - ${PM3_ROOT}/client/src/loclass/hash1_brute.c - ${PM3_ROOT}/client/src/loclass/ikeys.c - ${PM3_ROOT}/client/src/mifare/mad.c - ${PM3_ROOT}/client/src/mifare/mfkey.c - ${PM3_ROOT}/client/src/mifare/mifare4.c - ${PM3_ROOT}/client/src/mifare/mifaredefault.c - ${PM3_ROOT}/client/src/mifare/mifarehost.c - ${PM3_ROOT}/client/src/mifare/ndef.c - ${PM3_ROOT}/client/src/mifare/desfire_crypto.c - ${PM3_ROOT}/client/src/uart/uart_posix.c - ${PM3_ROOT}/client/src/uart/uart_win32.c - ${PM3_ROOT}/client/src/ui/overlays.ui - ${PM3_ROOT}/client/src/aiddesfire.c - ${PM3_ROOT}/client/src/aidsearch.c - ${PM3_ROOT}/client/src/cmdanalyse.c - ${PM3_ROOT}/client/src/cmdcrc.c - ${PM3_ROOT}/client/src/cmddata.c - ${PM3_ROOT}/client/src/cmdflashmem.c - ${PM3_ROOT}/client/src/cmdflashmemspiffs.c - ${PM3_ROOT}/client/src/cmdhf.c - ${PM3_ROOT}/client/src/cmdhf14a.c - ${PM3_ROOT}/client/src/cmdhf14b.c - ${PM3_ROOT}/client/src/cmdhf15.c - ${PM3_ROOT}/client/src/cmdhfcryptorf.c - ${PM3_ROOT}/client/src/cmdhfepa.c - ${PM3_ROOT}/client/src/cmdhffelica.c - ${PM3_ROOT}/client/src/cmdhffido.c - ${PM3_ROOT}/client/src/cmdhficlass.c - ${PM3_ROOT}/client/src/cmdhflegic.c - ${PM3_ROOT}/client/src/cmdhflist.c - ${PM3_ROOT}/client/src/cmdhflto.c - ${PM3_ROOT}/client/src/cmdhfmf.c - ${PM3_ROOT}/client/src/cmdhfmfdes.c - ${PM3_ROOT}/client/src/cmdhfmfhard.c - ${PM3_ROOT}/client/src/cmdhfmfp.c - ${PM3_ROOT}/client/src/cmdhfmfu.c - ${PM3_ROOT}/client/src/cmdhfst.c - ${PM3_ROOT}/client/src/cmdhfthinfilm.c - ${PM3_ROOT}/client/src/cmdhftopaz.c - ${PM3_ROOT}/client/src/cmdhfwaveshare.c - ${PM3_ROOT}/client/src/cmdhw.c - ${PM3_ROOT}/client/src/cmdlf.c - ${PM3_ROOT}/client/src/cmdlfawid.c - ${PM3_ROOT}/client/src/cmdlfcotag.c - ${PM3_ROOT}/client/src/cmdlfdestron.c - ${PM3_ROOT}/client/src/cmdlfem4x.c - ${PM3_ROOT}/client/src/cmdlfem4x05.c - ${PM3_ROOT}/client/src/cmdlfem4x50.c - ${PM3_ROOT}/client/src/cmdlffdxb.c - ${PM3_ROOT}/client/src/cmdlfgallagher.c - ${PM3_ROOT}/client/src/cmdlfguard.c - ${PM3_ROOT}/client/src/cmdlfhid.c - ${PM3_ROOT}/client/src/cmdlfhitag.c - ${PM3_ROOT}/client/src/cmdlfidteck.c - ${PM3_ROOT}/client/src/cmdlfindala.c - ${PM3_ROOT}/client/src/cmdlfio.c - ${PM3_ROOT}/client/src/cmdlfjablotron.c - ${PM3_ROOT}/client/src/cmdlfkeri.c - ${PM3_ROOT}/client/src/cmdlfmotorola.c - ${PM3_ROOT}/client/src/cmdlfnedap.c - ${PM3_ROOT}/client/src/cmdlfnexwatch.c - ${PM3_ROOT}/client/src/cmdlfnoralsy.c - ${PM3_ROOT}/client/src/cmdlfpac.c - ${PM3_ROOT}/client/src/cmdlfparadox.c - ${PM3_ROOT}/client/src/cmdlfpcf7931.c - ${PM3_ROOT}/client/src/cmdlfpresco.c - ${PM3_ROOT}/client/src/cmdlfpyramid.c - ${PM3_ROOT}/client/src/cmdlfsecurakey.c - ${PM3_ROOT}/client/src/cmdlft55xx.c - ${PM3_ROOT}/client/src/cmdlfti.c - ${PM3_ROOT}/client/src/cmdlfviking.c - ${PM3_ROOT}/client/src/cmdlfvisa2000.c - ${PM3_ROOT}/client/src/cmdmain.c - ${PM3_ROOT}/client/src/cmdparser.c - ${PM3_ROOT}/client/src/cmdscript.c - ${PM3_ROOT}/client/src/cmdsmartcard.c - ${PM3_ROOT}/client/src/cmdtrace.c - ${PM3_ROOT}/client/src/cmdusart.c - ${PM3_ROOT}/client/src/cmdwiegand.c - ${PM3_ROOT}/client/src/comms.c - ${PM3_ROOT}/client/src/fileutils.c - ${PM3_ROOT}/client/src/flash.c - ${PM3_ROOT}/client/src/graph.c - ${PM3_ROOT}/client/src/jansson_path.c - ${PM3_ROOT}/client/src/preferences.c - ${PM3_ROOT}/client/src/pm3.c - ${PM3_ROOT}/client/src/pm3_binlib.c - ${PM3_ROOT}/client/src/pm3_bitlib.c - ${PM3_ROOT}/client/src/prng.c - ${PM3_ROOT}/client/src/scandir.c - ${PM3_ROOT}/client/src/scripting.c - ${PM3_ROOT}/client/src/tea.c - ${PM3_ROOT}/client/src/ui.c - ${PM3_ROOT}/client/src/util.c - ${PM3_ROOT}/client/src/wiegand_formats.c - ${PM3_ROOT}/client/src/wiegand_formatutils.c - ${CMAKE_BINARY_DIR}/version.c - ) - -add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/version.c - COMMAND sh ${PM3_ROOT}/tools/mkversion.sh > ${CMAKE_BINARY_DIR}/version.c || perl ${PM3_ROOT}/tools/mkversion.pl > ${CMAKE_BINARY_DIR}/version.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version.c ${CMAKE_BINARY_DIR}/version.c - DEPENDS ${PM3_ROOT}/common/default_version.c -) - -set(ADDITIONAL_SRC "") -set(ADDITIONAL_LNK "") -set(ADDITIONAL_DIRS "") -set(ADDITIONAL_LNKDIRS "") -set(X86_CPUS x86 x86_64 i686) - -message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}") - -if (APPLE) - message(STATUS "Apple device detected.") - set(ADDITIONAL_SRC ${PM3_ROOT}/client/src/util_darwin.h ${PM3_ROOT}/client/src/util_darwin.m ${ADDITIONAL_SRC}) - set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit") -endif (APPLE) - -if ((NOT SKIPQT EQUAL 1) AND (Qt5_FOUND)) - set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) - set(CMAKE_AUTOUIC ON) - set (TARGET_SOURCES - ${PM3_ROOT}/client/src/proxgui.cpp - ${PM3_ROOT}/client/src/proxguiqt.cpp - ${TARGET_SOURCES}) - - add_definitions("-DHAVE_GUI") - set(ADDITIONAL_LNK ${Qt5_LIBRARIES} ${ADDITIONAL_LNK}) -else ((NOT SKIPQT EQUAL 1) AND (Qt5_FOUND)) - set(TARGET_SOURCES - ${PM3_ROOT}/client/src/guidummy.cpp - ${TARGET_SOURCES}) -endif ((NOT SKIPQT EQUAL 1) AND (Qt5_FOUND)) - -if (NOT SKIPBT EQUAL 1) - if (BLUEZ_FOUND) - add_definitions("-DHAVE_BLUEZ") - set(ADDITIONAL_LNK ${BLUEZ_LIBRARIES} ${ADDITIONAL_LNK}) - endif (BLUEZ_FOUND) -endif(NOT SKIPBT EQUAL 1) - -if (JANSSON_FOUND) - set(ADDITIONAL_DIRS ${JANSSON_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${JANSSON_LIBRARIES} ${ADDITIONAL_LNK}) -endif (JANSSON_FOUND) - -if (NOT SKIPPYTHON EQUAL 1) - if (PYTHON3EMBED_FOUND) - add_definitions(-DHAVE_PYTHON) - set(ADDITIONAL_DIRS ${PYTHON3EMBED_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${PYTHON3EMBED_LIBRARIES} ${ADDITIONAL_LNK}) - set(ADDITIONAL_LNKDIRS ${PYTHON3EMBED_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS}) - elseif (PYTHON3_FOUND) - add_definitions(-DHAVE_PYTHON) - set(ADDITIONAL_DIRS ${PYTHON3_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${PYTHON3_LIBRARIES} ${ADDITIONAL_LNK}) - set(ADDITIONAL_LNKDIRS ${PYTHON3_LIBRARY_DIRS} ${ADDITIONAL_LNKDIRS}) - endif (PYTHON3EMBED_FOUND) -endif (NOT SKIPPYTHON EQUAL 1) - -if (NOT SKIPREADLINE EQUAL 1) - if (READLINE_FOUND) - add_definitions("-DHAVE_READLINE") - set(ADDITIONAL_DIRS ${READLINE_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${READLINE_LIBRARIES} ${ADDITIONAL_LNK}) - endif (READLINE_FOUND) -endif(NOT SKIPREADLINE EQUAL 1) - -if (BZIP2_FOUND) - set(ADDITIONAL_DIRS ${BZIP2_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${BZIP2_LIBRARIES} ${ADDITIONAL_LNK}) -endif (BZIP2_FOUND) - -if (WHEREAMI_FOUND) - set(ADDITIONAL_DIRS ${WHEREAMI_INCLUDE_DIRS} ${ADDITIONAL_DIRS}) - set(ADDITIONAL_LNK ${WHEREAMI_LIBRARIES} ${ADDITIONAL_LNK}) -endif (WHEREAMI_FOUND) - -message(STATUS "===================================================================") -if (SKIPQT EQUAL 1) - message(STATUS "GUI support: skipped") -else (SKIPQT EQUAL 1) - if (Qt5_FOUND) - message(STATUS "GUI support: QT5 found, enabled") - else (Qt5_FOUND) - message(STATUS "GUI support: QT5 not found, disabled") - endif (Qt5_FOUND) -endif (SKIPQT EQUAL 1) - -if (SKIPBT EQUAL 1) - message(STATUS "native BT support: skipped") -else (SKIPBT EQUAL 1) - if (BLUEZ_FOUND) - message(STATUS "native BT support: Bluez found, enabled") - else (BLUEZ_FOUND) - message(STATUS "native BT support: Bluez not found, disabled") - endif (BLUEZ_FOUND) -endif(SKIPBT EQUAL 1) - -if (EMBED_BZIP2) - message(STATUS "Bzip2 library: embedded") -else (EMBED_BZIP2) - message(STATUS "Bzip2 library: system library found") -endif (EMBED_BZIP2) - -if (SKIPJANSSONSYSTEM EQUAL 1) - message(STATUS "Jansson library: local library forced") -else (SKIPJANSSONSYSTEM EQUAL 1) - if (JANSSON_FOUND) - message(STATUS "Jansson library: system library found") - else (JANSSON_FOUND) - message(STATUS "Jansson library: system library not found, using local library") - endif (JANSSON_FOUND) -endif (SKIPJANSSONSYSTEM EQUAL 1) - -if (SKIPPYTHON EQUAL 1) - message(STATUS "Python3 library: skipped") -else (SKIPPYTHON EQUAL 1) - if (PYTHON3EMBED_FOUND) - message(STATUS "Python3 library: Python3 embed found, enabled") - elseif (PYTHON_FOUND) - message(STATUS "Python3 library: Python3 found, enabled") - else (PYTHON3EMBED_FOUND) - message(STATUS "Python3 library: Python3 not found, disabled") - endif (PYTHON3EMBED_FOUND) -endif(SKIPPYTHON EQUAL 1) - -if (SKIPREADLINE EQUAL 1) - message(STATUS "Readline library: skipped") -else (SKIPREADLINE EQUAL 1) - if (READLINE_FOUND) - if (EMBED_READLINE) - message(STATUS "Readline library: embedded") - else (EMBED_READLINE) - message(STATUS "Readline library: system library found") - endif (EMBED_READLINE) - else (READLINE_FOUND) - message(STATUS "Readline library: Readline not found, disabled") - endif (READLINE_FOUND) -endif(SKIPREADLINE EQUAL 1) - -if (SKIPWHEREAMISYSTEM EQUAL 1) - message(STATUS "Whereami library: local library forced") -else (SKIPWHEREAMISYSTEM EQUAL 1) - if (WHEREAMI_FOUND) - message(STATUS "Whereami library: system library found") - else (WHEREAMI_FOUND) - message(STATUS "Whereami library: system library not found, using local library") - endif (WHEREAMI_FOUND) -endif (SKIPWHEREAMISYSTEM EQUAL 1) -message(STATUS "===================================================================") - -# Lua SWIG -if (EXISTS ${PM3_ROOT}/client/src/pm3_luawrap.c) - set (TARGET_SOURCES - ${PM3_ROOT}/client/src/pm3_luawrap.c - ${TARGET_SOURCES}) - add_definitions(-DHAVE_LUA_SWIG) - message("Lua SWIG wrapper found") -endif (EXISTS ${PM3_ROOT}/client/src/pm3_luawrap.c) - -# Python SWIG -if (NOT SKIPPYTHON EQUAL 1) - if (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) - if (EXISTS ${PM3_ROOT}/client/src/pm3_pywrap.c) - set (TARGET_SOURCES - ${PM3_ROOT}/client/src/pm3_pywrap.c - ${TARGET_SOURCES}) - add_definitions(-DHAVE_PYTHON_SWIG) - message("Python SWIG wrapper found") - endif (EXISTS ${PM3_ROOT}/client/src/pm3_pywrap.c) - endif (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) -endif (NOT SKIPPYTHON EQUAL 1) - -add_executable(proxmark3 - ${PM3_ROOT}/client/src/proxmark3.c - ${TARGET_SOURCES} - ${ADDITIONAL_SRC} -) - -target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3) -if (EMBED_READLINE) - if (NOT SKIPREADLINE EQUAL 1) - add_dependencies(proxmark3 ncurses readline) - endif (NOT SKIPREADLINE EQUAL 1) -endif (EMBED_READLINE) -if (EMBED_BZIP2) - add_dependencies(proxmark3 bzip2) -endif (EMBED_BZIP2) - -if (MINGW) - # Mingw uses by default Microsoft printf, we want the GNU printf (e.g. for %z) - # and setting _ISOC99_SOURCE sets internally __USE_MINGW_ANSI_STDIO=1 - # FTR __USE_MINGW_ANSI_STDIO seems deprecated in Mingw32 - # but not Mingw64 https://fr.osdn.net/projects/mingw/lists/archive/users/2019-January/000199.html - target_compile_definitions(proxmark3 PRIVATE _ISOC99_SOURCE) - - set(CMAKE_C_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_CXX_FLAGS}") -endif (MINGW) - -target_include_directories(proxmark3 PRIVATE - ${PM3_ROOT}/common - ${PM3_ROOT}/common_fpga - ${PM3_ROOT}/include - ${PM3_ROOT}/client/src - ${PM3_ROOT}/client/include - ${ADDITIONAL_DIRS} -) - -if (NOT APPLE) - # required for Raspberry Pi, but breaks with clang (OSX). Need to be at the end of the linker line. - set(ADDITIONAL_LNK ${ADDITIONAL_LNK} -Wl,--as-needed -latomic -Wl,--no-as-needed) -endif (NOT APPLE) - -if (NOT JANSSON_FOUND) - set(ADDITIONAL_LNK pm3rrg_rdv4_jansson ${ADDITIONAL_LNK}) -endif (NOT JANSSON_FOUND) -if (NOT WHEREAMI_FOUND) - set(ADDITIONAL_LNK pm3rrg_rdv4_whereami ${ADDITIONAL_LNK}) -endif (NOT WHEREAMI_FOUND) - -target_link_libraries(proxmark3 PRIVATE - m - pm3rrg_rdv4_mbedtls - pm3rrg_rdv4_cliparser - pm3rrg_rdv4_lua - pm3rrg_rdv4_tinycbor - pm3rrg_rdv4_amiibo - pm3rrg_rdv4_reveng - pm3rrg_rdv4_hardnested - ${ADDITIONAL_LNK}) - -if (NOT SKIPPTHREAD EQUAL 1) - target_link_libraries(proxmark3 PRIVATE pthread) -endif (NOT SKIPPTHREAD EQUAL 1) - -if (NOT SKIPPYTHON EQUAL 1) - # OSX have a hard time compiling python3 dependency with older cmake. - if (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) - if (NOT CMAKE_VERSION VERSION_LESS 3.13) - target_link_directories(proxmark3 PRIVATE ${ADDITIONAL_LNKDIRS}) - elseif (APPLE) - message( SEND_ERROR "Your CMAKE version is too old for Apple platform, please update to a version >=3.13" ) - endif (NOT CMAKE_VERSION VERSION_LESS 3.13) - endif (PYTHON3EMBED_FOUND OR PYTHON3_FOUND) -endif (NOT SKIPPYTHON EQUAL 1) - -install(TARGETS proxmark3 DESTINATION "bin") -install(DIRECTORY cmdscripts lualibs luascripts pyscripts resources dictionaries DESTINATION "share/proxmark3") - -add_custom_command(OUTPUT lualibs/pm3_cmd.lua - COMMAND "awk -f pm3_cmd_h2lua.awk ../include/pm3_cmd.h > lualibs/pm3_cmd.lua" - COMMENT "Creating lualibs/pm3_cmd.lua" - ) - -add_custom_command(OUTPUT lualibs/mfc_default_keys.lua - COMMAND "awk -f default_keys_dic2lua.awk mfc_default_keys.dic > lualibs/mfc_default_keys.lua" - COMMENT "Creating lualibs/mfc_default_keys.lua" - ) - -#"make package" will trigger this -SET(CPACK_GENERATOR "DEB") -SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Iceman") -INCLUDE(CPack) diff --git a/client/experimental_client_with_swig/output_grabber.py b/client/experimental_client_with_swig/output_grabber.py new file mode 100755 index 000000000..ad405c9d9 --- /dev/null +++ b/client/experimental_client_with_swig/output_grabber.py @@ -0,0 +1,78 @@ +import os +import sys +import threading +import time + +# From https://stackoverflow.com/a/29834357 +class OutputGrabber(object): + """ + Class used to grab standard output or another stream. + """ + escape_char = "\b" + + def __init__(self, stream=None, threaded=False): + self.origstream = stream + self.threaded = threaded + if self.origstream is None: + self.origstream = sys.stdout + self.origstreamfd = self.origstream.fileno() + self.capturedtext = "" + # Create a pipe so the stream can be captured: + self.pipe_out, self.pipe_in = os.pipe() + + def __enter__(self): + self.start() + return self + + def __exit__(self, type, value, traceback): + self.stop() + + def start(self): + """ + Start capturing the stream data. + """ + self.capturedtext = "" + # Save a copy of the stream: + self.streamfd = os.dup(self.origstreamfd) + # Replace the original stream with our write pipe: + os.dup2(self.pipe_in, self.origstreamfd) + if self.threaded: + # Start thread that will read the stream: + self.workerThread = threading.Thread(target=self.readOutput) + self.workerThread.start() + # Make sure that the thread is running and os.read() has executed: + time.sleep(0.01) + + def stop(self): + """ + Stop capturing the stream data and save the text in `capturedtext`. + """ + # Print the escape character to make the readOutput method stop: + self.origstream.write(self.escape_char) + # Flush the stream to make sure all our data goes in before + # the escape character: + self.origstream.flush() + if self.threaded: + # wait until the thread finishes so we are sure that + # we have until the last character: + self.workerThread.join() + else: + self.readOutput() + # Close the pipe: + os.close(self.pipe_in) + os.close(self.pipe_out) + # Restore the original stream: + os.dup2(self.streamfd, self.origstreamfd) + # Close the duplicate stream: + os.close(self.streamfd) + + def readOutput(self): + """ + Read the stream data (one byte at a time) + and save the text in `capturedtext`. + """ + while True: + char = os.read(self.pipe_out,1).decode(self.origstream.encoding) + if not char or self.escape_char in char: + break + self.capturedtext += char diff --git a/client/experimental_client_with_swig/testembedded_grab.py b/client/experimental_client_with_swig/testembedded_grab.py new file mode 100755 index 000000000..caec75769 --- /dev/null +++ b/client/experimental_client_with_swig/testembedded_grab.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python3 + +import pm3 +from output_grabber import OutputGrabber + +out = OutputGrabber() +p=pm3.pm3() +print("Device:", p.name) +with out: + p.console("hw status") +for line in out.capturedtext.split('\n'): + if "Unique ID" in line: + print(line) diff --git a/client/src/pm3.i b/client/src/pm3.i index 5b4a1fb47..dc47563b2 100644 --- a/client/src/pm3.i +++ b/client/src/pm3.i @@ -11,22 +11,22 @@ typedef struct { %extend { pm3() { - printf("SWIG pm3 constructor, get current pm3\n"); +// printf("SWIG pm3 constructor, get current pm3\n"); pm3_device * p = pm3_get_current_dev(); p->script_embedded = 1; return p; } pm3(char *port) { - printf("SWIG pm3 constructor with port, open pm3\n"); +// printf("SWIG pm3 constructor with port, open pm3\n"); pm3_device * p = pm3_open(port); p->script_embedded = 0; return p; } ~pm3() { if ($self->script_embedded) { - printf("SWIG pm3 destructor, nothing to do\n"); +// printf("SWIG pm3 destructor, nothing to do\n"); } else { - printf("SWIG pm3 destructor, close pm3\n"); +// printf("SWIG pm3 destructor, close pm3\n"); pm3_close($self); } } diff --git a/client/src/pm3_luawrap.c b/client/src/pm3_luawrap.c index 2dc4a8dc0..cc8ca7dcf 100644 --- a/client/src/pm3_luawrap.c +++ b/client/src/pm3_luawrap.c @@ -2687,7 +2687,7 @@ static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0}; #include "comms.h" SWIGINTERN pm3 *new_pm3__SWIG_0(void){ - printf("SWIG pm3 constructor, get current pm3\n"); +// printf("SWIG pm3 constructor, get current pm3\n"); pm3_device * p = pm3_get_current_dev(); p->script_embedded = 1; return p; @@ -2701,16 +2701,16 @@ SWIGINTERN int SWIG_lua_isnilstring(lua_State *L, int idx) { } SWIGINTERN pm3 *new_pm3__SWIG_1(char *port){ - printf("SWIG pm3 constructor with port, open pm3\n"); +// printf("SWIG pm3 constructor with port, open pm3\n"); pm3_device * p = pm3_open(port); p->script_embedded = 0; return p; } SWIGINTERN void delete_pm3(pm3 *self){ if (self->script_embedded) { - printf("SWIG pm3 destructor, nothing to do\n"); +// printf("SWIG pm3 destructor, nothing to do\n"); } else { - printf("SWIG pm3 destructor, close pm3\n"); +// printf("SWIG pm3 destructor, close pm3\n"); pm3_close(self); } } diff --git a/client/src/pm3_pywrap.c b/client/src/pm3_pywrap.c index a3a5812ff..03a584e48 100644 --- a/client/src/pm3_pywrap.c +++ b/client/src/pm3_pywrap.c @@ -2672,7 +2672,7 @@ static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0}; #include "comms.h" SWIGINTERN pm3 *new_pm3__SWIG_0(void){ - printf("SWIG pm3 constructor, get current pm3\n"); +// printf("SWIG pm3 constructor, get current pm3\n"); pm3_device * p = pm3_get_current_dev(); p->script_embedded = 1; return p; @@ -2801,16 +2801,16 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) SWIGINTERN pm3 *new_pm3__SWIG_1(char *port){ - printf("SWIG pm3 constructor with port, open pm3\n"); +// printf("SWIG pm3 constructor with port, open pm3\n"); pm3_device * p = pm3_open(port); p->script_embedded = 0; return p; } SWIGINTERN void delete_pm3(pm3 *self){ if (self->script_embedded) { - printf("SWIG pm3 destructor, nothing to do\n"); +// printf("SWIG pm3 destructor, nothing to do\n"); } else { - printf("SWIG pm3 destructor, close pm3\n"); +// printf("SWIG pm3 destructor, close pm3\n"); pm3_close(self); } }