X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/dec8e8bd9f67643c07af9b06f9d6e9e1a2fb9191..a198737b44d487782fb75bdc163744e14f5e1ac6:/client/proxmark3.c?ds=sidebyside

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 528cae34..c100bbea 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <readline/readline.h>
 #include <readline/history.h>
-//#include "proxusb.h"
+
 #include "proxmark3.h"
 #include "proxgui.h"
 #include "cmdmain.h"
@@ -34,20 +34,19 @@ static UsbCommand txcmd;
 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;
@@ -62,21 +61,6 @@ struct main_loop_arg {
   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;
 
@@ -84,30 +68,30 @@ static void *uart_receiver(void *targ) {
   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;
 }
@@ -119,44 +103,39 @@ static void *main_loop(void *targ) {
   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);
   }
-  
+
   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);
@@ -164,12 +143,12 @@ static void *main_loop(void *targ) {
       }
     }
 		
-		if (!script_file)
-		{
+		if (!script_file) {
       cmd = readline(PROXPROMPT);
 		}
 		
 		if (cmd) {
+
 			while(cmd[strlen(cmd) - 1] == ' ')
         cmd[strlen(cmd) - 1] = 0x00;
 			
@@ -178,7 +157,6 @@ static void *main_loop(void *targ) {
 					exit(0);
 					break;
 				}
-				
 				CommandReceived(cmd);
 				add_history(cmd);
 			}
@@ -195,26 +173,17 @@ static void *main_loop(void *targ) {
     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(int markdown)
 {
   printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
@@ -254,17 +223,6 @@ int main(int argc, char* argv[]) {
 	};
 	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) {
@@ -305,10 +263,6 @@ int main(int argc, char* argv[]) {
 
 	pthread_join(main_loop_t, NULL);
 
-//  if (marg.usb_present == 1) {
-//    CloseProxmark();
-//  }
-
 	// Clean up the port
 	uart_close(sp);