github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2219 from wh201906/hw_connect

Browse source 
Update connection type in CLI prompt
This commit is contained in:
Iceman 2023-12-27 15:36:01 +01:00 • committed by GitHub
commit 78dfd84b00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
- Fixed CLI prompt - Update connection type prompt after running `hw connect` (@wh201906)
- Changed `uart_receive()` - Check if TCP connection is lost (@wh201906) - Changed `uart_receive()` - Check if TCP connection is lost (@wh201906)
- Change `data detectclock` - now tries all clocks if called w/o any params (@iceman1001) - Change `data detectclock` - now tries all clocks if called w/o any params (@iceman1001)
- Changed `lf search -1u` - improved the autocorrelation detection for unknown signals (@iceman1001) - Changed `lf search -1u` - improved the autocorrelation detection for unknown signals (@iceman1001)

2
client/src/proxmark3.c
View file

@ -281,6 +281,8 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
prompt_net = PROXPROMPT_NET_UDPV6; prompt_net = PROXPROMPT_NET_UDPV6;
break; break;
case PM3_NONE: case PM3_NONE:
prompt_net = PROXPROMPT_NET_NONE;
break;
default: default:
break; break;
} }

1
client/src/proxmark3.h
View file

@ -39,6 +39,7 @@
#define PROXPROMPT_NET_UDPV4 "|" _RL_BOLD_GREEN_("udp") #define PROXPROMPT_NET_UDPV4 "|" _RL_BOLD_GREEN_("udp")
#define PROXPROMPT_NET_TCPV6 "|" _RL_BOLD_GREEN_("tcp v6") #define PROXPROMPT_NET_TCPV6 "|" _RL_BOLD_GREEN_("tcp v6")
#define PROXPROMPT_NET_UDPV6 "|" _RL_BOLD_GREEN_("udp v6") #define PROXPROMPT_NET_UDPV6 "|" _RL_BOLD_GREEN_("udp v6")
#define PROXPROMPT_NET_NONE ""
#define PROXHISTORY "history.txt" #define PROXHISTORY "history.txt"

13
client/src/uart/uart_posix.c
View file

@ -90,6 +90,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
} }
sp->udpBuffer = NULL; sp->udpBuffer = NULL;
rx_empty_counter = 0;
// init timeouts // init timeouts
timeout.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000; timeout.tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000;
g_conn.send_via_local_ip = false; g_conn.send_via_local_ip = false;
@ -157,10 +158,12 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
} }
// for bind option, it's possible to only specify address or port // for bind option, it's possible to only specify address or port
if (strlen(bindAddrStr) == 0) if (strlen(bindAddrStr) == 0) {
bindAddrStr = NULL; bindAddrStr = NULL;
if (bindPortStr != NULL && strlen(bindPortStr) == 0) }
if (bindPortStr != NULL && strlen(bindPortStr) == 0) {
bindPortStr = NULL; bindPortStr = NULL;
}
} }
const char *addrStr = NULL; const char *addrStr = NULL;
@ -208,8 +211,9 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
for (rp = addr; rp != NULL; rp = rp->ai_next) { for (rp = addr; rp != NULL; rp = rp->ai_next) {
sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); sfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (sfd == -1) if (sfd == -1) {
continue; continue;
}
if (!uart_bind(&sfd, bindAddrStr, bindPortStr, isBindingIPv6)) { if (!uart_bind(&sfd, bindAddrStr, bindPortStr, isBindingIPv6)) {
PrintAndLogEx(ERR, "error: Could not bind. errno: %d", errno); PrintAndLogEx(ERR, "error: Could not bind. errno: %d", errno);
@ -220,8 +224,9 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
return INVALID_SERIAL_PORT; return INVALID_SERIAL_PORT;
} }
if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1) if (connect(sfd, rp->ai_addr, rp->ai_addrlen) != -1) {
break; break;
}
close(sfd); close(sfd);
} }

13
client/src/uart/uart_win32.c
View file

@ -93,6 +93,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
} }
sp->udpBuffer = NULL; sp->udpBuffer = NULL;
rx_empty_counter = 0;
g_conn.send_via_local_ip = false; g_conn.send_via_local_ip = false;
g_conn.send_via_ip = PM3_NONE; g_conn.send_via_ip = PM3_NONE;
@ -149,10 +150,12 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
} }
// for bind option, it's possible to only specify address or port // for bind option, it's possible to only specify address or port
if (strlen(bindAddrStr) == 0) if (strlen(bindAddrStr) == 0) {
bindAddrStr = NULL; bindAddrStr = NULL;
if (bindPortStr != NULL && strlen(bindPortStr) == 0) }
if (bindPortStr != NULL && strlen(bindPortStr) == 0) {
bindPortStr = NULL; bindPortStr = NULL;
}
} }
const char *addrStr = NULL; const char *addrStr = NULL;
@ -211,8 +214,9 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
for (rp = addr; rp != NULL; rp = rp->ai_next) { for (rp = addr; rp != NULL; rp = rp->ai_next) {
hSocket = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); hSocket = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (hSocket == INVALID_SOCKET) if (hSocket == INVALID_SOCKET) {
continue; continue;
}
if (!uart_bind(&hSocket, bindAddrStr, bindPortStr, isBindingIPv6)) { if (!uart_bind(&hSocket, bindAddrStr, bindPortStr, isBindingIPv6)) {
PrintAndLogEx(ERR, "error: Could not bind. error: %u", WSAGetLastError()); PrintAndLogEx(ERR, "error: Could not bind. error: %u", WSAGetLastError());
@ -225,8 +229,9 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) {
return INVALID_SERIAL_PORT; return INVALID_SERIAL_PORT;
} }
if (connect(hSocket, rp->ai_addr, (int)rp->ai_addrlen) != INVALID_SOCKET) if (connect(hSocket, rp->ai_addr, (int)rp->ai_addrlen) != INVALID_SOCKET) {
break; break;
}
closesocket(hSocket); closesocket(hSocket);
hSocket = INVALID_SOCKET; hSocket = INVALID_SOCKET;