Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-01 09:00:46 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

WIP Serial fix for io_gdb. (#7808)

Browse Source 
At least it allows the serial rsocket backend to be called, but I can't quite connect to my BMP, so I am not 100% sure this works. Something else might have broken something.
This commit is contained in:
Adrian Pistol 2017-06-24 17:18:31 +02:00 committed by radare
parent 0452dea522
commit 7c6a74cdad
2 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libr/io/p/io_gdb.c
View File

@ -76,6 +76,8 @@ static int debug_gdb_write_at(const ut8 *buf, int sz, ut64 addr) {
static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
RIOGdb *riog;
char host[128], *port, *pid;
int i_port = -1;
bool isdev = false;
if (!__plugin_open (io, file, 0))
return NULL;
@ -85,32 +87,53 @@ static RIODesc *__open(RIO *io, const char *file, int rw, int mode) {
}
strncpy (host, file+6, sizeof (host)-1);
host [sizeof (host)-1] = '\0';
port = strchr (host , ':');
if (!port) {
eprintf ("Port not specified. Please use gdb://host:port[/port]\n");
return NULL;
if (host[0] == '/') {
isdev = true;
}
*port = '\0';
port++;
pid = strchr (port, '/');
if (isdev) {
port = strchr (host, '@');
if (port) {
*port = '\0';
port++;
pid = strchr (port, ':');
} else {
pid = strchr (host, ':');
}
} else {
if (r_sandbox_enable (0)) {
eprintf ("sandbox: Cannot use network\n");
return NULL;
}
port = strchr (host , ':');
if (!port) {
eprintf ("Invalid debugger URI. Port missing?\nPlease use either\n"
" - gdb://host:port[/pid] for a network gdbserver.\n"
" - gdb:///dev/DEVICENAME[@speed][:pid] for a serial gdbserver.\n");
return NULL;
}
*port = '\0';
port++;
pid = strchr (port, '/');
}
int i_pid = -1;
if (pid) {
*pid = 0;
pid++;
}
if (r_sandbox_enable (0)) {
eprintf ("sandbox: Cannot use network\n");
return NULL;
}
riog = R_NEW0 (RIOGdb);
gdbr_init (&riog->desc, false);
int i_port = atoi(port);
int i_pid = -1;
if (pid) {
i_pid = atoi (pid);
}
if (port) {
i_port = atoi (port);
}
riog = R_NEW0 (RIOGdb);
gdbr_init (&riog->desc, false);
if (gdbr_connect (&riog->desc, host, i_port) == 0) {
desc = &riog->desc;
if (pid) { // FIXME this is here for now because RDebug's pid and libgdbr's aren't properly synced.

1
libr/socket/serial.c
View File

@ -53,7 +53,6 @@ R_API int r_socket_connect_serial(RSocket *sock, const char *path, int speed, in
(void)set_interface_attribs (fd, speed, parity);
sock->fd = fd;
return fd;
return -1;
}
#else // __UNIX__