X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1282b0e6917006ece024a18517b062accdf74a7f..ea73261dc693f8504ef76653fc584d6c5ce2c76c:/client/proxmark3.c?ds=inline

diff --git a/client/proxmark3.c b/client/proxmark3.c
index e9d64c88..78bc1fe4 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -21,18 +21,25 @@
 #include "proxgui.h"
 #include "cmdmain.h"
 #include "uart.h"
-#include "messages.h"
 #include "ui.h"
+#include "sleep.h"
 
 static serial_port sp;
+static UsbCommand txcmd;
+static bool txcmd_pending = false;
 
 void SendCommand(UsbCommand *c) {
 #if 0
   printf("Sending %d bytes\n", sizeof(UsbCommand));
 #endif
-  if (!uart_send(sp,(byte_t*)c,sizeof(UsbCommand))) {
-    ERR("Sending bytes to proxmark failed");
+/*
+  if (txcmd_pending) {
+    ERR("Sending command failed, previous command is still pending");
   }
+*/
+  while(txcmd_pending);
+  txcmd = *c;
+  txcmd_pending = true;
 }
 
 struct receiver_arg {
@@ -60,6 +67,7 @@ struct main_loop_arg {
 //}
 
 byte_t rx[0x1000000];
+byte_t* prx = rx;
 
 static void *uart_receiver(void *targ) {
   struct receiver_arg *arg = (struct receiver_arg*)targ;
@@ -68,24 +76,31 @@ static void *uart_receiver(void *targ) {
   
   while (arg->run) {
     rxlen = sizeof(UsbCommand);
-    if (uart_receive(sp,rx,&rxlen)) {
-      if ((rxlen % sizeof(UsbCommand)) != 0) {
-        PrintAndLog("ERROR: received %03zd bytes, which does not seem to be one or more command(s)\n",rxlen	);
+    if (uart_receive(sp,prx,&rxlen)) {
+      prx += rxlen;
+      if (((prx-rx) % sizeof(UsbCommand)) != 0) {
         continue;
       }
-      cmd_count = rxlen / sizeof(UsbCommand);
-//      printf("received %zd bytes, which represents %zd commands\n",rxlen, cmd_count);
+      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++) {
         UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
       }
     }
+    prx = rx;
+    
+    if(txcmd_pending) {
+      if (!uart_send(sp,(byte_t*)&txcmd,sizeof(UsbCommand))) {
+        PrintAndLog("Sending bytes to proxmark failed");
+      }
+      txcmd_pending = false;
+    }
   }
   
   pthread_exit(NULL);
   return NULL;
 }
 
-
 static void *main_loop(void *targ) {
   struct main_loop_arg *arg = (struct main_loop_arg*)targ;
   struct receiver_arg rarg;
@@ -129,7 +144,7 @@ static void *main_loop(void *targ) {
         nl = strrchr(script_cmd_buf, '\n');
         if (nl) *nl = '\0';
         
-        if ((cmd = (char*) malloc(strlen(script_cmd_buf))) != NULL)
+        if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL)
         {
           memset(cmd, 0, strlen(script_cmd_buf));
           strcpy(cmd, script_cmd_buf);
@@ -181,6 +196,7 @@ static void *main_loop(void *targ) {
 }
 
 int main(int argc, char* argv[]) {
+  srand(time(0));
   
   if (argc < 2) {
     printf("syntax: %s <port>\n\n",argv[0]);
@@ -205,11 +221,16 @@ int main(int argc, char* argv[]) {
     offline = 0;
   }
 */
+  
   sp = uart_open(argv[1]);
   if (sp == INVALID_SERIAL_PORT) {
     printf("ERROR: invalid serial port\n");
     marg.usb_present = 0;
     offline = 1;
+  } else if (sp == CLAIMED_SERIAL_PORT) {
+    printf("ERROR: serial port is claimed by another process\n");
+    marg.usb_present = 0;
+    offline = 1;
   } else {
     marg.usb_present = 1;
     offline = 0;