Merge branch 'master' into master

Signed-off-by: Iceman <iceman@iuse.se>
This commit is contained in:
Iceman authored and GitHub committed 2023-10-14 09:52:55 +02:00
commit 80ac7972fd
5 files changed
+83 -2

No files matched your search

@@ -1,3 +1,4 @@
#!/bin/bash
gcc -o test test.c -I../../include -lpm3rrg_rdv4 -L../build -lpthread
gcc -o test_grab test_grab.c -I../../include -lpm3rrg_rdv4 -L../build -lpthread
+3
View File
@@ -0,0 +1,3 @@
#!/bin/bash
LD_LIBRARY_PATH=../build ./test_grab
@@ -0,0 +1,67 @@
#include "pm3.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
int main(int argc, char *argv[]) {
int pipefd[2];
char buf[8196 + 1];
size_t n;
if (pipe(pipefd) == -1) {
exit(-1);
}
int pid = fork();
if (pid == -1) {
perror("fork");
exit(-1);
}
// child
if (pid == 0) {
printf("[INFO] inside child\n");
// Redirect stdout to the write end of the pipe
dup2(pipefd[1], STDOUT_FILENO);
close(pipefd[0]); // Child: close read end of the pipe
close(pipefd[1]); // Close original write end
pm3 *p;
p = pm3_open("/dev/ttyS9");
//printf("Device: %s\n", pm3_name_get(p));
// Execute the command
pm3_console(p, "hw status");
pm3_close(p);
_exit(-1);
} else {
printf("[INFO] inside parent\n");
// Parent: close write end of the pipe
close(pipefd[1]);
// Read from the pipe
while (1) {
n = read(pipefd[0], buf, sizeof(buf));
if (n == -1) {
continue;
}
if (n == 0) {
break;
} else {
// null termination
buf[n] = 0;
if (strstr(buf, "Unique ID") != NULL) {
printf("%s", buf);
}
}
}
// Close read end
close(pipefd[0]);
}
}
+10 -1
View File
@@ -678,7 +678,16 @@ int TestProxmark(pm3_device_t *dev) {
if (g_conn.send_via_fpc_usart) {
PrintAndLogEx(INFO, "PM3 UART serial baudrate: " _YELLOW_("%u") "\n", g_conn.uart_speed);
} else {
int res = uart_reconfigure_timeouts(is_tcp_conn ? UART_TCP_CLIENT_RX_TIMEOUT_MS : UART_USB_CLIENT_RX_TIMEOUT_MS);
int res;
if (is_tcp_conn) {
if (memcmp(g_conn.serial_port_name + 4, "localhost", 9) == 0 || memcmp(g_conn.serial_port_name + 4, "127.0.0.1", 9) == 0) {
res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS * 2);
} else {
res = uart_reconfigure_timeouts(UART_TCP_CLIENT_RX_TIMEOUT_MS);
}
} else {
res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
}
if (res != PM3_SUCCESS) {
return res;
}