updated code to follow same blinking patterns with leds during flashing/holding button

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index d691eefc4e1b8231e4caf57c368ee551cc747f8c..fa24906d1d32047cefe19ed3a9eb606919daa0ba 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -10,6 +10,87 @@
 
 #include "util.h"
 
 
 #include "util.h"
 

+#ifndef _WIN32
+#include <termios.h>
+#include <sys/ioctl.h> 
+int ukbhit(void)
+{
+  int cnt = 0;
+  int error;
+  static struct termios Otty, Ntty;
+
+
+  tcgetattr( 0, &Otty);
+  Ntty = Otty;
+
+  Ntty.c_iflag          = 0;       /* input mode                */
+  Ntty.c_oflag          = 0;       /* output mode               */
+  Ntty.c_lflag         &= ~ICANON; /* raw mode */
+  Ntty.c_cc[VMIN]       = CMIN;    /* minimum time to wait      */
+  Ntty.c_cc[VTIME]      = CTIME;   /* minimum characters to wait for */
+
+  if (0 == (error = tcsetattr(0, TCSANOW, &Ntty))) {
+    error += ioctl(0, FIONREAD, &cnt);
+    error += tcsetattr(0, TCSANOW, &Otty);
+  }
+
+  return ( error == 0 ? cnt : -1 );
+}
+
+#else
+#include <conio.h>
+int ukbhit(void) {
+       return kbhit();
+}
+#endif
+
+// log files functions
+void AddLogLine(char *fileName, char *extData, char *c) {
+       FILE *fLog = NULL;
+
+       fLog = fopen(fileName, "a");
+       if (!fLog) {
+               printf("Could not append log file %s", fileName);
+               return;
+       }
+
+       fprintf(fLog, "%s", extData);
+       fprintf(fLog, "%s\n", c);
+       fclose(fLog);
+}
+
+void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
+       AddLogLine(fileName, extData, sprint_hex(data, len));
+}
+
+void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
+  char buf[100] = {0};
+       sprintf(buf, "%x%x", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+       AddLogLine(fileName, extData, buf);
+}
+
+void AddLogCurrentDT(char *fileName) {
+       char buff[20];
+       struct tm *curTime;
+
+       time_t now = time(0);
+       curTime = gmtime(&now);
+
+       strftime (buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", curTime);
+       AddLogLine(fileName, "\nanticollision: ", buff);
+}
+
+void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {
+       char * fnameptr = fileName;
+       memset(fileName, 0x00, 200);
+       
+       for (int j = 0; j < byteCount; j++, fnameptr += 2)
+               sprintf(fnameptr, "%02x", uid[j]); 
+       sprintf(fnameptr, "%s", ext); 
+}
+
+// printing and converting functions
+

 void print_hex(const uint8_t * data, const size_t len)
 {
        size_t i;
 void print_hex(const uint8_t * data, const size_t len)
 {
        size_t i;


@@ -49,3 +130,121 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
        }
        return num;
 }
        }
        return num;
 }

+
+//  -------------------------------------------------------------------------
+//  string parameters lib
+//  -------------------------------------------------------------------------
+
+//  -------------------------------------------------------------------------
+//  line     - param line
+//  bg, en   - symbol numbers in param line of beginning an ending parameter
+//  paramnum - param number (from 0)
+//  -------------------------------------------------------------------------
+int param_getptr(const char *line, int *bg, int *en, int paramnum)
+{
+       int i;
+       int len = strlen(line);
+       
+       *bg = 0;
+       *en = 0;
+       
+  // skip spaces
+       while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;
+       if (*bg >= len) {
+               return 1;
+       }
+
+       for (i = 0; i < paramnum; i++) {
+               while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;
+               while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;
+               
+               if (line[*bg] == '\0') return 1;
+       }
+       
+       *en = *bg;
+       while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;
+       
+       (*en)--;
+
+       return 0;
+}
+
+char param_getchar(const char *line, int paramnum)
+{
+       int bg, en;
+       
+       if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
+
+       return line[bg];
+}
+
+uint8_t param_get8(const char *line, int paramnum)
+{
+       return param_get8ex(line, paramnum, 10, 0);
+}
+
+uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
+{
+       int bg, en;
+
+       if (!param_getptr(line, &bg, &en, paramnum)) 
+               return strtol(&line[bg], NULL, base) & 0xff;
+       else
+               return deflt;
+}
+
+uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
+{
+       int bg, en;
+
+       if (!param_getptr(line, &bg, &en, paramnum)) 
+               return strtol(&line[bg], NULL, base);
+       else
+               return deflt;
+}
+
+uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
+{
+       int bg, en;
+
+       if (!param_getptr(line, &bg, &en, paramnum)) 
+               return strtoll(&line[bg], NULL, base);
+       else
+               return deflt;
+
+       return 0;
+}
+
+int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
+{
+       int bg, en, temp, i;
+
+       if (hexcnt % 2)
+               return 1;
+       
+       if (param_getptr(line, &bg, &en, paramnum)) return 1;
+
+       if (en - bg + 1 != hexcnt) 
+               return 1;
+
+       for(i = 0; i < hexcnt; i += 2) {
+               if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) )   return 1;
+               
+               sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+               data[i / 2] = temp & 0xff;
+       }       
+
+       return 0;
+}
+
+int param_getstr(const char *line, int paramnum, char * str)
+{
+       int bg, en;
+
+       if (param_getptr(line, &bg, &en, paramnum)) return 0;
+       
+       memcpy(str, line + bg, en - bg + 1);
+       str[en - bg + 1] = 0;
+       
+       return en - bg + 1;
+}