RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed the correct identification of used communications channel and made sure its only called once

Browse source
This commit is contained in:
iceman1001 2024-01-01 12:15:35 -05:00
parent 2e7be4faba
commit 1dee6c07d2
1 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
client/src/proxmark3.c
View file

@ -129,6 +129,40 @@ static const char *prompt_dev = "";
static const char *prompt_ctx = ""; static const char *prompt_ctx = "";
static const char *prompt_net = ""; static const char *prompt_net = "";
static void prompt_set(void) {
if (g_session.pm3_present) {
switch (g_conn.send_via_ip) {
case PM3_TCPv4:
prompt_net = PROXPROMPT_NET_TCPV4;
break;
case PM3_TCPv6:
prompt_net = PROXPROMPT_NET_TCPV6;
break;
case PM3_UDPv4:
prompt_net = PROXPROMPT_NET_UDPV4;
break;
case PM3_UDPv6:
prompt_net = PROXPROMPT_NET_UDPV6;
break;
case PM3_NONE:
prompt_net = PROXPROMPT_NET_NONE;
break;
default:
break;
}
if (g_conn.send_via_fpc_usart)
prompt_dev = PROXPROMPT_DEV_FPC;
else
prompt_dev = PROXPROMPT_DEV_USB;
} else {
prompt_dev = PROXPROMPT_DEV_OFFLINE;
}
}
static void prompt_compose(char *buf, size_t buflen, const char *promptctx, const char *promptdev, const char *promptnet, bool no_newline) { static void prompt_compose(char *buf, size_t buflen, const char *promptctx, const char *promptdev, const char *promptnet, bool no_newline) {
if (no_newline) { if (no_newline) {
snprintf(buf, buflen - 1, PROXPROMPT_COMPOSE, promptdev, promptnet, promptctx); snprintf(buf, buflen - 1, PROXPROMPT_COMPOSE, promptdev, promptnet, promptctx);
@ -137,6 +171,8 @@ static void prompt_compose(char *buf, size_t buflen, const char *promptctx, cons
} }
} }
static bool c_update_reconnect_prompt = false;
// This function is hooked via RL_EVENT_HOOK. // This function is hooked via RL_EVENT_HOOK.
static int check_comm(void) { static int check_comm(void) {
// If communications thread goes down. Device disconnected then this should hook up PM3 again. // If communications thread goes down. Device disconnected then this should hook up PM3 again.
@ -153,15 +189,19 @@ static int check_comm(void) {
pm3line_update_prompt(prompt_filtered); pm3line_update_prompt(prompt_filtered);
CloseProxmark(g_session.current_device); CloseProxmark(g_session.current_device);
StartReconnectProxmark(); StartReconnectProxmark();
c_update_reconnect_prompt = true;
} }
// its alive again // its alive again
if (IsReconnectedOk() && g_session.pm3_present) { if (c_update_reconnect_prompt && IsReconnectedOk() && g_session.pm3_present) {
prompt_dev = PROXPROMPT_DEV_USB;
prompt_set();
char prompt[PROXPROMPT_MAX_SIZE] = {0}; char prompt[PROXPROMPT_MAX_SIZE] = {0};
prompt_compose(prompt, sizeof(prompt), prompt_ctx, prompt_dev, prompt_net, false); prompt_compose(prompt, sizeof(prompt), prompt_ctx, prompt_dev, prompt_net, false);
char prompt_filtered[PROXPROMPT_MAX_SIZE] = {0}; char prompt_filtered[PROXPROMPT_MAX_SIZE] = {0};
memcpy_filter_ansi(prompt_filtered, prompt, sizeof(prompt_filtered), !g_session.supports_colors); memcpy_filter_ansi(prompt_filtered, prompt, sizeof(prompt_filtered), !g_session.supports_colors);
pm3line_update_prompt(prompt_filtered); pm3line_update_prompt(prompt_filtered);
c_update_reconnect_prompt = false;
} }
msleep(50); msleep(50);
@ -284,36 +324,8 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
while (1) { while (1) {
bool printprompt = false; bool printprompt = false;
if (g_session.pm3_present) {
switch (g_conn.send_via_ip) { prompt_set();
case PM3_TCPv4:
prompt_net = PROXPROMPT_NET_TCPV4;
break;
case PM3_TCPv6:
prompt_net = PROXPROMPT_NET_TCPV6;
break;
case PM3_UDPv4:
prompt_net = PROXPROMPT_NET_UDPV4;
break;
case PM3_UDPv6:
prompt_net = PROXPROMPT_NET_UDPV6;
break;
case PM3_NONE:
prompt_net = PROXPROMPT_NET_NONE;
break;
default:
break;
}
if (g_conn.send_via_fpc_usart)
prompt_dev = PROXPROMPT_DEV_FPC;
else
prompt_dev = PROXPROMPT_DEV_USB;
} else {
prompt_dev = PROXPROMPT_DEV_OFFLINE;
}
check_script: check_script:
// If there is a script file // If there is a script file