#include <unistd.h>
#include <readline/readline.h>
#include <readline/history.h>
-//#include "proxusb.h"
+
#include "proxmark3.h"
#include "proxgui.h"
#include "cmdmain.h"
#include "ui.h"
#include "sleep.h"
#include "cmdparser.h"
-#include "cmdmain.h"
+#include "cmdhw.h"
// a global mutex to prevent interlaced printing from different threads
pthread_mutex_t print_lock;
volatile static bool txcmd_pending = false;
void SendCommand(UsbCommand *c) {
-#if 0
+ #if 0
printf("Sending %d bytes\n", sizeof(UsbCommand));
-#endif
-/*
- if (txcmd_pending) {
- ERR("Sending command failed, previous command is still pending");
- }
-*/
- if(offline)
- {
+ #endif
+
+ if (offline) {
PrintAndLog("Sending bytes to proxmark failed - offline");
return;
}
-
+ /**
+ The while-loop below causes hangups at times, when the pm3 unit is unresponsive
+ or disconnected. The main console thread is alive, but comm thread just spins here.
+ Not good.../holiman
+ **/
while(txcmd_pending);
txcmd = *c;
txcmd_pending = true;
char *script_cmds_file;
};
-//static void *usb_receiver(void *targ) {
-// struct receiver_arg *arg = (struct receiver_arg*)targ;
-// UsbCommand cmdbuf;
-//
-// while (arg->run) {
-// if (ReceiveCommandPoll(&cmdbuf)) {
-// UsbCommandReceived(&cmdbuf);
-// fflush(NULL);
-// }
-// }
-//
-// pthread_exit(NULL);
-// return NULL;
-//}
-
byte_t rx[0x1000000];
byte_t* prx = rx;
struct receiver_arg *arg = (struct receiver_arg*)targ;
size_t rxlen;
size_t cmd_count;
-
+
while (arg->run) {
rxlen = sizeof(UsbCommand);
- if (uart_receive(sp,prx,&rxlen)) {
+ if (uart_receive(sp, prx, &rxlen)) {
prx += rxlen;
if (((prx-rx) % sizeof(UsbCommand)) != 0) {
continue;
}
cmd_count = (prx-rx) / sizeof(UsbCommand);
- // printf("received %d bytes, which represents %d commands\n",(prx-rx), cmd_count);
- for (size_t i=0; i<cmd_count; i++) {
+
+ for (size_t i = 0; i < cmd_count; i++) {
UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
}
}
prx = rx;
-
+
if(txcmd_pending) {
- if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) {
+ if (!uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
PrintAndLog("Sending bytes to proxmark failed");
}
txcmd_pending = false;
}
}
-
+
pthread_exit(NULL);
return NULL;
}
pthread_t reader_thread;
if (arg->usb_present == 1) {
- rarg.run=1;
- // pthread_create(&reader_thread, NULL, &usb_receiver, &rarg);
+ rarg.run = 1;
pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
+ // cache Version information now:
+ CmdVersion(NULL);
}
-
+
FILE *script_file = NULL;
- char script_cmd_buf[256];
-
- if (arg->script_cmds_file)
- {
+ char script_cmd_buf[256]; // iceman, needs lua script the same file_path_buffer as the rest
+
+ if (arg->script_cmds_file) {
script_file = fopen(arg->script_cmds_file, "r");
- if (script_file)
- {
+ if (script_file) {
printf("using 'scripting' commands file %s\n", arg->script_cmds_file);
}
}
read_history(".history");
- while(1)
- {
+
+ while(1) {
+
// If there is a script file
if (script_file)
{
- if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file))
- {
+ if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
fclose(script_file);
script_file = NULL;
- }
- else
- {
+ } else {
char *nl;
nl = strrchr(script_cmd_buf, '\r');
if (nl) *nl = '\0';
+
nl = strrchr(script_cmd_buf, '\n');
if (nl) *nl = '\0';
-
- if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL)
- {
+
+ if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
memset(cmd, 0, strlen(script_cmd_buf));
strcpy(cmd, script_cmd_buf);
printf("%s\n", cmd);
}
}
- if (!script_file)
- {
+ if (!script_file) {
cmd = readline(PROXPROMPT);
}
if (cmd) {
+
while(cmd[strlen(cmd) - 1] == ' ')
cmd[strlen(cmd) - 1] = 0x00;
exit(0);
break;
}
-
CommandReceived(cmd);
add_history(cmd);
}
rarg.run = 0;
pthread_join(reader_thread, NULL);
}
-
- if (script_file)
- {
+
+ if (script_file) {
fclose(script_file);
script_file = NULL;
}
-
+
ExitGraphics();
pthread_exit(NULL);
return NULL;
}
-//static void dumpHelp(char *parent, ...)
-//{
-// printf("## %s\n\n", parent);
-// CommandReceived(parent);
-//
-// printf("\n");
-//}
-
-static void dumpAllHelp()
+static void dumpAllHelp(int markdown)
{
- offline=3;
- printf("\n# Proxmark3 command dump\n\n");
- printf("Some commands are available only if a Proxmark is actually connected,\n");
- printf("Those commands are flagged with \"@\" in front of their description.\n");
+ printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
+ printf("Some commands are available only if a Proxmark is actually connected.%s\n",markdown?" ":"");
+ printf("Check column \"offline\" for their availability.\n");
printf("\n");
command_t *cmds = getTopLevelCommandTable();
-
- dumpCommandsRecursive(cmds);
-
+ dumpCommandsRecursive(cmds, markdown);
}
int main(int argc, char* argv[]) {
if (argc < 2) {
printf("syntax: %s <port>\n\n",argv[0]);
printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
- printf("help: %s -h\n\n", argv[0]);
- printf("\tDump all interactive help at once\n");
+ printf("help: %s -h\n\n", argv[0]);
+ printf("\tDump all interactive help at once\n");
+ printf("markdown: %s -m\n\n", argv[0]);
+ printf("\tDump all interactive help at once in markdown syntax\n");
return 1;
}
-
- if (strcmp(argv[1], "-h") == 0) {
- printf("syntax: %s <port>\n\n",argv[0]);
- printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
- dumpAllHelp();
- return 0;
- }
+ if (strcmp(argv[1], "-h") == 0) {
+ printf("syntax: %s <port>\n\n",argv[0]);
+ printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+ dumpAllHelp(0);
+ return 0;
+ }
+ if (strcmp(argv[1], "-m") == 0) {
+ dumpAllHelp(1);
+ return 0;
+ }
// Make sure to initialize
struct main_loop_arg marg = {
.usb_present = 0,
};
pthread_t main_loop_t;
-/*
- usb_init();
- if (!OpenProxmark(1)) {
- fprintf(stderr,"PROXMARK3: NOT FOUND!\n");
- marg.usb_present = 0;
- offline = 1;
- } else {
- marg.usb_present = 1;
- offline = 0;
- }
-*/
sp = uart_open(argv[1]);
if (sp == INVALID_SERIAL_PORT) {
pthread_join(main_loop_t, NULL);
-// if (marg.usb_present == 1) {
-// CloseProxmark();
-// }
-
// Clean up the port
uart_close(sp);
projects / proxmark3-svn / blobdiff